flack / openpsa

lib/org/openpsa/directmarketing/campaign/ruleresolver.php

Spacing +10 added lines, -15 removed lines

@@ -103,7 +103,7 @@ 
     {
         $eval_ret = @eval('$rules = ' . $ruleset . ';');
 
-        if (   $eval_ret === false
+        if ($eval_ret === false
             || !is_array($rules))
         {
             throw new midcom_error('given ruleset could not be parsed');
@@ -142,7 +142,7 @@ 
         $stat = true;
         //start with first group
         $this->result_mc->begin_group(strtoupper($rules['type']));
-        reset ($rules['classes']);
+        reset($rules['classes']);
         //iterate over groups
         foreach ($rules['classes'] as $group)
         {
@@ -174,8 +174,7 @@ 
         $ret = array();
         foreach (array_keys($results) as $key)
         {
-            $ret[$this->result_mc->get_subkey($key, 'id')] = array
-            (
+            $ret[$this->result_mc->get_subkey($key, 'id')] = array(
                 'lastname' => $this->result_mc->get_subkey($key, 'lastname'),
                 'firstname' => $this->result_mc->get_subkey($key, 'firstname'),
                 'email' => $this->result_mc->get_subkey($key, 'email'),
@@ -358,7 +357,7 @@ 
      */
     private function add_misc_rule(array $rule, $class, $person_property)
     {
-        $persons = array ( 0 => -1);
+        $persons = array(0 => -1);
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>')
@@ -391,8 +390,7 @@ 
 
     public static function build_property_map(midcom_services_i18n_l10n $l10n)
     {
-        $types = array
-        (
+        $types = array(
             'person' => new org_openpsa_contacts_person_dba,
             'group' => new org_openpsa_contacts_group_dba,
             'membership' => new org_openpsa_contacts_member_dba
@@ -400,15 +398,13 @@ 
         $return = array();
         foreach ($types as $name => $object)
         {
-            $return[$name] = array
-            (
+            $return[$name] = array(
                 'properties' => self::list_object_properties($object, $l10n),
                 'localized' => $l10n->get('class:' . $name),
                 'parameters' => false
             );
         }
-        $return['generic_parameters'] = array
-        (
+        $return['generic_parameters'] = array(
             'properties' => false,
             'localized' => $l10n->get('class:generic parameters'),
             'parameters' => true
@@ -428,8 +424,7 @@ 
     public static function list_object_properties(midcom_core_dbaobject $object, midcom_services_i18n_l10n $l10n)
     {
         // These are internal to midgard and/or not valid QB constraints
-        $skip_properties = array
-        (
+        $skip_properties = array(
             // These will be deprecated soon
             'orgOpenpsaAccesstype',
             'orgOpenpsaWgtype',
@@ -460,14 +455,14 @@ 
 
         foreach ($helper->get_object_vars($object) as $property => $value)
         {
-            if (   preg_match('/^_/', $property)
+            if (preg_match('/^_/', $property)
                 || in_array($property, $skip_properties)
                 || property_exists($object, $property))
             {
                 // Skip private or otherwise invalid properties
                 continue;
             }
-            if (   is_object($value)
+            if (is_object($value)
                 && !is_a($value, 'midgard_datetime'))
             {
                 while (list ($property2, $value2) = each($value))

Braces +3 added lines, -6 removed lines

@@ -308,8 +308,7 @@ 
             try
             {
                 $parent = midcom::get()->dbfactory->get_object_by_guid($guid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 continue;
@@ -365,8 +364,7 @@ 
         {
             $constraint_match = "NOT IN";
             $match = '=';
-        }
-        else if ($rule['match'] == 'NOT LIKE')
+        } else if ($rule['match'] == 'NOT LIKE')
         {
             $constraint_match = "NOT IN";
             $match = 'LIKE';
@@ -475,8 +473,7 @@ 
                     $prop_merged = "{$property}.{$property2}";
                     $ret[$prop_merged] = $l10n->get("property:{$prop_merged}");
                 }
-            }
-            else
+            } else
             {
                 $ret[$property] = $l10n->get("property:{$property}");
             }