From 6ece4910230624ca466ec78e096b3ac2e3fcc36b Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 2 Mar 2016 13:50:19 +0000 Subject: [PATCH] #extranet : redirect everything to https import translations svnize new icons theme --- .htaccess | 10 +- fluidbook/icones/13/mobile/nav-archives.svg | 14 + fluidbook/icones/13/mobile/nav-bookmark.svg | 15 + fluidbook/icones/13/mobile/nav-friend.svg | 8 + fluidbook/icones/13/mobile/nav-fullscreen.svg | 16 + fluidbook/icones/13/mobile/nav-help.svg | 9 + fluidbook/icones/13/mobile/nav-home.svg | 14 + fluidbook/icones/13/mobile/nav-index.svg | 13 + fluidbook/icones/13/mobile/nav-map.svg | 17 + fluidbook/icones/13/mobile/nav-print-pdf.svg | 21 + fluidbook/icones/13/mobile/nav-print.svg | 15 + fluidbook/icones/13/mobile/nav-sommaire.svg | 22 + fluidbook/icones/13/mobile/nav-tag.svg | 20 + fluidbook/icones/13/mobile/nav-zoomin.svg | 12 + fluidbook/icones/13/mobile/nav-zoomout.svg | 11 + inc/commons/class.common.ajax.php | 2 +- inc/commons/class.common.url.php | 10 +- .../Controlleur/class.extranet.tools.php | 4 +- .../Controlleur/class.extranet.url.php | 2 +- .../url/class.extranet.url.client.php | 2 +- inc/ws/Controlleur/class.ws.ajax.php | 2 +- inc/ws/Controlleur/class.ws.flash.php | 6 +- inc/ws/Controlleur/class.ws.services.php | 4 +- inc/ws/Controlleur/class.ws.url.php | 4 +- inc/ws/DAO/class.ws.dao.book.php | 2 +- inc/ws/DAO/class.ws.dao.document.php | 4 +- inc/ws/Metier/class.ws.document.php | 2 +- inc/ws/Metier/class.ws.lang.php | 2 +- .../html5/app/class.ws.html5.app.compiler.php | 2 +- .../Util/packager/class.ws.packager.html.php | 2 +- .../packager/class.ws.packager.phonegap.php | 2 +- .../html5/class.ws.packager.html5.links.php | 4 +- js/flashdetect.js | 205 ++++- l10n/en/main.lang.php | 699 +++++++++++++----- 34 files changed, 957 insertions(+), 220 deletions(-) create mode 100644 fluidbook/icones/13/mobile/nav-archives.svg create mode 100644 fluidbook/icones/13/mobile/nav-bookmark.svg create mode 100644 fluidbook/icones/13/mobile/nav-friend.svg create mode 100644 fluidbook/icones/13/mobile/nav-fullscreen.svg create mode 100644 fluidbook/icones/13/mobile/nav-help.svg create mode 100644 fluidbook/icones/13/mobile/nav-home.svg create mode 100644 fluidbook/icones/13/mobile/nav-index.svg create mode 100644 fluidbook/icones/13/mobile/nav-map.svg create mode 100644 fluidbook/icones/13/mobile/nav-print-pdf.svg create mode 100644 fluidbook/icones/13/mobile/nav-print.svg create mode 100644 fluidbook/icones/13/mobile/nav-sommaire.svg create mode 100644 fluidbook/icones/13/mobile/nav-tag.svg create mode 100644 fluidbook/icones/13/mobile/nav-zoomin.svg create mode 100644 fluidbook/icones/13/mobile/nav-zoomout.svg diff --git a/.htaccess b/.htaccess index fbc23f7a8..dd559d2bc 100644 --- a/.htaccess +++ b/.htaccess @@ -34,7 +34,15 @@ AddCharset UTF-8 log RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com [OR] RewriteCond %{HTTP_HOST} ws.fluidbook.com - RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301,L] + RewriteRule ^(.*)$ https://workshop.fluidbook.com/$1 [R=301,L] + + RewriteCond %{HTTPS} off + RewriteCond %{HTTP_HOST} workshop.fluidbook.com + RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + + RewriteCond %{HTTPS} off + RewriteCond %{HTTP_HOST} extranet.cubedesigners.com + RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] # Favicon RewriteCond %{HTTP_HOST} cubedesigners diff --git a/fluidbook/icones/13/mobile/nav-archives.svg b/fluidbook/icones/13/mobile/nav-archives.svg new file mode 100644 index 000000000..e27a85544 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-archives.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/icones/13/mobile/nav-bookmark.svg b/fluidbook/icones/13/mobile/nav-bookmark.svg new file mode 100644 index 000000000..69448824e --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-bookmark.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-friend.svg b/fluidbook/icones/13/mobile/nav-friend.svg new file mode 100644 index 000000000..b87ee7b2b --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-friend.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-fullscreen.svg b/fluidbook/icones/13/mobile/nav-fullscreen.svg new file mode 100644 index 000000000..11b686275 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-fullscreen.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-help.svg b/fluidbook/icones/13/mobile/nav-help.svg new file mode 100644 index 000000000..014cd0953 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-help.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-home.svg b/fluidbook/icones/13/mobile/nav-home.svg new file mode 100644 index 000000000..01739f4fe --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-home.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-index.svg b/fluidbook/icones/13/mobile/nav-index.svg new file mode 100644 index 000000000..eb7b8e735 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-index.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-map.svg b/fluidbook/icones/13/mobile/nav-map.svg new file mode 100644 index 000000000..8a327abef --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-map.svg @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-print-pdf.svg b/fluidbook/icones/13/mobile/nav-print-pdf.svg new file mode 100644 index 000000000..6ab8f7701 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-print-pdf.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-print.svg b/fluidbook/icones/13/mobile/nav-print.svg new file mode 100644 index 000000000..710863c8b --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-print.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-sommaire.svg b/fluidbook/icones/13/mobile/nav-sommaire.svg new file mode 100644 index 000000000..c4fd6811c --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-sommaire.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-tag.svg b/fluidbook/icones/13/mobile/nav-tag.svg new file mode 100644 index 000000000..c1b0c5375 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-tag.svg @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-zoomin.svg b/fluidbook/icones/13/mobile/nav-zoomin.svg new file mode 100644 index 000000000..db397d17a --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-zoomin.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/fluidbook/icones/13/mobile/nav-zoomout.svg b/fluidbook/icones/13/mobile/nav-zoomout.svg new file mode 100644 index 000000000..0df062698 --- /dev/null +++ b/fluidbook/icones/13/mobile/nav-zoomout.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php index 32f8912cd..7f678cf95 100644 --- a/inc/commons/class.common.ajax.php +++ b/inc/commons/class.common.ajax.php @@ -97,7 +97,7 @@ class commonAjax { $body = __('Bonjour,') . "\r\n\r\n"; $body .= ASK_IDENT . "\r\n"; $body .= __('Voici toutes les informations vous permettant de vous y connecter à nouveau :') . "\r\n\r\n"; - $body .= __('Adresse') . ' : http://' . $_SERVER['HTTP_HOST'] . '/' . "\r\n"; + $body .= __('Adresse') . ' : https://' . $_SERVER['HTTP_HOST'] . '/' . "\r\n"; $body .= __('Identifiant') . ' : ' . $utilisateur->email . "\r\n"; $body .= __('Mot de passe') . ' : ' . $utilisateur->password . "\r\n\r\n"; $body .= __('Cordialement,') . "\r\n"; diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php index 4373eb580..bd1a2d6d0 100644 --- a/inc/commons/class.common.url.php +++ b/inc/commons/class.common.url.php @@ -607,10 +607,10 @@ class commonUrl { if (!$for) { $mail->to = TEAM_EMAIL; $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés par ' . $core->user->prenom . ' ' . $core->user->nom; - $body = 'Tous les fichiers de ' . $core->user->prenom . ' ' . $core->user->nom . ' : http://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $core->user->utilisateur_id . "\n\n"; + $body = 'Tous les fichiers de ' . $core->user->prenom . ' ' . $core->user->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $core->user->utilisateur_id . "\n\n"; $body .= 'Fichiers chargés : ' . "\n"; foreach ($_SESSION['files_uploaded'] as $f) { - $body .= ' - http://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . $f . "\n"; + $body .= ' - https://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . $f . "\n"; } } else { $dao = new commonDAOClient($core->con); @@ -619,13 +619,13 @@ class commonUrl { $mail->to = $core->user->email; $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés pour ' . $client->prenom . ' ' . $client->nom; - $body = 'Tous les fichiers de ' . $client->prenom . ' ' . $client->nom . ' : http://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $client->utilisateur_id . "\n\n"; + $body = 'Tous les fichiers de ' . $client->prenom . ' ' . $client->nom . ' : https://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $client->utilisateur_id . "\n\n"; $body .= 'Fichiers chargés : ' . "\n"; foreach ($_SESSION['files_uploaded'] as $f) { - $body .= ' - http://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . commonUrl::hashFile($f) . '/' . $f . "\n"; + $body .= ' - httpx://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . commonUrl::hashFile($f) . '/' . $f . "\n"; } $body .= "\n" . RAPPEL . " : \n"; - $body .= ' - Adresse : http://' . $_SERVER['HTTP_HOST'] . '/' . "\n"; + $body .= ' - Adresse : https://' . $_SERVER['HTTP_HOST'] . '/' . "\n"; $body .= ' - Login : ' . $client->email . "\n"; $body .= ' - Mot de passe : ' . $client->password . "\n"; } diff --git a/inc/extranet/Controlleur/class.extranet.tools.php b/inc/extranet/Controlleur/class.extranet.tools.php index b54ad27da..c281d5c2a 100644 --- a/inc/extranet/Controlleur/class.extranet.tools.php +++ b/inc/extranet/Controlleur/class.extranet.tools.php @@ -78,7 +78,7 @@ class extranetTools { if (file_exists($dir . 'video.jpg')) { $poster = $web . 'video.jpg'; - $fv['poster'] = 'http://' . $_SERVER['HTTP_HOST'] . $poster; + $fv['poster'] = 'https://' . $_SERVER['HTTP_HOST'] . $poster; } $res = '