flack / openpsa

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

Spacing +22 added lines, -24 removed lines

@@ -95,15 +95,13 @@ 
         {
             $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb'));
 
-            if (   $this->_config->get('use_captcha')
-                || (   !midcom::get()->auth->user
+            if ($this->_config->get('use_captcha')
+                || (!midcom::get()->auth->user
                     && $this->_config->get('use_captcha_if_anonymous')))
             {
-                $this->_schemadb['comment']->append_field
-                (
+                $this->_schemadb['comment']->append_field(
                     'captcha',
-                    array
-                    (
+                    array(
                         'title' => $this->_l10n_midcom->get('captcha field title'),
                         'storage' => null,
                         'type' => 'captcha',
@@ -113,7 +111,7 @@ 
                 );
             }
 
-            if (   $this->_config->get('ratings_enable')
+            if ($this->_config->get('ratings_enable')
                 && array_key_exists('rating', $this->_schemadb['comment']->fields))
             {
                 $this->_schemadb['comment']->fields['rating']['hidden'] = false;
@@ -135,12 +133,12 @@ 
         }
 
         $this->_post_controller = midcom_helper_datamanager2_controller::create('create');
-        $this->_post_controller->schemadb =& $this->_schemadb;
+        $this->_post_controller->schemadb = & $this->_schemadb;
         $this->_post_controller->schema = 'comment';
         $this->_post_controller->defaults = $defaults;
-        $this->_post_controller->callback_object =& $this;
+        $this->_post_controller->callback_object = & $this;
 
-        if (! $this->_post_controller->initialize())
+        if (!$this->_post_controller->initialize())
         {
             throw new midcom_error('Failed to initialize a DM2 create controller.');
         }
@@ -149,7 +147,7 @@ 
     /**
      * DM2 creation callback, binds the new object directly to the _objectguid.
      */
-    function & dm2_create_callback (&$controller)
+    function & dm2_create_callback(&$controller)
     {
         $this->_new_comment = new net_nehmer_comments_comment();
         $this->_new_comment->objectguid = $this->_objectguid;
@@ -178,13 +176,13 @@ 
            $this->_new_comment->_send_notification = true;
         }
 
-        if (! $this->_new_comment->create())
+        if (!$this->_new_comment->create())
         {
             debug_print_r('We operated on this object:', $this->_new_comment);
-            throw new midcom_error('Failed to create a new comment, cannot continue. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new comment, cannot continue. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
-        if (   isset($_POST['subscribe'])
+        if (isset($_POST['subscribe'])
             && midcom::get()->auth->user)
         {
             // User wants to subscribe to receive notifications about this comments thread
@@ -216,7 +214,7 @@ 
      */
     public function _handler_comments($handler_id, array $args, array &$data)
     {
-        if (! mgd_is_guid($args[0]))
+        if (!mgd_is_guid($args[0]))
         {
             throw new midcom_error("The GUID '{$args[0]}' is invalid. Cannot continue.");
         }
@@ -249,7 +247,7 @@ 
             $this->_comments = $this->_comments->execute();
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous'))
         {
             $this->_init_post_controller();
@@ -264,7 +262,7 @@ 
         $this->_process_admintoolbar();
         // This might exit.
 
-        if (   $handler_id == 'view-comments-custom'
+        if ($handler_id == 'view-comments-custom'
             && count($args) > 1)
         {
             midcom::get()->skip_page_style = true;
@@ -274,7 +272,7 @@ 
         $this->_prepare_request_data();
         midcom::get()->metadata->set_request_metadata($this->_get_last_modified(), $this->_objectguid);
 
-        if (   isset($_SERVER['HTTP_X_REQUESTED_WITH'])
+        if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])
             && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest')
         {
             midcom::get()->skip_page_style = true;
@@ -313,7 +311,7 @@ 
      */
     private function _process_post()
     {
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             && !midcom::get()->auth->request_sudo('net.nehmer.comments'))
         {
             throw new midcom_error('We were anonymous but could not acquire SUDO privileges, aborting');
@@ -329,7 +327,7 @@ 
                 // Fall-through intentional
 
             case 'cancel':
-                if (! midcom::get()->auth->user)
+                if (!midcom::get()->auth->user)
                 {
                     midcom::get()->auth->drop_sudo();
                 }
@@ -346,7 +344,7 @@ 
      */
     private function _get_last_modified()
     {
-        if (! $this->_comments)
+        if (!$this->_comments)
         {
             return 0;
         }
@@ -398,8 +396,8 @@ 
                 $data['comment_toolbar'] = $this->_master->_populate_post_toolbar($comment);
                 midcom_show_style('comments-item');
 
-                if (   midcom::get()->auth->admin
-                    || (   midcom::get()->auth->user
+                if (midcom::get()->auth->admin
+                    || (midcom::get()->auth->user
                         && $comment->can_do('midgard:delete')))
                 {
                     midcom_show_style('comments-admintoolbar');
@@ -412,7 +410,7 @@ 
             midcom_show_style('comments-nonefound');
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous'))
         {
             midcom_show_style('post-comment');

lib/org/routamc/positioning/utils.php

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
         if ($unit == "K")
         {
             $dist *= 1.609344;
-        }
-        else if ($unit == "N")
+        } else if ($unit == "N")
         {
             $dist *= 0.8684;
         }
@@ -54,13 +53,11 @@ 
             if ($from['latitude'] < $to['latitude'])
             {
                 $bearing = 0;
-            }
-            else
+            } else
             {
                 $bearing = 180;
             }
-        }
-        else
+        } else
         {
             $dist = org_routamc_positioning_utils::get_distance($from, $to, 'N');
             $arad = acos((sin(deg2rad($to['latitude'])) - sin(deg2rad($from['latitude'])) * cos(deg2rad($dist / 60))) / (sin(deg2rad($dist / 60)) * cos(deg2rad($from['latitude']))));
@@ -77,8 +74,7 @@ 
         if (($rounded % 4) == 0)
         {
             $dir = $dirs[$rounded / 4];
-        }
-        else
+        } else
         {
             $dir = $dirs[2 * floor(((floor($rounded / 4) + 1) % 4) / 2)];
             $dir .= $dirs[1 + 2 * floor($rounded / 8)];
@@ -178,8 +174,7 @@ 
             if ($city_distance <= 4)
             {
                 $city_string = "{$city->city}, {$city->country}";
-            }
-            else
+            } else
             {
                 $bearing = org_routamc_positioning_utils::get_bearing($city_coordinates, $coordinates);
                 $city_string = sprintf(midcom::get()->i18n->get_string('%skm %s of %s', 'org.routamc.positioning'), $city_distance, $bearing, "{$city->city}, {$city->country}");
@@ -241,8 +236,7 @@ 
             if ($city_distance <= 4)
             {
                 $city_string .= $city_label;
-            }
-            else
+            } else
             {
                 $bearing = org_routamc_positioning_utils::get_bearing($city_coordinates, $coordinates);
                 $city_string .= sprintf(midcom::get()->i18n->get_string('%skm %s of %s', 'org.routamc.positioning'), $city_distance, $bearing, $city_label);