Passed
Pull Request — master (#329)
by Mirko
07:20
created
htdocs/activation.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,10 +14,8 @@
 block discarded – undo
14 14
 // We use short param codes 'u' and 'c' to generate short-enough activation
15 15
 // url that will not be wrapped in plain-text emails.
16 16
 
17
-$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) :
18
-    (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
19
-$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) :
20
-    (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
17
+$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : (isset($_REQUEST['c']) ? trim($_REQUEST['c']) : '');
18
+$email = isset($_REQUEST['email']) ? trim($_REQUEST['email']) : (isset($_REQUEST['e']) ? trim($_REQUEST['e']) : '');
21 19
 
22 20
 $tpl->assign('errorEMail', false);
23 21
 $tpl->assign('errorCode', false);
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/rating.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 
18 18
  ****************************************************************************/
19 19
 
20
-$rating_tpl =    '<tr>
20
+$rating_tpl = '<tr>
21 21
                 <td valign="top">' . t('Recommendations:') . '</td>
22 22
                 <td valign="top">
23 23
                     {rating_msg}
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/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/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/gcwp_update.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 class gcwp_update
14 14
 {
15 15
     public $name = 'gcwp_update';
16
-    public $interval = 3600;  // every hour
16
+    public $interval = 3600; // every hour
17 17
 
18 18
 
19 19
     public function run()
Please login to merge, or discard this patch.