From d276a9c12bb905442957499eba3541f991e5361b Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 11 Apr 2025 19:38:01 +0200
Subject: [PATCH] wait #7480 @1

---
 .docker/dev/docker-compose.yml                |   4 +-
 .idea/workspace.xml                           |  71 ++++++-----
 framework/application/configs/application.ini |   6 +-
 .../views/scripts/common/footer.phtml         |  38 +++---
 framework/library/CubeIT/Bootstrap/Locale.php |  27 ++++
 .../library/CubeIT/Bootstrap/Navigation.php   |   6 +-
 .../CubeIT/Controller/SeoController.php       | 120 ++++++++++--------
 framework/library/CubeIT/Util/Locale.php      |   3 +
 8 files changed, 166 insertions(+), 109 deletions(-)

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index cbf6223..19d8533 100644
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -9,8 +9,8 @@ services:
             - './www/:/application/'
             - './config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         environment:
-            VIRTUAL_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com
-            LETSENCRYPT_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com
+            VIRTUAL_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com,fr.dev.elearning.fluidbook.com
+            LETSENCRYPT_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com,fr.dev.elearning.fluidbook.com
         networks:
             - fluidbook-v3-dev
             - nginxproxy
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 812d484..7e59b8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7474">
-      <change afterPath="$PROJECT_DIR$/.docker/syncprodtodev" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.docker/syncprodtodev.exclude" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.docker/config/httpd/httpd.conf" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/httpd/httpd.conf" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/views/scripts/common/footer.phtml" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/views/scripts/common/footer.phtml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Locale.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Locale.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Controller/SeoController.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Controller/SeoController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Util/Locale.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Util/Locale.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -264,34 +265,34 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/Works/FluidbookWebV3/.docker",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.2",
-    "ruby.rails.projectView.checked": "true",
-    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/FluidbookWebV3/.docker&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Works\FluidbookWebV3\.docker" />
@@ -851,6 +852,9 @@
       <workItem from="1743685828952" duration="2161000" />
       <workItem from="1744010760355" duration="3501000" />
       <workItem from="1744211486656" duration="5649000" />
+      <workItem from="1744294067933" duration="116000" />
+      <workItem from="1744297988591" duration="226000" />
+      <workItem from="1744391230839" duration="1813000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1263,6 +1267,11 @@
           <line>338</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="php">
+          <url>file://$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Locale.php</url>
+          <line>38</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 59e5215..d0b1aaf 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -57,7 +57,7 @@ privacy.analytics = 1
 
 [learning : production]
 
-dev=false
+dev = false
 
 seo.robots = false
 
@@ -65,11 +65,12 @@ webhost = elearning.fluidbook.com
 
 locales.en = elearning.fluidbook.com
 locales.fr = fr.elearning.fluidbook.com
+locales.ignore[] = fr
 
 database.params.dbname = fluidbook-v3-elearning
 
 [testing-learning : learning]
-dev=false
+dev = false
 
 seo.robots = false
 
@@ -83,6 +84,7 @@ webhost = dev.elearning.fluidbook.com
 locales.en = dev.elearning.fluidbook.com
 locales.fr = fr.dev.elearning.fluidbook.com
 
+
 database.params.dbname = fluidbook-v3-elearning
 database.params.host = fluidbook-v3-dev-mariadb
 
diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index f3bd87c..2df8e18 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -68,21 +68,21 @@ foreach ($this->option('social_networks') as $social) {
     if (!file_exists($SVG_file)) continue;
     $SVG = file_get_contents(PUBLIC_PATH . CubeIT_View_Helper_ImageCms::getPath($social['icon']));
 
-	$res .= '<style type="text/css">';
-	$res .= '#s-' . $social_ID . ':hover{background-color: ' . $social['color'] . ';border-color: ' . $social['color'] . ';}';
-	$res .= '</style>';
-	$res .= $this->link($SVG, $social['url'], ['id' => 's-' . $social_ID,
-	                                              'title' => $social['title'],
-	                                              'class' => 'social-link',
-	                                              'itemprop' => 'sameAs',
-	                                              'target' => '_blank',
-	                                              'rel' => 'noopener',
-	                                              'data-event' => [
-	                                                  'category' => 'social',
-	                                                  'action' => 'go',
-	                                                  'label' => $social['title']
-                                                  ]
-                                              ]);
+    $res .= '<style type="text/css">';
+    $res .= '#s-' . $social_ID . ':hover{background-color: ' . $social['color'] . ';border-color: ' . $social['color'] . ';}';
+    $res .= '</style>';
+    $res .= $this->link($SVG, $social['url'], ['id' => 's-' . $social_ID,
+        'title' => $social['title'],
+        'class' => 'social-link',
+        'itemprop' => 'sameAs',
+        'target' => '_blank',
+        'rel' => 'noopener',
+        'data-event' => [
+            'category' => 'social',
+            'action' => 'go',
+            'label' => $social['title']
+        ]
+    ]);
 }
 $res .= '</div>'; // .footer-external
 
@@ -98,9 +98,11 @@ $res .= '</footer>';
 $res .= '<footer class="legal">';
 $res .= '<div class="footer-inner">';
 
-$res .= '<div class="locale-nav">';
-$res .= $this->localeNavigation(true, CubeIT_View_Helper_LocaleNavigation::BIGRAMME);
-$res .= '</div>'; // .locale-nav
+if (count(Bootstrap::getInstance()->getNotIgnoredLocales()) > 1) {
+    $res .= '<div class="locale-nav">';
+    $res .= $this->localeNavigation(true, CubeIT_View_Helper_LocaleNavigation::BIGRAMME);
+    $res .= '</div>'; // .locale-nav
+}
 
 $res .= $this->markupDotclear($this->option('footer'));
 
diff --git a/framework/library/CubeIT/Bootstrap/Locale.php b/framework/library/CubeIT/Bootstrap/Locale.php
index 371aceb..cee65cc 100644
--- a/framework/library/CubeIT/Bootstrap/Locale.php
+++ b/framework/library/CubeIT/Bootstrap/Locale.php
@@ -37,6 +37,9 @@ class CubeIT_Bootstrap_Locale extends CubeIT_Bootstrap_Auth
     public function getOptionLocales()
     {
         $res = $this->_getLocalesOption();
+        if (isset($res['ignore'])) {
+            unset($res['ignore']);
+        }
         if (isset($res['hub'])) {
             unset($res['hub']);
         }
@@ -132,6 +135,30 @@ class CubeIT_Bootstrap_Locale extends CubeIT_Bootstrap_Auth
         return $this->getOption('localesEnabled');
     }
 
+
+    public function getNotIgnoredLocales()
+    {
+        $locales = $this->getAppLocales();
+        $res = [];
+
+        foreach ($locales as $locale) {
+            if (!$this->isIgnoredLocale($locale)) {
+                $res[] = $locale;
+            }
+        }
+        return $res;
+    }
+
+    public function isIgnoredLocale($locale = null)
+    {
+        $locale = $locale ?? $this->getActiveLocale();
+        $opt = $this->_getLocalesOption();
+        if (!isset($opt['ignore']) || !is_array($opt['ignore']) || !in_array($locale, $opt['ignore'])) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * @return string
      */
diff --git a/framework/library/CubeIT/Bootstrap/Navigation.php b/framework/library/CubeIT/Bootstrap/Navigation.php
index 6515248..7b0aba4 100644
--- a/framework/library/CubeIT/Bootstrap/Navigation.php
+++ b/framework/library/CubeIT/Bootstrap/Navigation.php
@@ -191,9 +191,13 @@ class CubeIT_Bootstrap_Navigation extends CubeIT_Bootstrap_Locale
         $longTitle = isset($t['longTitle']) && $t['longTitle'] != '' ? $t['longTitle'] : $title;
         $seoUrl = isset($t['seourl']) && $t['seourl'] != '' ? $t['seourl'] : '';
         $robots = isset($t['robots']) ? $t['robots'] == true : true;
+        $ignored = false;
 
         if ($locale) {
             $domain = $this->getLocaleDomain($locale);
+            if ($this->isIgnoredLocale($locale)) {
+                $ignored = true;
+            }
             $page = new CubeIT_Navigation_Page_Locale();
             $page->setId($locale . '/' . $r->id);
             $url = $this->_makeURL($r, $seoUrl, $locale, $title, $parent, $isAdmin);
@@ -217,7 +221,7 @@ class CubeIT_Bootstrap_Navigation extends CubeIT_Bootstrap_Locale
         $page->setEditable(true);
         $page->setName($r->label);
         $page->setUri($url);
-        $page->setSitemap($robots);
+        $page->setSitemap($robots && !$ignored);
         $page->setVariant($this->getVariant());
         if ($domain['domain']) {
             $page->setDomain($domain['domain']);
diff --git a/framework/library/CubeIT/Controller/SeoController.php b/framework/library/CubeIT/Controller/SeoController.php
index 2853798..9d56c80 100644
--- a/framework/library/CubeIT/Controller/SeoController.php
+++ b/framework/library/CubeIT/Controller/SeoController.php
@@ -1,75 +1,85 @@
 <?php
 
-class CubeIT_Controller_SeoController extends CubeIT_Controller_LayoutlessController {
+class CubeIT_Controller_SeoController extends CubeIT_Controller_LayoutlessController
+{
 
-	public function robotsAction() {
+    public function robotsAction()
+    {
 
 
-		$this->getResponse()->setHeader('Content-type', 'text/plain', true);
-		$this->getResponse()->clearBody();
+        $this->getResponse()->setHeader('Content-type', 'text/plain', true);
+        $this->getResponse()->clearBody();
 
-		$robotsConfig = $this->getOpt('seo.robots', true);
+        $robotsConfig = $this->getOpt('seo.robots', true);
+        if (Bootstrap::getInstance()->isIgnoredLocale()) {
+            $robotsConfig = false;
+        }
 
-		$robots = 'User-agent: *' . "\n";
-		if ($robotsConfig) {
-			$robots .= 'Disallow: /admin/' . "\n";
-			$robots .= 'Disallow: /ajax/' . "\n";
-			$robots .= 'Disallow: /ajaxpopup/' . "\n";
-		} else {
-			$robots .= 'Disallow: /' . "\n";
-		}
-		if ($robotsConfig) {
-			$robots .= 'Sitemap: ' . SITE_PROTOCOL . $this->getOption('webhost') . '/sitemap' . "\n";
-		}
+        $robots = 'User-agent: *' . "\n";
+        if ($robotsConfig) {
+            $robots .= 'Disallow: /admin/' . "\n";
+            $robots .= 'Disallow: /ajax/' . "\n";
+            $robots .= 'Disallow: /ajaxpopup/' . "\n";
+        } else {
+            $robots .= 'Disallow: /' . "\n";
+        }
+        if ($robotsConfig) {
+            $robots .= 'Sitemap: ' . SITE_PROTOCOL . $this->getOption('webhost') . '/sitemap' . "\n";
+        }
 
-		echo $robots;
-		return;
-	}
+        echo $robots;
+        return;
+    }
 
-	public function googleverificationAction() {
-		$this->getResponse()->setHeader('Content-type', 'text/html', true);
-		$this->getResponse()->clearBody();
-		$seo = $this->getOption('seo');
-		echo 'google-site-verification: ' . $this->getParam('code');
-	}
+    public function googleverificationAction()
+    {
+        $this->getResponse()->setHeader('Content-type', 'text/html', true);
+        $this->getResponse()->clearBody();
+        $seo = $this->getOption('seo');
+        echo 'google-site-verification: ' . $this->getParam('code');
+    }
 
-	public function bingverificationAction() {
-		$this->getResponse()->setHeader('Content-type', 'text/xml', true);
-		$this->getResponse()->clearBody();
-		$seo = $this->getOption('seo');
-		echo '<?xml version="1.0"?>
+    public function bingverificationAction()
+    {
+        $this->getResponse()->setHeader('Content-type', 'text/xml', true);
+        $this->getResponse()->clearBody();
+        $seo = $this->getOption('seo');
+        echo '<?xml version="1.0"?>
 <users>
 	<user>' . $seo['bing'] . '</user>
 </users>';
-	}
+    }
 
-	public function sitemapAction() {
-		$this->getResponse()->setHeader('Content-type', 'text/xml', true);
-		$this->getResponse()->clearBody();
+    public function sitemapAction()
+    {
+        $this->getResponse()->setHeader('Content-type', 'text/xml', true);
+        $this->getResponse()->clearBody();
 
-		$navigation = $this->getSitemapNavigation();
+        $navigation = $this->getSitemapNavigation();
 
-		echo $this->view->navigation($navigation)
-			->sitemap()
-			->setFormatOutput(false)
-			->setMinDepth($this->_getSitemapMinDepth($navigation))
-			->setRole();
-		return;
-	}
+        echo $this->view->navigation($navigation)
+            ->sitemap()
+            ->setFormatOutput(false)
+            ->setMinDepth($this->_getSitemapMinDepth($navigation))
+            ->setRole();
+        return;
+    }
 
-	protected function getSitemapNavigation() {
-		return $this->getNavigation();
-	}
+    protected function getSitemapNavigation()
+    {
+        return $this->getNavigation();
+    }
 
-	protected function _getSitemapMinDepth($navigation) {
-		$minDepth = 0;
-		if ($navigation instanceof CubeIT_Navigation) {
-			$minDepth == 1;
-		}
-		if ($navigation instanceof CubeIT_Navigation_Locale) {
-			$minDepth = 2;
-		}
-		return $minDepth;
-	}
+    protected function _getSitemapMinDepth($navigation)
+    {
+        $minDepth = 0;
+        if ($navigation instanceof CubeIT_Navigation) {
+            $minDepth == 1;
+        }
+        if ($navigation instanceof CubeIT_Navigation_Locale) {
+            $minDepth = 2;
+        }
+        return $minDepth;
+    }
 
 }
\ No newline at end of file
diff --git a/framework/library/CubeIT/Util/Locale.php b/framework/library/CubeIT/Util/Locale.php
index 0f7a144..ed78483 100644
--- a/framework/library/CubeIT/Util/Locale.php
+++ b/framework/library/CubeIT/Util/Locale.php
@@ -27,6 +27,9 @@ class CubeIT_Util_Locale
             if ($k == 'hub') {
                 continue;
             }
+            if($k=='ignore'){
+                continue;
+            }
             $e = explode('/', $l, 2);
             $r = array('domain' => '', 'segment' => '', 'first' => false);
 
-- 
2.39.5