Completed
Pull Request — master (#313)
by Thomas
18:19 queued 08:41
created
htdocs/okapi/views/changelog_helper.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
                     throw new ErrorException();
44 44
                 }
45 45
                 Cache::set($cache_key, $changes_xml, 3600);
46
-                Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
46
+                Cache::set($cache_backup_key, $changes_xml, 3600 * 24 * 30);
47 47
             }
48 48
             catch (Exception $e)
49 49
             {
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
                 $changes_xml = Cache::get($cache_backup_key);
53 53
                 if ($changes_xml) {
54
-                    Cache::set($cache_key, $changes_xml, 3600*12);
54
+                    Cache::set($cache_key, $changes_xml, 3600 * 12);
55 55
                 }
56 56
             }
57 57
         }
Please login to merge, or discard this patch.
htdocs/lang/de/expressions.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 //common vars
23 23
 $dateformat = $opt['locale'][$locale]['format']['date'];
24
-$reset = t('Reset');  // obsolete
24
+$reset = t('Reset'); // obsolete
25 25
 $yes = t('Yes');
26 26
 $no = t('No');
27 27
 
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/purge_logs.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 class purge_logs
13 13
 {
14 14
     public $name = 'purge_logs';
15
-    public $interval = 86400;    // daily
15
+    public $interval = 86400; // daily
16 16
 
17 17
     public function run()
18 18
     {
Please login to merge, or discard this patch.
htdocs/util2/cron/modules/slave_cleanup.class.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
         }
29 29
         sql_free_result($rs);
30 30
 
31
-        $this->cleanup_slave(- 1);
31
+        $this->cleanup_slave(-1);
32 32
     }
33 33
 
34 34
     public function cleanup_slave($slaveId)
Please login to merge, or discard this patch.
htdocs/config2/locale.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
142 142
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
143 143
 $opt['locale']['DE']['mostly_translated'] = true;
144
-$opt['locale']['DE']['what3words'] = true;  // "beta"
144
+$opt['locale']['DE']['what3words'] = true; // "beta"
145 145
 
146 146
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
147 147
 $opt['locale']['IT']['format']['dm'] = '%d/%m';
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.
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.
local/ocxml11client/xml2array.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@
 block discarded – undo
16 16
 
17 17
     public function push_pos(&$pos)
18 18
     {
19
-        $this->stack[count($this->stack)] =& $pos;
20
-        $this->stack_ref =& $pos;
19
+        $this->stack[count($this->stack)] = & $pos;
20
+        $this->stack_ref = & $pos;
21 21
     }
22 22
 
23 23
     public function pop_pos()
24 24
     {
25 25
         unset($this->stack[count($this->stack) - 1]);
26
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
26
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
27 27
     }
28 28
 
29 29
     public function parse($strInputXML)
Please login to merge, or discard this patch.
htdocs/adminuser.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  *  Unicode Reminder メモ
6 6
  ***************************************************************************/
7 7
 
8
-require __DIR__ . '/lib2/web.inc.php';
8
+require __DIR__.'/lib2/web.inc.php';
9 9
 
10 10
 $tpl->name = 'adminuser';
11 11
 $tpl->menuitem = MNU_ADMIN_USER;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     // send a new confirmation
52 52
     $user->sendRegistrationCode();
53 53
 
54
-    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username=' . urlencode($user->getUsername()));
54
+    $tpl->redirect('adminuser.php?action=searchuser&msg=sendcodecommit&username='.urlencode($user->getUsername()));
55 55
 }
56 56
 
57 57
 function formAction()
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
         $user->addEmailProblem($datalicense);
98 98
     }
99 99
 
100
-    $tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) .
101
-        '&success=' . ($disduelicense + $disable));
100
+    $tpl->redirect('adminuser.php?action=searchuser&username='.urlencode($username).
101
+        '&success='.($disduelicense + $disable));
102 102
 }
103 103
 
104 104
 function searchUser()
Please login to merge, or discard this patch.