OpencachingDeutschland / oc-server3

htdocs/lib2/login.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-define('LOGIN_UNKNOWN_ERROR', - 1);     // unkown error occured
-define('LOGIN_OK', 0);                 // login succeeded
-define('LOGIN_BADUSERPW', 1);          // bad username or password
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the useraccount locked
+define('LOGIN_UNKNOWN_ERROR', - 1); // unkown error occured
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
+define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successfull
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);

htdocs/lib2/html2text.class.php

Spacing +2 added lines, -2 removed lines

@@ -534,7 +534,7 @@ 
         if (substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
             substr($link, 0, 7) == 'mailto:'
         ) {
-            $this->_link_count ++;
+            $this->_link_count++;
             $this->_link_list .= "[" . $this->_link_count . "] $link\n";
             $additional = ' [' . $this->_link_count . ']';
         } elseif (substr($link, 0, 11) == 'javascript:') {
@@ -542,7 +542,7 @@ 
             $additional = '';
             // what about href="#anchor" ?
         } else {
-            $this->_link_count ++;
+            $this->_link_count++;
             $this->_link_list .= "[" . $this->_link_count . "] " . $this->url;
             if (substr($link, 0, 1) != '/') {
                 $this->_link_list .= '/';

htdocs/map2.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
                        WHERE option_id=6 AND user_id='&1'", true, $login->userid))
 ) {
     $fullscreen = true;
-    $tpl->popup = true;        // disables page header and -frame
+    $tpl->popup = true; // disables page header and -frame
     $tpl->popupmargin = false;
 } else {
     $fullscreen = false;
@@ -456,7 +456,7 @@ 
     $caches_found = 0;
     while ($r = sql_fetch_assoc($rs)) {
         echo '<cache name="' . xmlentities($r['name']) . '" wpoc="' . xmlentities($r['wp_oc']) . '" />' . "\n";
-        ++ $caches_found;
+        ++$caches_found;
     }
     sql_free_result($rs);
 
@@ -496,7 +496,7 @@ 
         "SELECT `slave_id`
         FROM `map2_result`
         WHERE `result_id`='&1' AND DATE_ADD(`date_created`, INTERVAL '&2' SECOND)>NOW()",
-        - 2,
+        -2,
         $nResultId,
         $opt['map']['maxcacheage']
     );

htdocs/log.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
     // get logtext editormode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }

htdocs/ignore.php

Switch Indentation +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
 }
 
 switch ($action) {
-    case 'addignore':
-        sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
-        break;
-    case 'removeignore':
-        sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
-        break;
+        case 'addignore':
+            sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid);
+            break;
+        case 'removeignore':
+            sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid);
+            break;
 }
 
 // clear cached map result, so that the change directly appears on the map

htdocs/editcache.php

Spacing +23 added lines, -23 removed lines

@@ -139,7 +139,7 @@ 
                 }
 
                 //here we read all used information from the form if submitted, otherwise from DB
-                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']);  // Ocprop
+                $cache_name = trim(isset($_POST['name']) ? $_POST['name'] : $cache_record['name']); // Ocprop
                 $cache_type = isset($_POST['type']) ? $_POST['type'] : $cache_record['type'];
                 if (!isset($_POST['size'])) {
                     if ($cache_type == 4 || $cache_type == 5) {
@@ -153,15 +153,15 @@ 
                 $cache_hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date(
                     'd',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date(
                     'm',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
                 $cache_hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date(
                     'Y',
                     strtotime($cache_record['date_hidden'])
-                );  // Ocprop
+                ); // Ocprop
 
                 if (is_null($cache_record['date_activate'])) {
                     $cache_activate_day = isset($_POST['activate_day']) ? $_POST['activate_day'] : date('d');
@@ -187,11 +187,11 @@ 
                     );
                 }
 
-                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty'];  // Ocprop
-                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain'];  // Ocprop
-                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country'];  // Ocprop
+                $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop
+                $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop
+                $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop
                 $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0;
-                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status'];  // Ocprop
+                $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop
                 $status_old = $cache_record['status'];
                 $search_time = isset($_POST['search_time']) ? $_POST['search_time'] : $cache_record['search_time'];
                 $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length'];
@@ -253,7 +253,7 @@ 
 
                 $log_pw = isset($_POST['log_pw']) ? mb_substr($_POST['log_pw'], 0, 20) : $cache_record['logpw'];
                 // fix #4356: gc waypoints are frequently copy&pasted with leading spaces
-                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc'];  // Ocprop
+                $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop
                 $showlists = isset($_POST['showlists']) ? 1 : $cache_record['show_cachelists'] + 0;
                 $protect_old_coords = isset($_POST['protect_old_coords']) ? 1 : $cache_record['protect_old_coords'] + 0;
 
@@ -265,12 +265,12 @@ 
 
                 if (isset($_POST['latNS'])) {
                     //get coords from post-form
-                    $coords_latNS = $_POST['latNS'];  // Ocprop
-                    $coords_lonEW = $_POST['lonEW'];  // Ocprop
-                    $coords_lat_h = $_POST['lat_h'];  // Ocprop
-                    $coords_lon_h = $_POST['lon_h'];  // Ocprop
-                    $coords_lat_min = $_POST['lat_min'];  // Ocprop
-                    $coords_lon_min = $_POST['lon_min'];  // Ocprop
+                    $coords_latNS = $_POST['latNS']; // Ocprop
+                    $coords_lonEW = $_POST['lonEW']; // Ocprop
+                    $coords_lat_h = $_POST['lat_h']; // Ocprop
+                    $coords_lon_h = $_POST['lon_h']; // Ocprop
+                    $coords_lat_min = $_POST['lat_min']; // Ocprop
+                    $coords_lon_min = $_POST['lon_min']; // Ocprop
                 } else {
                     //get coords from DB
                     $coords_lon = $cache_record['longitude'];
@@ -564,7 +564,7 @@ 
                                     $logtype = 13;
                                     break;
                                 default:
-                                    $logtype = 0;  // ???
+                                    $logtype = 0; // ???
                             }
                             if ($logtype > 0) {
                                 sql(
@@ -585,7 +585,7 @@ 
 
                         // update cache attributes
                         $attriblist = "999";
-                        for ($i = 0; $i < count($cache_attribs); $i ++) {
+                        for ($i = 0; $i < count($cache_attribs); $i++) {
                             if ($cache_attribs[$i] + 0 > 0) {
                                 sql(
                                     "INSERT IGNORE INTO `caches_attributes` (`cache_id`, `attrib_id`) VALUES('&1', '&2')",
@@ -719,7 +719,7 @@ 
                         $line = mb_ereg_replace('{name}', escape_javascript($record['name']), $line);
                         $line = mb_ereg_replace('{color}', $rAttrGroup['color'], $line);
                         $group_line .= $line;
-                        $nLineAttrCount ++;
+                        $nLineAttrCount++;
 
                         $line = $cache_attrib_js;
                         $line = mb_ereg_replace('{id}', $record['id'], $line);
@@ -776,7 +776,7 @@ 
 
                 //difficulty
                 $difficulty_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_difficulty == $i) {
                         $difficulty_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
                     } else {
@@ -788,7 +788,7 @@ 
 
                 //build terrain options
                 $terrain_options = '';
-                for ($i = 2; $i <= 10; $i ++) {
+                for ($i = 2; $i <= 10; $i++) {
                     if ($cache_terrain == $i) {
                         $terrain_options .= '<option value="' . $i . '" selected="selected">' . $i / 2 . '</option>';
                     } else {
@@ -955,7 +955,7 @@ 
                     $tmp = mb_ereg_replace('{publish_notnow_checked}', ($publish == 'notnow') ? 'checked' : '', $tmp);
 
                     $activation_hours = '';
-                    for ($i = 0; $i <= 23; $i ++) {
+                    for ($i = 0; $i <= 23; $i++) {
                         if ($cache_activate_hour == $i) {
                             $activation_hours .= '<option value="' . $i . '" selected="selected">' . $i . '</option>';
                         } else {
@@ -983,7 +983,7 @@ 
                         $cache_id
                     );
 
-                    for ($i = 0; $i < mysql_num_rows($rspictures); $i ++) {
+                    for ($i = 0; $i < mysql_num_rows($rspictures); $i++) {
                         $tmpline = ($i == 0 ? $pictureline0 : $pictureline);
                         $pic_record = sql_fetch_array($rspictures);
 
@@ -1066,7 +1066,7 @@ 
                 tpl_set_var('showlists_checked', $showlists ? 'checked="checked"' : '');
                 tpl_set_var('protectcoords_checked', $protect_old_coords ? 'checked="checked"' : '');
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

htdocs/activation.php

Spacing +2 added lines, -4 removed lines

@@ -14,10 +14,8 @@
 // We use short param codes 'u' and 'c' to generate short-enough activation
 // url that will not be wrapped in plain-text emails.
 
-$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) :
-    (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
-$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) :
-    (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
+$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
+$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) : (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
 
 $tpl->assign('errorEMail', false);
 $tpl->assign('errorCode', false);

htdocs/lang/de/ocstyle/newcache.inc.php

Indentation +34 added lines, -34 removed lines

@@ -14,40 +14,40 @@
  * set template specific language variables
  ****************************************************************************/
 
- $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
-
- $submit = t('Submit cache');
- $default_country = t('EN');
- $default_lang = t('EN');
- $show_all = t('Show all');
- $default_NS = 'N';
- $default_EW = 'E';
- $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
-
- $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
- $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
- $error_lat_not_ok = $error_long_not_ok . "<br />";
- $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
- $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
- $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
- $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
- $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
- $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
- $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
- $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
- $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
- $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
- $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
- $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
-
- $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
-
- $sel_message = t('Select');
-
- $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
- $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
-
- $cache_attrib_group =
+    $firstcache_note = t('If this is your first cache on %1, be sure to check out the <a href="articles.php?page=cacheinfo">description</a> of the individual fields.');
+
+    $submit = t('Submit cache');
+    $default_country = t('EN');
+    $default_lang = t('EN');
+    $show_all = t('Show all');
+    $default_NS = 'N';
+    $default_EW = 'E';
+    $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
+
+    $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
+    $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
+    $error_lat_not_ok = $error_long_not_ok . "<br />";
+    $error_duplicate_coords = '<span class="errormsg">' . t('Another cache (<a href="viewcache.php?wp=%1">%1</a>) exists at these coords. Maybe you pressed "submit cache" twice. To publish a cache with identical coords, enter other coords first, then edit the listing and change coords.') . '</span>';
+    $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
+    $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
+    $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
+    $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
+    $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
+    $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
+    $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
+    $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
+    $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
+    $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
+    $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
+
+    $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
+
+    $sel_message = t('Select');
+
+    $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
+    $cache_attrib_pic = '<img id="attr{attrib_id}" src="{attrib_pic}" border="0" onmousedown="toggleAttr({attrib_id})" onmouseover="Tip(\'{html_desc}\', TITLE, \'{name}\', TITLEBGCOLOR, \'{color}\', TITLEFONTCOLOR, \'#000000\', BGCOLOR, \'#FFFFFF\', BORDERCOLOR, \'{color}\', CLICKCLOSE, true, DELAY, 0, FADEIN, false, FADEOUT, false, FONTCOLOR, \'#000080\', WIDTH, 500)" onmouseout="UnTip()" />&nbsp;';
+
+    $cache_attrib_group =
     '<div class="attribgroup"><table cellspacing="0" style="display:inline;border-spacing:0px;">
          <tr><td bgcolor="{color}" style="line-height:9px;padding-top:2px;margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-top:1px solid gray;"><font size="1">{name}</font></td></tr>
          <tr><td bgcolor="#F8F8F8" style="margin:0 0 0 0;border-left:1px solid gray;border-right:1px solid gray;border-bottom:1px solid gray;">{attribs}</td></tr>

htdocs/lang/de/ocstyle/removelog.inc.php

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
         
  ****************************************************************************/
 
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
- $removed_message_end = '---';
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
+    $removed_message_end = '---';
  
 
 function removed_log_subject($lang)