Completed
Pull Request — development (#738)
by Kai
04:36
created
htdocs/lib/settings-dist.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
 
143 143
 /* default locale
144 144
  */
145
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
145
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
146 146
 
147 147
 // include all locale settings
148 148
 require_once __DIR__ . '/../config2/locale.inc.php';
Please login to merge, or discard this patch.
htdocs/lib/settings-sample-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
 // database names
20 20
 $dbname = 'opencaching';
21
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
21
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
22 22
 
23 23
 // common developer system settings
24 24
 require 'settings-dev.inc.php';
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
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
  * language specific vars
12 12
  ****************************************************************************/
13 13
  
14
- $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
14
+    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.');
15 15
 
16
- $commit = t('the cache description has been deleted');
17
- $commit_title = t('delete this cache-description');
16
+    $commit = t('the cache description has been deleted');
17
+    $commit_title = t('delete this cache-description');
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
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 );
80 80
 
81 81
 $opt['page']['develsystem'] = true;
82
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
82
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
83 83
 
84 84
 $opt['mail']['from'] = 'root';
85 85
 $opt['mail']['subject'] = '[local.team-opencaching.de] ';
Please login to merge, or discard this patch.
htdocs/lib2/OcSmarty.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     public $main_template = 'sys_main';
20 20
     public $bench = null;
21 21
     public $compile_id = null;
22
-    public $cache_id = null;    // This is a smarty caching ID, not a caches.cache_id.
22
+    public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id.
23 23
     public $title = '';
24 24
     public $menuitem = null;
25 25
     public $nowpsearch = false;
Please login to merge, or discard this patch.
htdocs/lib2/errorhandler.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@
 block discarded – undo
134 134
     $errorlog_dir = __DIR__ . '/../var/errorlog';
135 135
     $errorlog_path = $errorlog_dir . '/errorlog-' . date('Y-m-d');
136 136
 
137
-    $error_mail_limit = 32768;    // send max 32 KB = ca. 5-20 errors per day/logfile
137
+    $error_mail_limit = 32768; // send max 32 KB = ca. 5-20 errors per day/logfile
138 138
 
139 139
     // All errors which may happen here are ignored, to avoid error recursions.
140 140
 
Please login to merge, or discard this patch.
htdocs/util/watchlist/runwatch.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -608,7 +608,7 @@
 block discarded – undo
608 608
         $pid_daemon = fgets($pidfile, 20);
609 609
         fclose($pidfile);
610 610
 
611
-        $pid_daemon = (int) $pid_daemon;
611
+        $pid_daemon = (int)$pid_daemon;
612 612
 
613 613
         // process running?
614 614
         if (posix_kill($pid_daemon, 0)) {
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -504,6 +504,9 @@
 block discarded – undo
504 504
     );
505 505
 }
506 506
 
507
+/**
508
+ * @param string $watchtext
509
+ */
507 510
 function insert_recommendation($rLog, $language, $watchtext)
508 511
 {
509 512
     global $translate;
Please login to merge, or discard this patch.
htdocs/lib2/search/search.html.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
         // decide if the cache is new
87 87
         $dDiff = dateDiff('d', $rCache['date_created'], date('Y-m-d'));
88 88
 
89
-        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int) $rCache['type'] !== 6);
89
+        $rCache['isnew'] = ($dDiff <= NEWCACHES_DAYS && (int)$rCache['type'] !== 6);
90 90
 
91 91
         // get last logs
92 92
         if ($options['sort'] != 'bymylastlog' || !$login->logged_in()) {
Please login to merge, or discard this patch.
htdocs/addtolist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 $tpl->menuitem = MNU_CACHES_ADDTOLIST;
10 10
 
11 11
 $login->verify();
12
-if ($login->userid  == 0) {
12
+if ($login->userid == 0) {
13 13
     $tpl->redirect_login();
14 14
 }
15 15
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 $default_list = isset($_REQUEST['listid']) ? (int)$_REQUEST['listid'] : cachelist::getMyLastAddedToListId();
33 33
 
34 34
 if (isset($_REQUEST['save'], $_REQUEST['listid'])) {
35
-    $listId = (int) $_REQUEST['listid'];
35
+    $listId = (int)$_REQUEST['listid'];
36 36
     if ($listId === 0) {
37 37
         $cacheList = new cachelist(ID_NEW, $login->userid);
38 38
         $name_error = $cacheList->setNameAndVisibility($newListName, $newListPublic ? 2 : 0);
Please login to merge, or discard this patch.