Completed
Pull Request — development (#405)
by Mirko
14:04 queued 06:05
created
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/config2/settings-dist-common.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
  *   bin/dbsv-update.php will then migrate the tables' charset.
16 16
  */
17 17
 $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name
18
-$opt['charset']['mysql'] = 'utf8';     // use mysql compatible charset-name
18
+$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name
19 19
 
20 20
 // handling of SQL and PHP errors
21 21
 $opt['db']['error']['display'] = false;
22
-$opt['db']['error']['mail'] = 'root';  // set '' to disable
22
+$opt['db']['error']['mail'] = 'root'; // set '' to disable
23 23
 
24 24
 // page title
25 25
 $opt['page']['title'] = 'OPENCACHING';
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
  * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten.
58 58
  * See examples for overriding in settings-sample.inc.php.
59 59
  */
60
-$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur';  // 5-10 keywords are recommended
60
+$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended
61 61
 // see http://forum.opencaching.de/index.php?topic=3065.0
62 62
 // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description
63 63
 $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.';
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 // see also setting in lib/settings.inc.php!
95 95
 $opt['logic']['admin']['team_comments_only_for_reports'] = true;
96 96
 $opt['logic']['admin']['enable_listing_admins'] = false;
97
-$opt['logic']['admin']['listingadmin_notification'] = '';  // Email address(es), comma separated
97
+$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated
98 98
 
99 99
 /*
100 100
  * html purifier
Please login to merge, or discard this patch.
htdocs/config2/settings-sample.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
  * other parameters may be customized
67 67
  */
68 68
 $opt['session']['mode'] = SAVE_COOKIE;
69
-$opt['session']['cookiename'] = '<cookiename>';   // e.g. 'ocde'
70
-$opt['session']['domain'] = '<.do.main>';  // may be overwritten by $opt['domain'][...]['cookiedomain']
69
+$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
70
+$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
71 71
 
72 72
 /* If the Referer was sent by the client and the substring was not found,
73 73
  * the embedded session id will be marked as invalid.
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
 /* default locale
102 102
  */
103
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
103
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
104 104
 
105 105
 /* multi-domain settings
106 106
  *
Please login to merge, or discard this patch.
htdocs/cachelist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 $dontwatch = isset($_REQUEST['dontwatch']);
16 16
 $bookmark = isset($_REQUEST['bookmark']);
17 17
 $unbookmark = isset($_REQUEST['unbookmark']);
18
-$invalid_waypoints = isset($_REQUEST['invalidwp']) ? '&invalidwp='.urlencode($_REQUEST['invalidwp']) : '';
18
+$invalid_waypoints = isset($_REQUEST['invalidwp']) ? '&invalidwp=' . urlencode($_REQUEST['invalidwp']) : '';
19 19
 
20 20
 if ($id) {
21 21
     $login->verify();
Please login to merge, or discard this patch.
htdocs/editlog.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
                 tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl));
177 177
 
178 178
                 if (isset($_POST['descMode'])) {
179
-                    $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
179
+                    $descMode = $_POST['descMode'] + 0; // Ocprop: 2
180 180
                     if (($descMode < 1) || ($descMode > 3)) {
181 181
                         $descMode = 3;
182 182
                     }
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
                 tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8'));
435 435
                 tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8'));
436 436
                 tpl_set_var('cacheid', $log_record['cache_id']);
437
-                tpl_set_var('reset', $reset);  // obsolete
437
+                tpl_set_var('reset', $reset); // obsolete
438 438
                 tpl_set_var('submit', $submit);
439 439
                 tpl_set_var('logid', $log_id);
440 440
                 tpl_set_var('date_message', !$date_ok ? $date_message : '');
Please login to merge, or discard this patch.
htdocs/viewcache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
     if ($count > 0) {
29 29
         $formatter = new FormatterCoordinate();
30 30
 
31
-        for ($i = 0; $i < $count; $i ++) {
31
+        for ($i = 0; $i < $count; $i++) {
32 32
             $waypoints[$i]['coord']['lat'] = $waypoints[$i]['coordinate']->latitude();
33 33
             $waypoints[$i]['coord']['lon'] = $waypoints[$i]['coordinate']->longitude();
34 34
             $waypoints[$i]['coordinateHtml'] = $formatter->formatHtml($waypoints[$i]['coordinate'], '<br />');
Please login to merge, or discard this patch.
htdocs/lib/settings-dev.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -117,11 +117,11 @@
 block discarded – undo
117 117
 /* maximum number of failed logins per hour before that IP address is blocked
118 118
  * (used to prevent brute-force-attacks)
119 119
  */
120
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
120
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
121 121
 $opt['page']['headoverlay'] = 'oc_head_alpha3';
122 122
 
123 123
 // data license
124
-$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
124
+$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
125 125
 $opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
126 126
 
127 127
 $opt['logic']['admin']['listingadmin_notification'] = 'root';
Please login to merge, or discard this patch.
htdocs/lib/common.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -680,7 +680,7 @@
 block discarded – undo
680 680
 
681 681
     $str = $translate->t($str, '', basename(__FILE__), __LINE__);
682 682
     $args = func_get_args();
683
-    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex --) {
683
+    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex--) {
684 684
         $str = str_replace('%' . $nIndex, $args[$nIndex], $str);
685 685
     }
686 686
 
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.