wait #7057 @1

diff --git a/.htaccess b/.htaccess
index 737380eafb1c5b50415d44e637e1aafc8041340b..7e8c80bfafeee59df0697b90212ee7d5b400b05d 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -15,12 +15,6 @@
        RewriteEngine on
        RewriteBase /
        #
-       # Redirection to www. subdomain
-       RewriteCond %{HTTP_HOST} =cubedesigners.fr
-       RewriteRule ^(.*)$ https://www.cubedesigners.fr/$1 [R=301,L]
-       # Redirection to www. subdomain
-       RewriteCond %{HTTP_HOST} =cubedesigners.com
-       RewriteRule ^(.*)$ https://www.cubedesigners.com/$1 [R=301,L]
        
        RewriteRule ^happynewyear$ files/voeux/index_en.html [NC,L]
        RewriteRule ^bonneannee$ files/voeux/index_fr.html [NC,L]

diff --git a/.idea/cubedesigners-v7.iml b/.idea/cubedesigners-v7.iml
index d6ebd4805981b8400db3e3291c74a743fef9a824..a0264a43e4a9daddfc199db7b381cf6321c237a6 100644 (file)
--- a/.idea/cubedesigners-v7.iml
+++ b/.idea/cubedesigners-v7.iml
@@ -2,7 +2,14 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/framework/library" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/framework/library/Braintree" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/framework/library/Doctrine" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/framework/library/Microdata" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/framework/library/Stripe/lib" isTestSource="false" packagePrefix="Stripe" />
+      <sourceFolder url="file://$MODULE_DIR$/framework/library/Stripe/tests" isTestSource="true" packagePrefix="Stripe" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index f0787ee4923f261d3d77015b60007eaba4549844..88213d023d5bdbbe5696791946a2172b22b0eb43 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="www.cubedesigners.fr" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="v7.cubedesigners.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
+      <paths name="alpha.toolbox.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="alpha.toolbox.fluidbook.com (Host)">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="alphaville.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -10,6 +24,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="bastide-resah.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="demo1.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -115,6 +136,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="elearning.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="etatpur.ei-plateforme1.com">
         <serverdata>
           <mappings>
@@ -129,6 +157,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="extranet.cubedesigners.com (Host)">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="extranet.preventicom.com">
         <serverdata>
           <mappings>
@@ -227,6 +262,27 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="v4.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="v7.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="v7.cubedesigners.com (host)">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="vps-e87c4d02.vps.ovh.net">
         <serverdata>
           <mappings>
@@ -269,13 +325,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.cubedesigners.fr">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="www.detouteslescouleurs.com">
         <serverdata>
           <mappings>

diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644 (file)
index 0000000..66ea8f5
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.0">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 976c16b7197014d041a26991f9b90613483af1a5..ae843f987dbe12311b55806299e0078526c2cf42 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -41,8 +41,8 @@ googleapi = AIzaSyDKYIWGbAgnV0N9SVx0jb9lt1qqD4dSFmQ
 
 locales.hub = www.cubedesigners.eu
 locales.redirect = false
-locales.fr = www.cubedesigners.fr
-locales.en = www.cubedesigners.com
+locales.fr = v7.cubedesigners.com
+locales.en = en.v7.cubedesigners.com
 
 acl.perpage = false
 acl.roles[] = superadmin
@@ -53,6 +53,10 @@ mail.test = APPLICATION_PATH "/../data/email/test"
 privacy.dnt = 1
 privacy.analytics = 1
 
+seo.robots = false
+httpauth.username = cube
+httpauth.password = v7
+
 [testing : production]
 dev = true
 

diff --git a/framework/library/CubeIT/View/Helper/HeadScript.php b/framework/library/CubeIT/View/Helper/HeadScript.php
index 739d26fb14706a121a9d5d734037f1aad512a4a0..1f7fb4b32085d31c18da840edd76710cbf7759c3 100644 (file)
--- a/framework/library/CubeIT/View/Helper/HeadScript.php
+++ b/framework/library/CubeIT/View/Helper/HeadScript.php
@@ -1654,8 +1654,7 @@ class CubeIT_View_Helper_HeadScript extends Zend_View_Helper_HeadScript
             $this->_mtime = time();
         }
 
-        $res = '<script type="text/javascript" src="' . $this->view->baseUrl($furl) . '?j=' . $this->_mtime . '"></script>';
-        return $res;
+        return '<script type="text/javascript" src="' . $this->view->baseUrl($furl) . '?j=' . $this->_mtime . '"></script>';
     }
 
     protected function _minify($js, $final)

diff --git a/index.php b/index.php
index f6607811b04c78c886a43f6c735abd6307bc39a2..ca5b7b7c56a0bd1888c2f3f6da03d74ae7c0df0d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,11 +2,7 @@
 
 $start = microtime(true);
 ini_set('log_errors', '1');
-ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
-if ($_SERVER['HTTP_HOST'] == 'www.cubedesigners.com' || $_SERVER['HTTP_HOST'] == 'www.cubedesigners.fr') {
-       define('APPLICATION_ENV', 'production');
-} else {
-       define('APPLICATION_ENV', 'testing');
-}
+
+define('APPLICATION_ENV', 'production');
 
 include dirname(__FILE__) . '/CubeIT/common.php';

diff --git a/js/isotope-select.js b/js/isotope-select.js
index bfa09b5c517c78cf8ceac7152a9bfdd9c58d4675..2cc5d09e8dfd0afb6e83fabe3f49b61b0a1fc9b7 100644 (file)
--- a/js/isotope-select.js
+++ b/js/isotope-select.js
@@ -95,11 +95,11 @@
 
                 // Reset animations on elements for WOW.js when re-filtering
                 // Ref: https://github.com/matthieua/WOW/issues/46#issuecomment-133760823
-                $this.container.find('a').each(function () {
+                $this.container.find('a').each(function() {
 
                     $(this).css({
-                        'visibility': 'hidden',
-                        'animation-name': 'none'
+                        'visibility' : 'hidden',
+                        'animation-name' : 'none'
                     });
 
                     $(this).removeClass('animated');
@@ -194,7 +194,6 @@
                 }
             });
 
-            console.log(ew);
         }
 
     };