(no commit message)

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index d279e7f2c223e3d1d4d67e4f3f571628605400b6..3a3b3451a5ab83e339b12f1cdd7bdd6febbdca00 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -429,15 +429,15 @@ class commonUrl {
 \r
                $res = '';\r
                if ($ext == 'ipa') {\r
-                       $res.='<a href="itms-services://?action=download-manifest&url=' . self::manifestFromIpa($fichier) . '">' . $core->typo->Telecharger('Installer') . '</a> ';\r
+                       $res .= '<a href="itms-services://?action=download-manifest&url=' . self::manifestFromIpa($fichier) . '">' . $core->typo->Telecharger('Installer') . '</a> ';\r
                }\r
-               $res.= '<a href="' . SITE_PATH . 'telecharger/' . self::hashFile($fichier->relPath) . '/' . $fichier->relPath . '">' . $core->typo->Telecharger('Télécharger') . '</a>';\r
+               $res .= '<a href="' . SITE_PATH . 'telecharger/' . self::hashFile($fichier->relPath) . '/' . $fichier->relPath . '">' . $core->typo->Telecharger('Télécharger') . '</a>';\r
                return $res;\r
        }\r
 \r
        public static function manifestFromIpa($fichier) {\r
                $manifest = sha1($fichier->relPath) . '.plist';\r
-               $res = 'http://' . $_SERVER['HTTP_HOST'] . '/cache/iosotamanifest/' . $manifest;\r
+               $res = SCHEME . '://' . $_SERVER['HTTP_HOST'] . '/cache/iosotamanifest/' . $manifest;\r
                $file = ROOT . '/cache/iosotamanifest/' . $manifest;\r
                $tmp = $file . '.info';\r
                $ipa = $fichier->chemin;\r
@@ -459,7 +459,7 @@ class commonUrl {
                        $bundle = $infos['CFBundleIdentifier'];\r
                        $appName = $infos['CFBundleDisplayName'];\r
                        $version = $infos['CFBundleVersion'];\r
-                       $ipaURL = 'http://' . $_SERVER['HTTP_HOST'] . '/telechargerr/' . self::hashFile($fichier->relPath . '//') . '/' . $fichier->relPath;\r
+                       $ipaURL = SCHEME . '://' . $_SERVER['HTTP_HOST'] . '/telechargerr/' . self::hashFile($fichier->relPath . '//') . '/' . $fichier->relPath;\r
 \r
                        $xml = '<?xml version="1.0" encoding="UTF-8"?>\r
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index a69aad61a6658421250aba322a1111fa33006790..e75a9f73e941cbb7c21da6ea78ec0080e6a064f4 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -3,6 +3,8 @@
 define('DB_DRIVER', 'mysql');
 define('DB_ENGINE', 'MyISAM');
 
+$scheme = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http';
+
 define('ROOT', dirname(__FILE__) . '/..');
 
 define('WEBROOT', '');

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 20824fa27f0b2cbb9f7b5a275e50de79a7dcb23d..e4573d9cb041169096e444a0078dfc32b1099d59 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -9,6 +9,8 @@ if ($_SERVER['HTTP_HOST'] == 'workshop.studio-france.com') {
        $theme = 'studiofrance';\r
 }\r
 \r
+\r
+define('SCHEME', $scheme);\r
 define('THEME', $theme);\r
 define('DEV', $dev);\r
 \r
@@ -24,8 +26,8 @@ define('DB_USER', 'extranet');
 define('DB_PASSWORD', 'WvcAeYBDnrB93RXa');\r
 \r
 \r
-define('EXTRANET_URL', 'http://extranet.cubedesigners.com');\r
-define('WS_URL', 'http://workshop.fluidbook.com');\r
+define('EXTRANET_URL', SCHEME . '://extranet.cubedesigners.com');\r
+define('WS_URL', SCHEME . '://workshop.fluidbook.com');\r
 \r
 \r
 if ($ws) {\r
@@ -34,7 +36,7 @@ if ($ws) {
        define('MODE', 'extranet');\r
 }\r
 \r
-define('STATIC_SERVER', 'http://' . $_SERVER['HTTP_HOST'] . WEBROOT);\r
+define('STATIC_SERVER', SCHEME . '://' . $_SERVER['HTTP_HOST'] . WEBROOT);\r
 \r
 define('CSS_PATH', WEBROOT . '/style/' . MODE);\r
 define('STYLE', CSS_PATH);\r
@@ -52,4 +54,3 @@ if (THEME) {
 \r
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);\r
 define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');\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 6c7b86acc236817bb3d304ddc939e0602d7f96ea..6c0f743eecbbe6b6ca39118ed15df6af3b1b7dd6 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -65,7 +65,7 @@ class wsServices extends cubeFlashGateway {
                foreach ($bookmarks as $b) {
                        $range = $b['page'];
                        if ($b['nb'] > 1) {
-                               $range.='-' . ($b['page'] + $b['nb'] - 1);
+                               $range .= '-' . ($b['page'] + $b['nb'] - 1);
                        }
 
                        $file = $this->getPDFComplex($this->args['id'], $range);
@@ -96,7 +96,7 @@ class wsServices extends cubeFlashGateway {
                                }
                        } else {
                                $group[] = $f;
-                               $groupsize+=$size;
+                               $groupsize += $size;
                        }
                }
 
@@ -263,7 +263,7 @@ class wsServices extends cubeFlashGateway {
                                if (!isset($res[$page])) {
                                        $res[$page] = 0;
                                }
-                               $res[$page]+=$f;
+                               $res[$page] += $f;
                        }
                }
                $this->xml->addChild('results', json_encode($res));
@@ -411,7 +411,7 @@ class wsServices extends cubeFlashGateway {
                        $this->outputXML = false;
                        $res = '<!DOCTYPE html><html><head>
                                <meta http-equiv="X-UA-Compatible" content="IE=8" />
-                               <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
+                               <script type="text/javascript" src="//code.jquery.com/jquery-1.8.2.min.js"></script>
                                <script type="text/javascript" src="/js/pdfprint.js"></script>
                                <link rel="stylesheet" type="text/css" href="/style/ws/printpdf.css" />
                                </head>
@@ -502,10 +502,10 @@ class wsServices extends cubeFlashGateway {
                }
 
                $fields = array('Civilité' => 'civilite', 'Prénom' => 'prenom', 'Nom' => 'nom',
-                       'E-mail' => 'email', 'Adresse' => 'adresse', 'Code postal' => 'codepostal', 'Ville' => 'ville',
-                       'Téléphone' => 'telephone', 'Connu par' => 'connu', 'Energie' => 'energie',
-                       'Type de logement' => 'logement', 'Echéance travaux' => 'echeance',
-                       'Optin' => 'optin', 'Optin partenaires' => 'optin_partenaires', 'Coupons sélectionnés' => 'reflist');
+                               'E-mail' => 'email', 'Adresse' => 'adresse', 'Code postal' => 'codepostal', 'Ville' => 'ville',
+                               'Téléphone' => 'telephone', 'Connu par' => 'connu', 'Energie' => 'energie',
+                               'Type de logement' => 'logement', 'Echéance travaux' => 'echeance',
+                               'Optin' => 'optin', 'Optin partenaires' => 'optin_partenaires', 'Coupons sélectionnés' => 'reflist');
 
                $mail = new cubeMail();
                $mail->charset = 'UTF-8';
@@ -519,7 +519,7 @@ class wsServices extends cubeFlashGateway {
                $body = '';
 
                foreach ($fields as $k => $f) {
-                       $body.=$k . ' : ' . $this->args[$f] . "\r\n";
+                       $body .= $k . ' : ' . $this->args[$f] . "\r\n";
                        $datas[$f] = $this->args[$f];
                }
                $datas['date'] = TIME;
@@ -549,7 +549,7 @@ class wsServices extends cubeFlashGateway {
                foreach ($refs as $ref) {
 
                        foreach ($xml->xpath('//item[@reference=\'' . $ref . '\']') as $item) {
-                               $code = (string) $item['code'];
+                               $code = (string)$item['code'];
                        }
 
                        $file = $couponsRoot . $ref . '.pdf';
@@ -590,46 +590,46 @@ class wsServices extends cubeFlashGateway {
                $xml = simplexml_load_file($couponsRoot . 'references.xml');
 
                $cols = array('Date' => 'date', 'Civilité' => 'civilite', 'Prénom' => 'prenom', 'Nom' => 'nom',
-                       'E-mail' => 'email', 'Adresse' => 'adresse', 'Code postal' => 'codepostal', 'Ville' => 'ville',
-                       'Téléphone' => 'telephone', 'Connu par' => 'connu', 'Energie' => 'energie', 'Type de logement' => 'logement',
-                       'Echéance travaux' => 'echeance',
-                       'Optin' => 'optin', 'Optin partenaires' => 'optin_partenaires');
+                             'E-mail' => 'email', 'Adresse' => 'adresse', 'Code postal' => 'codepostal', 'Ville' => 'ville',
+                             'Téléphone' => 'telephone', 'Connu par' => 'connu', 'Energie' => 'energie', 'Type de logement' => 'logement',
+                             'Echéance travaux' => 'echeance',
+                             'Optin' => 'optin', 'Optin partenaires' => 'optin_partenaires');
                $refs = array();
                foreach ($xml->xpath('//item') as $i) {
-                       $refs[(string) $i['reference']] = $i['name'];
+                       $refs[(string)$i['reference']] = $i['name'];
                }
 
                //
                $h = '<table>';
-               $h.='<tr>';
+               $h .= '<tr>';
                foreach ($cols as $l => $k) {
-                       $h.='<th>' . utf8_decode($l) . '</th>';
+                       $h .= '<th>' . utf8_decode($l) . '</th>';
                }
                foreach ($refs as $k => $l) {
-                       $h.='<th>' . utf8_decode($l) . '</th>';
+                       $h .= '<th>' . utf8_decode($l) . '</th>';
                }
-               $h.='</tr>';
+               $h .= '</tr>';
 
                $r = $core->con->select('SELECT * FROM grdf' . $annee);
                while ($r->fetch()) {
                        $d = json_decode($r->datas);
                        $rl = explode(',', $d->reflist);
-                       $h.='<tr>';
+                       $h .= '<tr>';
                        foreach ($cols as $l => $k) {
                                $v = $d->$k;
                                if ($k == 'date') {
                                        $v = date('Y-m-d H:i', $v);
                                }
-                               $h.='<td>' . utf8_decode($v) . '</td>';
+                               $h .= '<td>' . utf8_decode($v) . '</td>';
                        }
                        foreach ($refs as $k => $l) {
                                $v = in_array($k, $rl) ? '1' : '0';
-                               $h.='<td>' . utf8_decode($v) . '</td>';
+                               $h .= '<td>' . utf8_decode($v) . '</td>';
                        }
-                       $h.='</tr>';
+                       $h .= '</tr>';
                }
 
-               $h.='</table>';
+               $h .= '</table>';
 
                if (!file_exists(ROOT . '/cache/12568/')) {
                        mkdir(ROOT . '/cache/12568/', 0777, true);