Passed
Branch development (08947d)
by Thomas
08:58
created
htdocs/lang/de/ocstyle/newcache.inc.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -14,40 +14,40 @@
 block discarded – undo
14 14
  * set template specific language variables
15 15
  ****************************************************************************/
16 16
 
17
- $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.');
18
-
19
- $submit = t('Submit cache');
20
- $default_country = t('EN');
21
- $default_lang = t('EN');
22
- $show_all = t('Show all');
23
- $default_NS = 'N';
24
- $default_EW = 'E';
25
- $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
26
-
27
- $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
28
- $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
29
- $error_lat_not_ok = $error_long_not_ok . "<br />";
30
- $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>';
31
- $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
32
- $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
33
- $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
34
- $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
35
- $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
36
- $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
37
- $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
38
- $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
39
- $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
40
- $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
41
- $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
42
-
43
- $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
44
-
45
- $sel_message = t('Select');
46
-
47
- $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
48
- $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;';
49
-
50
- $cache_attrib_group =
17
+    $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.');
18
+
19
+    $submit = t('Submit cache');
20
+    $default_country = t('EN');
21
+    $default_lang = t('EN');
22
+    $show_all = t('Show all');
23
+    $default_NS = 'N';
24
+    $default_EW = 'E';
25
+    $date_time_format_message = '&nbsp;' . t('Format:&nbsp;DD-MM-YYYY');
26
+
27
+    $error_general = "<tr><td class='error' colspan='2'><b>" . t('Some errors occured, please check the marked fields.') . "</b></td></tr>";
28
+    $error_long_not_ok = '<span class="errormsg">' . t('Your chosen coordinated are invalid') . '</span>';
29
+    $error_lat_not_ok = $error_long_not_ok . "<br />";
30
+    $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>';
31
+    $time_not_ok_message = '<span class="errormsg">' . t('The entered time is invalid.') . '</span>';
32
+    $way_length_not_ok_message = '<span class="errormsg">' . t('The entered distance is invalid, Format: aa.aaa') . '</span>';
33
+    $date_not_ok_message = '<span class="errormsg">' . t('Invalid date, format:DD-MM-JJJJ') . '</span>';
34
+    $name_not_ok_message = '&nbsp;<span class="errormsg">' . t('Cachename is invalid') . '</span>';
35
+    $tos_not_ok_message = '<br/><span class="errormsg">' . t('The cache can only be adopted if you agree our terms of use.') . '</span>';
36
+    $type_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-type is chosen.') . '</span>';
37
+    $size_not_ok_message = '&nbsp;<span class="errormsg">' . t('No cache-size is chosen.') . '</span>';
38
+    $diff_not_ok_message = '&nbsp;<span class="errormsg">' . t('Choose both valuations!') . '</span>';
39
+    $sizemismatch_message = '&nbsp;<span class="errormsg">' . t('For virtual and webcam caches, the cache size has to be -no container-!') . '</span>';
40
+    $safari_not_allowed_message = '<span class="errormsg">' . t('Only virtual caches can be safari caches.') . '</span>';
41
+    $bad_wpgc_message = '<span class="errormsg">' . t('GC waypoint is invalid, must be GCxxxxx') . '</span>';
42
+
43
+    $cache_submitted = t('Your cache is successfully added to the database. You will be redirected to the cache page, now.');
44
+
45
+    $sel_message = t('Select');
46
+
47
+    $cache_attrib_js = "new Array({id}, {selected}, '{img_undef}', '{img_large}')";
48
+    $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;';
49
+
50
+    $cache_attrib_group =
51 51
     '<div class="attribgroup"><table cellspacing="0" style="display:inline;border-spacing:0px;">
52 52
          <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>
53 53
          <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>
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/removelog.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@
 block discarded – undo
15 15
         
16 16
  ****************************************************************************/
17 17
 
18
- $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
19
- $removed_message_end = '---';
18
+    $error_wrong_node = t('This log entry has been created on another Opencaching website. The cache can only be edited there.');
19
+    $removed_message_end = '---';
20 20
  
21 21
 
22 22
 function removed_log_subject($lang)
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/removedesc.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
      
16 16
  ****************************************************************************/
17 17
  
18
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
18
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
19 19
 
20
- $commit = t('the cache description has been deleted');
21
- $commit_title = t('delete this cache-description');
20
+    $commit = t('the cache description has been deleted');
21
+    $commit_title = t('delete this cache-description');
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/varset.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 $error_suffix = '</span>';
72 72
 
73 73
 $htmlnotice =
74
- '<tr><td class="spacer" colspan="2"></td></tr>
74
+    '<tr><td class="spacer" colspan="2"></td></tr>
75 75
     <tr>
76 76
         <td class="help" colspan="2">
77 77
             <img src="lang/de/ocstyle/images/misc/hint.gif" border="0" width="15" height="11" alt="' . t('Notice') . '" title="' . t('Notice') . '" />
Please login to merge, or discard this patch.
htdocs/util2/stats/rank.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,6 +19,6 @@
 block discarded – undo
19 19
               LIMIT 100');
20 20
 while ($r = sql_fetch_assoc($rs)) {
21 21
     echo $n . ' ' . $r['username'] . ': ' . $r['found'] . "\n";
22
-    $n ++;
22
+    $n++;
23 23
 }
24 24
 sql_free_result($rs);
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/maillog.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 class maillog
13 13
 {
14 14
     public $name = 'maillog';
15
-    public $interval = 600;  // every 10 minutes
15
+    public $interval = 600; // every 10 minutes
16 16
 
17 17
 
18 18
     public function run()
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
             $opt['system']['maillog']['syslog_db_user'],
34 34
             $opt['system']['maillog']['syslog_db_password'],
35 35
             true
36
-        );  // use separate connection even if on same DB host
36
+        ); // use separate connection even if on same DB host
37 37
         if ($dbc === false) {
38 38
             echo $this->name . ": could not connect to syslog database\n";
39 39
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         }
100 100
 
101 101
         while ($logentry = mysql_fetch_assoc($rs)) {
102
-            $message = $logentry['message'];   // latin-1 charset
102
+            $message = $logentry['message']; // latin-1 charset
103 103
             $delivered = strpos($message, 'status=sent') > 0;
104 104
             $bounced = strpos($message, 'status=bounced') > 0;
105 105
             if ($delivered || $bounced) {
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/cache_waypoint_pool.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 $free_wp = $opt['logic']['waypoint_pool']['prefix'] . '0001';
82 82
             }
83 83
             $nInsertCount += $this->fill_turn($free_wp, $max_inserts_count - $nInsertCount);
84
-            $rowCount ++;
84
+            $rowCount++;
85 85
         }
86 86
         sql_free_result($rsStartWp);
87 87
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $nWaypointsGenerated = 0;
122 122
         while (($nWaypointsGenerated < $max_inserts_count) && ($start_wp != $end_wp)) {
123 123
             sql("INSERT INTO `cache_waypoint_pool` (`wp_oc`) VALUES ('&1')", $start_wp);
124
-            $nWaypointsGenerated ++;
124
+            $nWaypointsGenerated++;
125 125
             $start_wp = $this->increment_waypoint($start_wp, $opt['logic']['waypoint_pool']['prefix']);
126 126
         }
127 127
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
         $wp_value = substr($wp, 2);
144 144
         $b36_value = '';
145
-        for ($i = 0; $i < strlen($wp_value); $i ++) {
145
+        for ($i = 0; $i < strlen($wp_value); $i++) {
146 146
             $b36_value .= substr($b36_chars, strpos($wp_chars, substr($wp_value, $i, 1)), 1);
147 147
         }
148 148
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
         $b36_value = strtoupper(base_convert($dec_value, 10, strlen($wp_chars)));
151 151
 
152 152
         $wp_value = '';
153
-        for ($i = 0; $i < strlen($b36_value); $i ++) {
153
+        for ($i = 0; $i < strlen($b36_value); $i++) {
154 154
             $wp_value .= substr($wp_chars, strpos($b36_chars, substr($b36_value, $i, 1)), 1);
155 155
         }
156 156
 
Please login to merge, or discard this patch.
htdocs/config2/settings-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 );
81 81
 
82 82
 $opt['page']['develsystem'] = true;
83
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
83
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
84 84
 
85 85
 $opt['mail']['from'] = 'root';
86 86
 $opt['mail']['subject'] = '[local.opencaching.de] ';
Please login to merge, or discard this patch.
htdocs/lib/consts-common.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
  *  common constant definitions of lib1 and lib2
8 8
  ***************************************************************************/
9 9
 
10
-define('GUI_HTML', 0);   // also defined in lib/consts.inc.php
10
+define('GUI_HTML', 0); // also defined in lib/consts.inc.php
11 11
 define('GUI_TEXT', 1);
12 12
 
13
-define('HTTPS_DISABLED', 0);   // also defined in lib/consts.inc.php
13
+define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php
14 14
 define('HTTPS_ENABLED', 1);
15 15
 define('HTTPS_ENFORCED', 2);
16 16
 
Please login to merge, or discard this patch.