Completed
Pull Request — development (#696)
by Thomas
04:58
created
local/maintenance/email_recovery.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@
 block discarded – undo
300 300
         while ($r = sql_fetch_assoc($rs)) {
301 301
             $user = new user($r['user_id']);
302 302
             $user->sendRegistrationCode();
303
-            ++ $n;
303
+            ++$n;
304 304
         }
305 305
         sql_free_result($rs);
306 306
         self::message(0, $n . ' users have been re-sent the activation code');
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
             'SELECT COUNT(*)
101 101
              FROM `' . $table . '`
102 102
              WHERE ' . $this->getDateCondition($table, $dateField) .
103
-                       ($andWhere ? ' AND (' . $andWhere . ')' : ''),
103
+                        ($andWhere ? ' AND (' . $andWhere . ')' : ''),
104 104
             0
105 105
         );
106 106
         self::message(1, $objectCount . ' ' . $description);
Please login to merge, or discard this patch.
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -81,6 +81,10 @@  discard block
 block discarded – undo
81 81
         return preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $datetime);
82 82
     }
83 83
 
84
+    /**
85
+     * @param integer $level
86
+     * @param string $text
87
+     */
84 88
     private static function message($level, $text)
85 89
     {
86 90
         echo str_repeat(' ', 2 * $level) . $text . "\n";
@@ -93,6 +97,11 @@  discard block
 block discarded – undo
93 97
             ' AND `' . $table . '`.`' . $field . "` <= '" . sql_escape($this->toDateTime) . "'";
94 98
     }
95 99
 
100
+    /**
101
+     * @param string $table
102
+     * @param string $dateField
103
+     * @param string $description
104
+     */
96 105
     private function showObjectCount($table, $dateField, $description, $andWhere = '')
97 106
     {
98 107
         $objectCount = sql_value(
Please login to merge, or discard this patch.
local/mailing/mailing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
 foreach ($sendTo as $receiver) {
41 41
     $receiver = trim($receiver);
42
-    echo ++ $n . "/$total: $receiver";
42
+    echo ++$n . "/$total: $receiver";
43 43
     mail(
44 44
         $receiver,
45 45
         $subject,
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
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
 
15 15
     public function push_pos(&$pos)
16 16
     {
17
-        $this->stack[count($this->stack)] =& $pos;
18
-        $this->stack_ref =& $pos;
17
+        $this->stack[count($this->stack)] = & $pos;
18
+        $this->stack_ref = & $pos;
19 19
     }
20 20
 
21 21
     public function pop_pos()
22 22
     {
23 23
         unset($this->stack[count($this->stack) - 1]);
24
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
24
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
25 25
     }
26 26
 
27 27
     /**
Please login to merge, or discard this patch.
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/src/Oc/Util/StyleCleanUp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
                         && (trim($line, " \n") !== '' || substr($line, -1) !== "\n")
98 98
                     ) {
99 99
                         $oldLine = $line;
100
-                        $line = rtrim($line);   # trims " \t\n\r\0\x0B"
100
+                        $line = rtrim($line); # trims " \t\n\r\0\x0B"
101 101
                         $line = $this->expandTabs($line);
102 102
                         $line .= "\n";
103 103
 
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.