flack / openpsa

lib/org/openpsa/contacts/duplicates/merge.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
                             $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']);
 
                             if ($dup !== true) {
-                                if (   !is_object($dup)
+                                if (!is_object($dup)
                                     || !array_key_exists($dup->id, $todelete)) {
                                     $todelete[$result->id] = $result;
                                 }
@@ -97,7 +97,7 @@ 
                         }
                     }
                 }
-                if (   $needs_update
+                if ($needs_update
                     && !$result->update()) {
                     throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string());
                 }
@@ -145,7 +145,7 @@ 
         }
 
         foreach ($results as $result) {
-            if (   $result->$field === $object->$field
+            if ($result->$field === $object->$field
                 && $result->id !== $object->id) {
                 return $result;
             }
@@ -163,7 +163,7 @@ 
         $changed = false;
         foreach ($person2 as $property => $value) {
             // Copy only simple properties not marked to be skipped missing from person1
-            if (   !empty($person2->$property)
+            if (!empty($person2->$property)
                 && empty($person1->$property)
                 && !isset($skip_properties[$property])
                 && is_scalar($value)) {

lib/midcom/helper/nav/leaf.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by(string $user_id) : bool
     {
-        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/helper/nav/node.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by(string $user_id) : bool
     {
-        return (   !$user_id
+        return (!$user_id
                 || !$this->guid
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, midcom_db_topic::class, $user_id));
     }

lib/org/openpsa/user/accounthelper.php

Spacing +6 added lines, -6 removed lines

@@ -154,7 +154,7 @@ 
         $account = $this->get_account();
         if (!empty($new_password)) {
             //check if the new encrypted password was already used
-            if (   !$this->check_password_reuse($new_password, true)
+            if (!$this->check_password_reuse($new_password, true)
                 || !$this->check_password_strength($new_password, true)) {
                 $this->errstr = "password strength too low";
                 return false;
@@ -293,7 +293,7 @@ 
         $password_length = mb_strlen($password);
 
         if ($password_length < $this->_config->get('min_password_length')) {
-            if ($show_ui_message){
+            if ($show_ui_message) {
                 midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password too short'), 'error');
             }
             return false;
@@ -311,7 +311,7 @@ 
         }
 
         if ($score < $this->_config->get('min_password_score')) {
-            if ($show_ui_message){
+            if ($show_ui_message) {
                 midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password weak'), 'error');
             }
             return false;
@@ -439,7 +439,7 @@ 
 
     public static function get_person_by_formdata(array $data)
     {
-        if (   empty($data['username'])
+        if (empty($data['username'])
             || empty($data['password'])) {
             return false;
         }
@@ -471,7 +471,7 @@ 
         $max_attempts = midcom_baseclasses_components_configuration::get($component, 'config')->get('max_password_attempts');
         $timeframe = midcom_baseclasses_components_configuration::get($component, 'config')->get('password_block_timeframe_min');
 
-        if (   $max_attempts == 0
+        if ($max_attempts == 0
             || $timeframe == 0) {
             return $stat;
         }
@@ -493,7 +493,7 @@ 
          * If the maximum number of attempts is reached and the oldest attempt
          * on the stack is within our defined timeframe, we block the account
          */
-        if (   count($attempts) >= $max_attempts
+        if (count($attempts) >= $max_attempts
             && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60))) {
             $this->disable_account();
             $stat = false;

lib/org/openpsa/projects/workflow.php

Spacing +2 added lines, -2 removed lines

@@ -137,7 +137,7 @@ 
     {
         debug_add("task->start() called with user #" . midcom_connection::get_user());
         //PONDER: Check actual status objects for more accurate logic ?
-        if (   $task->status >= org_openpsa_projects_task_status_dba::STARTED
+        if ($task->status >= org_openpsa_projects_task_status_dba::STARTED
             && $task->status <= org_openpsa_projects_task_status_dba::APPROVED) {
             //We already have started status
             debug_add('Task has already been started');
@@ -318,7 +318,7 @@ 
 
     private static function is_manager(org_openpsa_projects_task_dba $task) : bool
     {
-        return (   $task->manager == 0
+        return ($task->manager == 0
                 || midcom_connection::get_user() == $task->manager);
     }
 }

src/midcom/datamanager/datamanager.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
 
     public function set_storage(midcom_core_dbaobject $storage = null, string $schemaname = null) : self
     {
-        if (   $schemaname === null
+        if ($schemaname === null
             && !empty($storage->id)) {
             $schemaname = $storage->get_parameter('midcom.helper.datamanager2', 'schema_name');
         }
@@ -164,7 +164,7 @@ 
         }
         $name = $this->get_name($name);
 
-        if (   $this->form === null
+        if ($this->form === null
             || $this->form->getName() != $name) {
             $this->build_form($this->get_builder($name));
         }
@@ -261,7 +261,7 @@ 
     {
         $ret = true;
         foreach ($this->storage as $field) {
-            if (   $field instanceof recreateable
+            if ($field instanceof recreateable
                 && !$field->recreate()) {
                 $ret = false;
             }

lib/org/openpsa/core/acl/synchronizer.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function write_acls(midcom_core_dbaobject $object, $owner_id, int $accesstype) : bool
     {
-        if (   empty($owner_id)
+        if (empty($owner_id)
             || empty($accesstype)) {
             return false;
         }
@@ -63,14 +63,14 @@ 
 
         if ($privileges) {
             foreach ($privileges as $privilege) {
-                if (   !empty($needed_privileges[$privilege->privilegename])
+                if (!empty($needed_privileges[$privilege->privilegename])
                     && $needed_privileges[$privilege->privilegename]['assignee'] == $privilege->assignee
                     && $needed_privileges[$privilege->privilegename]['value'] == $privilege->value) {
                     unset($needed_privileges[$privilege->privilegename]);
                     continue;
                 }
                 // Clear old ACLs applying to others than current user or selected owner group
-                if (   $privilege->assignee != midcom::get()->auth->user->id
+                if ($privilege->assignee != midcom::get()->auth->user->id
                     && $privilege->assignee != $owner_id) {
                     debug_add("Removing privilege {$privilege->privilegename} from {$privilege->assignee}");
                     $object->unset_privilege($privilege->privilegename, $privilege->assignee);

lib/midcom/db/attachment.php

Spacing +1 added lines, -1 removed lines

@@ -318,7 +318,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
             $this->remove_from_cache();

src/midcom/grid/grid.php

Spacing +4 added lines, -4 removed lines

@@ -109,7 +109,7 @@ 
         if (file_exists(MIDCOM_STATIC_ROOT . $jqgrid_path . 'i18n/grid.locale-' . $language . '.js')) {
             $lang = $language;
         }
-        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-'. $lang . '.js');
+        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-' . $lang . '.js');
         $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'jquery.jqgrid.min.js');
 
         $head->add_jsfile(MIDCOM_STATIC_URL . '/midcom.grid/jqGrid.custom.js');
@@ -155,7 +155,7 @@ 
     public function set_option(string $key, $value, bool $autoquote_string = true) : self
     {
         $this->_raw_options[$key] = $value;
-        if (   $autoquote_string
+        if ($autoquote_string
             && is_string($value)) {
             $value = '"' . str_replace('"', '\\"', $value) . '"';
         } elseif ($value === true) {
@@ -185,7 +185,7 @@ 
     public function set_select_column(string $name, string $label, string $options, array $selectdata) : self
     {
         $selectstring = implode(';', array_map(
-            function ($key, $value) {
+            function($key, $value) {
                 return $key . ':' . $value;
             },
             array_keys($selectdata),
@@ -231,7 +231,7 @@ 
      */
     public function remove_column(string $name)
     {
-        if (   empty($name)
+        if (empty($name)
             || !array_key_exists($name, $this->_columns)) {
             throw new midcom_error('Invalid column name ' . $name);
         }