flack / openpsa

lib/midcom/admin/rcs/handler.php

Spacing +4 added lines, -4 removed lines

@@ -202,7 +202,7 @@ 
         $this->_guid = $args[0];
         $this->_load_object();
 
-        if (   !$this->_backend->version_exists($args[1])
+        if (!$this->_backend->version_exists($args[1])
             || !$this->_backend->version_exists($args[2])) {
             throw new midcom_error_notfound("One of the revisions {$args[1]} or {$args[2]} does not exist.");
         }
@@ -217,7 +217,7 @@ 
         $this->_request_data['earlier_revision'] = $this->_backend->get_prev_version($args[1]);
         $this->_request_data['previous_revision'] = $args[1];
         $this->_request_data['latest_revision'] = $args[2];
-        $this->_request_data['next_revision']  = $this->_backend->get_next_version($args[2]);
+        $this->_request_data['next_revision'] = $this->_backend->get_next_version($args[2]);
 
         $this->_request_data['guid'] = $args[0];
 
@@ -291,7 +291,7 @@ 
         // Set the version numbers
         $data['previous_revision'] = $this->_backend->get_prev_version($args[1]);
         $data['latest_revision'] = $args[1];
-        $data['next_revision']  = $this->_backend->get_next_version($args[1]);
+        $data['next_revision'] = $this->_backend->get_next_version($args[1]);
         $data['guid'] = $args[0];
     }
 
@@ -318,7 +318,7 @@ 
         $this->_object->require_do('midgard:update');
         // TODO: set another privilege for restoring?
 
-        if (   $this->_backend->version_exists($args[1])
+        if ($this->_backend->version_exists($args[1])
             && $this->_backend->restore_to_revision($args[1])) {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate(midcom::get()->permalinks->create_permalink($this->_object->guid));

lib/midcom/db/attachment.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
     public function update_cache()
     {
         // Check if the attachment can be read anonymously
-        if (   midcom::get()->config->get('attachment_cache_enabled')
+        if (midcom::get()->config->get('attachment_cache_enabled')
             && !$this->can_do('midgard:read', 'EVERYONE')) {
             // Not public file, ensure it is removed
             $filename = $this->get_cache_path();

lib/midcom/helper/nav/item.php

Spacing +2 added lines, -2 removed lines

@@ -98,8 +98,8 @@
         }
 
         // Check the Metadata if and only if we are configured to do so.
-        if (   is_object($this->object)
-            && (   midcom::get()->config->get('show_hidden_objects') == false
+        if (is_object($this->object)
+            && (midcom::get()->config->get('show_hidden_objects') == false
                 || midcom::get()->config->get('show_unapproved_objects') == false)) {
             // Check Hiding, Scheduling and Approval
             $metadata = $this->object->metadata;

lib/midcom/helper/nav/leaf.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by($user_id)
     {
-        return (   empty($this->object)
+        return (empty($this->object)
                 || !$this->guid
                 || !$user_id
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, $this->object->__midcom_class_name__, $user_id));

lib/midcom/services/auth/backend/simple.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             $this->_cookie_path = midcom_connection::get_url('self');
         }
 
-        if (   !empty($_SERVER['HTTPS'])
+        if (!empty($_SERVER['HTTPS'])
             && $_SERVER['HTTPS'] !== 'off'
             && midcom::get()->config->get('auth_backend_simple_cookie_secure')) {
             $this->_secure_cookie = true;
@@ -73,7 +73,7 @@ 
                  * @todo checksumming ? (though hijacking this is only slightly simpler than hijacking cookies)
                  */
                 debug_add('Found cookie-id in _GET but not in _COOKIE, referencing', MIDCOM_LOG_INFO);
-                $_COOKIE[$this->_cookie_id] =& $_GET[$this->_cookie_id];
+                $_COOKIE[$this->_cookie_id] = & $_GET[$this->_cookie_id];
                 $reset_cookie = true;
             } else {
                 return false;

lib/midcom/services/auth/acl.php

Spacing +8 added lines, -8 removed lines

@@ -518,7 +518,7 @@ 
         $cache_id = $user_id . '::' . $object_guid;
 
         if (!array_key_exists($cache_id, self::$_privileges_cache)) {
-            if (   empty($object_guid)
+            if (empty($object_guid)
                 || empty($object_class)) {
                 /* No idea if there should be some special log message written */
                 return array();
@@ -630,7 +630,7 @@ 
         midcom::get()->auth->acl->_internal_sudo = $previous_sudo;
         // <== out of SUDO
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             $base_privileges = array();
         } else {
@@ -641,7 +641,7 @@ 
         // Determine parent ownership
         $is_owner = false;
         $last_owner_scope = -1;
-        if (   array_key_exists('midgard:owner', $base_privileges)
+        if (array_key_exists('midgard:owner', $base_privileges)
             && $base_privileges['midgard:owner'] == MIDCOM_PRIVILEGE_ALLOW) {
             $is_owner = true;
         }
@@ -681,7 +681,7 @@ 
 
             $valid_privileges[$scope][$privilege->privilegename] = $privilege->value;
 
-            if (   $privilege->privilegename == 'midgard:owner'
+            if ($privilege->privilegename == 'midgard:owner'
                 && $scope > $last_owner_scope) {
                 $is_owner = ($privilege->value == MIDCOM_PRIVILEGE_ALLOW);
                 $last_owner_scope = $scope;
@@ -892,7 +892,7 @@ 
         $content_privilege = null;
 
         foreach ($object_privileges as $privilege) {
-            if (   $privilege->privilegename != $privilegename
+            if ($privilege->privilegename != $privilegename
                 ||  $privilege->scope <= $last_scope
                 || !$privilege->does_privilege_apply($user_id)) {
                 continue;
@@ -903,10 +903,10 @@ 
         }
 
         //owner privileges override everything but person privileges, so we have to cross-check those here
-        if (   $privilegename != 'midgard:owner'
+        if ($privilegename != 'midgard:owner'
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
             $owner_privileges = $this->get_owner_default_privileges();
-            if (    array_key_exists($privilegename, $owner_privileges)
+            if (array_key_exists($privilegename, $owner_privileges)
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);
@@ -930,7 +930,7 @@ 
         midcom::get()->auth->acl->_internal_sudo = $previous_sudo;
         // <== out of SUDO
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             return false;
         }

lib/midcom/services/i18n/main.php

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
         $rawdata = base64_decode($_COOKIE['midcom_services_i18n']);
         $array = unserialize($rawdata);
 
-        if (   !array_key_exists('language', $array)
+        if (!array_key_exists('language', $array)
             || !array_key_exists('charset', $array)) {
             debug_add("Rejecting cookie, it seems invalid.");
             return;
@@ -167,7 +167,7 @@ 
                 $lang = substr($lang, 0, 2);
                 $q = $this->_get_q($params);
 
-                if (   !isset($http_langs[$lang])
+                if (!isset($http_langs[$lang])
                     || $http_langs[$lang] < $q) {
                     $http_langs[$lang] = $q;
                 }
@@ -496,7 +496,7 @@ 
     function iconv($source_charset, $destination_charset, $string)
     {
         $result = @iconv($source_charset, $destination_charset, $string);
-        if (   $result === false
+        if ($result === false
             && strlen($string) > 0) {
             debug_add("Iconv returned failed to convert a string, returning an empty string.", MIDCOM_LOG_WARN);
             debug_print_r("Tried to convert this string from {$source_charset} to {$destination_charset}:", $string);

lib/midcom/services/cache/module/nap.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
             // Get parent from DB and compare to catch moves
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
-                if (    $parent_entry_from_object
+                if ($parent_entry_from_object
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $cached_node_id) {
                     $this->_cache->delete($this->_prefix . '-' . $parent_entry_from_object[MIDCOM_NAV_ID] . '-leaves');
                 }
@@ -92,7 +92,7 @@ 
             $parent_id = $napobject[MIDCOM_NAV_NODEID];
             $parent_entry = $this->get_node($parent_id);
 
-            if (   $parent_entry
+            if ($parent_entry
                 && array_key_exists(MIDCOM_NAV_SUBNODES, $parent_entry)) {
                 unset($parent_entry[MIDCOM_NAV_SUBNODES]);
                 $this->put_node($parent_id, $parent_entry);
@@ -102,7 +102,7 @@ 
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
 
-                if (    !empty($parent_entry_from_object[MIDCOM_NAV_ID])
+                if (!empty($parent_entry_from_object[MIDCOM_NAV_ID])
                      && !empty($parent_entry[MIDCOM_NAV_ID])
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $parent_entry[MIDCOM_NAV_ID]) {
                     unset($parent_entry_from_object[MIDCOM_NAV_SUBNODES]);
@@ -128,7 +128,7 @@ 
             $nav = new midcom_helper_nav;
             if (is_a($object, 'midcom_db_topic')) {
                 $napobject = $nav->get_node($object->id);
-            } elseif (   ($node = $nav->find_closest_topic($object))
+            } elseif (($node = $nav->find_closest_topic($object))
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }
@@ -153,7 +153,7 @@ 
         }
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$key}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }
@@ -177,7 +177,7 @@ 
 
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$key}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }
@@ -262,7 +262,7 @@ 
 
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$guid}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }

lib/midcom/services/cache/module/content.php

Spacing +11 added lines, -11 removed lines

@@ -278,8 +278,8 @@ 
         $this->_uncached = midcom::get()->config->get('cache_module_content_uncached');
         $this->_headers_strategy = strtolower(midcom::get()->config->get('cache_module_content_headers_strategy'));
         $this->_headers_strategy_authenticated = strtolower(midcom::get()->config->get('cache_module_content_headers_strategy_authenticated'));
-        $this->_default_lifetime = (int)midcom::get()->config->get('cache_module_content_default_lifetime');
-        $this->_default_lifetime_authenticated = (int)midcom::get()->config->get('cache_module_content_default_lifetime_authenticated');
+        $this->_default_lifetime = (int) midcom::get()->config->get('cache_module_content_default_lifetime');
+        $this->_default_lifetime_authenticated = (int) midcom::get()->config->get('cache_module_content_default_lifetime_authenticated');
         $this->_force_headers = midcom::get()->config->get('cache_module_content_headers_force');
 
         switch ($this->_headers_strategy) {
@@ -451,7 +451,7 @@ 
         _midcom_header('Cache-Control: post-check=0, pre-check=0', false);
 
         //Suppress "Pragma: no-cache" header, because otherwise file downloads don't work in IE < 9 with https.
-        if (   !isset($_SERVER['HTTPS'])
+        if (!isset($_SERVER['HTTPS'])
             || !isset($_SERVER['HTTP_USER_AGENT'])
             || !preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) {
             _midcom_header('Pragma: no-cache');
@@ -507,7 +507,7 @@ 
      */
     public function expires($timestamp)
     {
-        if (   is_null($this->_expires)
+        if (is_null($this->_expires)
             || $this->_expires > $timestamp) {
             $this->_expires = $timestamp;
         }
@@ -783,7 +783,7 @@ 
      */
     public function write_meta_cache($content_id, $etag)
     {
-        if (   $this->_uncached
+        if ($this->_uncached
             || $this->_no_cache) {
             return;
         }
@@ -832,7 +832,7 @@ 
                 $to_save[$guid] = $guidmap;
             }
 
-            if (   $content_id !== $request_id
+            if ($content_id !== $request_id
                 && !in_array($request_id, $guidmap)) {
                 $guidmap[] = $request_id;
                 $to_save[$guid] = $guidmap;
@@ -844,7 +844,7 @@ 
 
     public function check_dl_hit($context, $dl_config)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_live_mode) {
             return false;
         }
@@ -865,7 +865,7 @@ 
 
     public function store_dl_content($context, $dl_config, $dl_cache_data)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_live_mode
             || $this->_uncached) {
             return;
@@ -949,7 +949,7 @@ 
                     $time = $meta['lastmodified'];
                 }
             }
-            if (   $time == 0
+            if ($time == 0
                 || !is_numeric($time)) {
                 $time = time();
             }
@@ -960,7 +960,7 @@ 
 
         $this->cache_control_headers();
 
-        if (   is_array($this->_force_headers)
+        if (is_array($this->_force_headers)
             && !empty($this->_force_headers)) {
             foreach ($this->_force_headers as $header => $value) {
                 $header_string = "{$header}: {$value}";
@@ -1005,7 +1005,7 @@ 
         $expires = false;
         $strategy = $this->_headers_strategy;
         $default_lifetime = $this->_default_lifetime;
-        if (   midcom::get()->auth->is_valid_user()
+        if (midcom::get()->auth->is_valid_user()
             || midcom_connection::get_user()) {
             $strategy = $this->_headers_strategy_authenticated;
             $default_lifetime = $this->_default_lifetime_authenticated;