flack / openpsa

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 {

lib/midcom/baseclasses/components/interface.php

Spacing +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
      */
     public function can_handle($current_object, $argc, $argv, $contextid)
     {
-        $data =& $this->_context_data[$contextid];
+        $data = & $this->_context_data[$contextid];
         $loader = midcom::get()->componentloader;
         $class = $loader->path_to_prefix($this->_component) . '_' . $this->_site_class_suffix;
         $data['handler'] = new $class($current_object, $data['config']);

lib/midcom/style/midcom_helper_datamanager2_unlock.php

Braces +2 added lines, -1 removed lines

@@ -4,7 +4,8 @@
 try {
     $person = new midcom_db_person($metadata->locker);
     $name = $person->name;
-} catch (midcom_error $e) {
+}
+catch (midcom_error $e) {
     $name = $this->data['handler']->_l10n_midcom->get('unknown user');
     $e->log();
 }

lib/midcom/admin/folder/handler/metadata.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $schemadb = midcom_helper_datamanager2_schema::load_database(midcom::get()->config->get('metadata_schema'));
 
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $schemadb;
+        $this->_controller->schemadb = & $schemadb;
 
         $object_schema = midcom_helper_metadata::find_schemaname($schemadb, $this->_object);
 

lib/midcom/admin/folder/handler/move.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
     {
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($args[0]);
 
-        if (   !is_a($this->_object, 'midcom_db_topic')
+        if (!is_a($this->_object, 'midcom_db_topic')
             && !is_a($this->_object, 'midcom_db_article')) {
             throw new midcom_error_notfound("Moving only topics and articles is supported.");
         }
@@ -78,7 +78,7 @@ 
             $folder = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
         }
 
-        if (   is_a($this->_object, 'midcom_db_topic')
+        if (is_a($this->_object, 'midcom_db_topic')
             && $folder->up == $this->_object->id) {
             $tree_disabled = true;
         }
@@ -91,7 +91,7 @@ 
             $selected = ' checked="checked"';
         }
 
-        if (   !is_a($this->_object, 'midcom_db_topic')
+        if (!is_a($this->_object, 'midcom_db_topic')
             && $folder->component !== $this->_request_data['current_folder']->component) {
             // Non-topic objects may only be moved under folders of same component
             $class = 'wrong_component';
@@ -127,7 +127,7 @@ 
         $move_to_topic = new midcom_db_topic();
 
         if (!$move_to_topic->get_by_id($target)) {
-            throw new midcom_error( 'Failed to move the topic. Could not get the target topic');
+            throw new midcom_error('Failed to move the topic. Could not get the target topic');
         }
 
         $move_to_topic->require_do('midgard:create');

lib/midcom/exec/touch_attachments.php

Braces +2 added lines, -1 removed lines

@@ -16,7 +16,8 @@
 foreach ($atts as $att) {
     try {
         $att->file_to_cache();
-    } catch (midcom_error $e) {
+    }
+    catch (midcom_error $e) {
         echo 'Error: ' . $e->getMessage() . "\n";
     }
 }

lib/midcom/exec/reindex.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 $http_client = new org_openpsa_httplib();
 $http_client->set_param('timeout', 300);
-if (   !empty($_SERVER['PHP_AUTH_USER'])
+if (!empty($_SERVER['PHP_AUTH_USER'])
     && !empty($_SERVER['PHP_AUTH_PW'])) {
     $http_client->basicauth['user'] = $_SERVER['PHP_AUTH_USER'];
     $http_client->basicauth['password'] = $_SERVER['PHP_AUTH_PW'];