From: vincent@cubedesigners.com Date: Tue, 21 Aug 2012 11:53:22 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3b0cb04c2ebfc43fcd0dcd88b202d707d63cd79c;p=cubeextranet.git --- diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php index d5e2c5a5f..6c77fa13c 100644 --- a/inc/commons/class.common.core.php +++ b/inc/commons/class.common.core.php @@ -77,7 +77,7 @@ class commonCore extends cubeCore { $_SESSION['user_password'] = $_REQUEST['user_password']; } // Maintenant on vérifie si ces variables sont présentes dans la session - if (!isset($_SESSION['user_email']) || !isset($_SESSION['user_password'])) { + if (!isset($_SESSION['user_email']) || !isset($_SESSION['user_password']) || empty($_SESSION['user_email']) || empty($_SESSION['user_password'])) { // Ce n'est pas le cas, on place la variable connected à false // Et on s'arrête là $this->user = null; diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php index 94a2a9c8d..9ce572d3c 100644 --- a/inc/commons/class.common.tools.php +++ b/inc/commons/class.common.tools.php @@ -380,9 +380,9 @@ class commonTools { $res .= commonPage::bh(); $res.='
'; $res.=''; - $res.=''; + $res.=''; $res.=''; - $res.=''; + $res.=''; $res.=''; $res.=''; $res.='
'.__('Générer une application Phonegap').'
' . __('Générer une application Phonegap') . '
' . __("Titre de l'application") . '' . form::field('title', 30, 64) . '
' . __("Description de l'application") . '' . form::textarea('description',25,5) . '
' . __("Description de l'application") . '' . form::textarea('description', 25, 5) . '
' . __('Package') . '' . form::field('package', 30, 64) . '
' . __('Version') . '' . form::field('version', 30, 64) . '
'; @@ -393,6 +393,77 @@ class commonTools { return $res; } + public static function csr() { + commonDroits::min(1); + global $core; + $res = commonPage::barre(); + $res .= commonPage::tMain(); + $res .= commonPage::bh(); + $res.=''; + $res.=''; + $res.=''; + $res.=''; + $res.=''; + $res.=''; + $res.=''; + $res.='
' . __('Générer une demande de signature de certificat') . '
' . __("Email") . '' . form::field('email', 64, 64, $core->user->email) . '
' . __("Nom") . '' . form::field('nom', 64, 128, $core->user->prenom . ' ' . $core->user->nom) . '
' . __('Pays') . '' . form::combo('country', cubeCountry::getList(false), $core->user->pays) . '
' . $core->typo->BoutonOK(__('Générer la demande de signature')) . '
'; + $res.='
'; + $res .= ''; + $res .= commonPage::bf(); + $res .= commonPage::bMain(); + return $res; + } + + public static function makeCsr() { + + // http://help.adobe.com/en_US/as3/iphone/WS144092a96ffef7cc-371badff126abc17b1f-8000.html + + commonDroits::min(1); + $tmp = cubeFiles::tempdir(); + if (!file_exists($tmp)) { + mkdir($tmp, 0777, true); + } + + // générate key + $openssl = new cubeCommandLine('openssl'); + $openssl->setPath(CONVERTER_PATH); + $openssl->setArg(null, 'genrsa'); + $openssl->setArg('-out', $tmp . '/' . $_POST['email'] . '.key'); + $openssl->setArg(null, '2048'); + $openssl->execute(); + + + // Generate csr + // openssl req -new -key mykey.key -out CertificateSigningRequest.certSigningRequest -subj "/emailAddress=yourAddress@example.com, CN=John Doe, C=US" + + $openssl = new cubeCommandLine('openssl'); + $openssl->setPath(CONVERTER_PATH); + $openssl->setArg(null, 'req'); + $openssl->setArg('-new'); + $openssl->setArg('-key', $tmp . '/' . $_POST['email'] . '.key'); + $openssl->setArg('-out', $tmp . '/CertificateSigningRequest.certSigningRequest'); + $openssl->setArg('-subj', '/emailAddress=' . $_POST['email'] . ', CN=' . $_POST['nom'] . ', C=' . $_POST['country']); + $openssl->execute(); + + fb($openssl->commande); + fb($openssl->output); + + + $tmpfile = cubeFiles::tempnam() . '.zip'; + + $zip = new cubeCommandLine('zip'); + $zip->cd($tmp); + $zip->setArg(null, $tmpfile); + $zip->setArg('0'); + $zip->setArg('u'); + $zip->setArg('r'); + $zip->setArg('X'); + $zip->setArg(null, '.'); + $zip->execute(); + + cubeHTTP::downloadFile($tmpfile, 'csr.zip'); + } + } ?> diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 50ae963fb..062a0891c 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -777,7 +777,6 @@ class wsMaintenance { cubeFiles::deleteFilesOlderThan('/home/ws/ftp', 60); cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60); } - } ?> \ No newline at end of file diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 581a188c6..32db0c784 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -73,6 +73,7 @@ class wsServices extends cubeFlashGateway { } // Send the email $mail = new cubeMail(); + $mail->returnPath = 'postmaster@fluidbook.com'; $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge']; $mail->charset = 'UTF-8'; $mail->to = $this->args['email']; @@ -288,7 +289,7 @@ class wsServices extends cubeFlashGateway { public function proxy() { ob_end_clean(); fb(netHttp::quickGet($_GET['u'], 'php://output')); - $this->outputXML=false; + $this->outputXML = false; } } diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index b199b1b91..87d175d4d 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -607,6 +607,7 @@ html{height:100%}' . "\n"; $args = cubePage::getArgs($args); + $e = explode('_', $args[0]); if (count($e) == 2 || $e[2] < TIME - 10) { $e[2] = TIME; @@ -626,10 +627,15 @@ html{height:100%}' . "\n"; $args = cubePage::getArgs($args); + $qs = ''; + if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) { + $qs = '?' . $_SERVER['QUERY_STRING']; + } + $e = explode('_', $args[0]); if (count($e) == 2 || $e[2] < TIME - 10) { $e[2] = TIME; - http::redirect(SITE_PATH . 'vieweru/' . implode('_', $e) . '/'); + http::redirect(SITE_PATH . 'vieweru/' . implode('_', $e) . '/' . $qs); exit; } @@ -762,13 +768,17 @@ html{height:100%}' . "\n"; public static function viewer($args) { $args = cubePage::getArgs($args); - $wmode = isset($args[1]) ? $args[1] : ''; + + $qs = ''; + if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) { + $qs = '?' . $_SERVER['QUERY_STRING']; + } $e = explode('_', $args[0]); $newurl = null; if (count($e) == 2 || $e[2] < TIME - 10) { $e[2] = TIME; - http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode); + http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $qs); exit; } @@ -836,7 +846,7 @@ html{height:100%}' . "\n"; $standard = 'XHTML 1.0 Transitional'; $css = $js = array(); $css[] = $webcompile . 'style.css'; - $fv = array(); + $fv = $_GET; if ($standalone) { $fv['base'] = $_SERVER['REQUEST_URI']; }