flack / openpsa

web/rootfile.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     include dirname(__DIR__) . '/config-default.inc.php';
 }
 
-if (! defined('MIDCOM_STATIC_URL')) {
+if (!defined('MIDCOM_STATIC_URL')) {
     define('MIDCOM_STATIC_URL', '/midcom-static');
 }
 

lib/org/openpsa/invoices/billing/data.php

Braces +6 added lines, -3 removed lines

@@ -77,7 +77,8 @@ 
             // if the property useContactAddress is set
             $billing_data[0]->set_address();
             return $billing_data[0];
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -122,10 +123,12 @@ 
     {
         try {
             return new org_openpsa_contacts_person_dba($this->linkGuid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             try {
                 return new org_openpsa_contacts_group_dba($this->linkGuid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR);
                 return false;
             }

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object)
     {
         if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
-               // check if the customerContact is set and has invoice_data
+                // check if the customerContact is set and has invoice_data
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
             $bd = new org_openpsa_invoices_billing_data_dba();
             $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days');

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      */
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object)
     {
-        if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
+        if (!($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
                // check if the customerContact is set and has invoice_data
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
             $bd = new org_openpsa_invoices_billing_data_dba();

lib/org/openpsa/invoices/handler/invoice/action.php

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
         try {
             $pdf_helper->render_and_attach();
             return $this->reply(true, $this->_l10n->get('pdf created'));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage());
         }
     }

lib/net/nehmer/blog/handler/index.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
         $data['page_title'] = $this->_topic->extra;
 
         // Filter by categories
-        if (   $handler_id == 'index-category'
+        if ($handler_id == 'index-category'
             || $handler_id == 'latest-category') {
             $data['category'] = trim(strip_tags($args[0]));
 
@@ -111,7 +111,7 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['page_title']);
 
         // Activate correct leaf
-        if (   $this->_config->get('show_navigation_pseudo_leaves')
+        if ($this->_config->get('show_navigation_pseudo_leaves')
             && in_array($this->_request_data['category'], $this->_request_data['categories'])) {
             $this->set_active_leaf($this->_topic->id . '_CAT_' . $this->_request_data['category']);
         }

Braces +4 added lines, -2 removed lines

@@ -141,7 +141,8 @@ 
             foreach ($this->_articles as $article_counter => $article) {
                 try {
                     $data['datamanager']->set_storage($article);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }
@@ -178,7 +179,8 @@ 
         if ($this->_config->get('comments_topic')) {
             try {
                 $comments_topic = new midcom_db_topic($this->_config->get('comments_topic'));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
 

lib/midcom/services/i18n/main.php

Spacing +3 added lines, -3 removed lines

@@ -129,7 +129,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;
@@ -158,7 +158,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;
                 }
@@ -421,7 +421,7 @@ 
     private 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/admin/folder/handler/move.php

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
                 $target = new midcom_db_topic((int) $_POST['move_to']);
                 $this->_move_object($target);
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label()));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error');
             }
         }

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     {
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($args[0]);
 
-        if (   !is_a($this->_object, midcom_db_topic::class)
+        if (!is_a($this->_object, midcom_db_topic::class)
             && !is_a($this->_object, midcom_db_article::class)) {
             throw new midcom_error_notfound("Moving only topics and articles is supported.");
         }
@@ -73,7 +73,7 @@ 
             $folder = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
         }
 
-        if (   is_a($this->_object, midcom_db_topic::class)
+        if (is_a($this->_object, midcom_db_topic::class)
             && $folder->up == $this->_object->id) {
             $tree_disabled = true;
         }
@@ -86,7 +86,7 @@ 
             $selected = ' checked="checked"';
         }
 
-        if (   !is_a($this->_object, midcom_db_topic::class)
+        if (!is_a($this->_object, midcom_db_topic::class)
             && $folder->component !== $this->_request_data['current_folder']->component) {
             // Non-topic objects may only be moved under folders of same component
             $class = 'wrong_component';

lib/midcom/services/rcs/handler.php

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
     {
         $this->object = midcom::get()->dbfactory->get_object_by_guid($guid);
 
-        if (   !midcom::get()->config->get('midcom_services_rcs_enable')
+        if (!midcom::get()->config->get('midcom_services_rcs_enable')
             || !$this->object->_use_rcs) {
             throw new midcom_error_notfound("Revision control not supported for " . get_class($this->object) . ".");
         }
@@ -183,8 +183,8 @@ 
     public function _handler_history($handler_id, array $args, array &$data)
     {
         // Check if the comparison request is valid
-        if (    !empty($_GET['first']) && !empty($_GET['last'])
-            && $_GET['first']  !== $_GET['last']) {
+        if (!empty($_GET['first']) && !empty($_GET['last'])
+            && $_GET['first'] !== $_GET['last']) {
             return new midcom_response_relocate($this->url_prefix . "diff/{$args[0]}/{$_GET['first']}/{$_GET['last']}/");
         }
 
@@ -218,7 +218,7 @@ 
     {
         $this->load_object($args[0]);
 
-        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.");
         }
@@ -292,7 +292,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('midcom.admin.rcs'), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate($this->get_object_url());

lib/org/openpsa/projects/task/resource.php

Spacing +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@
     private function find_duplicates()
     {
         $qb = org_openpsa_projects_task_resource_dba::new_query_builder();
-        $qb->add_constraint('person', '=', (int)$this->person);
-        $qb->add_constraint('task', '=', (int)$this->task);
-        $qb->add_constraint('orgOpenpsaObtype', '=', (int)$this->orgOpenpsaObtype);
+        $qb->add_constraint('person', '=', (int) $this->person);
+        $qb->add_constraint('task', '=', (int) $this->task);
+        $qb->add_constraint('orgOpenpsaObtype', '=', (int) $this->orgOpenpsaObtype);
 
         if ($this->id) {
-            $qb->add_constraint('id', '<>', (int)$this->id);
+            $qb->add_constraint('id', '<>', (int) $this->id);
         }
 
         return ($qb->count() > 0);

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
 
     protected function _add_visibility_checks()
     {
-        if (   $this->hide_invisible
+        if ($this->hide_invisible
             && !$this->_visibility_checks_added) {
             if (!midcom::get()->config->get('show_hidden_objects')) {
                 $this->add_constraint('metadata.hidden', '=', false);
@@ -194,7 +194,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;