flack / openpsa

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/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'];

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
 
     protected function _add_visibility_checks()
     {
-        if (   !$this->_visibility_checks_added
+        if (!$this->_visibility_checks_added
             && $this->hide_invisible
             && !midcom::get()->config->get('show_hidden_objects')) {
             $this->add_constraint('metadata.hidden', '=', false);
@@ -181,7 +181,7 @@ 
         // Deal with empty arrays, which would produce invalid queries
         // This is done here to avoid repetitive code in callers, and because
         // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true
-        if (   is_array($value)
+        if (is_array($value)
             && empty($value)) {
             if ($operator == 'NOT IN') {
                 return true;

lib/midcom/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -438,7 +438,7 @@ 
         // show_unapproved_objects). Disabled by default. Unsafe to Link Prefetching!
         'metadata_approval' => false,
         'metadata_scheduling' => false,
-        'metadata_lock_timeout' => 60,    // Time in minutes
+        'metadata_lock_timeout' => 60, // Time in minutes
         'staging2live_staging' => false,
 
         // Set the DM2 schema used by the Metadata Service
@@ -563,7 +563,7 @@ 
         }
 
         // Check the midcom_config site prefix for absolute local urls
-        if (   $key === 'midcom_site_url'
+        if ($key === 'midcom_site_url'
             && substr($this->_merged_config[$key], 0, 1) === '/') {
             $this->_merged_config[$key] = midcom::get()->get_page_prefix() . substr($this->_merged_config[$key], 1);
         }

lib/midcom/services/toolbars.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
             return;
         }
         $initialized = true;
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             || !midcom::get()->config->get('toolbars_enable_centralized')
             || !midcom::get()->auth->can_user_do('midcom:centralized_toolbar', null, $this)) {
             return;

lib/midcom/services/cron.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
     {
         foreach ($data as $component => $jobs) {
             // First, verify the component is loaded
-            if (   $component != 'midcom'
+            if ($component != 'midcom'
                 && !midcom::get()->componentloader->load_graceful($component)) {
                 $msg = "Failed to load the component {$component}. See the debug level log for further information, skipping this component.";
                 debug_add($msg, MIDCOM_LOG_ERROR);

lib/midcom/services/uimessages.php

Spacing +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
      */
     public function show($show_simple = false)
     {
-        if (   $show_simple
+        if ($show_simple
             || !midcom::get()->auth->can_user_do('midcom:ajax', null, 'midcom_services_uimessages')) {
             $this->show_simple();
             return;
@@ -177,7 +177,7 @@ 
      */
     public function show_simple($prefer_fancy = false)
     {
-        if (   $prefer_fancy
+        if ($prefer_fancy
             && midcom::get()->auth->can_user_do('midcom:ajax', null, 'midcom_services_uimessages')) {
             return $this->show();
         }

lib/midcom/services/metadata.php

Spacing +6 added lines, -6 removed lines

@@ -152,13 +152,13 @@ 
         }
 
         // Approval attributes
-        if (   midcom::get()->config->get('metadata_approval')
+        if (midcom::get()->config->get('metadata_approval')
             && !$object->metadata->is_approved()) {
             $css_classes[] = 'unapproved';
         }
 
         // Hiding and scheduling attributes
-        if (   (   !midcom::get()->config->get('show_hidden_objects')
+        if ((!midcom::get()->config->get('show_hidden_objects')
                 || midcom::get()->config->get('metadata_scheduling'))
             && !$object->metadata->is_visible()) {
             $css_classes[] = 'hidden';
@@ -281,7 +281,7 @@ 
     private function _add_opengraph_metadata($view_metadata)
     {
         $opengraph_type = $view_metadata->object->get_parameter('midcom.helper.metadata', 'opengraph_type');
-        if (   $opengraph_type
+        if ($opengraph_type
             && $opengraph_type != 'none') {
             $request_metadata = $this->get_request_metadata();
 
@@ -401,7 +401,7 @@ 
         }
 
         $component = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_COMPONENT);
-        if (   !$component
+        if (!$component
             || !midcom::get()->componentloader->is_installed($component)
             || !midcom::get()->componentloader->load_graceful($component)) {
             return '';
@@ -425,7 +425,7 @@ 
      */
     public function set_request_metadata($lastmodified, $permalinkguid)
     {
-        if (   is_object($lastmodified)
+        if (is_object($lastmodified)
             && is_a($lastmodified, 'midgard_datetime')) {
             // Midgard2 compatibility
             $lastmodified = $lastmodified->format('U');
@@ -456,7 +456,7 @@ 
             'permalink' => midcom::get()->permalinks->create_permalink($context->get_key(MIDCOM_CONTEXT_PERMALINKGUID)),
         );
 
-        if (   is_object($meta['lastmodified'])
+        if (is_object($meta['lastmodified'])
             && is_a($meta['lastmodified'], 'midgard_datetime')) {
             // Midgard2 compatibility
             $meta['lastmodified'] = $meta['lastmodified']->format('U');