Completed
Pull Request — develop (#740)
by Maxim
08:32
created
manager/actions/mutate_settings/snippet_smtp.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
   <tr>
3 3
     <td><?php echo $_lang['smtp_auth_title'] ?></td>
4 4
     <td>
5
-        <?php echo wrap_label($_lang['yes'],form_radio('smtp_auth','1' ));?><br />
6
-        <?php echo wrap_label($_lang['no'],form_radio('smtp_auth','0' ));?>
5
+        <?php echo wrap_label($_lang['yes'], form_radio('smtp_auth', '1')); ?><br />
6
+        <?php echo wrap_label($_lang['no'], form_radio('smtp_auth', '0')); ?>
7 7
     </td>
8 8
   </tr>
9 9
   <tr>
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
     <td >
16 16
      <select name="smtp_secure" size="1" class="inputBox">
17 17
   <option value="none" ><?php echo $_lang['no'] ?></option>
18
-   <option value="ssl" <?php if($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>
19
-  <option value="tls" <?php if($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>
18
+   <option value="ssl" <?php if ($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option>
19
+  <option value="tls" <?php if ($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option>
20 20
  </select>
21 21
  <br />
22 22
   </td>
Please login to merge, or discard this patch.
manager/actions/mutate_settings/tab2_furl_settings.inc.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 <tr>
7 7
 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurls_title'] ?><br><small>[(friendly_urls)]</small></td>
8 8
 <td>
9
-    <?php echo wrap_label($_lang['yes'],form_radio('friendly_urls', 1, 'id="furlRowOn"'));?><br />
10
-    <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"'));?>
9
+    <?php echo wrap_label($_lang['yes'], form_radio('friendly_urls', 1, 'id="furlRowOn"')); ?><br />
10
+    <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"')); ?>
11 11
 </td>
12 12
 </tr>
13 13
 <tr>
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
 <tr>
21 21
     <td nowrap class="warning"><?php echo $_lang['xhtml_urls_title'] ?><br><small>[(xhtml_urls)]</small></td>
22 22
     <td>
23
-        <?php echo wrap_label($_lang['yes'],form_radio('xhtml_urls', 1));?><br />
24
-        <?php echo wrap_label($_lang['no'], form_radio('xhtml_urls', 0));?>
23
+        <?php echo wrap_label($_lang['yes'], form_radio('xhtml_urls', 1)); ?><br />
24
+        <?php echo wrap_label($_lang['no'], form_radio('xhtml_urls', 0)); ?>
25 25
     </td>
26 26
 </tr>
27 27
 <tr>
@@ -31,135 +31,135 @@  discard block
 block discarded – undo
31 31
 <tr>
32 32
 <td colspan="2"><div class="split"></div></td>
33 33
 </tr>
34
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
34
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
35 35
 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsprefix_title'] ?><br><small>[(friendly_url_prefix)]</small></td>
36 36
 <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_prefix" value="<?php echo $friendly_url_prefix; ?>" /></td>
37 37
 </tr>
38
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
38
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
39 39
 <td width="200">&nbsp;</td>
40 40
 <td class="comment"><?php echo $_lang['friendlyurlsprefix_message'] ?></td>
41 41
 </tr>
42
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
42
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
43 43
 <td colspan="2"><div class="split"></div></td>
44 44
 </tr>
45
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
45
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
46 46
 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsuffix_title'] ?><br><small>[(friendly_url_suffix)]</small></td>
47 47
 <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_suffix" value="<?php echo $friendly_url_suffix; ?>" /></td>
48 48
 </tr>
49
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
49
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
50 50
 <td width="200">&nbsp;</td>
51 51
 <td class="comment"><?php echo $_lang['friendlyurlsuffix_message'] ?></td>
52 52
 </tr>
53
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
53
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
54 54
 <td colspan="2"><div class="split"></div></td>
55 55
 </tr>
56
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
56
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
57 57
 <th><?php echo $_lang['make_folders_title'] ?><br><small>[(make_folders)]</small></th>
58 58
 <td>
59
-  <?php echo wrap_label($_lang['yes'],form_radio('make_folders','1'));?><br />
60
-  <?php echo wrap_label($_lang['no'],form_radio('make_folders','0'));?>
59
+  <?php echo wrap_label($_lang['yes'], form_radio('make_folders', '1')); ?><br />
60
+  <?php echo wrap_label($_lang['no'], form_radio('make_folders', '0')); ?>
61 61
 </td>
62 62
 </tr>
63
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
63
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
64 64
         <td width="200">&nbsp;</td>
65 65
         <td class="comment"><?php echo $_lang['make_folders_message'] ?></td>
66 66
       </tr>
67
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
67
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
68 68
 <td colspan="2"><div class="split"></div></td>
69 69
 </tr>
70 70
   
71
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
71
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
72 72
 <th><?php echo $_lang['seostrict_title'] ?><br><small>[(seostrict)]</small></th>
73 73
 <td>
74
-  <?php echo wrap_label($_lang['yes'],form_radio('seostrict','1'));?><br />
75
-  <?php echo wrap_label($_lang['no'],form_radio('seostrict','0'));?>
74
+  <?php echo wrap_label($_lang['yes'], form_radio('seostrict', '1')); ?><br />
75
+  <?php echo wrap_label($_lang['no'], form_radio('seostrict', '0')); ?>
76 76
  </td>
77 77
 </tr>
78
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
78
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
79 79
         <td width="200">&nbsp;</td>
80 80
         <td class="comment"><?php echo $_lang['seostrict_message'] ?></td>
81 81
 </tr>
82
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
82
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
83 83
 <td colspan="2"><div class="split"></div></td>
84 84
 </tr>
85 85
 
86
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
86
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
87 87
   <th><?php echo $_lang['aliaslistingfolder_title'] ?><br><small>[(aliaslistingfolder)]</small></th>
88 88
   <td>
89
-      <?php echo wrap_label($_lang['yes'],form_radio('aliaslistingfolder','1'));?><br />
90
-      <?php echo wrap_label($_lang['no'],form_radio('aliaslistingfolder','0'));?>
89
+      <?php echo wrap_label($_lang['yes'], form_radio('aliaslistingfolder', '1')); ?><br />
90
+      <?php echo wrap_label($_lang['no'], form_radio('aliaslistingfolder', '0')); ?>
91 91
   </td>
92 92
 </tr>
93
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
93
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
94 94
   <td width="200">&nbsp;</td>
95 95
   <td class="comment"><?php echo $_lang['aliaslistingfolder_message'] ?></td>
96 96
 </tr>
97
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
97
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
98 98
   <td colspan="2"><div class="split"></div></td>
99 99
 </tr>
100 100
 
101
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
101
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
102 102
 <td nowrap class="warning" valign="top"><?php echo $_lang['friendly_alias_title'] ?><br><small>[(friendly_alias_urls)]</small></td>
103 103
 <td>
104
-  <?php echo wrap_label($_lang['yes'],form_radio('friendly_alias_urls','1'));?><br />
105
-  <?php echo wrap_label($_lang['no'],form_radio('friendly_alias_urls','0'));?>
104
+  <?php echo wrap_label($_lang['yes'], form_radio('friendly_alias_urls', '1')); ?><br />
105
+  <?php echo wrap_label($_lang['no'], form_radio('friendly_alias_urls', '0')); ?>
106 106
 </td>
107 107
 </tr>
108
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
108
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
109 109
 <td width="200">&nbsp;</td>
110 110
 <td class="comment"><?php echo $_lang['friendly_alias_message'] ?></td>
111 111
 </tr>
112
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
112
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
113 113
 <td colspan="2"><div class="split"></div></td>
114 114
 </tr>
115
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
115
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
116 116
 <td nowrap class="warning" valign="top"><?php echo $_lang['use_alias_path_title'] ?><br><small>[(use_alias_path)]</small></td>
117 117
 <td>
118
-  <?php echo wrap_label($_lang['yes'],form_radio('use_alias_path','1'));?><br />
119
-  <?php echo wrap_label($_lang['no'],form_radio('use_alias_path','0'));?>
118
+  <?php echo wrap_label($_lang['yes'], form_radio('use_alias_path', '1')); ?><br />
119
+  <?php echo wrap_label($_lang['no'], form_radio('use_alias_path', '0')); ?>
120 120
 </td>
121 121
 </tr>
122
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
122
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
123 123
 <td width="200">&nbsp;</td>
124 124
 <td class="comment"><?php echo $_lang['use_alias_path_message'] ?></td>
125 125
 </tr>
126
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
126
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
127 127
 <td colspan="2"><div class="split"></div></td>
128 128
 </tr>
129
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
129
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
130 130
 <td nowrap class="warning" valign="top"><?php echo $_lang['duplicate_alias_title'] ?><br><small>[(allow_duplicate_alias)]</small></td>
131 131
 <td>
132
-  <?php echo wrap_label($_lang['yes'],form_radio('allow_duplicate_alias','1'));?><br />
133
-  <?php echo wrap_label($_lang['no'],form_radio('allow_duplicate_alias','0'));?>
132
+  <?php echo wrap_label($_lang['yes'], form_radio('allow_duplicate_alias', '1')); ?><br />
133
+  <?php echo wrap_label($_lang['no'], form_radio('allow_duplicate_alias', '0')); ?>
134 134
 </td>
135 135
 </tr>
136
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
136
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
137 137
 <td width="200">&nbsp;</td>
138 138
 <td class="comment"><?php echo $_lang['duplicate_alias_message'] ?></td>
139 139
 </tr>
140
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
140
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
141 141
 <td colspan="2"><div class="split"></div></td>
142 142
 </tr>
143
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
143
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
144 144
 <td nowrap class="warning" valign="top"><?php echo $_lang['automatic_alias_title'] ?><br><small>[(automatic_alias)]</small></td>
145 145
 <td>
146
-  <?php echo wrap_label($_lang['yes'],form_radio('automatic_alias','1'));?><br />
147
-  <?php echo wrap_label($_lang['no'],form_radio('automatic_alias','0'));?>
146
+  <?php echo wrap_label($_lang['yes'], form_radio('automatic_alias', '1')); ?><br />
147
+  <?php echo wrap_label($_lang['no'], form_radio('automatic_alias', '0')); ?>
148 148
 </td>
149 149
 </tr>
150
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
150
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
151 151
 <td width="200">&nbsp;</td>
152 152
 <td class="comment"><?php echo $_lang['automatic_alias_message'] ?></td>
153 153
 </tr>
154
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
154
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
155 155
 <td colspan="2"><div class="split"></div></td>
156 156
 </tr>
157
-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>
157
+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>
158 158
 <td colspan="2">
159 159
     <?php
160 160
         // invoke OnFriendlyURLSettingsRender event
161 161
         $evtOut = $modx->invokeEvent('OnFriendlyURLSettingsRender');
162
-        if(is_array($evtOut)) echo implode("",$evtOut);
162
+        if (is_array($evtOut)) echo implode("", $evtOut);
163 163
     ?>
164 164
 </td>
165 165
 </tr>
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/types/type_img.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
   *      @link http://kcfinder.sunhater.com
13 13
   */
14 14
 
15
-class type_img {
15
+class type_img{
16 16
 
17
-    public function checkFile($file, array $config) {
17
+    public function checkFile($file, array $config){
18 18
 
19 19
         $driver = isset($config['imageDriversPriority'])
20 20
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/types/type_mime.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
   *      @link http://kcfinder.sunhater.com
13 13
   */
14 14
 
15
-class type_mime {
15
+class type_mime{
16 16
 
17
-    public function checkFile($file, array $config) {
17
+    public function checkFile($file, array $config){
18 18
         if (!class_exists("finfo"))
19 19
             return "Fileinfo PECL extension is missing.";
20 20
 
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
         $mimes = $config['params'];
34 34
         if (substr($mimes, 0, 1) == "!") {
35 35
             $mimes = trim(substr($mimes, 1));
36
-            return in_array($type , explode(" ", $mimes))
36
+            return in_array($type, explode(" ", $mimes))
37 37
                 ? "You can't upload such files."
38 38
                 : true;
39 39
         }
40 40
 
41
-        return !in_array($type , explode(" ", $mimes))
41
+        return !in_array($type, explode(" ", $mimes))
42 42
             ? "You can't upload such files."
43 43
             : true;
44 44
     }
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/tpl/tpl_css.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1
-<link href="css.php?type=<?php echo $this->type ?><?php echo ($this->cms ? "&amp;cms={$this->cms}" : "" ) ?>" rel="stylesheet" type="text/css" />
1
+<link href="css.php?type=<?php echo $this->type ?><?php echo ($this->cms ? "&amp;cms={$this->cms}" : "") ?>" rel="stylesheet" type="text/css" />
2 2
 <link href="themes/<?php echo $this->config['theme'] ?>/style.css" rel="stylesheet" type="text/css" />
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lang/pt-br.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,8 @@
 block discarded – undo
9 9
 
10 10
 $lang = array(
11 11
 
12
-    '_locale' => "pt_BR.UTF-8",  // UNIX localization code
13
-    '_charset' => "utf-8",       // Browser charset
12
+    '_locale' => "pt_BR.UTF-8", // UNIX localization code
13
+    '_charset' => "utf-8", // Browser charset
14 14
 
15 15
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
16 16
     '_dateTimeFull' => "%A, %e %B, %Y %H:%M",
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lang/de.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@
 block discarded – undo
6 6
 
7 7
 $lang = array(
8 8
 
9
-    '_locale' => "de_DE.UTF-8",  // UNIX localization code
10
-    '_charset' => "utf-8",       // Browser charset
9
+    '_locale' => "de_DE.UTF-8", // UNIX localization code
10
+    '_charset' => "utf-8", // Browser charset
11 11
 
12 12
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
13 13
     '_dateTimeFull' => "%A, %e.%B.%Y %I:%M %p",
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lang/uk.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
 
8 8
 $lang = array(
9 9
 
10
-    '_locale' => "uk_UA.UTF-8",  // UNIX localization code
11
-    '_charset' => "utf-8",       // Browser charset
10
+    '_locale' => "uk_UA.UTF-8", // UNIX localization code
11
+    '_charset' => "utf-8", // Browser charset
12 12
 
13 13
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
14 14
     '_dateTimeFull' => "%A, %e %B, %Y %H:%M",
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lang/ja.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@
 block discarded – undo
11 11
 
12 12
 $lang = array(
13 13
 
14
-    '_locale' => "ja_JP.UTF-8",  // UNIX localization code
15
-    '_charset' => "utf-8",       // Browser charset
14
+    '_locale' => "ja_JP.UTF-8", // UNIX localization code
15
+    '_charset' => "utf-8", // Browser charset
16 16
 
17 17
     // Date time formats. See http://www.php.net/manual/en/function.strftime.php
18 18
     '_dateTimeFull' => "%Y/%m/%d %H:%M",
Please login to merge, or discard this patch.