OpencachingDeutschland / oc-server3

htdocs/restorecaches.php

Indentation +1 added lines, -1 removed lines

@@ -1011,7 +1011,7 @@
                             }
                             $logs_restored = true;
                         }
-                       // if it was not already restored by a later restore operation ...
+                        // if it was not already restored by a later restore operation ...
                     } elseif (sql_value("SELECT `id` FROM `cache_logs` WHERE `id`='&1'", 0, $revert_logid) == 0) {
                         // id, uuid, date_created and last_modified are set automatically;
                         // picture will be updated automatically on picture-restore

htdocs/lib2/logic/logpics.class.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         global $login;
 
         $fields =
-          "`pics`.`uuid` AS `pic_uuid`,
+            "`pics`.`uuid` AS `pic_uuid`,
            `pics`.`url` AS `pic_url`,
            `pics`.`title`,
            `pics`.`date_created`,

htdocs/lib2/error.inc.php

Indentation +27 added lines, -27 removed lines

@@ -7,34 +7,34 @@
  *  Common error messages
  ***************************************************************************/
 
- define('ERROR_UNKNOWN', 1000);
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
- define('ERROR_COMPILATION_FAILED', 1002);
- define('ERROR_NO_ACCESS', 1003);
- define('ERROR_INVALID_OPERATION', 1004);
- define('ERROR_LOGIN_REQUIRED', 1005);
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
- define('ERROR_NO_COOKIES', 1007);
- define('ERROR_ALREADY_LOGGEDIN', 1008);
- define('ERROR_USER_NOT_ACTIVE', 1009);
- define('ERROR_USER_NO_EMAIL', 1010);
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
- define('ERROR_CACHE_LOCKED', 1012);
+    define('ERROR_UNKNOWN', 1000);
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
+    define('ERROR_COMPILATION_FAILED', 1002);
+    define('ERROR_NO_ACCESS', 1003);
+    define('ERROR_INVALID_OPERATION', 1004);
+    define('ERROR_LOGIN_REQUIRED', 1005);
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
+    define('ERROR_NO_COOKIES', 1007);
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
+    define('ERROR_USER_NOT_ACTIVE', 1009);
+    define('ERROR_USER_NO_EMAIL', 1010);
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
+    define('ERROR_CACHE_LOCKED', 1012);
 
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
  
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
- define('ERROR_DB_NO_ROOT', 1017);
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
+    define('ERROR_DB_NO_ROOT', 1017);
 
- define('ERROR_USER_NOT_EXISTS', 1018);
- define('ERROR_CACHE_NOT_EXISTS', 1019);
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
+    define('ERROR_USER_NOT_EXISTS', 1018);
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
 
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
- define('ERROR_UPLOAD_UNKNOWN', 1025);
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);

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/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') . '" />

local/maintenance/email_recovery.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
             "SELECT COUNT(*)
              FROM `" . $table . "`
              WHERE " . $this->getDateCondition($table, $dateField) .
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
+                        ($andWhere ? ' AND (' . $andWhere . ')' : ''),
             0
         );
         self::message(1, $objectCount . ' ' . $description);

htdocs/lib2/common.inc.php

Indentation +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
     ) {
         return 'https' . strstr($url, '://');
     } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url'])))
-                  == $opt['page']['absolute_https_url']
+                    == $opt['page']['absolute_https_url']
               && !$opt['page']['https']['active']
     ) {
         return 'http' . strstr($url, '://');