OpencachingDeutschland / oc-server3

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" != "" &&

htdocs/log.php

Braces +7 added lines, -3 removed lines

@@ -24,14 +24,16 @@ 
 
 // check login
 $login->verify();
-if ($login->userid == 0)
+if ($login->userid == 0) {
     $tpl->redirect_login();
+}
 
 // get cache_id if not given
 $cacheId = 0;
 if (isset($_REQUEST['wp'])) {
     $cacheId = cache::cacheIdFromWP($_REQUEST['wp']);
-} elseif (isset($_REQUEST['cacheid'])) { // Ocprop
+} elseif (isset($_REQUEST['cacheid'])) {
+// Ocprop
     $cacheId = $_REQUEST['cacheid'];
 }
 
@@ -216,7 +218,8 @@ 
     $validate['duplicateLog'] = true;
 
     // all checks done, no error => log
-    if (isset($_POST['submitform']) && $loggable)  // Ocprop
+    if (isset($_POST['submitform']) && $loggable) {
+        // Ocprop
     {
         /*
          * check if time is logged
@@ -226,6 +229,7 @@ 
         $logTimeSecond = ($logTimeHour . $logTimeMinute != ""
                 && $logTimeHour == 0
                 && $logTimeMinute == 0) + 0;
+    }
 
         // make time values database ready
         $logDate = date(

htdocs/resource2/tinymce/config/list.js.php

Braces +6 added lines, -5 removed lines

@@ -1,9 +1,10 @@
 <?php
-  if (isset($_REQUEST['lang']))
-    $lang = $_REQUEST['lang'];
-  else
-    $lang = 'de';
-?>
+  if (isset($_REQUEST['lang'])) {
+      $lang = $_REQUEST['lang'];
+  } else {
+      $lang = 'de';
+  }
+  ?>
 
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

htdocs/lang/de/ocstyle/main.tpl.php

Braces +15 added lines, -18 removed lines

@@ -145,10 +145,11 @@ 
                         <td><strong>{t}Language:{/t}&nbsp;</strong></td>
                         <td>
 <?php
-                            foreach ($opt['template']['locales'] AS $k => $lang)
-                                if ($lang['show'] == true)
+                            foreach ($opt['template']['locales'] AS $k => $lang) {
+                                                            if ($lang['show'] == true)
                                     echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
-?>
+                            }
+                            ?>
                         </td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
                         <td>
@@ -157,10 +158,8 @@ 
                                     global $tpl_usercountries;
                                     $nLastGroup = 0;
                                     $maxUserCountries = count($tpl_usercountries);
-                                    for ($i = 0; $i < $maxUserCountries; $i++)
-                                    {
-                                        if ($nLastGroup != $tpl_usercountries[$i]['group'])
-                                        {
+                                    for ($i = 0; $i < $maxUserCountries; $i++) {
+                                        if ($nLastGroup != $tpl_usercountries[$i]['group']) {
                                             echo '<option disabled="disabled">';
                                             if ($tpl_usercountries[$i]['group'] == 1) {
                                                 echo '- ' . t('This OC node') . ' -';
@@ -205,11 +204,12 @@ 
                     <ul>
 <?php
                         // $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
-                        if ($pageidx >= 0)
-                            mnu_EchoMainMenu($menu[$pageidx]['siteid']);
-                        else
-                            mnu_EchoMainMenu(-1);
-?>
+                        if ($pageidx >= 0) {
+                                                    mnu_EchoMainMenu($menu[$pageidx]['siteid']);
+                        } else {
+                                                    mnu_EchoMainMenu(-1);
+                        }
+                        ?>
                     </ul>
                 </div>
 
@@ -228,8 +228,7 @@ 
                 <div class="nav3">
 <?php
                     //SubNavigation
-                    if (isset($menu[$pageidx]['submenu']))
-                    {
+                    if (isset($menu[$pageidx]['submenu'])) {
 ?>
                         <ul>
                             <li class="title">{t}Main menu{/t}</li>
@@ -257,8 +256,7 @@ 
 
                     <!-- Paypalbutton -->
 <?php
-                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations'])
-                    {
+                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations']) {
 ?>
                         <p class="sidebar-maintitle">{t}Donations{/t}</p>
                         <div style="margin-top:16px;width:100%;text-align:center;">
@@ -273,8 +271,7 @@ 
 
                     <!-- Social Media -->
 <?php
-                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia'])
-                    {
+                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia']) {
 ?>
                     <p class="sidebar-maintitle">{t}Social media{/t}</p>
                     <div style="margin-top: 10px; margin-bottom: 14px; margin-left: auto; margin-right: auto; text-align: center">

htdocs/lang/de/ocstyle/lib/menu.php

Braces +2 added lines, -1 removed lines

@@ -423,7 +423,8 @@
 {
     global $menu;
 
-    if ($mainmenuindex >= 0) { // is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
+    if ($mainmenuindex >= 0) {
+// is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
         echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8');
 
         if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) {

htdocs/picture.php

Braces +10 added lines, -5 removed lines

@@ -34,10 +34,12 @@ 
 
 $uuid = isset($_REQUEST['uuid']) ? $_REQUEST['uuid'] : 0;
 
-if ($action == 'add') { // Ocprop
+if ($action == 'add') {
+// Ocprop
     $picture = new picture();
 
-    if (isset($_REQUEST['cacheuuid'])) {  // Ocprop
+    if (isset($_REQUEST['cacheuuid'])) {
+// Ocprop
         $cache = cache::fromUUID($_REQUEST['cacheuuid']);
         if ($cache === null) {
             $tpl->error(ERROR_CACHE_NOT_EXISTS);
@@ -51,7 +53,8 @@ 
         $picture->setObjectType(OBJECT_CACHE);
 
         $cache = null;
-    } elseif (isset($_REQUEST['loguuid'])) {// Ocprop
+    } elseif (isset($_REQUEST['loguuid'])) {
+// Ocprop
         $cachelog = cachelog::fromUUID($_REQUEST['loguuid']);
         if ($cachelog === null) {
             $tpl->error(ERROR_CACHELOG_NOT_EXISTS);
@@ -72,7 +75,8 @@ 
     }
 
     // uploaded file ok?
-    if (isset($_REQUEST['ok'])) { // Ocprop
+    if (isset($_REQUEST['ok'])) {
+// Ocprop
         $bError = false;
 
         $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
@@ -92,7 +96,8 @@ 
             $tpl->redirect($picture->getPageLink());
         }
 
-        if (!isset($_FILES['file'])) { // Ocprop
+        if (!isset($_FILES['file'])) {
+// Ocprop
             $tpl->assign('errorfile', ERROR_UPLOAD_ERR_NO_FILE);
             $bError = true;
         } elseif ($_FILES['file']['error'] == UPLOAD_ERR_NO_FILE) {

htdocs/restorecaches.php

Braces +10 added lines, -5 removed lines

@@ -757,7 +757,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `latitude`='&1', `longitude`='&2' WHERE `cache_id`='&3'",
@@ -790,7 +791,8 @@ 
                 $cacheid,
                 $rdate
             );
-            if ($r = sql_fetch_assoc($rs)) { // should always be true ...
+            if ($r = sql_fetch_assoc($rs)) {
+// should always be true ...
                 if (!$simulate) {
                     sql(
                         "UPDATE `caches` SET `country`='&1'  WHERE `cache_id`='&2'",
@@ -827,7 +829,8 @@ 
             'wp_nc' => 'waypoints'
         ];
 
-        if ($r = sql_fetch_assoc($rs)) {// can be false
+        if ($r = sql_fetch_assoc($rs)) {
+// can be false
             $setfields = "";
             foreach ($fields as $field => $ropt) {
                 if (in_array($ropt, $roptions) && $r[$field] != $cache[$field]) {
@@ -896,13 +899,15 @@ 
 
             while ($r = sql_fetch_assoc($rs)) {
                 if (!$simulate) {
-                    if ($r['desc'] === null) { // was newly created -> delete
+                    if ($r['desc'] === null) {
+// was newly created -> delete
                         sql(
                             "DELETE FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'",
                             $cacheid,
                             $r['language']
                         );
-                    } else {// id, uuid, date_created and last_modified are set automatically
+                    } else {
+// id, uuid, date_created and last_modified are set automatically
                         sql(
                             "INSERT INTO `cache_desc`
                             (`node`, `cache_id`, `language`, `desc`, `desc_html`, `desc_htmledit`, `hint`, `short_desc`)

htdocs/util2/gns/gns_import.php

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
     $file = fopen($filename, "r");
     $cnt = 0;
     while ($line = fgets($file, 4096)) {
-        if ($cnt ++ == 0) {// skip first line
+        if ($cnt ++ == 0) {
+// skip first line
             continue;
         }