flack / openpsa

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

lib/org/routamc/positioning/exec/geolocation-json.php

Spacing +2 added lines, -3 removed lines

@@ -1,12 +1,11 @@
 <?php
 midcom::get()->header('Content-type: application/json');
 
-if (   isset($_POST['latitude'])
+if (isset($_POST['latitude'])
     && isset($_POST['longitude']))
 {
     // Updating user's location
-    $location_array = array
-    (
+    $location_array = array(
         'latitude' => (float) $_POST['latitude'],
         'longitude' => (float) $_POST['longitude'],
     );

Braces +3 added lines, -6 removed lines

@@ -18,16 +18,13 @@
         {
             // Exact enough
             $location_array['accuracy'] = org_routamc_positioning_log_dba::ACCURACY_GPS;
-        }
-        elseif ($_POST['accuracy'] < 400)
+        } elseif ($_POST['accuracy'] < 400)
         {
             $location_array['accuracy'] = org_routamc_positioning_log_dba::ACCURACY_STREET;
-        }
-        elseif ($_POST['accuracy'] < 5000)
+        } elseif ($_POST['accuracy'] < 5000)
         {
             $location_array['accuracy'] = org_routamc_positioning_log_dba::ACCURACY_CITY;
-        }
-        else
+        } else
         {
             // Fall back to "state level"
             $location_array['accuracy'] = 50;

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

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     'modification date'=> 18, // date of last modification in yyyy-MM-dd format
 );
 
-if (   array_key_exists('cities_file_path', $_POST)
+if (array_key_exists('cities_file_path', $_POST)
     && file_exists($_POST['cities_file_path']))
 {
     $features = explode(',', $_POST['featurecodes_to_import']);
@@ -47,7 +47,7 @@ 
         $row++;
         //if ($row > 1000) { break; }
 
-        if (   !isset($data[$fields_map['featurecode']])
+        if (!isset($data[$fields_map['featurecode']])
             || !in_array($data[$fields_map['featurecode']], $features))
         {
             continue;
@@ -86,7 +86,7 @@ 
             $new_city->alternatenames .= '|';
         }
 
-        if (   array_key_exists("{$new_city->country}:{$data[3]}:{$new_city->city}", $imported_cities)
+        if (array_key_exists("{$new_city->country}:{$data[3]}:{$new_city->city}", $imported_cities)
             || $row == 1)
         {
             // We have city by this name for the country already

Braces +2 added lines, -4 removed lines

@@ -100,8 +100,7 @@ 
             echo "<span style=\"color: #00cc00;\">Success,</span> ";
             $imported_cities["{$new_city->country}:{$data[3]}:{$new_city->city}"] = true;
             $cities_created++;
-        }
-        else
+        } else
         {
             echo "<span style=\"color: #cc0000;\">FAILED</span>, ";
         }
@@ -110,8 +109,7 @@ 
     }
 
     echo "<p>{$cities_created} cities imported.</p>\n";
-}
-else
+} else
 {
     ?>
     <h1>World Cities Database installation</h1>

lib/org/routamc/positioning/dm2/widget.php

Spacing +32 added lines, -42 removed lines

@@ -105,8 +105,7 @@ 
 
         if (is_null($this->enabled_methods))
         {
-            $this->enabled_methods = array
-            (
+            $this->enabled_methods = array(
                 'place',
                 'map',
                 'coordinates'
@@ -138,8 +137,7 @@ 
         $this->_get_country_list();
         $this->_init_widgets_js_options();
 
-        $this->_allowed_xep_keys = array
-        (
+        $this->_allowed_xep_keys = array(
             'area',
             'building',
             'description',
@@ -164,11 +162,11 @@ 
         $html = "<div id=\"{$this->_element_id}\" class=\"midcom_helper_datamanager2_widget_position\"><!-- widget starts -->\n";
 
         $input_key = $this->_get_input_key("id");
-        $html .= "<input class=\"position_widget_id\" id=\"{$this->_element_id}_id\" name=\"".$input_key."\" type=\"hidden\" value=\"{$this->_element_id}\" />";
+        $html .= "<input class=\"position_widget_id\" id=\"{$this->_element_id}_id\" name=\"" . $input_key . "\" type=\"hidden\" value=\"{$this->_element_id}\" />";
         $input_key = $this->_get_input_key("backend_url");
-        $html .= "<input class=\"position_widget_backend_url\" id=\"{$this->_element_id}_backend_url\" name=\"".$input_key."\" type=\"hidden\" value=\"{$this->_handler_url}\" />";
+        $html .= "<input class=\"position_widget_backend_url\" id=\"{$this->_element_id}_backend_url\" name=\"" . $input_key . "\" type=\"hidden\" value=\"{$this->_handler_url}\" />";
         $input_key = $this->_get_input_key("backend_service");
-        $html .= "<input class=\"position_widget_backend_service\" id=\"{$this->_element_id}_backend_service\" name=\"".$input_key."\" type=\"hidden\" value=\"{$this->service}\" />";
+        $html .= "<input class=\"position_widget_backend_service\" id=\"{$this->_element_id}_backend_service\" name=\"" . $input_key . "\" type=\"hidden\" value=\"{$this->service}\" />";
 
         $html .= "    <ul>\n";
 
@@ -178,8 +176,7 @@ 
         }
 
         $html .= "    </ul>\n";
-        $this->_widget_elements[] = $this->_form->createElement
-        (
+        $this->_widget_elements[] = $this->_form->createElement(
             'static',
             "{$this->_element_id}_static_widget_start",
             '',
@@ -193,16 +190,14 @@ 
         }
 
         $html = "</div><!-- widget ends -->\n";
-        $this->_widget_elements[] = $this->_form->createElement
-        (
+        $this->_widget_elements[] = $this->_form->createElement(
             'static',
             "{$this->_element_id}_static_widget_end",
             '',
             $html
         );
 
-        $this->_main_group = $this->_form->addGroup
-        (
+        $this->_main_group = $this->_form->addGroup(
             $this->_widget_elements,
             $this->name,
             $this->_translate($this->_field['title']),
@@ -218,7 +213,7 @@ 
         {
             $value = $value_input;
         }
-        if (   !$value
+        if (!$value
             && isset($this->input_defaults[$fieldname]))
         {
             $value = $this->input_defaults[$fieldname];
@@ -246,8 +241,7 @@ 
 
         $html .= "\n</div><!-- tab_content_place ends -->\n";
 
-        $this->_widget_elements[] = $this->_form->createElement
-        (
+        $this->_widget_elements[] = $this->_form->createElement(
             'static',
             "{$this->_element_id}_static_place",
             '',
@@ -264,7 +258,7 @@ 
         $input_key = $this->_get_input_key($fieldname);
         $html = "<label for='{$this->_element_id}_input_place_{$fieldname}' id='{$this->_element_id}_input_place_{$fieldname}_label'>";
         $html .= "<span class=\"field_text\">" . midcom::get()->i18n->get_string("xep_{$fieldname}", 'org.routamc.positioning') . "</span><span class=\"proposal\"></span>";
-        $html .= "<input size=\"40\" class=\"shorttext position_widget_input position_widget_input_place_{$fieldname}\" id=\"{$this->_element_id}_input_place_{$fieldname}\" name=\"".$input_key."\" type=\"text\" value=\"{$value}\" />";
+        $html .= "<input size=\"40\" class=\"shorttext position_widget_input position_widget_input_place_{$fieldname}\" id=\"{$this->_element_id}_input_place_{$fieldname}\" name=\"" . $input_key . "\" type=\"text\" value=\"{$value}\" />";
         $html .= "</label>";
         return $html;
     }
@@ -284,13 +278,13 @@ 
             }
         }
 
-        if (   !$city_id
+        if (!$city_id
             && isset($this->input_defaults['city'])
             && is_numeric($this->input_defaults['city']))
         {
             $city_id = $this->input_defaults['city'];
         }
-        if (   !$city_name
+        if (!$city_name
             && isset($this->input_defaults['city'])
             && is_string($this->input_defaults['city']))
         {
@@ -304,7 +298,7 @@ 
                 $city = new org_routamc_positioning_city_dba($city_id);
                 $city_name = $city->city;
             }
-            catch (midcom_error $e){}
+            catch (midcom_error $e) {}
         }
         return $city_name;
     }
@@ -316,7 +310,7 @@ 
 
         foreach ($this->_allowed_xep_keys as $xep_key)
         {
-            if (   !in_array($xep_key, $this->use_xep_keys)
+            if (!in_array($xep_key, $this->use_xep_keys)
                 || !midcom::get()->dbfactory->property_exists($this->_type->location, $xep_key)
                 || in_array($xep_key, $inserted_xep_keys))
             {
@@ -342,8 +336,7 @@ 
 
         $html .= "\n</div><!-- tab_content_map ends -->\n";
 
-        $this->_widget_elements[] = $this->_form->createElement
-        (
+        $this->_widget_elements[] = $this->_form->createElement(
             'static',
             "{$this->_element_id}_static_map",
             '',
@@ -381,19 +374,18 @@ 
         $input_key = $this->_get_input_key("latitude");
         $html .= "<label for='{$this->_element_id}_input_coordinates_latitude' id='{$this->_element_id}_input_coordinates_latitude_label'>";
         $html .= "<span class=\"field_text\">" . midcom::get()->i18n->get_string('latitude', 'org.routamc.positioning') . "</span>";
-        $html .= "<input size=\"20\" class=\"shorttext position_widget_input position_widget_input_coordinates_latitude\" id=\"{$this->_element_id}_input_coordinates_latitude\" name=\"".$input_key."\" type=\"text\" value=\"{$lat}\" />";
+        $html .= "<input size=\"20\" class=\"shorttext position_widget_input position_widget_input_coordinates_latitude\" id=\"{$this->_element_id}_input_coordinates_latitude\" name=\"" . $input_key . "\" type=\"text\" value=\"{$lat}\" />";
         $html .= "</label>";
 
         $input_key = $this->_get_input_key("longitude");
         $html .= "<label for='{$this->_element_id}_input_coordinates_longitude' id='{$this->_element_id}_input_coordinates_longitude_label'>";
         $html .= "<span class=\"field_text\">" . midcom::get()->i18n->get_string('longitude', 'org.routamc.positioning') . "</span>";
-        $html .= "<input size=\"20\" class=\"shorttext position_widget_input position_widget_input_coordinates_longitude\" id=\"{$this->_element_id}_input_coordinates_longitude\" name=\"".$input_key."\" type=\"text\" value=\"{$lon}\" />";
+        $html .= "<input size=\"20\" class=\"shorttext position_widget_input position_widget_input_coordinates_longitude\" id=\"{$this->_element_id}_input_coordinates_longitude\" name=\"" . $input_key . "\" type=\"text\" value=\"{$lon}\" />";
         $html .= "</label>";
 
         $html .= "\n</div><!-- tab_content_coordinates ends -->\n";
 
-        $this->_widget_elements[] = $this->_form->createElement
-        (
+        $this->_widget_elements[] = $this->_form->createElement(
             'static',
             "{$this->_element_id}_static_coordinates",
             '',
@@ -403,8 +395,7 @@ 
 
     public function _get_country_list()
     {
-        $this->_countrylist = array
-        (
+        $this->_countrylist = array(
             '' => midcom::get()->i18n->get_string('select your country', 'org.routamc.positioning'),
         );
 
@@ -424,11 +415,11 @@ 
         }
     }
 
-    public function _render_country_list($current='')
+    public function _render_country_list($current = '')
     {
         $html = '';
 
-        if (   empty($this->_countrylist)
+        if (empty($this->_countrylist)
             || count($this->_countrylist) == 1)
         {
             return $html;
@@ -437,7 +428,7 @@ 
         $input_key = $this->_get_input_key("country");
         $html .= "<label for='{$this->_element_id}_input_place_country' id='{$this->_element_id}_input_place_country_label'>";
         $html .= "<span class=\"field_text\">" . midcom::get()->i18n->get_string('xep_country', 'org.routamc.positioning') . "</span>";
-        $html .= "<select class=\"dropdown position_widget_input position_widget_input_place_country\" id=\"{$this->_element_id}_input_place_country\" name=\"".$input_key."\">";
+        $html .= "<select class=\"dropdown position_widget_input position_widget_input_place_country\" id=\"{$this->_element_id}_input_place_country\" name=\"" . $input_key . "\">";
 
         foreach ($this->_countrylist as $code => $name)
         {
@@ -460,19 +451,19 @@ 
         $this->js_options['maxRows'] = 20;
         $this->js_options['radius'] = 5;
 
-        if (   !is_null($this->js_maxRows)
+        if (!is_null($this->js_maxRows)
             && $this->js_maxRows > 0)
         {
             $this->js_options['maxRows'] = $this->js_maxRows;
         }
-        if (   !is_null($this->js_radius)
+        if (!is_null($this->js_radius)
             && $this->js_radius > 0)
         {
             $this->js_options['radius'] = $this->js_radius;
         }
 
         $this->js_options_str = "{ ";
-        if (! empty($this->js_options))
+        if (!empty($this->js_options))
         {
             $opt_cnt = count($this->js_options);
             $i = 0;
@@ -523,8 +514,7 @@ 
             midcom::get()->head->add_jquery_state_script($script);
         }
 
-        return Array
-        (
+        return Array(
             $this->_get_input_key("country") => $this->_type->location->country,
             $this->_get_input_key("city") => $city_name,
             $this->_get_input_key("street") => $this->_type->location->street,
@@ -542,12 +532,12 @@ 
         }
         $city_id = 0;
         $city = org_routamc_positioning_city_dba::get_by_name($city_name);
-        if (   $city
+        if ($city
             && $city->id)
         {
             $city_id = $city->id;
         }
-        else if (! empty($results))
+        else if (!empty($results))
         {
             $city = new org_routamc_positioning_city_dba();
             $city->city = $city_name;
@@ -572,7 +562,7 @@ 
             {
                 $city->longitude = $lon;
             }
-            if (! $city->create())
+            if (!$city->create())
             {
                 debug_add("Cannot save new city '{$city_name}'");
             }
@@ -585,7 +575,7 @@ 
 
     private function _get_input_key($input_name)
     {
-        return $this->_element_id . "_input[".$input_name."]";
+        return $this->_element_id . "_input[" . $input_name . "]";
     }
 
     private function _get_input($input_name, $data)
@@ -634,7 +624,7 @@ 
 
         foreach ($this->_allowed_xep_keys as $xep_key)
         {
-            if (   !in_array($xep_key, $this->use_xep_keys)
+            if (!in_array($xep_key, $this->use_xep_keys)
                 || !midcom::get()->dbfactory->property_exists($this->_type->location, $xep_key))
             {
                 continue;

Braces +3 added lines, -6 removed lines

@@ -303,8 +303,7 @@ 
             {
                 $city = new org_routamc_positioning_city_dba($city_id);
                 $city_name = $city->city;
-            }
-            catch (midcom_error $e){}
+            } catch (midcom_error $e){}
         }
         return $city_name;
     }
@@ -495,8 +494,7 @@ 
         {
             $city = new org_routamc_positioning_city_dba($this->_type->location->city);
             $city_name = $city->city;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $city_name = '';
         }
@@ -546,8 +544,7 @@ 
             && $city->id)
         {
             $city_id = $city->id;
-        }
-        else if (! empty($results))
+        } else if (! empty($results))
         {
             $city = new org_routamc_positioning_city_dba();
             $city->city = $city_name;

lib/org/routamc/positioning/dm2/type.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 
     public function convert_to_storage()
     {
-        if (   !$this->storage
+        if (!$this->storage
             || !$this->storage->object)
         {
             return '';
@@ -76,7 +76,7 @@ 
         return '';
     }
 
-    public function convert_from_csv ($source)
+    public function convert_from_csv($source)
     {
         // TODO: Not yet supported
         return '';

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

lib/org/routamc/positioning/geocoder/geoplugin.php

Spacing +2 added lines, -3 removed lines

@@ -51,14 +51,13 @@
         $json = substr($json, 10, -1);
         $geocoded = json_decode($json);
 
-        if (   !$geocoded->geoplugin_latitude
+        if (!$geocoded->geoplugin_latitude
             || !$geocoded->geoplugin_longitude)
         {
             throw new RuntimeException("GeoPlugin did not return coordinates for IP");
         }
 
-        $location = array
-        (
+        $location = array(
             'latitude' => (float) $geocoded->geoplugin_latitude,
             'longitude' => (float) $geocoded->geoplugin_longitude,
         );

lib/org/routamc/positioning/geocoder/city.php

Spacing +13 added lines, -19 removed lines

@@ -24,12 +24,11 @@ 
     {
         $results = array();
 
-        $parameters = array
-        (
+        $parameters = array(
             'maxRows' => 1,
         );
 
-        if (! empty($options))
+        if (!empty($options))
         {
             foreach ($options as $key => $value)
             {
@@ -87,12 +86,10 @@ 
 
         foreach ($matches as $city_entry)
         {
-            $results[] = array
-            (
+            $results[] = array(
                 'latitude' => $city_entry->latitude,
                 'longitude' => $city_entry->longitude,
-                'distance' => array
-                (
+                'distance' => array(
                     'meters' => 0,
                     'bearing' => null,
                 ),
@@ -113,16 +110,15 @@ 
      * @param array $options
      * @return Array containing geocoded information
      */
-    function reverse_geocode($coordinates, $options=array())
+    function reverse_geocode($coordinates, $options = array())
     {
         $results = array();
 
-        $parameters = array
-        (
+        $parameters = array(
             'maxRows' => 1,
         );
 
-        if (! empty($options))
+        if (!empty($options))
         {
             foreach ($options as $key => $value)
             {
@@ -133,7 +129,7 @@ 
             }
         }
 
-        if (   !isset($coordinates['latitude'])
+        if (!isset($coordinates['latitude'])
             && !isset($coordinates['longitude']))
         {
             $this->error = 'POSITIONING_MISSING_ATTRIBUTES';
@@ -150,18 +146,16 @@ 
 
         foreach ($closest as $city)
         {
-            $city_coordinates = array
-            (
+            $city_coordinates = array(
                 'latitude'  => $city->latitude,
                 'longitude' => $city->longitude,
             );
 
             $position = array();
-            $position['latitude' ] = $city->latitude;
-            $position['longitude' ] = $city->longitude;
-            $position['distance'] = array
-            (
-                'meters' => round( org_routamc_positioning_utils::get_distance($coordinates, $city_coordinates) * 1000 ),
+            $position['latitude'] = $city->latitude;
+            $position['longitude'] = $city->longitude;
+            $position['distance'] = array(
+                'meters' => round(org_routamc_positioning_utils::get_distance($coordinates, $city_coordinates) * 1000),
                 'bearing' => org_routamc_positioning_utils::get_bearing($coordinates, $city_coordinates),
             );
             $position['city'] = $city->city;