flack / openpsa

lib/errors.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
     private function send(int $httpcode, string $message)
     {
         $error_actions = midcom::get()->config->get('error_actions');
-        if (   !isset($error_actions[$httpcode])
+        if (!isset($error_actions[$httpcode])
             || !isset($error_actions[$httpcode]['action'])) {
             // No action specified for this error code, skip
             return;
@@ -141,7 +141,7 @@ 
             return;
         }
 
-        if (   !is_writable($config['filename'])
+        if (!is_writable($config['filename'])
             && !is_writable(dirname($config['filename']))) {
             debug_add("Error logging file {$config['filename']} is not writable", MIDCOM_LOG_WARN);
             return;

lib/midgard/admin/asgard/navigation.php

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
         parent::__construct();
 
         $this->_object = $object;
-        $this->_request_data =& $request_data;
+        $this->_request_data = & $request_data;
 
         $this->root_types = midcom_helper_reflector_tree::get_root_classes();
 
@@ -59,7 +59,7 @@ 
             // we go through the path bottom up and show the first root type we find
             foreach (array_reverse($this->_object_path) as $node) {
                 foreach ($this->root_types as $root_type) {
-                    if (   is_a($node, $root_type)
+                    if (is_a($node, $root_type)
                         || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) {
                         $this->expanded_root_types[] = $root_type;
                         break;
@@ -71,7 +71,7 @@ 
 
     protected function _is_collapsed(string $type, int $total) : bool
     {
-        return (   $total > $this->_config->get('max_navigation_entries')
+        return ($total > $this->_config->get('max_navigation_entries')
                 && empty($_GET['show_all_' . $type]));
     }
 
@@ -87,7 +87,7 @@ 
         foreach ($ref->get_child_classes() as $class) {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked())) {
                 continue;
             }
@@ -133,7 +133,7 @@ 
     {
         $qb = $ref->_root_objects_qb(false);
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked())) {
             return;
         }
@@ -212,7 +212,7 @@ 
         $label = html_entity_decode($label);
 
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-        if (   $selected
+        if ($selected
             || $autoexpand) {
             $this->_list_child_elements($object, $level + 1);
         }
@@ -232,7 +232,7 @@ 
                 continue;
             }
 
-            if (   method_exists($class, 'navigation')
+            if (method_exists($class, 'navigation')
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}")) {
                 $this->_request_data['expanded'] = true;
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
@@ -266,13 +266,13 @@ 
         if ($this->_is_selected($object)) {
             $css_class .= ' selected';
         }
-        if (   is_object($this->_object)
-            && (   $object->guid == $this->_object->guid
-                || (   is_a($this->_object, midcom_db_parameter::class)
+        if (is_object($this->_object)
+            && ($object->guid == $this->_object->guid
+                || (is_a($this->_object, midcom_db_parameter::class)
                     && $object->guid == $this->_object->parentguid))) {
             $css_class .= ' current';
         }
-        if ( !$object->can_do('midgard:update')) {
+        if (!$object->can_do('midgard:update')) {
             $css_class .= ' readonly';
         }
         return $css_class;
@@ -315,7 +315,7 @@ 
 
         // If the regular expression has been set, check which types should be shown
         if ($regexp !== '//') {
-            $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) {
+            $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) {
                 return preg_match($regexp, $root_type) == $exclude;
             }, ARRAY_FILTER_USE_KEY);
         }
@@ -345,7 +345,7 @@ 
          * click if nothing is expanded
          */
         $types_shown = false;
-        if (    !empty($expanded_types)
+        if (!empty($expanded_types)
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') {
             $this->_draw_select_navigation();
             $types_shown = true;
@@ -384,7 +384,7 @@ 
             echo "    <li class=\"mgdschema-type\">";
 
             $dbaclass = midcom::get()->dbclassloader->get_midcom_class_name_for_mgdschema_object($type);
-            if (   $dbaclass
+            if ($dbaclass
                 && class_exists($dbaclass)) {
                 $object = new $dbaclass;
             } else {

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/relatedto/plugin.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      */
     public static function create($from_obj, string $from_component, $to_obj, string $to_component, int $status = null, array $extra = []) : ?org_openpsa_relatedto_dba
     {
-        if (   !is_object($from_obj)
+        if (!is_object($from_obj)
             || !is_object($to_obj)) {
             return null;
         }

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);
     }
 }

lib/org/openpsa/directmarketing/handler/message/report.php

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
         $qb_receipts->add_constraint('message', '=', $this->_message->id);
         $qb_receipts->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT);
         $receipts = $qb_receipts->execute_unchecked();
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
         $receipt_data['first_send'] = $receipts[0]->timestamp ?? 0;
         $receipt_data['last_send'] = 0;
         $receipt_data['sent'] = count($receipts);
@@ -76,7 +76,7 @@ 
 
     private function _get_campaign_data(int $first_send)
     {
-        $campaign_data =& $this->_request_data['report']['campaign_data'];
+        $campaign_data = & $this->_request_data['report']['campaign_data'];
         $qb_unsub = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
         $qb_unsub->add_constraint('campaign', '=', $this->_message->campaign);
         $qb_unsub->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED);
@@ -100,7 +100,7 @@ 
     private function _get_link_data($segmentation_param)
     {
         $this->_request_data['report']['link_data'] = [];
-        $link_data =& $this->_request_data['report']['link_data'];
+        $link_data = & $this->_request_data['report']['link_data'];
 
         $link_data['counts'] = [];
         $link_data['percentages'] = ['of_links' => [], 'of_recipients' => []];
@@ -126,7 +126,7 @@ 
         foreach ($links as $link) {
             $segment = '';
             $segment_notfound = false;
-            if (   $segmentation_param
+            if ($segmentation_param
                 && !empty($link->person)) {
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
@@ -140,7 +140,7 @@ 
                 if (!isset($link_data['segments'][$segment])) {
                     $link_data['segments'][$segment] = $segment_prototype;
                 }
-                $segment_data =& $link_data['segments'][$segment];
+                $segment_data = & $link_data['segments'][$segment];
             } else {
                 $segment_data = $segment_prototype;
             }
@@ -250,15 +250,15 @@ 
         $this->_initialize_field($array['percentages']['of_links'], $link);
         $this->_initialize_field($array['percentages']['of_recipients'], $link);
 
-        $link_data =& $this->_request_data['report']['link_data'];
-        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total']/$link_data['total'])*100;
-        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/$link_data['total'])*100;
+        $link_data = & $this->_request_data['report']['link_data'];
+        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total'] / $link_data['total']) * 100;
+        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / $link_data['total']) * 100;
 
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
-        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target])-1)/($receipt_data['sent']-$receipt_data['bounced']))*100;
-        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/($receipt_data['sent']-$receipt_data['bounced']))*100;
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
+        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target]) - 1) / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
+        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
 
-        if (   !isset($array['percentages']['of_recipients']['total'])
+        if (!isset($array['percentages']['of_recipients']['total'])
             || $array['percentages']['of_recipients'][$link->target]['total'] > $array['percentages']['of_recipients']['total']) {
             $array['percentages']['of_recipients']['total'] = $array['percentages']['of_recipients'][$link->target]['total'];
         }