flack / openpsa

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}.");

lib/org/openpsa/directmarketing/handler/export.php

Braces +4 added lines, -2 removed lines

@@ -59,7 +59,8 @@ 
     {
         try {
             $person = new org_openpsa_contacts_person_dba($member->person);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return;
         }
@@ -82,7 +83,8 @@ 
                 $row['organization_member'] = $membership;
                 try {
                     $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN);
                     continue;
                 }

lib/org/openpsa/directmarketing/handler/message/compose.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
         }
 
         //Substyle handling
-        if (   !empty($data['message_array']['substyle'])
+        if (!empty($data['message_array']['substyle'])
             && !preg_match('/^builtin:/', $data['message_array']['substyle'])) {
             debug_add("Appending substyle {$data['message_array']['substyle']}");
             midcom::get()->style->append_substyle($data['message_array']['substyle']);
@@ -117,7 +117,7 @@ 
     private function _real_show_compose($handler_id, array &$data)
     {
         $prefix = '';
-        if (   !empty($data['message_array']['substyle'])
+        if (!empty($data['message_array']['substyle'])
             && preg_match('/^builtin:(.*)/', $data['message_array']['substyle'], $matches_style)) {
             $prefix = $matches_style[1] . '-';
         }

lib/org/openpsa/directmarketing/handler/import.php

Spacing +3 added lines, -3 removed lines

@@ -154,7 +154,7 @@ 
         $contacts = $importer->parse($input);
         if (count($contacts) > 0) {
             $this->_request_data['import_status'] = $importer->import_subscribers($contacts, $this->_request_data['campaign']);
-            if (   $this->_request_data['import_status']['subscribed_new'] > 0
+            if ($this->_request_data['import_status']['subscribed_new'] > 0
                 || $this->_request_data['import_status']['already_subscribed'] > 0) {
                 $this->_import_success = true;
             }
@@ -192,7 +192,7 @@ 
         // Update the breadcrumb line
         $this->_update_breadcrumb($handler_id, $args);
 
-        if (   array_key_exists('org_openpsa_directmarketing_import', $_POST)
+        if (array_key_exists('org_openpsa_directmarketing_import', $_POST)
             && is_uploaded_file($_FILES['org_openpsa_directmarketing_import_upload']['tmp_name'])) {
             $importer = new org_openpsa_directmarketing_importer_vcards($this->_schemadbs);
             $this->_run_import($importer, $_FILES['org_openpsa_directmarketing_import_upload']['tmp_name']);
@@ -246,7 +246,7 @@ 
                 $read_rows = 0;
                 $handle = fopen($_FILES['org_openpsa_directmarketing_import_upload']['tmp_name'], 'r');
                 $total_columns = 0;
-                while (   $read_rows < 2
+                while ($read_rows < 2
                        && $csv_line = fgetcsv($handle, 1000, $data['separator'])) {
                     if ($total_columns == 0) {
                         $total_columns = count($csv_line);

lib/org/openpsa/directmarketing/link/log.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         if (!$this->timestamp) {
             $this->timestamp = time();
         }
-        if (   !$this->referrer
+        if (!$this->referrer
             && !empty($_SERVER['HTTP_REFERER'])) {
             $this->referrer = $_SERVER['HTTP_REFERER'];
         }

lib/org/openpsa/directmarketing/support/bounce_detector.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 }
 $recipient = $_ENV["RECIPIENT"];
 $token_length = strlen($recipient) - strlen($prefix) - strlen($suffix);
-if (   $token_length <= 0
+if ($token_length <= 0
     || substr($recipient, 0, strlen($prefix)) != $prefix
     || substr($recipient, strlen($prefix) + $token_length) != $suffix) {
     error_log("Recipient address does not match address template: $recipient");
@@ -61,7 +61,7 @@ 
         fclose($fh);
         exit(0);
     }
-} elseif (   substr($BOUNCE_LOGGER, 0, strlen("http://")) == "http://"
+} elseif (substr($BOUNCE_LOGGER, 0, strlen("http://")) == "http://"
           || substr($BOUNCE_LOGGER, 0, strlen("https://")) == "https://") {
     $client = new org_openpsa_httplib();
     $client->post($BOUNCE_LOGGER, array("token" => $token));

lib/org/openpsa/directmarketing/importer/csv.php

Spacing +2 added lines, -2 removed lines

@@ -55,13 +55,13 @@
         foreach (array_filter($csv_line) as $field => $value) {
             // Process the row accordingly
             $field_matching = $this->_settings['fields'][$field];
-            if (   $field_matching
+            if ($field_matching
                 && strstr($field_matching, ':')) {
                 $matching_parts = explode(':', $field_matching);
                 $schemadb = $matching_parts[0];
                 $schema_field = $matching_parts[1];
 
-                if (   !array_key_exists($schemadb, $this->_schemadbs)
+                if (!array_key_exists($schemadb, $this->_schemadbs)
                     || !array_key_exists($schema_field, $this->_schemadbs[$schemadb]['default']->fields)) {
                     // Invalid matching, skip
                     continue;