flack / openpsa

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

Braces +3 added lines, -3 removed lines

@@ -64,7 +64,8 @@ 
     {
         try {
             $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             if (midcom_connection::get_error() == MGD_ERR_OBJECT_DELETED) {
                 $relocate = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) . '__mfa/asgard/object/deleted/' . $guid . '/';
                 midcom::get()->relocate($relocate);
@@ -232,8 +233,7 @@ 
         $this->_new_object = new $create_type();
         $mgd_type = midcom::get()->dbclassloader->get_mgdschema_class_name_for_midcom_class($create_type);
 
-        if ($parent_property = midgard_object_class::get_property_parent($mgd_type))
-        {
+        if ($parent_property = midgard_object_class::get_property_parent($mgd_type)) {
             $this->_new_object->$parent_property = $controller->formmanager->get_value($parent_property);
         }
 

Spacing +14 added lines, -14 removed lines

@@ -167,7 +167,7 @@ 
 
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_object, 'object');
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for object {$this->_object->guid}.");
@@ -184,11 +184,11 @@ 
                 return $this->_prepare_relocate($this->_object);
 
             case 'edit':
-                $qf =& $this->_controller->formmanager->form;
-                if (   $qf->isSubmitted()
+                $qf = & $this->_controller->formmanager->form;
+                if ($qf->isSubmitted()
                     && !$qf->validate()) {
                     foreach ($qf->_errors as $field => $error) {
-                        $element =& $qf->getElement($field);
+                        $element = & $qf->getElement($field);
                         $message = sprintf($this->_l10n->get('validation error in field %s: %s'), $element->getLabel(), $error);
                         midcom::get()->uimessages->add(
                             $this->_l10n->get('midgard.admin.asgard'),
@@ -231,7 +231,7 @@ 
 
         if (!$this->_new_object->create()) {
             debug_print_r('We operated on this object:', $this->_new_object);
-            throw new midcom_error('Failed to create a new object. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new object. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_new_object;
@@ -260,7 +260,7 @@ 
         midcom::get()->auth->require_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin');
 
         $data['defaults'] = array();
-        if (   $handler_id == '____mfa-asgard-object_create_toplevel'
+        if ($handler_id == '____mfa-asgard-object_create_toplevel'
             || $handler_id == '____mfa-asgard-object_create_chooser') {
             midcom::get()->auth->require_user_do('midgard:create', null, $this->_new_type);
 
@@ -278,9 +278,9 @@ 
         }
 
         $this->_controller = midcom_helper_datamanager2_controller::create('create');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->schema = 'object';
-        $this->_controller->callback_object =& $this;
+        $this->_controller->callback_object = & $this;
         $this->_controller->defaults = $this->_get_defaults();
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
@@ -321,11 +321,11 @@ 
             $parent_property = null;
             $new_type_reflector = midcom_helper_reflector::get($this->_new_type);
             $link_properties = $new_type_reflector->get_link_properties();
-            $type_to_link_to =  midcom_helper_reflector::class_rewrite(get_class($this->_object));
+            $type_to_link_to = midcom_helper_reflector::class_rewrite(get_class($this->_object));
             foreach ($link_properties as $child_property => $link) {
                 $linked_type = midcom_helper_reflector::class_rewrite($link['class']);
                 if (midcom_helper_reflector::is_same_class($linked_type, $type_to_link_to)
-                    || (   $link['type'] == MGD_TYPE_GUID
+                    || ($link['type'] == MGD_TYPE_GUID
                         && is_null($link['class']))) {
                     $parent_property = $link['target'];
                     break;
@@ -338,7 +338,7 @@ 
         }
 
         // Allow setting defaults from query string, useful for things like "create event for today" and chooser
-        if (   isset($_GET['defaults'])
+        if (isset($_GET['defaults'])
             && is_array($_GET['defaults'])) {
             $get_defaults = array_intersect_key($_GET['defaults'], $this->_schemadb['object']->fields);
             $defaults = array_merge($defaults, array_map('trim', $get_defaults));
@@ -356,7 +356,7 @@ 
     {
         if ($handler_id == '____mfa-asgard-object_create_chooser') {
             midcom_show_style('midgard_admin_asgard_popup_header');
-            if (   $this->_new_object
+            if ($this->_new_object
                 || isset($data['cancelled'])) {
                 $data['jsdata'] = $this->_object_to_jsdata($this->_new_object);
                 midcom_show_style('midgard_admin_asgard_object_create_after');
@@ -407,7 +407,7 @@ 
             $url = $type;
 
             $class_extends = $this->_config->get('class_extends');
-            if (   is_array($class_extends)
+            if (is_array($class_extends)
                 && array_key_exists($type, $class_extends)) {
                 $url = $class_extends[$type];
             }
@@ -506,7 +506,7 @@ 
 
         // Load the nullstorage controller
         $this->_controller = midcom_helper_datamanager2_controller::create('nullstorage');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
 
         if (!$this->_controller->initialize()) {
             throw new midcom_error('Failed to initialize the controller');

lib/midcom/admin/folder/management.php

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
             }
 
             // Skip components beginning with midcom or midgard
-            if (   preg_match('/^(midcom|midgard)\./', $manifest->name)
+            if (preg_match('/^(midcom|midgard)\./', $manifest->name)
                 && $manifest->name != 'midcom.helper.search') {
                 continue;
             }
@@ -99,7 +99,7 @@ 
         asort($components);
 
         // Set the parent component to be the first if applicable
-        if (   $parent_component !== ''
+        if ($parent_component !== ''
             && array_key_exists($parent_component, $components)) {
             $temp = array();
             $temp[$parent_component] = $components[$parent_component];
@@ -128,14 +128,14 @@ 
         }
 
         foreach (self::get_component_list() as $component => $details) {
-            if (   $component !== $parent_component
+            if ($component !== $parent_component
                 && !$all) {
-                if (   is_array(midcom::get()->config->get('component_listing_allowed'))
+                if (is_array(midcom::get()->config->get('component_listing_allowed'))
                     && !in_array($component, midcom::get()->config->get('component_listing_allowed'))) {
                     continue;
                 }
 
-                if (   is_array(midcom::get()->config->get('component_listing_excluded'))
+                if (is_array(midcom::get()->config->get('component_listing_excluded'))
                     && in_array($component, midcom::get()->config->get('component_listing_excluded'))) {
                     continue;
                 }

lib/midcom/config/test.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 class midcom_config_test
 {
     const OK = 0;
-    const WARNING =  1;
+    const WARNING = 1;
     const ERROR = 2;
 
     private $messages = array(

Indentation +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             $this->add('Setting: upload_max_filesize', self::OK, ini_get('upload_max_filesize'));
         } else {
             $this->add('Setting: upload_max_filesize',
-                             self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})");
+                                self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})");
         }
 
         $post_limit = $this->ini_get_filesize('post_max_size');

Braces +2 added lines, -1 removed lines

@@ -74,7 +74,8 @@
                 $config = new midcom_services_rcs_config($config);
                 $config->test_rcs_config();
                 $this->add("MidCOM RCS", self::OK);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $this->add("MidCOM RCS", self::ERROR, $e->getMessage());
             }
         } else {

lib/midcom/helper/datamanager2/ajax/autocomplete.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
     {
         $qb = call_user_func(array($this->_request['class'], 'new_query_builder'));
 
-        if (   !empty($this->_request['constraints'])
+        if (!empty($this->_request['constraints'])
             && is_array($this->_request['constraints'])) {
             $this->_apply_constraints($qb, $this->_request['constraints']);
         }
@@ -64,7 +64,7 @@ 
             $qb->end_group();
         }
 
-        if (   !empty($this->_request['orders'])
+        if (!empty($this->_request['orders'])
             && is_array($this->_request['orders'])) {
             ksort($this->_request['orders']);
             foreach ($this->_request['orders'] as $data) {
@@ -83,7 +83,7 @@ 
 
         ksort($constraints);
         foreach ($constraints as $key => $data) {
-            if (   !array_key_exists('value', $data)
+            if (!array_key_exists('value', $data)
                 || empty($data['field'])
                 || empty($data['op'])) {
                 debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN);
@@ -156,7 +156,7 @@ 
     {
         $query = $this->_request["term"];
         $wildcard_query = $query;
-        if (   isset($this->_request['auto_wildcards'])
+        if (isset($this->_request['auto_wildcards'])
             && strpos($query, '%') === false) {
             switch ($this->_request['auto_wildcards']) {
                 case 'start':

lib/midcom/connection.php

Spacing +3 added lines, -3 removed lines

@@ -275,11 +275,11 @@ 
             self::$_data = self::$_defaults;
         }
 
-        if (   null === $subkey
+        if (null === $subkey
             && isset(self::$_data[$key])) {
             return self::$_data[$key];
         }
-        if (   null !== $subkey
+        if (null !== $subkey
             && isset(self::$_data[$key][$subkey])) {
             return self::$_data[$key][$subkey];
         }
@@ -341,7 +341,7 @@ 
             if ($part === '') {
                 continue;
             }
-            if (    midcom::get()->config->get('theme')
+            if (midcom::get()->config->get('theme')
                  && !$args_started
                  && midcom_helper_misc::check_page_exists($part)) {
                 $page_style .= '/' . $part;

Braces +2 added lines, -1 removed lines

@@ -136,7 +136,8 @@
 
         try {
             $user = new midgard_user($login_tokens);
-        } catch (midgard_error_exception $e) {
+        }
+        catch (midgard_error_exception $e) {
             return false;
         }
 

lib/midcom/core/collector.php

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
         $counter = 0;
 
         foreach ($result as $object_guid => $empty_copy) {
-            if (    $this->_user_id
+            if ($this->_user_id
                 && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $object_guid, $classname, $this->_user_id)) {
                 debug_add("Failed to load result, read privilege on {$object_guid} not granted for the current user.", MIDCOM_LOG_INFO);
                 continue;
@@ -145,7 +145,7 @@ 
                 if ($counter <= $this->_offset) {
                     continue;
                 }
-                if (   $this->_limit
+                if ($this->_limit
                     && $counter > ($this->_offset + $this->_limit)) {
                     break;
                 }
@@ -223,7 +223,7 @@ 
 
     public function get_subkey($key, $property)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
@@ -233,7 +233,7 @@ 
 
     public function get($key)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;

lib/midcom/application.php

Spacing +5 added lines, -5 removed lines

@@ -300,7 +300,7 @@ 
         }
 
         // Sanity check expires
-        if (   !is_int($expires)
+        if (!is_int($expires)
             || $expires < -1) {
             throw new midcom_error("\$expires has to be a positive integer or zero or -1, is now {$expires}.");
         }
@@ -313,7 +313,7 @@ 
         $etag = md5("{$last_modified}{$attachment->name}{$attachment->mimetype}{$attachment->guid}");
 
         // Check etag and return 304 if necessary
-        if (   $expires <> 0
+        if ($expires <> 0
             && $this->cache->content->_check_not_modified($last_modified, $etag)) {
             if (!_midcom_headers_sent()) {
                 $this->cache->content->cache_control_headers();
@@ -491,8 +491,8 @@ 
     function get_host_name()
     {
         if (!$this->_cached_host_name) {
-            if (   array_key_exists("SSL_PROTOCOL", $_SERVER)
-                || (   array_key_exists('HTTPS', $_SERVER)
+            if (array_key_exists("SSL_PROTOCOL", $_SERVER)
+                || (array_key_exists('HTTPS', $_SERVER)
                     && $_SERVER['HTTPS'] == 'on')
                 || $_SERVER["SERVER_PORT"] == 443) {
                 $protocol = "https";
@@ -502,7 +502,7 @@ 
 
             $port = "";
             if (strpos($_SERVER['SERVER_NAME'], ':') === false) {
-                if (   ($protocol == "http" && $_SERVER["SERVER_PORT"] != 80)
+                if (($protocol == "http" && $_SERVER["SERVER_PORT"] != 80)
                     || ($protocol == "https" && $_SERVER["SERVER_PORT"] != 443)) {
                     $port = ":" . $_SERVER["SERVER_PORT"];
                 }

lib/midcom/core/urlmethods.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
     private function _process_cache($value)
     {
         if ($value == 'invalidate') {
-            if (   !is_array(midcom::get()->config->get('indexer_reindex_allowed_ips'))
+            if (!is_array(midcom::get()->config->get('indexer_reindex_allowed_ips'))
                 || !in_array($_SERVER['REMOTE_ADDR'], midcom::get()->config->get('indexer_reindex_allowed_ips'))) {
                 midcom::get()->auth->require_valid_user('basic');
                 midcom::get()->auth->require_admin_user();
@@ -173,7 +173,7 @@ 
     private function _get_remaining_url($value)
     {
         $redirect_to = '';
-        if (   !empty($value)
+        if (!empty($value)
             || !empty($this->_context->parser->argv)) {
             $redirect_to = "{$value}/" . implode($this->_context->parser->argv, '/');
             $redirect_to = preg_replace('%^(.*?):/([^/])%', '\\1://\\2', $redirect_to);

lib/org/openpsa/calendar/event.php

Spacing +6 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
 
     public function get_parent_guid_uncached()
     {
-        if (   $this->up
+        if ($this->up
             || $this->title != '__org_openpsa_calendar') {
             $root_event = org_openpsa_calendar_interface::find_root_event();
             if ($this->id != $root_event->id) {
@@ -141,7 +141,7 @@ 
         }
 
         //Check up
-        if (   !$this->up
+        if (!$this->up
             && $this->title != '__org_openpsa_calendar') {
             $root_event = org_openpsa_calendar_interface::find_root_event();
             $this->up = $root_event->id;
@@ -173,9 +173,9 @@ 
     private function _check_timerange()
     {
         //Force types
-        $this->start = (int)$this->start;
-        $this->end = (int)$this->end;
-        if (   !$this->start
+        $this->start = (int) $this->start;
+        $this->end = (int) $this->end;
+        if (!$this->start
             || !$this->end) {
             debug_add('Event must have start and end timestamps');
             midcom_connection::set_error(MGD_ERR_RANGE);
@@ -186,7 +186,7 @@ 
          * Force start and end seconds to 1 and 0 respectively
          * (to avoid stupid one second overlaps)
          */
-        $this->start = mktime(  date('G', $this->start),
+        $this->start = mktime(date('G', $this->start),
                                 date('i', $this->start),
                                 1,
                                 date('n', $this->start),