flack / openpsa

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

Spacing +6 added lines, -6 removed lines

@@ -171,8 +171,8 @@ 
         $this->_uncached = $config->get('cache_module_content_uncached');
         $this->_headers_strategy = $this->get_strategy('cache_module_content_headers_strategy');
         $this->_headers_strategy_authenticated = $this->get_strategy('cache_module_content_headers_strategy_authenticated');
-        $this->_default_lifetime = (int)$config->get('cache_module_content_default_lifetime');
-        $this->_default_lifetime_authenticated = (int)$config->get('cache_module_content_default_lifetime_authenticated');
+        $this->_default_lifetime = (int) $config->get('cache_module_content_default_lifetime');
+        $this->_default_lifetime_authenticated = (int) $config->get('cache_module_content_default_lifetime_authenticated');
 
         if ($this->_headers_strategy == 'no-cache') {
             // we can't call no_cache() here, because it would try to call back to this class via the global getter
@@ -458,7 +458,7 @@ 
      */
     public function expires(int $timestamp)
     {
-        if (   $this->_expires === null
+        if ($this->_expires === null
             || $this->_expires > $timestamp) {
             $this->_expires = $timestamp;
         }
@@ -570,7 +570,7 @@ 
      */
     public function write_meta_cache(string $content_id, Request $request, Response $response)
     {
-        if (   $this->_uncached
+        if ($this->_uncached
             || $this->_no_cache) {
             return;
         }
@@ -639,7 +639,7 @@ 
 
     public function store_dl_content(int $context, string $dl_cache_data, Request $request)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_uncached) {
             return;
         }
@@ -700,7 +700,7 @@ 
             // Add Expiration and Cache Control headers
             $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;

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/midcom/helper/toolbar.php

Spacing +9 added lines, -9 removed lines

@@ -351,11 +351,11 @@ 
 
         $item = array_replace($defaults, $item);
 
-        if (   !empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
+        if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
             && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) {
             // We have valid access key, add it to help text
             $prefix = 'Alt-';
-            if (   isset($_SERVER['HTTP_USER_AGENT'])
+            if (isset($_SERVER['HTTP_USER_AGENT'])
                 && strstr($_SERVER['HTTP_USER_AGENT'], 'Macintosh')) {
                 // Mac users
                 $prefix = 'Ctrl-Alt-';
@@ -377,7 +377,7 @@ 
     private function set_url(array &$item, string $url)
     {
         $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url;
-        if (   (   empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
+        if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
                 // Some items may want to keep their links unmutilated
                 || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink")
             && !str_starts_with($url, '/')
@@ -402,7 +402,7 @@ 
 
         if ($index == 0) {
             array_shift($this->items);
-        } elseif ($index == count($this->items) -1) {
+        } elseif ($index == count($this->items) - 1) {
             array_pop($this->items);
         } else {
             $this->items = array_merge(array_slice($this->items, 0, $index - 1),
@@ -525,7 +525,7 @@ 
      */
     public function render() : string
     {
-        $visible_items = array_filter($this->items, function ($item) {
+        $visible_items = array_filter($this->items, function($item) {
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
         });
         $this->rendered = true;
@@ -588,7 +588,7 @@ 
             // Try finding uppercase version of the accesskey first
             $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
             $position = strpos($label, $accesskey);
-            if (   $position === false
+            if ($position === false
                 && midcom::get()->i18n->get_current_language() == 'en') {
                 // Try lowercase, too
                 $accesskey = strtolower($accesskey);
@@ -649,7 +649,7 @@ 
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
         }
 
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
             && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) {
             $attributes['class'] = 'accesskey';
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -712,7 +712,7 @@ 
     public function get_index_from_url(string $url) : ?int
     {
         foreach ($this->items as $i => $item) {
-            if (   $item[MIDCOM_TOOLBAR_URL] == $url
+            if ($item[MIDCOM_TOOLBAR_URL] == $url
                 || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) {
                 return $i;
             }
@@ -730,7 +730,7 @@ 
      *
      * @param mixed $index The integer index or URL to check
      */
-    protected function _check_index($index, bool $raise_error = true) :?int
+    protected function _check_index($index, bool $raise_error = true) : ?int
     {
         if (is_string($index)) {
             $url = $index;

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

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'];
         }

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

src/midcom/dba/privileges.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function set_privilege($privilege, $assignee = null, int $value = MIDCOM_PRIVILEGE_ALLOW, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to set a privilege, midgard:update or midgard:privileges on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -94,7 +94,7 @@ 
      */
     public function unset_privilege($privilege, $assignee = null, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);