OpencachingDeutschland / oc-server3

htdocs/editdesc.php

Braces +14 added lines, -7 removed lines

@@ -19,9 +19,12 @@ 
     require $stylepath . '/editdesc.inc.php';
 
     // check for old-style parameters
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
+        // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid'];
+    }
+    // Ocprop
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@ 
                 $show_all_langs = false;
 
                 //save to DB?
-                if (isset($_POST['post']))  // Ocprop
+                if (isset($_POST['post'])) {
+                    // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
+                }
+                // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@ 
 
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
 
-                    if (isset($_POST['submitform']))  // Ocprop
+                    if (isset($_POST['submitform'])) {
+                        // Ocprop
                     {
                         // prüfen, ob sprache nicht schon vorhanden
                         $rs = sql(
@@ -160,6 +167,7 @@ 
                             $descid,
                             $desclang
                         );
+                    }
                         $r = sql_fetch_array($rs);
                         if ($r['count'] > 0) {
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@ 
 
                     if ($oldDescMode == 0) {
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
-                    }
-                    else {
+                    } else {
                         $desc = $desc_record['desc'];
                     }
                 }

htdocs/mailto.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 $text = isset($_REQUEST['text']) ? $_REQUEST['text'] : '';
 if (isset($_REQUEST['emailaddress'])) {
     $bEmailaddress = ($_REQUEST['emailaddress'] == 1);
-}
-else {
+} else {
     $own_user = new user($login->userid);
     $bEmailaddress = $own_user->getUsermailSendAddress();
 }

htdocs/lib2/db.inc.php

Braces +3 added lines, -2 removed lines

@@ -894,8 +894,9 @@
     }
 
     if ($db['dblink_slave'] !== false) {
-        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false)
-            sql_error();
+        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false) {
+                    sql_error();
+        }
 
         mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
 

htdocs/editcache.php

Braces +15 added lines, -5 removed lines

@@ -76,10 +76,12 @@ 
 if ($error == false) {
     //cacheid
     $cache_id = 0;
-    if (isset($_REQUEST['cacheid']))  // Ocprop
+    if (isset($_REQUEST['cacheid'])) {
+        // Ocprop
     {
         $cache_id = $_REQUEST['cacheid'];
     }
+    }
 
     if ($usr === false) {
         $tplname = 'login';
@@ -197,9 +199,11 @@ 
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
 
                 if ($status_old == 5 && $status == 5) {
-                    if (isset($_POST['publish']))  // Ocprop
+                    if (isset($_POST['publish'])) {
+                        // Ocprop
                     {
                         $publish = $_POST['publish'];
+                    }
                         if (!($publish == 'now' || $publish == 'later' || $publish == 'notnow')) {
                             // somebody messed up the POST-data, so we do not publish the cache, since he isn't published right now (status=5)
                             $publish = 'notnow';
@@ -228,12 +232,14 @@ 
                     $status = $status_old;
                 }
 
-                if ($status_old == 7) // cache is locked
+                if ($status_old == 7) {
+                    // cache is locked
                 {
                     // only admins can change status of locked caches
                     if (($bAdmin & ADMIN_USER) != ADMIN_USER) {
                         // no status change allowed for normal user
                         $status = $status_old;
+                }
                     }
                 }
 
@@ -439,11 +445,13 @@ 
                 }
 
                 //try to save to DB?
-                if (isset($_POST['submit']))  // Ocprop
+                if (isset($_POST['submit'])) {
+                    // Ocprop
                 {
                     //all validations ok?
                     if (!($hidden_date_not_ok || $lat_not_ok || $lon_not_ok || $name_not_ok || $time_not_ok || $way_length_not_ok || $size_not_ok || $activate_date_not_ok || $status_not_ok || $diff_not_ok || $attribs_not_ok || $wpgc_not_ok)) {
                         $cache_lat = $coords_lat_h + $coords_lat_min / 60;
+                }
                         if ($coords_latNS == 'S') {
                             $cache_lat = - $cache_lat;
                         }
@@ -931,9 +939,11 @@ 
                 tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change));
 
                 // show activation form?
-                if ($status_old == 5) // status = not yet published
+                if ($status_old == 5) {
+                    // status = not yet published
                 {
                     $tmp = $activation_form;
+                }
 
                     $tmp = mb_ereg_replace(
                         '{activate_day}',

htdocs/ocstats.php

Braces +2 added lines, -1 removed lines

@@ -17,8 +17,9 @@
 $userid = isset($_REQUEST['userid']) ? $_REQUEST['userid'] + 0 : 0;
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
 
-if (!isset($opt['locale'][$lang]))
+if (!isset($opt['locale'][$lang])) {
     $lang = $opt['template']['locale'];
+}
 
 $filename = GetFilename($userid, $lang);
 

htdocs/util2/cron/modules/maillog.class.php

Braces +3 added lines, -1 removed lines

@@ -112,7 +112,8 @@ 
                             $emailadr
                         );
                     } else {
-                        if ($bounced) // maximum one bounce per day is counted, to filter out temporary problems
+                        if ($bounced) {
+                            // maximum one bounce per day is counted, to filter out temporary problems
                         {
                             sql(
                                 "UPDATE `user` SET `email_problems`=`email_problems`+1, `last_email_problem`='&2'
@@ -121,6 +122,7 @@ 
                                 $logentry['created']
                             );
                         }
+                        }
                     }
                 } else {
                     echo $this->name . ": no email address found for record ID " . $logentry['id'] . "\n";

htdocs/coordinates.php

Braces +2 added lines, -1 removed lines

@@ -88,8 +88,9 @@
     $tpl->assign('coordW3W2', $coord->getW3W($w3w_langs[1]));
     $lang2_name = sql_value("SELECT `name` FROM `languages` WHERE `short`='&1'", '', $w3w_langs[1]);
     $tpl->assign('W3Wlang2', $translate->t($lang2_name, '', '', 0));
-} else
+} else {
     $tpl->assign('coordW3W2', false);
+}
 
 // wp gesetzt?
 $wp = isset($_REQUEST['wp']) ? $_REQUEST['wp'] : '';

htdocs/search.php

Braces +24 added lines, -12 removed lines

@@ -84,7 +84,8 @@ 
 $called_by_search = isset($_REQUEST['calledbysearch']) ? $_REQUEST['calledbysearch'] <> 0 : true;
 $called_by_profile_query = false;
 
-if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {  // Ocprop: showresult, queryid
+if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {
+// Ocprop: showresult, queryid
     $bCookieQueryid = false;
     $queryid = isset($_REQUEST['queryid']) ? $_REQUEST['queryid'] : 0;
     if ($queryid &&
@@ -208,7 +209,8 @@ 
             sql_free_result($rs_name);
         }
     }
-} else {  // $queryid == 0
+} else {
+// $queryid == 0
     // build search options from GET/POST parameters or default values
 
     // hack
@@ -287,12 +289,14 @@ 
         if (!isset($_REQUEST['utf8'])) {
             $options['cachename'] = iconv("ISO-8859-1", "UTF-8", $options['cachename']);
         }
-    } elseif (isset($_REQUEST['searchbyowner'])) { // Ocprop
+    } elseif (isset($_REQUEST['searchbyowner'])) {
+// Ocprop
         $options['searchtype'] = 'byowner';
 
         $options['ownerid'] = isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
         $options['owner'] = isset($_REQUEST['owner']) ? stripslashes($_REQUEST['owner']) : '';
-    } elseif (isset($_REQUEST['searchbyfinder'])) { // Ocprop
+    } elseif (isset($_REQUEST['searchbyfinder'])) {
+// Ocprop
         $options['searchtype'] = 'byfinder';
 
         $options['finderid'] = isset($_REQUEST['finderid']) ? $_REQUEST['finderid'] : 0;
@@ -437,7 +441,8 @@ 
 $bRememberQuery = isset($_REQUEST['skipqueryid']) ? !$_REQUEST['skipqueryid'] : true;
 // This is used by the map, which implements its own query-caching.
 if ($bRememberQuery) {
-    if ($queryid == 0 && $options['showresult'] != 0) { // 'showresult' = "execute query"
+    if ($queryid == 0 && $options['showresult'] != 0) {
+// 'showresult' = "execute query"
         sql(
             "INSERT INTO `queries` (`user_id`, `options`, `last_queried`) VALUES (0, '&1', NOW())",
             serialize($options)
@@ -854,7 +859,8 @@ 
                 outputSearchForm($options);
                 exit;
             }
-        } elseif ($options['searchtype'] == 'bydistance') { // Ocprop
+        } elseif ($options['searchtype'] == 'bydistance') {
+// Ocprop
             //check the entered data
             if (isset($options['lat']) && isset($options['lon'])) {
                 $lat = $options['lat'] + 0;
@@ -924,7 +930,8 @@ 
             $sql_innerjoin[] = '`cache_logs` ON `caches`.`cache_id`=`cache_logs`.`cache_id`';
             $sql_where[] = '`cache_logs`.`user_id`=\'' . sql_escape($finder_id) . '\'';
 
-            if ($options['logtype'] != '0') { // 0 = all types
+            if ($options['logtype'] != '0') {
+// 0 = all types
                 $ids = explode(',', $options['logtype']);
                 $idNumbers = '0';
                 foreach ($ids as $id) {
@@ -1405,7 +1412,8 @@ 
     }
 
     $count = $caches_per_page;
-    if (isset($_REQUEST['count'])) { // Ocprop
+    if (isset($_REQUEST['count'])) {
+// Ocprop
         $count = floor($_REQUEST['count'] + 0);
     }
     if ($count == 'max') {
@@ -1525,7 +1533,8 @@ 
     } else {
         exit;
     }
-} else { // $options['showresult'] == 0
+} else {
+// $options['showresult'] == 0
     //=============================================================
     //  F5. present search options form to the user
     //=============================================================
@@ -1597,7 +1606,8 @@ 
 
     if (isset($options['sort'])) {
         $bBynameChecked = ($options['sort'] == 'byname');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $bBynameChecked = (!$login->logged_in());
     }
     $tpl->assign('byname_checked', $bBynameChecked);
@@ -1759,7 +1769,8 @@ 
     }
     if ($options['searchtype'] == 'bydistance') {
         $dByDistanceChecked = ($options['searchtype'] == 'bydistance');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $dByDistanceChecked = false;
     }
     $tpl->assign('dbydistance_checked', $dByDistanceChecked);
@@ -1800,7 +1811,8 @@ 
     );
     if ($options['searchtype'] == 'bywaypoint') {
         $dByWaypointChecked = ($options['searchtype'] == 'bywaypoint');
-    } else { // Ocprop
+    } else {
+// Ocprop
         $dByWaypointChecked = false;
     }
     $tpl->assign('dbywaypoint_checked', $dByWaypointChecked);

htdocs/editlog.php

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
 if ($error == false) {
     //logid
     $log_id = 0;
-    if (isset($_REQUEST['logid'])) { // Ocprop
+    if (isset($_REQUEST['logid'])) {
+// Ocprop
         $log_id = $_REQUEST['logid'];
     }
 
@@ -273,7 +274,8 @@ 
                 }
 
                 //store?
-                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) { // Ocprop
+                if ($date_ok && $logtype_ok && $pw_ok && isset($_POST['submitform'])) {
+// Ocprop
                     // 00:00:01 = "00:00 was logged"
                     // 00:00:00 = "no time was logged"
                     if ("$log_time_hour$log_time_minute" != "" &&