flack / openpsa

lib/net/nemein/wiki/handler/view.php

Spacing +3 added lines, -3 removed lines

@@ -202,9 +202,9 @@
         $toc .= "\n<ol class=\"midcom_helper_toc_formatter level_{$current_list_level}\">\n";
         foreach ($headings[4] as $key => $heading) {
             $anchor = 'heading-' . md5($heading);
-            $tag_level =& $headings[3][$key];
-            $heading_code =& $headings[0][$key];
-            $heading_tag =& $headings[2][$key];
+            $tag_level = & $headings[3][$key];
+            $heading_code = & $headings[0][$key];
+            $heading_tag = & $headings[2][$key];
             $heading_new_code = "<a id='{$anchor}'></a>{$heading_code}";
             $content = str_replace($heading_code, $heading_new_code, $content);
             if ($current_tag_level === false) {

lib/org/openpsa/contacts/handler/duplicates/person.php

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 
     private function load_next()
     {
-        $i =& $this->_request_data['loop_i'];
+        $i = & $this->_request_data['loop_i'];
         while ($i < 100) {
             debug_add("Loop iteration {$i}");
             $qb = new midgard_query_builder('midgard_parameter');
@@ -69,7 +69,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$person1->can_do('midgard:update')
+            if (!$person1->can_do('midgard:update')
                 || !$person1->can_do('midgard:delete')
                 || !$person2->can_do('midgard:update')
                 || !$person2->can_do('midgard:delete')) {
@@ -78,7 +78,7 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
+            if ($person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
                 || $person2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person1->guid)) {
                 debug_add("It seems these two (#{$person1->id} and #{$person2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
                 $i++;
@@ -102,7 +102,7 @@ 
             if ($keep == 'both') {
                 $option1->require_do('midgard:update');
                 $option2->require_do('midgard:update');
-                if (   $option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
+                if ($option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
                     && $option2->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option1->guid, time())) {
                     // Clear the possible duplicate parameters
                     $option1->delete_parameter('org.openpsa.contacts.duplicates:possible_duplicate', $option2->guid);
@@ -120,11 +120,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

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

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     {
         $nap = new midcom_helper_nav();
         $node = $nap->get_node($nap->get_current_node());
-        $compose_url = $node[MIDCOM_NAV_RELATIVEURL] . 'message/compose/' . $data['message']->guid .'/';
+        $compose_url = $node[MIDCOM_NAV_RELATIVEURL] . 'message/compose/' . $data['message']->guid . '/';
         $this->batch_url_base_full = $node[MIDCOM_NAV_RELATIVEURL] . 'message/send_bg/' . $data['message']->guid . '/';
         debug_add("compose_url: {$compose_url}");
         debug_add("batch_url base: {$this->batch_url_base_full}");

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
     public function _load_data(string $handler_id, array &$args, array &$data) : array
     {
-        if (   empty($_POST)
+        if (empty($_POST)
             && $this->session->exists('POST_data')) {
             $_POST = $this->session->get('POST_data');
             $this->session->remove('POST_data');

lib/midcom/helper/reflector/tree.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
     private static function _check_permissions(bool $deleted) : bool
     {
         // PONDER: Check for some generic user privilege instead  ??
-        if (   $deleted
+        if ($deleted
             && !midcom_connection::is_admin()
             && !midcom::get()->auth->is_component_sudo()) {
             debug_add('Non-admins are not allowed to list deleted objects', MIDCOM_LOG_ERROR);
@@ -221,7 +221,7 @@ 
             $field_type = $field_data['type'];
             $field = $field_data['name'];
 
-            if (   !$field_target
+            if (!$field_target
                 || !isset($for_object->$field_target)) {
                 // Why return false ???
                 return false;

lib/midgard/admin/asgard/handler/object/manage.php

Spacing +2 added lines, -2 removed lines

@@ -223,10 +223,10 @@
             $new_type_reflector = midcom_helper_reflector::get($new_type);
             $link_properties = $new_type_reflector->get_link_properties();
             foreach ($link_properties as $property => $link) {
-                if (   ($link['class'] && midcom_helper_reflector::is_same_class($link['class'], $this->_object->__mgdschema_class_name__))
+                if (($link['class'] && midcom_helper_reflector::is_same_class($link['class'], $this->_object->__mgdschema_class_name__))
                     || $link['type'] == MGD_TYPE_GUID) {
                     $defaults[$property] = $this->_object->{$link['target']};
-                } elseif (   $property == $parent_property
+                } elseif ($property == $parent_property
                           && midcom_helper_reflector::is_same_class($new_type, $this->_object->__mgdschema_class_name__)) {
                     $defaults[$property] = $this->_object->$parent_property;
                 }

lib/errors.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
     private function send(int $httpcode, string $message)
     {
         $error_actions = midcom::get()->config->get_array('error_actions');
-        if (   !isset($error_actions[$httpcode])
+        if (!isset($error_actions[$httpcode])
             || !isset($error_actions[$httpcode]['action'])) {
             // No action specified for this error code, skip
             return;
@@ -141,7 +141,7 @@ 
             return;
         }
 
-        if (   !is_writable($config['filename'])
+        if (!is_writable($config['filename'])
             && !is_writable(dirname($config['filename']))) {
             debug_add("Error logging file {$config['filename']} is not writable", MIDCOM_LOG_WARN);
             return;

lib/midcom/services/auth/main.php

Spacing +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
             return true;
         }
         if ($user === null) {
-            $user =& $this->user;
+            $user = & $this->user;
         }
 
         if ($user == 'EVERYONE') {

lib/midcom/helper/reflector/main.php

Spacing +4 added lines, -4 removed lines

@@ -326,7 +326,7 @@ 
 
         $label_prop = $this->get_label_property();
 
-        if (    $label_prop != 'guid'
+        if ($label_prop != 'guid'
              && $this->_mgd_reflector->property_exists($label_prop)) {
             $search_properties[$label_prop] = true;
         }
@@ -380,7 +380,7 @@ 
                 continue;
             }
 
-            if (   !$ref->is_link($property)
+            if (!$ref->is_link($property)
                 && $ref->get_midgard_type($property) != MGD_TYPE_GUID) {
                 continue;
             }
@@ -415,7 +415,7 @@ 
     protected static function class_rewrite(string $schema_type) : string
     {
         $extends = midcom_baseclasses_components_configuration::get('midcom.helper.reflector', 'config')->get_array('class_extends');
-        if (   isset($extends[$schema_type])
+        if (isset($extends[$schema_type])
             && class_exists($extends[$schema_type])) {
             return $extends[$schema_type];
         }
@@ -485,7 +485,7 @@ 
         // Configured properties
         foreach ($this->_config->get_array($type . '_exceptions') as $class => $property) {
             if (midcom::get()->dbfactory->is_a($object, $class)) {
-                if (   $property !== false
+                if ($property !== false
                     && !$this->_mgd_reflector->property_exists($property)) {
                     debug_add("Matched class '{$key}' to '{$class}' via is_a but property '{$property}' does not exist", MIDCOM_LOG_ERROR);
                 } else {