flack / openpsa

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;

lib/org/openpsa/directmarketing/exec/cleanup.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     echo "            <th>{$type}</th>\n";
     echo "            <td style=\"text-align: right;\">" . number_format($count) . "</td>\n";
     if (isset($cleanups_kept[$type])) {
-        echo "            <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) ."</td>\n";
+        echo "            <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) . "</td>\n";
     }
     echo "        </tr>\n";
 }

lib/org/openpsa/user/handler/person/create.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
         $this->_person = new midcom_db_person;
         if (!$this->_person->create()) {
             debug_print_r('We operated on this object:', $this->_person);
-            throw new midcom_error('Failed to create a new person. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new person. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_person;

lib/fi/protie/navigation/main.php

Spacing +8 added lines, -8 removed lines

@@ -257,7 +257,7 @@ 
             return;
         }
 
-        if (   isset($this->_get_params[$name])
+        if (isset($this->_get_params[$name])
             && $this->_get_params[$name] == $value) {
             return;
         }
@@ -393,8 +393,8 @@ 
         $classes = array();
 
         if ($child[MIDCOM_NAV_TYPE] === 'node') {
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
-                && (   !$this->_nap->get_current_leaf()
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
+                && (!$this->_nap->get_current_leaf()
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf()))) {
                 $classes[] = $this->css_active;
             }
@@ -441,7 +441,7 @@ 
         }
 
         // Add information about the object's status
-        if (   $this->object_status_to_class
+        if ($this->object_status_to_class
             && isset($item[MIDCOM_NAV_OBJECT])
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT])) {
             $classes[] = $css_status_class;
@@ -462,12 +462,12 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}{$get_params}\"{$link_class}>{$item[MIDCOM_NAV_NAME]}</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
             && !$this->show_only_current
-            && (   $this->list_levels === 0
+            && ($this->list_levels === 0
                 || $this->_level < $this->list_levels)) {
-            if (   $this->follow_all
-                || (   $this->follow_selected
+            if ($this->follow_all
+                || ($this->follow_selected
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true))) {
                 $this->_level++;
                 $this->_list_child_elements($item[MIDCOM_NAV_ID]);

src/midcom/events/watcher.php

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
 
         try {
             $interface = \midcom::get()->componentloader->get_interface_class($this->component);
-        } catch (\midcom_error $e) {
+        }
+        catch (\midcom_error $e) {
             debug_add("Failed to load the component {$this->component}: " . $e->getMessage(), MIDCOM_LOG_INFO);
             return;
         }