flack / openpsa

lib/net/nehmer/blog/navigation.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 
         // Hide the articles that have the publish time in the future and if
         // the user is not administrator
-        if (   $this->_config->get('enable_scheduled_publishing')
+        if ($this->_config->get('enable_scheduled_publishing')
             && !midcom::get()->auth->admin) {
             // Show the article only if the publishing time has passed or the viewer
             // is the author
@@ -83,14 +83,14 @@ 
 
     private function _add_pseudo_leaves(array &$leaves)
     {
-        if (   $this->_config->get('archive_enable')
+        if ($this->_config->get('archive_enable')
             && $this->_config->get('archive_in_navigation')) {
             $leaves["{$this->_topic->id}_ARCHIVE"] = [
                 MIDCOM_NAV_URL => "archive/",
                 MIDCOM_NAV_NAME => $this->_l10n->get('archive'),
             ];
         }
-        if (   $this->_config->get('rss_enable')
+        if ($this->_config->get('rss_enable')
             && $this->_config->get('feeds_in_navigation')) {
             $leaves[self::LEAFID_FEEDS] = [
                 MIDCOM_NAV_URL => "feeds/",
@@ -98,7 +98,7 @@ 
             ];
         }
 
-        if (   $this->_config->get('categories_in_navigation')
+        if ($this->_config->get('categories_in_navigation')
             && $this->_config->get('categories') != '') {
             $categories = explode(',', $this->_config->get('categories'));
             foreach ($categories as $category) {
@@ -109,14 +109,14 @@ 
             }
         }
 
-        if (   $this->_config->get('archive_years_in_navigation')
+        if ($this->_config->get('archive_years_in_navigation')
             && $this->_config->get('archive_years_enable')) {
             $qb = midcom_db_article::new_query_builder();
             $qb->add_constraint('topic', '=', $this->_topic->id);
 
             // Hide the articles that have the publish time in the future and if
             // the user is not administrator
-            if (   $this->_config->get('enable_scheduled_publishing')
+            if ($this->_config->get('enable_scheduled_publishing')
                 && !midcom::get()->auth->admin) {
                 // Show the article only if the publishing time has passed or the viewer
                 // is the author

lib/net/nehmer/static/viewer.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             }
         }
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $buttons[] = $workflow->get_button('config/', [
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),

lib/net/nehmer/comments/handler/moderate.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
     {
         $this->load_comment($args[0], false);
         $moderators = $this->_config->get('moderators');
-        if (   $this->_comment->report_abuse()
+        if ($this->_comment->report_abuse()
             && $moderators) {
             // Prepare notification message
             $message = [];
@@ -46,7 +46,7 @@ 
             $message['content'] = '';
             $logs = $this->_comment->get_logs();
             if (count($logs) > 0) {
-                $message['content'] .= $this->_l10n->get('moderation history').":\n\n";
+                $message['content'] .= $this->_l10n->get('moderation history') . ":\n\n";
                 foreach ($logs as $time => $log) {
                     $reported = $this->_l10n->get_formatter()->datetime(strtotime("{$time}Z"));
                     $message['content'] .= $this->_l10n->get(sprintf('%s: %s by %s (from %s)', "$reported:\n", $this->_l10n->get($log['action']), $log['reporter'], $log['ip'])) . "\n\n";
@@ -119,7 +119,7 @@ 
         $this->_comment = new net_nehmer_comments_comment($identifier);
 
         if (!$this->_comment->can_do('midgard:update')) {
-            $this->_comment->_sudo_requested = midcom::get()->auth->request_sudo('net.nehmer.comments');;
+            $this->_comment->_sudo_requested = midcom::get()->auth->request_sudo('net.nehmer.comments'); ;
         }
         if ($require_moderation_privilege) {
             $this->_comment->require_do('net.nehmer.comments:moderation');

lib/midgard/admin/asgard/stylehelper.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct(array &$data)
     {
-        $this->_data =& $data;
+        $this->_data = & $data;
         midcom::get()->head->enable_jquery_ui(['accordion']);
     }
 
@@ -33,11 +33,11 @@ 
             return;
         }
 
-        if (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
-            && (   $this->_data['handler_id'] !== '____mfa-asgard-object_create'
+        if (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
+            && ($this->_data['handler_id'] !== '____mfa-asgard-object_create'
                 || $this->_data['current_type'] == 'midgard_element')) {
             $help_element = $this->_get_help_style_elementnames($this->_data['object']);
-        } elseif (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
+        } elseif (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
                   && $this->_data['handler_id'] !== '____mfa-asgard-object_create') {
             $help_element = $this->_get_help_element();
         }
@@ -49,7 +49,7 @@ 
 
     private function _get_help_element()
     {
-        if (   empty($this->_data['object']->name)
+        if (empty($this->_data['object']->name)
             || empty($this->_data['object']->style)) {
             // We cannot help with empty elements
             return;

lib/midcom/services/auth/acl.php

Spacing +8 added lines, -8 removed lines

@@ -521,7 +521,7 @@ 
         $cache_id = $user_id . '::' . $object_guid;
 
         if (!array_key_exists($cache_id, self::$_privileges_cache)) {
-            if (   empty($object_guid)
+            if (empty($object_guid)
                 || empty($object_class)) {
                 /* No idea if there should be some special log message written */
                 return [];
@@ -621,7 +621,7 @@ 
         // otherwise. (get_parent_data calling get_object_by_guid calling can_do ...)
         list ($parent_guid, $parent_class) = $this->get_parent_data($guid, $class);
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             $base_privileges = [];
         } else {
@@ -632,7 +632,7 @@ 
         // Determine parent ownership
         $is_owner = false;
         $last_owner_scope = -1;
-        if (   array_key_exists('midgard:owner', $base_privileges)
+        if (array_key_exists('midgard:owner', $base_privileges)
             && $base_privileges['midgard:owner'] == MIDCOM_PRIVILEGE_ALLOW) {
             $is_owner = true;
         }
@@ -672,7 +672,7 @@ 
 
             $valid_privileges[$scope][$privilege->privilegename] = $privilege->value;
 
-            if (   $privilege->privilegename == 'midgard:owner'
+            if ($privilege->privilegename == 'midgard:owner'
                 && $scope > $last_owner_scope) {
                 $is_owner = ($privilege->value == MIDCOM_PRIVILEGE_ALLOW);
                 $last_owner_scope = $scope;
@@ -869,7 +869,7 @@ 
         $content_privilege = null;
 
         foreach ($object_privileges as $privilege) {
-            if (   $privilege->privilegename != $privilegename
+            if ($privilege->privilegename != $privilegename
                 ||  $privilege->scope <= $last_scope
                 || !$privilege->does_privilege_apply($user_id)) {
                 continue;
@@ -880,10 +880,10 @@ 
         }
 
         //owner privileges override everything but person privileges, so we have to cross-check those here
-        if (   $privilegename != 'midgard:owner'
+        if ($privilegename != 'midgard:owner'
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
             $owner_privileges = $this->get_owner_default_privileges();
-            if (    array_key_exists($privilegename, $owner_privileges)
+            if (array_key_exists($privilegename, $owner_privileges)
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);
@@ -899,7 +899,7 @@ 
         //if nothing was found, we try to recurse to parent
         list ($parent_guid, $parent_class) = $this->get_parent_data($guid, $class);
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             return false;
         }

lib/midcom/cron/purgedeleted.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     {
         $classes = [];
         foreach (midcom_connection::get_schema_types() as $mgdschema) {
-            if (   substr($mgdschema, 0, 2) == '__'
+            if (substr($mgdschema, 0, 2) == '__'
                 || !midgard_reflector_object::has_metadata_class($mgdschema)) {
                 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 = [

lib/midcom/admin/folder/handler/order.php

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
         }
 
         // Approve if possible
-        if (   $approval_status
+        if ($approval_status
             && $object->can_do('midcom:approve')) {
             $object->metadata->approve();
         }
@@ -135,10 +135,10 @@ 
             // jQuery sorting
             midcom::get()->head->enable_jquery_ui(['mouse', 'sortable']);
 
-            midcom::get()->head->add_jsfile(MIDCOM_STATIC_URL.'/midcom.admin.folder/jquery-postfix.js');
+            midcom::get()->head->add_jsfile(MIDCOM_STATIC_URL . '/midcom.admin.folder/jquery-postfix.js');
 
             // Custom styles
-            $this->add_stylesheet(MIDCOM_STATIC_URL.'/midcom.admin.folder/midcom-admin-order.css');
+            $this->add_stylesheet(MIDCOM_STATIC_URL . '/midcom.admin.folder/midcom-admin-order.css');
         }
     }
 

lib/midcom/helper/imagefilter.php

Spacing +5 added lines, -5 removed lines

@@ -191,7 +191,7 @@ 
             debug_add("The File {$filename} is not writeable.", MIDCOM_LOG_ERROR);
             return false;
         }
-        if (   !empty($this->_filename)
+        if (!empty($this->_filename)
             && $this->_filename !== $filename) {
             $this->_tmpfiles[] = $this->_filename;
         }
@@ -416,7 +416,7 @@ 
         $tmpfile = null;
         $imagesize = getimagesize($this->_filename);
 
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && $this->_jpegtran_available()) {
             /* jpegtran */
             $operations = [
@@ -475,7 +475,7 @@ 
         while ($rotate > 360) {
             $rotate -= 360;
         }
-        if (   $rotate == 0
+        if ($rotate == 0
             || $rotate == 360) {
             debug_add("Rotate is {$rotate}, we're happy as-is.");
             return;
@@ -485,7 +485,7 @@ 
         $imagesize = getimagesize($this->_filename);
 
         // Try lossless jpegtran rotation if possible
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && ($rotate % 90 == 0)
             && $this->_jpegtran_available()) {
             $tmpfile = $this->_get_tempfile();
@@ -614,7 +614,7 @@ 
      */
     public function fill($x = null, $y = null, $color = null, $gravity = 'center')
     {
-        if (   empty($x)
+        if (empty($x)
             || empty($y)
             || empty($color)) {
             //This is a bit silly, but here for backwards compatibility...