(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index d5e2c5a5fb957ecd007b7df5138c12e462b1d087..6c77fa13c9faf7011c6763ad969bf5ae7bbd422e 100644 (file)
--- 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'];\r
                }\r
                // Maintenant on vérifie si ces variables sont présentes dans la session\r
-               if (!isset($_SESSION['user_email']) || !isset($_SESSION['user_password'])) {\r
+               if (!isset($_SESSION['user_email']) || !isset($_SESSION['user_password']) || empty($_SESSION['user_email']) || empty($_SESSION['user_password'])) {\r
                        // Ce n'est pas le cas, on place la variable connected à false\r
                        // Et on s'arrête là\r
                        $this->user = null;\r

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 94a2a9c8dafa2ef7e3269fc377c6c7f01558ae01..9ce572d3c019c519cc8c318e77cb9144c8a3b3c5 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -380,9 +380,9 @@ class commonTools {
                $res .= commonPage::bh();
                $res.='<form id="urlDecoder" method="post">';
                $res.='<table class="liste">';
-               $res.='<tr><th colspan="2"><strong>'.__('Générer une application Phonegap').'</strong></th></tr>';
+               $res.='<tr><th colspan="2"><strong>' . __('Générer une application Phonegap') . '</strong></th></tr>';
                $res.='<tr><td>' . __("Titre de l'application") . '</td><td>' . form::field('title', 30, 64) . '</td></tr>';
-               $res.='<tr><td>' . __("Description de l'application") . '</td><td>' . form::textarea('description',25,5) . '</td></tr>';
+               $res.='<tr><td>' . __("Description de l'application") . '</td><td>' . form::textarea('description', 25, 5) . '</td></tr>';
                $res.='<tr><td>' . __('Package') . '</td><td>' . form::field('package', 30, 64) . '</td></tr>';
                $res.='<tr><td>' . __('Version') . '</td><td>' . form::field('version', 30, 64) . '</td></tr>';
                $res.='</table>';
@@ -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.='<form action="' . SITE_PATH . 'tools/makeCsr" method="post" class="notajax" enctype="multipart/form-data">';
+               $res.='<table class="liste">';
+               $res.='<tr><th colspan="2"><strong>' . __('Générer une demande de signature de certificat') . '</strong></th></tr>';
+               $res.='<tr><td>' . __("Email") . '</td><td>' . form::field('email', 64, 64, $core->user->email) . '</td></tr>';
+               $res.='<tr><td>' . __("Nom") . '</td><td>' . form::field('nom', 64, 128, $core->user->prenom . ' ' . $core->user->nom) . '</td></tr>';
+               $res.='<tr><td>' . __('Pays') . '</td><td>' . form::combo('country', cubeCountry::getList(false), $core->user->pays) . '</td></tr>';
+               $res.='<tr><td class="right" colspan="2"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Générer la demande de signature')) . '</a></td></td>';
+               $res.='</table>';
+               $res.='</form>';
+               $res .= '</div>';
+               $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 50ae963fb83e41572cd989a40767a61c62f47365..062a0891c129520ebe3872561bfc9e62e0f058e1 100644 (file)
--- 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);\r
                cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60);\r
        }\r
-\r
 }\r
 \r
 ?>
\ 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 581a188c65c9100fcea7276efb6a157566cc9f5a..32db0c7849454c77f74098cbeb80cdc5331bd874 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -73,6 +73,7 @@ class wsServices extends cubeFlashGateway {
                }\r
                // Send the email\r
                $mail = new cubeMail();\r
+               $mail->returnPath = 'postmaster@fluidbook.com';\r
                $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];\r
                $mail->charset = 'UTF-8';\r
                $mail->to = $this->args['email'];\r
@@ -288,7 +289,7 @@ class wsServices extends cubeFlashGateway {
        public function proxy() {\r
                ob_end_clean();\r
                fb(netHttp::quickGet($_GET['u'], 'php://output'));\r
-               $this->outputXML=false;\r
+               $this->outputXML = false;\r
        }\r
 \r
 }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index b199b1b91c37dee13b8a2cd7a81beadbb04cbe04..87d175d4dfacb1c0e5f1e210b42312f2be475edf 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -607,6 +607,7 @@ html{height:100%}' . "\n";
 \r
                $args = cubePage::getArgs($args);\r
 \r
+\r
                $e = explode('_', $args[0]);\r
                if (count($e) == 2 || $e[2] < TIME - 10) {\r
                        $e[2] = TIME;\r
@@ -626,10 +627,15 @@ html{height:100%}' . "\n";
 \r
                $args = cubePage::getArgs($args);\r
 \r
+               $qs = '';\r
+               if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {\r
+                       $qs = '?' . $_SERVER['QUERY_STRING'];\r
+               }\r
+\r
                $e = explode('_', $args[0]);\r
                if (count($e) == 2 || $e[2] < TIME - 10) {\r
                        $e[2] = TIME;\r
-                       http::redirect(SITE_PATH . 'vieweru/' . implode('_', $e) . '/');\r
+                       http::redirect(SITE_PATH . 'vieweru/' . implode('_', $e) . '/' . $qs);\r
                        exit;\r
                }\r
 \r
@@ -762,13 +768,17 @@ html{height:100%}' . "\n";
        public static function viewer($args) {\r
                $args = cubePage::getArgs($args);\r
 \r
-               $wmode = isset($args[1]) ? $args[1] : '';\r
+\r
+               $qs = '';\r
+               if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {\r
+                       $qs = '?' . $_SERVER['QUERY_STRING'];\r
+               }\r
 \r
                $e = explode('_', $args[0]);\r
                $newurl = null;\r
                if (count($e) == 2 || $e[2] < TIME - 10) {\r
                        $e[2] = TIME;\r
-                       http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $wmode);\r
+                       http::redirect(SITE_PATH . 'viewer/' . implode('_', $e) . '/' . $qs);\r
                        exit;\r
                }\r
 \r
@@ -836,7 +846,7 @@ html{height:100%}' . "\n";
                $standard = 'XHTML 1.0 Transitional';\r
                $css = $js = array();\r
                $css[] = $webcompile . 'style.css';\r
-               $fv = array();\r
+               $fv = $_GET;\r
                if ($standalone) {\r
                        $fv['base'] = $_SERVER['REQUEST_URI'];\r
                }\r