flack / openpsa

lib/midgard/admin/asgard/handler/component/configuration.php

Spacing +4 added lines, -4 removed lines

@@ -114,11 +114,11 @@ 
                 $schemadb[$schema]->fields[$key]['title'] = $schemadb[$schema]->l10n_schema->get($schemadb[$schema]->fields[$key]['title']);
             }
 
-            if (   !isset($this->_request_data['config']->_local[$key])
+            if (!isset($this->_request_data['config']->_local[$key])
                 || $this->_request_data['config']->_local[$key] == $this->_request_data['config']->_global[$key]) {
                 // No local configuration setting, note to user that this is the global value
                 $schemadb[$schema]->fields[$key]['title'] = $schemadb[$schema]->l10n_schema->get($schemadb[$schema]->fields[$key]['title']);
-                $schemadb[$schema]->fields[$key]['title'] .= " <span class=\"global\">(" . $this->_l10n->get('global value') .")</span>";
+                $schemadb[$schema]->fields[$key]['title'] .= " <span class=\"global\">(" . $this->_l10n->get('global value') . ")</span>";
             }
         }
 
@@ -306,7 +306,7 @@ 
         }
 
         foreach ($config as $key => $value) {
-            if (   is_array($value)
+            if (is_array($value)
                 || is_object($value)) {
                 /**
                  * See http://trac.midgard-project.org/ticket/1442
@@ -327,7 +327,7 @@ 
                 $newval = $post[$key];
             }
 
-            if (   is_a($this->_controller->datamanager->types[$key], 'midcom_helper_datamanager2_type_select')
+            if (is_a($this->_controller->datamanager->types[$key], 'midcom_helper_datamanager2_type_select')
                 || is_a($this->_controller->datamanager->types[$key], 'midcom_helper_datamanager2_type_boolean')) {
                 // We want the actual values regardless of widget
                 $newval = $this->_controller->datamanager->types[$key]->convert_to_storage();

lib/midcom/core/dbaobject.php

Spacing +5 added lines, -5 removed lines

@@ -85,12 +85,12 @@ 
         if (is_object($id)) {
             $this->__object = midcom::get()->dbfactory->convert_midcom_to_midgard($id);
         } else {
-            if (   is_string($id)
+            if (is_string($id)
                 && strlen($id) == 1) {
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' with ID typecast to string. Changing typecast.', MIDCOM_LOG_INFO);
                 $id = (int) $id;
             }
-            if (   is_int($id)
+            if (is_int($id)
                 && $id < 1) {
                 throw new midcom_error($id . ' is not a valid database ID');
             }
@@ -104,7 +104,7 @@ 
             }
 
             //Some useful information for performance tuning
-            if (   midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
+            if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
                 && $this->__object->guid) {
                 static $guids = array();
                 static $total = 0;
@@ -126,7 +126,7 @@ 
             }
         }
 
-        if (   $this->__object->guid
+        if ($this->__object->guid
             && mgd_is_guid($this->__object->guid)) {
             midcom_baseclasses_core_dbobject::post_db_load_checks($this);
         }
@@ -678,7 +678,7 @@ 
     }
     public function enable_rcs()
     {
-        $this->_use_rcs  = true;
+        $this->_use_rcs = true;
     }
     public function set_rcs_message($msg)
     {

lib/midcom/helper/_componentloader.php

Spacing +1 added lines, -1 removed lines

@@ -378,7 +378,7 @@
         // repositories are "merged" manually
         $directories = array();
         $manifests = array();
-        exec('find ' . MIDCOM_ROOT . ' '  . dirname(MIDCOM_ROOT) . '/src -follow -type d -name "config"', $directories);
+        exec('find ' . MIDCOM_ROOT . ' ' . dirname(MIDCOM_ROOT) . '/src -follow -type d -name "config"', $directories);
         foreach ($directories as $directory) {
             $candidates[] = "{$directory}/manifest.inc";
         }

lib/net/nehmer/comments/comment.php

Spacing +7 added lines, -7 removed lines

@@ -181,7 +181,7 @@ 
         }
 
         // Set the status
-        if (   $this->can_do('net.nehmer.comments:moderation')
+        if ($this->can_do('net.nehmer.comments:moderation')
             && !$this->_sudo_requested) {
             $this->status = net_nehmer_comments_comment::ABUSE;
         } else {
@@ -205,7 +205,7 @@ 
             return false;
         }
         // Set the status
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -229,7 +229,7 @@ 
         }
 
         // Set the status
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -248,7 +248,7 @@ 
      */
     public function report_not_abuse()
     {
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -351,8 +351,8 @@ 
     {
         $config = midcom_baseclasses_components_configuration::get('net.nehmer.comments', 'config');
 
-        if (   $config->get('ratings_enable')
-            && (    $config->get('ratings_cache_to_object')
+        if ($config->get('ratings_enable')
+            && ($config->get('ratings_cache_to_object')
                  || $config->get('comment_count_cache_to_object'))) {
             // Handle ratings
             $comments = net_nehmer_comments_comment::list_by_objectguid($this->objectguid);
@@ -413,7 +413,7 @@ 
             return false;
         }
 
-        if (   empty($this->title)
+        if (empty($this->title)
             && empty($this->content)) {
             // No need to send notifications about empty rating entries
             return false;

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 = array();
@@ -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/net/nemein/tag/handler.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         $tagstring = self::resolve_tagname($tagname);
         $tag = net_nemein_tag_tag_dba::get_by_tag($tagstring);
         if (!$tag) {
-            $tag =  new net_nemein_tag_tag_dba();
+            $tag = new net_nemein_tag_tag_dba();
             $tag->tag = $tagstring;
             $tag->url = $url;
             if (!$tag->create()) {
@@ -77,7 +77,7 @@ 
                 return;
             }
         }
-        $link =  new net_nemein_tag_link_dba();
+        $link = new net_nemein_tag_link_dba();
         $link->tag = $tag->id;
         $link->context = self::resolve_context($tagname);
         $link->value = self::resolve_value($tagname);
@@ -189,7 +189,7 @@ 
      */
     public function copy_tags($from, $to, $component = null)
     {
-        if (   !is_object($from)
+        if (!is_object($from)
             || !is_object($to)) {
             return false;
         }
@@ -493,7 +493,7 @@ 
         $quote_open = false;
         for ($i = 0; $i < (strlen($tags_string) + 1); $i++) {
             $char = substr($tags_string, $i, 1);
-            if (   (   $char == ' '
+            if (($char == ' '
                     && !$quote_open)
                 || $i == strlen($tags_string)) {
                 $tags[] = $current_tag;
@@ -504,7 +504,7 @@ 
                 $quote_open = false;
                 continue;
             }
-            if (   $char === '"'
+            if ($char === '"'
                 || $char === "'") {
                 $quote_open = $char;
                 continue;

lib/net/nemein/tag/link.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
             }
         }
 
-        if (   is_null($position['longitude'])
+        if (is_null($position['longitude'])
             || is_null($position['latitude'])) {
             // Not enough information for positioning, we need both lon and lat
             return false;

lib/org/openpsa/calendar/conflictmanager.php

Spacing +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
         }
         // TODO: Shared tasks need a separate check (different member object)
 
-        if (   !empty($this->busy_members)
+        if (!empty($this->busy_members)
             || !empty($this->busy_resources)) {
             //Unresolved conflicts (note return value is for conflicts not lack of them)
             midcom::get()->auth->drop_sudo();
@@ -138,7 +138,7 @@ 
             //These events have been robbed of (some of) their resources
             $creator = midcom_db_person::get_cached($event->metadata->creator);
             $other_participants = array_diff_key($event->participants, array($creator->id => true));
-            if (   count($other_participants) == 0
+            if (count($other_participants) == 0
                 && count($event->resources) == 0) {
                 /* If modified event has no-one or only creator as participant and no resources
                    then delete it (as it's unlikely the stub event is useful anymore) */
@@ -189,7 +189,7 @@ 
         }
 
         if (array_key_exists($member->event, $modified_events)) {
-            $event =& $modified_events[$member->event];
+            $event = & $modified_events[$member->event];
             $set_as_modified = false;
         } else {
             try {
@@ -203,7 +203,7 @@ 
         }
         debug_add("overlap found in event {$event->title} (#{$event->id})");
 
-        if (   $event->tentative
+        if ($event->tentative
             && $rob_tentative) {
             debug_add('event is tentative, robbing resources');
             $event->resources = array_diff_key($event->resources, $this->_event->resources);
@@ -230,7 +230,7 @@ 
         }
         debug_add("overlap found in event {$event->title} (#{$event->id})");
 
-        if (   $event->tentative
+        if ($event->tentative
             && $rob_tentative) {
             debug_add('event is tentative, robbing participants');
             $event->participants = array_diff_key($event->participants, $this->_event->participants);

lib/org/openpsa/calendar/event/member.php

Spacing +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
             $event = new org_openpsa_calendar_event_dba($this->eid);
         }
 
-        if (    $recipient->id == midcom_connection::get_user()
+        if ($recipient->id == midcom_connection::get_user()
              && !$event->send_notify_me) {
             //Do not send notification to current user
             debug_add('event->send_notify_me is false and recipient is current user, aborting notify');
@@ -111,7 +111,7 @@ 
                 return false;
         }
 
-        if (   $type == 'cancel'
+        if ($type == 'cancel'
             || $type == 'remove') {
             // TODO: Create iCal export with correct delete commands
         } else {
@@ -185,7 +185,7 @@ 
         while ($stamp <= $end) {
             $ymd = date('Ymd', $stamp);
             debug_add("making sure date {$ymd} has at least one event");
-            $stamp = mktime(0, 0, 1, date('m', $stamp), date('d', $stamp)+1, date('Y', $stamp));
+            $stamp = mktime(0, 0, 1, date('m', $stamp), date('d', $stamp) + 1, date('Y', $stamp));
             if (array_key_exists($ymd, $events_by_date)) {
                 continue;
             }
@@ -202,12 +202,12 @@ 
             $workday_starts = 8;
             $workday_ends = 16;
 
-            $workday_starts_ts = mktime($workday_starts, 0, 0, (int)$ymd_matches[2], (int)$ymd_matches[3], (int)$ymd_matches[1]);
-            $workday_ends_ts = mktime($workday_ends, 0, 0, (int)$ymd_matches[2], (int)$ymd_matches[3], (int)$ymd_matches[1]);
+            $workday_starts_ts = mktime($workday_starts, 0, 0, (int) $ymd_matches[2], (int) $ymd_matches[3], (int) $ymd_matches[1]);
+            $workday_ends_ts = mktime($workday_ends, 0, 0, (int) $ymd_matches[2], (int) $ymd_matches[3], (int) $ymd_matches[1]);
             $last_end_time = false;
             $last_event = false;
             foreach ($events as $event) {
-                if (   $event->end <= $workday_starts_ts
+                if ($event->end <= $workday_starts_ts
                     || $event->start >= $workday_ends_ts) {
                     // We need not to consider this event, it is outside the defined workday
                     continue;
@@ -238,7 +238,7 @@ 
             if ($last_end_time === false) {
                 $last_end_time = $workday_starts_ts;
             }
-            if (   $last_end_time < $workday_ends_ts
+            if ($last_end_time < $workday_ends_ts
                 && (($workday_ends_ts - $last_end_time) >= $amount)) {
                 $slots[] = self::_create_slot($last_end_time, $workday_ends_ts, $last_event);
             }