flack / openpsa

src/midcom/datamanager/extension/type/toolbar.php

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
                     //@todo Move to template?
                     $attributes['attr']['accesskey'] = 's';
                     $attributes['attr']['class'] .= ' save_' . $key;
-                }
-                else if ($operation == controller::CANCEL)
+                } else if ($operation == controller::CANCEL)
                 {
                     //@todo Move to template?
                     $attributes['attr']['accesskey'] = 'd';

src/midcom/datamanager/extension/transformer/jsdate.php

Braces +2 added lines, -4 removed lines

@@ -45,8 +45,7 @@ 
         if ($this->config['type_config']['storage_type'] === datetype::UNIXTIME)
         {
             $date->setTimestamp($input);
-        }
-        else if ($this->config['type_config']['storage_type'] === datetype::ISO)
+        } else if ($this->config['type_config']['storage_type'] === datetype::ISO)
         {
             $date->modify($input);
         }
@@ -79,8 +78,7 @@ 
         if ($this->config['type_config']['storage_type'] === datetype::UNIXTIME)
         {
             return $array['date']->format('U');
-        }
-        else if ($this->config['type_config']['storage_type'] === datetype::ISO)
+        } else if ($this->config['type_config']['storage_type'] === datetype::ISO)
         {
             return $array['date']->format('Y-m-d H:i:s');
         }

src/midcom/datamanager/extension/transformer/photo.php

Braces +2 added lines, -4 removed lines

@@ -25,13 +25,11 @@
             {
                 //This is converting from storage
                 $result[$key] = $this->transform_persistent($value);
-            }
-            else if (!empty($value['object']))
+            } else if (!empty($value['object']))
             {
                 //This is during validation errors
                 $result[$key] = $this->transform_persistent($value['object']);
-            }
-            else if ($value !== null)
+            } else if ($value !== null)
             {
                 $result[$key] = $this->transform_nonpersistent(array('file' => $value, 'identifier' => 'archival'));
             }

src/midcom/datamanager/storage/blobs.php

Braces +3 added lines, -6 removed lines

@@ -40,8 +40,7 @@ 
             try
             {
                 $results[$identifier] = new midcom_db_attachment($guid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -77,8 +76,7 @@ 
                         {
                             $identifier = md5(time() . $data['file']['name'] . $data['file']['tmp_name']);
                         }
-                    }
-                    else
+                    } else
                     {
                         if ($attachment->name != $filename)
                         {
@@ -92,8 +90,7 @@ 
                     {
                         throw new midcom_error('Failed to copy attachment: ' . midcom_connection::get_error_string());
                     }
-                }
-                else if ($attachment === null)
+                } else if ($attachment === null)
                 {
                     continue;
                 }

src/midcom/datamanager/storage/photo.php

Braces +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
             }
 
             return $this->save_attachment_list();
-        }
-        elseif (!empty($this->value['delete']))
+        } elseif (!empty($this->value['delete']))
         {
             $this->map = array();
             return $this->save_attachment_list();

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

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

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

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;