OpencachingDeutschland / oc-server3

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)

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

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
  ****************************************************************************/
 
-$rating_tpl =    '<tr>
+$rating_tpl = '<tr>
                 <td valign="top">' . t('Recommendations:') . '</td>
                 <td valign="top">
                     {rating_msg}

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

Indentation +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@
      
  ****************************************************************************/
  
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
 
- $commit = t('the cache description has been deleted');
- $commit_title = t('delete this cache-description');
+    $commit = t('the cache description has been deleted');
+    $commit_title = t('delete this cache-description');

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

Indentation +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 $error_suffix = '</span>';
 
 $htmlnotice =
- '<tr><td class="spacer" colspan="2"></td></tr>
+    '<tr><td class="spacer" colspan="2"></td></tr>
     <tr>
         <td class="help" colspan="2">
             <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />

htdocs/lang/de/expressions.inc.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 //common vars
 $dateformat = $opt['locale'][$locale]['format']['date'];
-$reset = t('Reset');  // obsolete
+$reset = t('Reset'); // obsolete
 $yes = t('Yes');
 $no = t('No');
 

htdocs/util2/stats/rank.php

Spacing +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
               LIMIT 100');
 while ($r = sql_fetch_assoc($rs)) {
     echo $n . ' ' . $r['username'] . ': ' . $r['found'] . "\n";
-    $n ++;
+    $n++;
 }
 sql_free_result($rs);

htdocs/util2/stats/owner.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     $n = 1;
     while ($r = sql_fetch_assoc($rs)) {
-        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;" . ($n ++) . ".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>" . $r['count'] . "</td><td>&nbsp;&nbsp;" . $r['name'] . "</td></tr>\n";
+        echo "  <tr><td style='text-align:right'>&nbsp;&nbsp;" . ($n++) . ".&nbsp;&nbsp;&nbsp;</td><td style='text-align:right'>" . $r['count'] . "</td><td>&nbsp;&nbsp;" . $r['name'] . "</td></tr>\n";
     }
     sql_free_result($rs);