flack / openpsa

lib/org/openpsa/products/handler/product/csv.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
     function _load_data($handler_id, &$args, &$data)
     {
-        if (   empty($_POST)
+        if (empty($_POST)
             && $data['session']->exists('POST_data')) {
             $_POST = $data['session']->get('POST_data');
             $data['session']->remove('POST_data');

lib/org/openpsa/products/handler/group/csvimport.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
                 $handle = fopen($_FILES['org_openpsa_products_import_upload']['tmp_name'], 'r');
                 $separator = $data['separator'];
                 $total_columns = 0;
-                while (   $read_rows < 2
+                while ($read_rows < 2
                        && $csv_line = fgetcsv($handle, 1000, $separator)) {
                     if ($total_columns == 0) {
                         $total_columns = count($csv_line);
@@ -226,13 +226,13 @@ 
                 if ($field_matching = $_POST['org_openpsa_products_import_csv_field'][$field]) {
                     $schema_field = $field_matching;
 
-                    if (   !array_key_exists($schema_field, $data['schemadb_group']['default']->fields)
+                    if (!array_key_exists($schema_field, $data['schemadb_group']['default']->fields)
                         && $schema_field != 'org_openpsa_products_import_parent_group') {
                         // Invalid matching, skip
                         continue;
                     }
 
-                    if (   $value == ''
+                    if ($value == ''
                         || $value == 'NULL') {
                         // No value, skip
                         continue;

lib/org/openpsa/products/product/group.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
         }
 
         $result_cache[$cache_key] = array();
-        $ret =& $result_cache[$cache_key];
+        $ret = & $result_cache[$cache_key];
 
         if (empty($up)) {
             // TODO: use reflection to see what kind of property this is ?
@@ -94,14 +94,14 @@ 
             $value_properties[] = $keyproperty;
         }
         foreach ($label_fields as $fieldname) {
-            if (   $fieldname != 'id'
+            if ($fieldname != 'id'
                 && $fieldname != $keyproperty) {
                 $value_properties[] = $fieldname;
                 continue;
             }
         }
 
-        $mc = org_openpsa_products_product_group_dba::new_collector('up', (int)$up);
+        $mc = org_openpsa_products_product_group_dba::new_collector('up', (int) $up);
         if ($order_by_score) {
             $mc->add_order('metadata.score', 'DESC');
         }

lib/org/openpsa/products/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@
         $object = $dm->storage->object;
 
         $document = $indexer->new_document($dm);
-        if (   $config->get('enable_scheduling')
+        if ($config->get('enable_scheduling')
             && midcom::get()->dbfactory->is_a($object, 'org_openpsa_products_product_dba')) {
             // Check start/end for products
-            if (   $object->start > time()
-                || (   $object->end != 0
+            if ($object->start > time()
+                || ($object->end != 0
                     && $object->end < time())) {
                 // Not in market, remove from index
                 $indexer->delete($document->RI);

lib/org/openpsa/products/exec/import-images.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 midcom::get()->auth->require_admin_user();
 
-if (   !isset($_POST['address'])
+if (!isset($_POST['address'])
     || !strstr($_POST['address'], '__PRODUCT_CODE__')) {
     ?>
     <h1>Import product images</h1>

lib/org/openpsa/directmarketing/midcom/interfaces.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     public function _on_watched_dba_delete($object)
     {
         $qb = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
-        if (   is_a($object, 'midcom_db_person')
+        if (is_a($object, 'midcom_db_person')
             || is_a($object, 'org_openpsa_contacts_person_dba')) {
             $qb->add_constraint('person', '=', $object->id);
         } elseif (is_a($object, 'org_openpsa_directmarketing_campaign_dba')) {
@@ -43,7 +43,7 @@ 
      */
     public function background_send_message(array $args, midcom_baseclasses_components_cron_handler $handler)
     {
-        if (   !isset($args['url_base'])
+        if (!isset($args['url_base'])
             || !isset($args['batch'])) {
             $handler->print_error('url_base or batch number not set, aborting');
             return false;

Braces +4 added lines, -2 removed lines

@@ -57,7 +57,8 @@ 
         try {
             midcom::get()->dynamic_load($batch_url);
             $ret = true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $ret = $e->getMessage();
         }
         ob_end_clean();
@@ -83,7 +84,8 @@ 
         midcom::get()->auth->request_sudo($this->_component);
         try {
             $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID");
             return false;
         }

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

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
             return;
         }
         foreach ($parameters as $param_data) {
-            if (   empty($param_data['domain'])
+            if (empty($param_data['domain'])
                 || empty($param_data['name'])
                 || empty($param_data['value'])) {
                 // TODO: Log warning

lib/org/openpsa/directmarketing/sender.php

Spacing +3 added lines, -3 removed lines

@@ -262,7 +262,7 @@ 
         $token .= $generator->generateString($this->token_size - 1, 'abcdefghijklmnopqrstuvwxyz0123456789');
 
         //If token is not free or (very, very unlikely) matches our dummy token, recurse.
-        if (   $token === 'dummy'
+        if ($token === 'dummy'
             || !org_openpsa_directmarketing_campaign_messagereceipt_dba::token_is_free($token)) {
             return $this->_create_token();
         }
@@ -286,7 +286,7 @@ 
             return false;
         }
         $type = $this->_backend->get_type();
-        if (   $person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
+        if ($person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
             || $person->get_parameter('org.openpsa.directmarketing', "send_{$type}_denied")) {
             debug_add("Sending {$type} messages to person {$person->rname} is denied, unsubscribing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;
@@ -333,7 +333,7 @@ 
         debug_add("Recursion level is {$level}, limit is {$this->_chunk_max_recurse}");
         /* Make sure we still have results left, if not just recurse...
          (basically this is to avoid returning an empty array when everything is otherwise ok) */
-        if (   count($results) == 0
+        if (count($results) == 0
             && ($level < $this->_chunk_max_recurse)) {
             debug_add('All our results got filtered, recursing for another round');
             //Trivial rate limiting.

Braces +4 added lines, -2 removed lines

@@ -222,7 +222,8 @@ 
             $this->_backend->send($person, $member, $token, $subject, $content, $from);
             self::$_messages_sent++;
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE;
             if (!$this->test_mode) {
                 $params[] = array(
@@ -279,7 +280,8 @@ 
     {
         try {
             $person = org_openpsa_contacts_person_dba::get_cached($member->person);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Person #{$member->person} deleted or missing, removing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;
             $member->delete();

lib/org/openpsa/directmarketing/handler/campaign/admin.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     {
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_campaign);
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for campaign {$this->_campaign->id}.");