gbentley · textagroup · Jan 14, 2013 · Jan 14, 2013 · Jan 14, 2013 · Jan 14, 2013
diff --git a/autoloads/eztemplateautoload.php b/autoloads/eztemplateautoload.php
@@ -7,6 +7,5 @@
 $eZTemplateOperatorArray[] =
   array( 'script' => eZExtension::baseDirectory() . '/region/autoloads/region.php',
          'class' => 'Region',
-         'operator_names' => array( 'language_uri', 'region_languages', 'regions', 'in_region' ) );
-
+         'operator_names' => array( 'language_uri', 'region_languages', 'regions', 'in_region', 'canonical_url', 'canonical_language_url', 'detected_region', 'detected_locale' ) );
 ?>
diff --git a/autoloads/region.php b/autoloads/region.php
@@ -14,7 +14,7 @@ function Region()
     */
     function operatorList()
     {
-        return array( 'region_languages', 'regions', 'language_uri', 'in_region' );
+        return array( 'region_languages', 'regions', 'language_uri', 'in_region', 'canonical_url', 'canonical_language_url', 'detected_region', 'detected_locale' );
     }
     /*!
      \return true to tell the template engine that the parameter list exists per operator type,
@@ -23,8 +23,8 @@ function operatorList()
     function namedParameterPerOperator()
     {
         return true;
-    }    
- 
+    }
+
     /*!
      See eZTemplateOperator::namedParameterList
     */
@@ -42,17 +42,25 @@ function namedParameterList()
                       'regions' => array( 'siteaccessname' => array( 'type' => 'string',
                                                                      'required' => true,
                                                                      'default' => false ) ),
-					        		'in_region' => array( 'region' => array( 'type' => 'string',
-					        																									 'required' => true,
-					        																									 'default' => false ) ),
-                                                                      );
+                      'in_region' => array( 'region' => array( 'type' => 'string',
+                                                               'required' => true,
+                                                               'default' => false ) ),
+                      'canonical_url' => array(),
+                      'canonical_language_url' => array(),
+                      'detected_region' => array(),
+                      'detected_locale' => array()
+		);
 
     }
     /*!
      Executes the PHP function for the operator cleanup and modifies \a $operatorValue.
     */
     function modify( &$tpl, &$operatorName, &$operatorParameters, &$rootNamespace, &$currentNamespace, &$operatorValue, &$namedParameters )
     {
+		$moduleResult  = $tpl->hasVariable( 'module_result' ) ? $tpl->variable( 'module_result' ) : array();
+		$contentInfo   = isset( $moduleResult['content_info'] ) ? $moduleResult['content_info'] : array();
+		$currentNodeId = isset( $moduleResult['node_id'] ) ? (int) $moduleResult['node_id'] : 0;
+
         switch ( $operatorName )
         {
             case 'language_uri':
@@ -76,24 +84,93 @@ function modify( &$tpl, &$operatorName, &$operatorParameters, &$rootNamespace, &
             case 'in_region':
 	            	$regionini = eZINI::instance( 'region.ini' );
 	            	$regions = $regionini->variableArray('Regions', 'RegionCountryList');
-	            	
+
 	            	$ip = ( array_key_exists( 'TESTIP', $_GET ) and ezxISO3166::validip( $_GET['TESTIP'] ) ) ? new ezxISO3166( $_GET['TESTIP']) : new ezxISO3166();
 	            	$ccode = ( array_key_exists( 'country', $_GET ) ) ? strtoupper($_GET['country']) : $ip->getCCfromIP();
 	            	eZDebug::writeDebug( $regions, 'Regions' );
 	            	eZDebug::writeDebug( $ccode, 'Country code' );
-	            	
+
 	            	// CHECK THAT THE REGION EXISTS IN THE REGION GROUP
 	            	if ( in_array( $ccode, $regions[$namedParameters['region']] ) && array_key_exists($namedParameters['region'], $regions) )
 	            		{
 	            			$operatorValue = true;
 	            			break;
 	            		}
-	            	
+
 	            	$operatorValue = false;
 	          break;
+				case 'canonical_url':
+                	if(
+						isset( $contentInfo['main_node_url_alias'] )
+						&& $contentInfo['main_node_url_alias']
+					) {
+						$operatorValue = $contentInfo['main_node_url_alias'];
+                	}
+				break;
+				case 'canonical_language_url':
+					$return = array();
+
+					$node   = eZContentObjectTreeNode::fetch( $currentNodeId );
+					$object = false;
+					if(	$node instanceof eZContentObjectTreeNode ) {
+						$object = $node->attribute( 'object' );
+					}
+
+					$translatedURLs  = ezpLanguageSwitcher::setupTranslationSAList( $currentNodeId );
+					$localeCountries = eZINI::instance( 'region.ini' )->variable( 'Regions', 'LocaleCountryList' );
+					foreach( $translatedURLs as $sa => $translation ) {
+						$ini        = eZSiteAccess::getIni( $sa );
+						$localeCode = $ini->variable( 'RegionalSettings', 'Locale' );
+						$locale     = new eZLocale( $localeCode );
+						if( isset( $localeCountries[ $localeCode ] ) && $localeCode != 'eng-US' ) {
+							$tmp         = explode( '-', strtolower( $locale->attribute( 'http_locale_code' ) ) );
+							$countryCode = $tmp[0];
+							$languages   = explode( ';', strtolower( $localeCountries[ $localeCode ] ) );
+							foreach( $languages as $language ) {
+								$return[] = array(
+									'language'   => $countryCode . '-' . $language,
+									'url'        => $translation['url'],
+									'siteaccess' => $sa
+								);								
+							}
+						} else {
+							$return[] = array(
+								'language'   => strtolower( $locale->attribute( 'http_locale_code' ) ),
+								'url'        => $translation['url'],
+								'siteaccess' => $sa
+							);
+						}
+					}
+
+					$operatorValue = $return;
+				break;
+				case 'detected_region':
+			                $operatorValue = eZINI::instance( 'site.ini' )->variable('SiteSettings','DefaultAccess');
+			                $systemIdentifiedRegion = ezxRegion::getRegionData(ezxISO3166::getRealIpAddr());
+			                $preferredRegion = $systemIdentifiedRegion['preferred_region'];
+
+			                if(array_key_exists('preferred_regions',$systemIdentifiedRegion)) {
+			                    $preferredRegion = empty($preferredRegion) ? 'eng-US' : $preferredRegion;
+			                    $systemIdentifiedSiteAccess = $systemIdentifiedRegion['preferred_regions'][$preferredRegion][0];
+
+			                    $countryNames = eZINI::instance( 'site.ini' )->variable( 'RegionalSettings', 'TranslationSA' );
+			                    $operatorValue = array_key_exists($systemIdentifiedSiteAccess, $countryNames) ? $countryNames[$systemIdentifiedSiteAccess] : 'United States';
+			                }
+                            break;
+                 case 'detected_locale':
+                            $operatorValue = eZINI::instance( 'site.ini' )->variable('SiteSettings','DefaultAccess');
+                            $systemIdentifiedRegion = ezxRegion::getRegionData(ezxISO3166::getRealIpAddr());
+                            $preferredRegion = $systemIdentifiedRegion['preferred_region'];
+                            if(array_key_exists('preferred_regions',$systemIdentifiedRegion)) {
+                                $preferredRegion = empty($preferredRegion) ? 'eng-US' : $preferredRegion;
+
+                                $operatorValue = $preferredRegion;
+                            }
+                 break;
+
         }
-            
-            
+
+
     }
 }
 ?>
diff --git a/classes/ezi18noperator.php b/classes/ezi18noperator.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * File containing the eZi18nOperator class.
+ *
+ * @copyright Copyright (C) 1999-2012 eZ Systems AS. All rights reserved.
+ * @license http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
+ * @version  2012.8
+ * @package kernel
+ */
+
+//!! eZKernel
+//! The class eZi18nOperator does
+/*!
+
+*/
+
+class eZi18nOperator
+{
+    function eZi18nOperator( $name = 'i18n', $extensionName = 'x18n', $dynamicName = 'd18n' )
+    {
+        $this->Operators = array( $name, $extensionName, $dynamicName );
+        $this->Name = $name;
+        $this->ExtensionName = $extensionName;
+        // d18n is a i18n alias for use with dynamic variables as input
+        // where you don't want ezlupdate to pick up the string
+        $this->DynamicName = $dynamicName;
+    }
+
+    /*!
+     Returns the operators in this class.
+    */
+    function operatorList()
+    {
+        return $this->Operators;
+    }
+
+    /*!
+     \return true to tell the template engine that the parameter list exists per operator type.
+    */
+    function namedParameterPerOperator()
+    {
+        return true;
+    }
+
+    /*!
+     See eZTemplateOperator::namedParameterList()
+    */
+    function namedParameterList()
+    {
+        $def = array( $this->Name => array( 'context' => array( 'type' => 'string',
+                                                                'required' => false,
+                                                                'default' => false ),
+                                            'comment' => array( 'type' => 'string',
+                                                                'required' => false,
+                                                                'default' => '' ),
+                                            'arguments' => array( 'type' => 'hash',
+                                                                  'required' => false,
+                                                                  'default' => false ),
+                                            'locale' => array( 'type' => 'array',
+                                                               'required' => false,
+                                                               'default' => false ) ),
+                      $this->ExtensionName => array( 'extension' => array( 'type' => 'string',
+                                                                           'required' => true,
+                                                                           'default' => false ),
+                                                     'context' => array( 'type' => 'string',
+                                                                         'required' => false,
+                                                                         'default' => false ),
+                                                     'comment' => array( 'type' => 'string',
+                                                                         'required' => false,
+                                                                         'default' => '' ),
+                                                     'arguments' => array( 'type' => 'hash',
+                                                                           'required' => false,
+                                                                           'default' => false ) ) );
+        $def[ $this->DynamicName ] = $def[ $this->Name ];
+        return $def;
+    }
+
+    function operatorTemplateHints()
+    {
+        $def = array( $this->Name => array( 'input' => true,
+                                            'output' => true,
+                                            'parameters' => true,
+                                            'element-transformation' => true,
+                                            'transform-parameters' => true,
+                                            'input-as-parameter' => 'always',
+                                            'element-transformation-func' => 'i18nTrans') );
+        $def[ $this->DynamicName ] = $def[ $this->Name ];
+        return $def;
+    }
+
+    function i18nTrans( $operatorName, &$node, $tpl, &$resourceData,
+                        $element, $lastElement, $elementList, $elementTree, &$parameters )
+    {
+        // i18n( $input, $context, $comment, $arguments )
+        // Check if if the three first parameters are constants, if not we cannot compile it
+        foreach ( array_slice( $parameters, 0, 3 ) as $parameter )
+        {
+            if ( $parameter !== null &&
+                 !eZTemplateNodeTool::isConstantElement( $parameter ) )
+            {
+                return false;
+            }
+        }
+        $value = eZTemplateNodeTool::elementConstantValue( $parameters[0] );
+
+        $numParameters = count ( $parameters );
+        $context = ( $numParameters > 1 ) ? eZTemplateNodeTool::elementConstantValue( $parameters[1] ) : null;
+        $comment = ( $numParameters > 2 ) ? eZTemplateNodeTool::elementConstantValue( $parameters[2] ) : null;
+        $locale = ( $numParameters > 4 ) ? eZTemplateNodeTool::elementConstantValue( $parameters[4] ) : null;
+
+        if ( $numParameters < 4 )
+        {
+            return array ( eZTemplateNodeTool::createStringElement( ezpI18n::tr( $context, $value, $comment, null ) ) );
+        }
+
+        $values = array();
+
+        $ini = eZINI::instance();
+        if ( $ini->variable( 'RegionalSettings', 'TextTranslation' ) != 'disabled' )
+        {
+            $language = ( $locale != null ) ? eZLocale::instance($locale)->localeFullCode() : eZLocale::instance()->localeFullCode();
+            if ( $language != "eng-GB" ) // eng-GB does not need translation
+            {
+                $file = 'translation.ts';
+                $ini = eZINI::instance();
+                $useCache = $ini->variable( 'RegionalSettings', 'TranslationCache' ) != 'disabled';
+                eZTSTranslator::initialize( $context, $language, $file, $useCache );
+
+                $man = eZTranslatorManager::instance();
+                $newValue = $man->translate( $context, $value, $comment );
+                if ( $newValue )
+                {
+                    $value = $newValue;
+                }
+            }
+        }
+
+        $values[] = array( eZTemplateNodeTool::createStringElement( $value ) );
+        $values[] = $parameters[3];
+
+        $code = '%tmp1% = array();' . "\n" .
+             'foreach ( %2% as %tmp2% => %tmp3% )' . "\n" .
+             '{' . "\n" .
+             '  if ( is_int( %tmp2% ) )' . "\n" .
+             '    %tmp1%[\'%\' . ( (%tmp2%%9) + 1 )] = %tmp3%;' . "\n" .
+             '  else' . "\n" .
+             '    %tmp1%[%tmp2%] = %tmp3%;' . "\n" .
+             '}' . "\n" .
+             '%output% = strtr( %1%, %tmp1% );' . "\n";
+
+        return array( eZTemplateNodeTool::createCodePieceElement( $code, $values, false, 3 ) );
+    }
+
+    function modify( $tpl, $operatorName, $operatorParameters, $rootNamespace, $currentNamespace, &$value, &$namedParameters, $placement )
+    {
+        switch ( $operatorName )
+        {
+            case $this->Name:
+            case $this->DynamicName:
+            {
+                $context = $namedParameters['context'];
+                $comment = $namedParameters['comment'];
+                $arguments = $namedParameters['arguments'];
+                $locale = $namedParameters['locale'];
+                $value = ezpI18n::tr( $context, $value, $comment, $arguments, $locale );
+            } break;
+            case $this->ExtensionName:
+            {
+                $extension = $namedParameters['extension'];
+                $context = $namedParameters['context'];
+                $comment = $namedParameters['comment'];
+                $arguments = $namedParameters['arguments'];
+                $value = ezpI18n::tr( $context, $value, $comment, $arguments );
+            } break;
+        }
+    }
+
+    /// \privatesection
+    public $Operators;
+    public $Name;
+    public $ExtensionName;
+}
+
+?>