flack / openpsa

lib/midcom/helper/_dbfactory.php

Spacing +11 added lines, -11 removed lines

@@ -49,8 +49,8 @@ 
 
             throw new midcom_error_midgard($e, $guid);
         }
-        $person_class =  midcom::get()->config->get('person_class');
-        if (   get_class($tmp) == 'midgard_person'
+        $person_class = midcom::get()->config->get('person_class');
+        if (get_class($tmp) == 'midgard_person'
             && $person_class != 'midgard_person') {
             $tmp = new $person_class($guid);
         }
@@ -81,7 +81,7 @@ 
         }
         $object = new $classname($src);
         $cache[$classname][$object->guid] = $object;
-        $cache[$classname][$object->id] =& $cache[$classname][$object->guid];
+        $cache[$classname][$object->id] = & $cache[$classname][$object->guid];
         return $cache[$classname][$object->guid];
     }
 
@@ -174,7 +174,7 @@ 
             throw new midcom_error("Cannot cast the object to an MgdSchema type, it is not a MidCOM DBA object");
         }
 
-        if (   !isset($object->__object)
+        if (!isset($object->__object)
             || !is_object($object->__object)) {
             debug_print_r("Object dump:", $object);
             throw new midcom_error("Cannot cast the object to an MgdSchema type, as it doesn't contain it");
@@ -198,14 +198,14 @@ 
             return true;
         }
 
-        if (   isset($object->__object)
+        if (isset($object->__object)
             && is_object($object->__object)
             && is_a($object->__object, $class)) {
             // Decorator whose MgdSchema object matches
             return true;
         }
 
-        if (   isset($object->__mgdschema_class_name__)
+        if (isset($object->__mgdschema_class_name__)
             && $object->__mgdschema_class_name__ == $class) {
             // Decorator without object instantiated, check class match
             return true;
@@ -227,7 +227,7 @@ 
         if (is_object($object)) {
             $helper = new helper;
             // We're dealing with either MgdSchema or MidCOM DBA object
-            if (   isset($object->__object)
+            if (isset($object->__object)
                 && is_object($object->__object)) {
                 // MidCOM DBA decorator
                 return $helper->property_exists($object->__object, $property);
@@ -236,7 +236,7 @@ 
             return $helper->property_exists($object, $property);
         }
 
-        if (   !is_string($object)
+        if (!is_string($object)
             || !class_exists($object)) {
             // TODO: Raise exception?
             debug_add("\$object is not string or class_exists() returned false", MIDCOM_LOG_WARN);
@@ -261,7 +261,7 @@ 
         $parent_data = $this->_get_parent_guid_cached($object->guid, $object);
 
         $parent_guid = current($parent_data);
-        if (   empty($parent_guid)
+        if (empty($parent_guid)
             || $parent_guid === $object->guid) {
             return null;
         }
@@ -464,11 +464,11 @@ 
                 );
             }
 
-            if (   $parent_property
+            if ($parent_property
                 && $reflector->get_link_target($parent_property)) {
                 $target_class = $reflector->get_link_name($parent_property);
                 if ($target_class == 'midgard_person') {
-                    $person_class =  midcom::get()->config->get('person_class');
+                    $person_class = midcom::get()->config->get('person_class');
                     if ($person_class != 'midgard_person') {
                         $target_class = $person_class;
                     }

lib/midcom/helper/reflector/tree.php

Spacing +7 added lines, -7 removed lines

@@ -158,7 +158,7 @@ 
     private static function _check_permissions($deleted)
     {
         // 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);
@@ -248,7 +248,7 @@ 
                     'target' => $ref->get_link_target($field)
                 );
                 $linked_class = $ref->get_link_name($field);
-                if (   empty($linked_class)
+                if (empty($linked_class)
                     && $info['type'] === MGD_TYPE_GUID) {
                     // Guid link without class specification, valid for all classes
                     if (empty($info['target'])) {
@@ -298,7 +298,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;
@@ -414,7 +414,7 @@ 
             $parent_property = midgard_object_class::get_property_parent($schema_type);
             $up_property = midgard_object_class::get_property_up($schema_type);
 
-            if (   !$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
+            if (!$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
                 && !$this->_resolve_child_classes_links_back($up_property, $schema_type, $this->mgdschema_class)) {
                 continue;
             }
@@ -439,7 +439,7 @@ 
 
         $ref = new midgard_reflection_property($prospect_type);
         $link_class = $ref->get_link_name($property);
-        if (   empty($link_class)
+        if (empty($link_class)
             && $ref->get_midgard_type($property) === MGD_TYPE_GUID) {
             return true;
         }
@@ -534,12 +534,12 @@ 
         $ref = self::get($schema_type);
         $dummy = new $schema_type();
         $title_property = $ref->get_title_property($dummy);
-        if (   is_string($title_property)
+        if (is_string($title_property)
             && midcom::get()->dbfactory->property_exists($schema_type, $title_property)) {
             $qb->add_order($title_property);
         }
         $name_property = $ref->get_name_property($dummy);
-        if (   is_string($name_property)
+        if (is_string($name_property)
             && midcom::get()->dbfactory->property_exists($schema_type, $name_property)) {
             $qb->add_order($name_property);
         }

lib/midcom/helper/reflector/copy.php

Spacing +5 added lines, -5 removed lines

@@ -346,7 +346,7 @@ 
         }
 
         // Override requested root object properties
-        if (   !empty($this->target->guid)
+        if (!empty($this->target->guid)
             && $target->guid === $this->target->guid) {
             foreach ($this->root_object_values as $name => $value) {
                 $target->$name = $value;
@@ -391,7 +391,7 @@ 
         // Store for later use - if ever needed
         $this->new_objects[] = $target;
 
-        if (   !$this->_copy_data('parameters', $source, $target)
+        if (!$this->_copy_data('parameters', $source, $target)
             || !$this->_copy_data('metadata', $source, $target)
             || !$this->_copy_data('attachments', $source, $target)
             || !$this->_copy_data('privileges', $source, $target)) {
@@ -412,7 +412,7 @@ 
     private function _copy_data($type, $source, &$target)
     {
         $method = 'copy_' . $type;
-        if (   !$this->$method($source, $target)
+        if (!$this->$method($source, $target)
             && $this->halt_on_errors) {
             $this->errors[] = $this->_l10n->get('failed to copy ' . $type);
             return false;
@@ -564,8 +564,8 @@ 
     public static function copy_object_tree($source, $parent, $exclude = array(), $copy_parameters = true, $copy_metadata = true, $copy_attachments = true)
     {
         $copy = new midcom_helper_reflector_copy();
-        $copy->source =& $source;
-        $copy->target =& $parent;
+        $copy->source = & $source;
+        $copy->target = & $parent;
         $copy->copy_parameters = $copy_parameters;
         $copy->copy_metadata = $copy_metadata;
         $copy->copy_attachments = $copy_attachments;

lib/midcom/helper/search/handler/search.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     {
         $node = $nap->get_node($node_id);
 
-        if (   !array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
+        if (!array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
             && $node[MIDCOM_NAV_COMPONENT] != 'midcom.helper.search') {
             $l10n = $this->_i18n->get_l10n($node[MIDCOM_NAV_COMPONENT]);
             $this->_request_data['components'][$node[MIDCOM_NAV_COMPONENT]] = $l10n->get($node[MIDCOM_NAV_COMPONENT]);
@@ -112,7 +112,7 @@ 
         $this->prepare_query_data();
         $this->prepare_formdata($_REQUEST['type']);
 
-        if (   count(explode(' ', $data['query'])) == 1
+        if (count(explode(' ', $data['query'])) == 1
             && strpos($data['query'], '*') === false
             && $this->_config->get('single_term_auto_wilcard')) {
             //If there is only one search term append * to the query if auto_wildcard is enabled
@@ -192,12 +192,12 @@ 
             $this->_request_data['last_document_number'] = $last_document_id + 1;
             $this->_request_data['shown_documents'] = $last_document_id - $first_document_id + 1;
             $this->_request_data['results_per_page'] = $results_per_page;
-            $this->_request_data['all_results'] =& $result;
+            $this->_request_data['all_results'] = & $result;
             $this->_request_data['result'] = array_slice($result, $first_document_id, $results_per_page);
 
             // Register GUIDs for cache engine
             foreach ($this->_request_data['result'] as $doc) {
-                if (   !isset($doc->source)
+                if (!isset($doc->source)
                     || !mgd_is_guid($doc->source)) {
                     // Non-Midgard results don't need to go through cache registration
                     continue;

lib/midcom/baseclasses/components/request.php

Spacing +7 added lines, -7 removed lines

@@ -433,7 +433,7 @@ 
                 $this->_request_switch[$key]['handler'] = array(&$this, $value['handler']);
             }
 
-            if (   !array_key_exists('expires', $value)
+            if (!array_key_exists('expires', $value)
                 || !is_integer($value['expires'])
                 || $value['expires'] < -1) {
                 $this->_request_switch[$key]['expires'] = -1;
@@ -465,7 +465,7 @@ 
         }
 
         // Check if we need to start up a plugin.
-        if (   $argc > 1
+        if ($argc > 1
             && array_key_exists($argv[0], self::$_plugin_namespace_config)
             && array_key_exists($argv[1], self::$_plugin_namespace_config[$argv[0]])) {
             $namespace = $argv[0];
@@ -481,7 +481,7 @@ 
                 continue;
             }
             $fixed_args_count = count($request['fixed_args']);
-            $this->_handler =& $this->_request_switch[$key];
+            $this->_handler = & $this->_request_switch[$key];
 
             $this->_handler['id'] = $key;
             $this->_handler['args'] = array_slice($argv, $fixed_args_count);
@@ -490,10 +490,10 @@ 
             $this->_prepare_handler();
 
             // If applicable, run the _can_handle check for the handler in question.
-            $handler =& $this->_handler['handler'][0];
+            $handler = & $this->_handler['handler'][0];
             $method = "_can_handle_{$this->_handler['handler'][1]}";
 
-            if (   method_exists($handler, $method)
+            if (method_exists($handler, $method)
                 && !$handler->$method($this->_handler['id'], $this->_handler['args'], $this->_request_data)) {
                 // This can_handle failed, allow next one to take over if there is one
                 continue;
@@ -510,7 +510,7 @@ 
         $variable_args_count = $request['variable_args'];
         $total_args_count = $fixed_args_count + $variable_args_count;
 
-        if (   ($argc != $total_args_count && ($variable_args_count >= 0))
+        if (($argc != $total_args_count && ($variable_args_count >= 0))
             || $fixed_args_count > $argc) {
             return false;
         }
@@ -530,7 +530,7 @@ 
                 $success = false;
                 foreach ($request['validation'][$i] as $rule) {
                     // rule is a callable function, like mgd_is_guid or is_int
-                    if (   is_callable($rule)
+                    if (is_callable($rule)
                         && $success = call_user_func($rule, $param)) {
                         break;
                     }

lib/midcom/baseclasses/components/handler/configuration.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
         midcom::get()->head->set_pagetitle($this->_l10n_midcom->get('component configuration'));
 
         $workflow = $this->get_workflow('datamanager2', array('controller' => $this->_controller));
-        if (   method_exists($this, '_load_datamanagers')
+        if (method_exists($this, '_load_datamanagers')
             && method_exists($this, '_load_objects')) {
             $workflow->add_post_button('config/recreate/', $this->_l10n_midcom->get('recreate images'), array(
                 'midcom_baseclasses_components_handler_configuration_recreateok' => true,

lib/midcom/baseclasses/components/handler/crud.php

Spacing +8 added lines, -8 removed lines

@@ -131,7 +131,7 @@ 
     {
         return;
         $indexer = midcom::get()->indexer;
-        $topic =& $this->_content_topic;
+        $topic = & $this->_content_topic;
 
         $nav = new midcom_helper_nav();
         $node = $nav->get_node($topic->id);
@@ -227,7 +227,7 @@ 
     {
         $prefix = $this->_get_url_prefix();
         $buttons = array();
-        if (   $this->_mode !== 'update'
+        if ($this->_mode !== 'update'
             && $this->_object->can_do('midgard:update')) {
             $workflow = $this->get_workflow('datamanager2');
             $buttons[] = $workflow->get_button($prefix . "edit/{$this->_object->guid}/", array(
@@ -235,7 +235,7 @@ 
             ));
         }
 
-        if (   $this->_mode !== 'delete'
+        if ($this->_mode !== 'delete'
             && $this->_object->can_do('midgard:delete')) {
             $workflow = $this->get_workflow('delete', array('object' => $this->_object));
             $buttons[] = $workflow->get_button($prefix . "delete/{$this->_object->guid}/");
@@ -261,7 +261,7 @@ 
      */
     public function _on_initialize()
     {
-        $this->_content_topic =& $this->_request_data['content_topic'];
+        $this->_content_topic = & $this->_request_data['content_topic'];
     }
 
     /**
@@ -271,7 +271,7 @@ 
      */
     public function _load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb'];
+        $this->_schemadb = & $this->_request_data['schemadb'];
     }
 
     /**
@@ -322,13 +322,13 @@ 
     public function _load_controller($type = 'simple')
     {
         $this->_controller = midcom_helper_datamanager2_controller::create($type);
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
 
         if ($type == 'create') {
             // Creation controller, give additional parameters
             $this->_controller->schemaname = $this->_schema;
             $this->_controller->defaults = $this->_defaults;
-            $this->_controller->callback_object =& $this;
+            $this->_controller->callback_object = & $this;
         } else {
             if (!$this->_object) {
                 throw new midcom_error_notfound("No object defined for DM2.");
@@ -426,7 +426,7 @@ 
             // AJAX editing is possible
             $this->_load_controller('ajax');
             $this->_controller->process_ajax();
-            $this->_datamanager =& $this->_controller->datamanager;
+            $this->_datamanager = & $this->_controller->datamanager;
         } else {
             $this->_load_datamanager();
         }

lib/midcom/baseclasses/components/handler/dataexport.php

Spacing +13 added lines, -13 removed lines

@@ -48,8 +48,8 @@ 
      */
     public function _prepare_request_data()
     {
-        $this->_request_data['datamanagers'] =& $this->_datamanagers;
-        $this->_request_data['rows'] =& $this->_rows;
+        $this->_request_data['datamanagers'] = & $this->_datamanagers;
+        $this->_request_data['rows'] = & $this->_rows;
     }
 
     /**
@@ -132,9 +132,9 @@ 
 
         foreach ($this->_datamanagers as $type => $datamanager) {
             foreach ($datamanager->schema->field_order as $name) {
-                $title =& $datamanager->schema->fields[$name]['title'];
-                $fieldtype =& $datamanager->schema->fields[$name]['type'];
-                if (   $this->include_totals
+                $title = & $datamanager->schema->fields[$name]['title'];
+                $fieldtype = & $datamanager->schema->fields[$name]['type'];
+                if ($this->include_totals
                     && $fieldtype == 'number') {
                     $this->_totals[$type . '-' . $name] = 0;
                 }
@@ -153,7 +153,7 @@ 
             $row = array();
             foreach ($this->_datamanagers as $type => $datamanager) {
                 foreach ($datamanager->schema->field_order as $name) {
-                    $fieldtype =& $datamanager->schema->fields[$name]['type'];
+                    $fieldtype = & $datamanager->schema->fields[$name]['type'];
                     $value = "";
                     if ($fieldtype == 'number') {
                         $value = $this->_totals[$type . '-' . $name];
@@ -181,14 +181,14 @@ 
                     $output = array_pad($output, $target_size, '');
                     continue;
                 }
-                $object =& $row[$type];
+                $object = & $row[$type];
 
                 if (!$datamanager->set_storage($object)) {
                     // Major error, panic
-                    throw new midcom_error( "Could not set_storage for row #{$num} ({$type} {$object->guid})");
+                    throw new midcom_error("Could not set_storage for row #{$num} ({$type} {$object->guid})");
                 }
 
-                if (   $this->include_guid
+                if ($this->include_guid
                     && $type == $first_type) {
                     $output[] = $object->guid;
                 }
@@ -196,7 +196,7 @@ 
                 foreach ($datamanager->schema->field_order as $fieldname) {
                     $fieldtype = $datamanager->schema->fields[$fieldname]['type'];
                     $data = $datamanager->types[$fieldname]->convert_to_csv();
-                    if (   $this->include_totals
+                    if ($this->include_totals
                         && $fieldtype == 'number') {
                         $this->_totals[$type . '-' . $fieldname] += $data;
                     }
@@ -231,7 +231,7 @@ 
         if (empty($this->csv['charset'])) {
             // Default to ISO-LATIN-15 (Latin-1 with EURO sign etc)
             $this->csv['charset'] = 'ISO-8859-15';
-            if (   isset($_SERVER['HTTP_USER_AGENT'])
+            if (isset($_SERVER['HTTP_USER_AGENT'])
                 && !preg_match('/Windows/i', $_SERVER['HTTP_USER_AGENT'])) {
                 // Excep when not on windows, then default to UTF-8
                 $this->csv['charset'] = 'UTF-8';
@@ -259,8 +259,8 @@ 
         }
 
         // Strings and numbers beginning with zero are quoted
-        if (   !empty($data)
-            && (   !is_numeric($data)
+        if (!empty($data)
+            && (!is_numeric($data)
                 || preg_match('/^[0+]/', $data))) {
             // Make sure we have only newlines in data
             $data = preg_replace("/\n\r|\r\n|\r/", "\n", $data);

lib/midcom/baseclasses/components/handler.php

Spacing +2 added lines, -2 removed lines

@@ -100,12 +100,12 @@
     {
         $this->_master = $master;
 
-        $this->_request_data =& $master->_request_data;
+        $this->_request_data = & $master->_request_data;
         $this->_topic = $master->_topic;
 
         // Load component specific stuff, special treatment if the handler has
         // a component different than the master handler set.
-        if (   $this->_component
+        if ($this->_component
             && $this->_component != $master->_component) {
             $this->_config->store_from_object($this->_topic, $this->_component, true);
         } else {