Merge pull request arnebratt#9 from arnebratt/translations-logic

Added support for choosing "and" and "or" logic between local filters

Author: arnebratt

classes/translations_filter.php

@@ -9,6 +9,7 @@ function eZTranslationsFilter()
     function createSqlParts( $params )
     {
         $sqlJoins = '';
+        $is_or_logic = isset( $params['or'] ) && ( $params['or'] === true );
 
         if ( isset( $params['locales'] ) )
         {
@@ -23,7 +24,8 @@ function createSqlParts( $params )
             }
             if ( $language_mask )
             {
-                $sqlJoins = " ezcontentobject.language_mask & $language_mask AND ";
+                $sqlJoins = ( $is_or_logic ) ? " ezcontentobject.language_mask & $language_mask AND " :
+                                               " ezcontentobject.language_mask & $language_mask = $language_mask AND ";
             }
         }
 

filters/fetchnodelist.php

@@ -15,6 +15,7 @@ classname - A list of class identifiers separated by a colon
 depth - Max level of depth to fetch nodes from (default is current folder only)
 ignore_visibility - Fetch also hidden nodes
 locales - List of translation locale codes to filter on, separated by a colon (ex."nor-NO:eng-GB")
+          The first locales parameter can be an optional "or" or "and", to specify the logic between the languages (default is "or")
 ';
     }
 
@@ -65,8 +66,14 @@ function getObjectList()
         }
         if ( !empty( $this->locales ) )
         {
+            $is_or_logic = true;
+            if ( $this->locales[0] == 'and' OR $this->locales[0] == 'or' )
+            {
+                $is_or_logic = !( array_shift( $this->locales ) == 'and' );
+            }
             $parameters['extended_attribute_filter'] = array( 'id' => 'TranslationsFilter',
-                                                              'params' => array( 'locales' => $this->locales ) );
+                                                              'params' => array( 'or' => $is_or_logic,
+                                                                                 'locales' => $this->locales ) );
         }
         return eZFunctionHandler::execute( 'content', 'list', $parameters );
     }