flack / openpsa

lib/midcom.php

Spacing +5 added lines, -6 removed lines

@@ -38,8 +38,7 @@ 
     /**
      * Mapping of service names to classes implementing the service
      */
-    private static $_service_classes = array
-    (
+    private static $_service_classes = array(
         'auth' => 'midcom_services_auth',
         'componentloader' => 'midcom_helper__componentloader',
         'cache' => 'midcom_services_cache',
@@ -67,12 +66,12 @@ 
         ///////////////////////////////////
         // Try to be smart about the paths:
         // Define default constants
-        if (! defined('MIDCOM_ROOT'))
+        if (!defined('MIDCOM_ROOT'))
         {
             define('MIDCOM_ROOT', __DIR__);
         }
 
-        if (! defined('MIDCOM_STATIC_ROOT'))
+        if (!defined('MIDCOM_STATIC_ROOT'))
         {
             $pos = strrpos(MIDCOM_ROOT, '/');
             if ($pos === false)
@@ -82,14 +81,14 @@ 
             }
             define('MIDCOM_STATIC_ROOT', substr(MIDCOM_ROOT, 0, $pos) . '/static');
         }
-        if (! defined('MIDCOM_STATIC_URL'))
+        if (!defined('MIDCOM_STATIC_URL'))
         {
             define('MIDCOM_STATIC_URL', '/midcom-static');
         }
 
         if (!defined('OPENPSA2_THEME_ROOT'))
         {
-            define ('OPENPSA2_THEME_ROOT', MIDCOM_ROOT . '/../var/themes/');
+            define('OPENPSA2_THEME_ROOT', MIDCOM_ROOT . '/../var/themes/');
         }
 
         // Instantiate the MidCOM main class

lib/no/bergfald/rcs/style/bergfald-rcs-history.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 if (count($history) == 0)
 {
-   echo $data['l10n']->get('no revisions exist');
+    echo $data['l10n']->get('no revisions exist');
 }
 else
 {

Braces +6 added lines, -12 removed lines

@@ -8,8 +8,7 @@ 
 if (count($history) == 0)
 {
    echo $data['l10n']->get('no revisions exist');
-}
-else
+} else
 {
     ?>
     <form name="no_bergfald_rcs_history" action="" >
@@ -43,27 +42,22 @@ 
                         {
                             $user_card = new org_openpsa_widgets_contact($person);
                             $person_label = $user_card->show_inline();
-                        }
-                        else
+                        } else
                         {
                             $person_label = $person->name;
                         }
                         echo "                    <td>{$person_label}</td>\n";
-                    }
-                    elseif ($history['ip'])
+                    } elseif ($history['ip'])
                     {
                         echo "                    <td>{$history['ip']}</td>\n";
-                    }
-                    else
+                    } else
                     {
                         echo "                    <td></td>\n";
                     }
-                }
-                elseif ($history['ip'])
+                } elseif ($history['ip'])
                 {
                     echo "                    <td>{$history['ip']}</td>\n";
-                }
-                else
+                } else
                 {
                     echo "                    <td></td>\n";
                 }

lib/no/bergfald/rcs/style/bergfald-rcs-preview.php

Spacing +4 added lines, -4 removed lines

@@ -9,11 +9,11 @@ 
 if ($data['previous_revision'])
 {
     echo "<<\n";
-    echo "<a href=\"{$prefix}__ais/rcs/preview/{$data['guid']}/{$data['previous_revision']}\">". sprintf($l10n->get('version %s'), $data['previous_revision']) ."</a>\n";
+    echo "<a href=\"{$prefix}__ais/rcs/preview/{$data['guid']}/{$data['previous_revision']}\">" . sprintf($l10n->get('version %s'), $data['previous_revision']) . "</a>\n";
     echo "(<em><a href=\"{$prefix}__ais/rcs/diff/{$data['guid']}/{$data['previous_revision']}/{$data['latest_revision']}/\">{$l10n->get('show differences')}</a></em>)\n";
 }
 
-if (   $data['previous_revision']
+if ($data['previous_revision']
     && $data['next_revision'])
 {
     echo " | ";
@@ -21,7 +21,7 @@ 
 
 if ($data['next_revision'])
 {
-    echo "<a href=\"{$prefix}__ais/rcs/preview/{$data['guid']}/{$data['latest_revision']}\">". sprintf($l10n->get('version %s'), $data['latest_revision']) ."</a>\n";
+    echo "<a href=\"{$prefix}__ais/rcs/preview/{$data['guid']}/{$data['latest_revision']}\">" . sprintf($l10n->get('version %s'), $data['latest_revision']) . "</a>\n";
     echo "(<em><a href=\"{$prefix}__ais/rcs/diff/{$data['guid']}/{$data['latest_revision']}/{$data['next_revision']}/\">{$l10n->get('show differences')}</a></em>)\n";
     echo "&gt;&gt;\n";
 }
@@ -52,7 +52,7 @@ 
     }
 
     // Three fold fallback in localization
-    echo "<dt>". $data['handler']->translate($attribute) ."</dt>\n";
+    echo "<dt>" . $data['handler']->translate($attribute) . "</dt>\n";
     echo "    <dd>" . nl2br($value) . "</dd>\n";
 }
 ?>

lib/no/bergfald/rcs/handler.php

Spacing +13 added lines, -21 removed lines

@@ -96,8 +96,7 @@ 
     private function _prepare_toolbars($revision = '', $diff_view = false)
     {
         $this->_view_toolbar->add_item(
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => midcom::get()->permalinks->create_permalink($this->_guid),
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('back to %s'), $this->_resolve_object_title()),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_up.png',
@@ -116,7 +115,7 @@ 
         $show_previous = false;
         if ($diff_view)
         {
-            if (   $before != ''
+            if ($before != ''
                 && $before2 != '')
             {
                 // When browsing diffs we want to display buttons to previous instead of current
@@ -137,16 +136,14 @@ 
         $buttons = array();
         if ($show_previous)
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/rcs/diff/{$this->_guid}/{$first}/{$second}/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('view %s differences with previous (%s)'), $second, $first),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_left.png',
             );
         }
 
-        $buttons[] = array
-        (
+        $buttons[] = array(
             MIDCOM_TOOLBAR_URL => "__ais/rcs/preview/{$this->_guid}/{$revision}/",
             MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('view this revision (%s)'), $revision),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/search.png',
@@ -155,16 +152,14 @@ 
         // Display restore and next buttons only if we're not in latest revision
         if ($after != '')
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/rcs/restore/{$this->_guid}/{$revision}/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('restore this revision (%s)'), $revision),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/editpaste.png',
                 MIDCOM_TOOLBAR_ENABLED => $this->_object->can_do('midgard:update'),
             );
 
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/rcs/diff/{$this->_guid}/{$revision}/{$after}/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('view %s differences with next (%s)'), $revision, $after),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_right.png',
@@ -222,7 +217,7 @@ 
         $this->_guid = $args[0];
         $this->_load_object();
 
-        if (   !$this->_backend->version_exists($args[1])
+        if (!$this->_backend->version_exists($args[1])
             || !$this->_backend->version_exists($args[2]))
         {
             throw new midcom_error_notfound("One of the revisions {$args[1]} or {$args[2]} does not exist.");
@@ -238,7 +233,7 @@ 
         $this->_request_data['earlier_revision'] = $this->_backend->get_prev_version($args[1]);
         $this->_request_data['previous_revision'] = $args[1];
         $this->_request_data['latest_revision'] = $args[2];
-        $this->_request_data['next_revision']  = $this->_backend->get_next_version($args[2]);
+        $this->_request_data['next_revision'] = $this->_backend->get_next_version($args[2]);
 
         $this->_request_data['guid'] = $args[0];
 
@@ -246,13 +241,11 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['view_title']);
 
         $this->_prepare_breadcrumb();
-        $this->add_breadcrumb
-        (
+        $this->add_breadcrumb(
             "__ais/rcs/preview/{$this->_guid}/{$data['latest_revision']}/",
             sprintf($this->_l10n->get('version %s'), $data['latest_revision'])
         );
-        $this->add_breadcrumb
-        (
+        $this->add_breadcrumb(
             "__ais/rcs/diff/{$this->_guid}/{$data['previous_revision']}/{$data['latest_revision']}/",
             sprintf($this->_l10n->get('changes from version %s'), $data['previous_revision'])
         );
@@ -309,8 +302,7 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['view_title']);
 
         $this->_prepare_breadcrumb();
-        $this->add_breadcrumb
-        (
+        $this->add_breadcrumb(
             "__ais/rcs/preview/{$this->_guid}/{$revision}/",
             sprintf($this->_l10n->get('version %s'), $revision)
         );
@@ -318,7 +310,7 @@ 
         // Set the version numbers
         $data['previous_revision'] = $this->_backend->get_prev_version($args[1]);
         $data['latest_revision'] = $args[1];
-        $data['next_revision']  = $this->_backend->get_next_version($args[1]);
+        $data['next_revision'] = $this->_backend->get_next_version($args[1]);
         $data['guid'] = $args[0];
     }
 
@@ -347,7 +339,7 @@ 
 
         $this->_prepare_toolbars($args[1]);
 
-        if (   $this->_backend->version_exists($args[1])
+        if ($this->_backend->version_exists($args[1])
             && $this->_backend->restore_to_revision($args[1]))
         {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
                 $second = $before;
                 $show_previous = true;
             }
-        }
-        else
+        } else
         {
             if ($before != '')
             {

lib/org/routamc/positioning/exec/import-aerodromes.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     $aerodromeinfo = explode(',', $line);
 
     // Skip the non-ICAO ones
-    if (   empty($aerodromeinfo[0])
+    if (empty($aerodromeinfo[0])
         || strlen($aerodromeinfo[0]) != 4)
     {
         continue;

lib/org/routamc/positioning/exec/test-georss.php

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 if ($coordinates)
 {
     printf('According to your GeoRSS feed your position is %s', org_routamc_positioning_utils::microformat_location($coordinates['latitude'], $coordinates['longitude']));
-}
-else
+} else
 {
     echo "Failed to get position, last error is {$html->error}";
 }

lib/org/routamc/positioning/exec/manual-position.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     }
 
     $import = $manual->import($manual_position);
-    echo $manual->error."<br />\n";
+    echo $manual->error . "<br />\n";
 }
 
 $user_position = new org_routamc_positioning_person($user);

lib/org/routamc/positioning/exec/test-distance.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     throw new midcom_error("Failed to get your current position.");
 }
 
-echo "<p>".sprintf('Your position is %s', org_routamc_positioning_utils::pretty_print_coordinates($coordinates['latitude'], $coordinates['longitude']))."</p>\n";
+echo "<p>" . sprintf('Your position is %s', org_routamc_positioning_utils::pretty_print_coordinates($coordinates['latitude'], $coordinates['longitude'])) . "</p>\n";
 
 $run_times = 1;
 $run = 0;

lib/org/routamc/positioning/exec/test-userlocation.php

Braces +2 added lines, -4 removed lines

@@ -20,14 +20,12 @@
 {
     printf('You\'re in %s, %s', $user_location['latitude'], $user_location['longitude']);
     // Will print "You're in 60.2345, 25.00456"
-}
-else
+} else
 {
     if ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')
     {
         echo "You're here";
-    }
-    else
+    } else
     {
         echo "No location found";
     }