Completed
Push — develop ( cb7ecf...5e631f )
by Dmytro
17s
created
manager/actions/import_site.static.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
     <div class="container container-body">
45 45
         <?php
46 46
         if (!isset($_POST['import'])) {
47
-            echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
47
+            echo "<div class=\"element-edit-message\">".$_lang['import_site_message']."</div>";
48 48
             ?>
49 49
             <form action="index.php" method="post" name="importFrm">
50 50
                 <input type="hidden" name="import" value="import"/>
Please login to merge, or discard this patch.
manager/actions/resources/functions.inc.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 
@@ -9,11 +9,11 @@  discard block
 block discarded – undo
9 9
  */
10 10
 
11 11
 $tpl = array(
12
-    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),
13
-    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
14
-    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
15
-    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
16
-    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')
12
+    'viewForm' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_viewForm.tpl'),
13
+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
14
+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
15
+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
16
+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl')
17 17
 );
18 18
 
19 19
 /**
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @param array $ph
22 22
  * @return string
23 23
  */
24
-function parsePh($tpl, $ph) {
24
+function parsePh($tpl, $ph){
25 25
     $modx = evolutionCMS(); global $_lang;
26 26
     $tpl = $modx->parseText($tpl, $_lang, '[%', '%]');
27 27
     return $modx->parseText($tpl, $ph);
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
  * @param string|int $cssId
32 32
  * @return string
33 33
  */
34
-function renderViewSwitchButtons($cssId) {
34
+function renderViewSwitchButtons($cssId){
35 35
     $modx = evolutionCMS(); global $_lang, $tpl;
36 36
 
37 37
     return parsePh($tpl['viewForm'], array(
@@ -44,19 +44,19 @@  discard block
 block discarded – undo
44 44
  * @param mgrResources $resources
45 45
  * @return string
46 46
  */
47
-function createResourceList($resourceTable, $resources) {
47
+function createResourceList($resourceTable, $resources){
48 48
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;
49 49
 
50 50
     $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;
51 51
 
52
-    if( ! is_array($items) || empty($items)) {
52
+    if (!is_array($items) || empty($items)) {
53 53
         return $_lang['no_results'];
54 54
     }
55 55
 
56 56
     // Prepare elements- and categories-list
57 57
     $elements = array();
58 58
     $categories = array();
59
-    foreach($items as $row) {
59
+    foreach ($items as $row) {
60 60
         $catid = $row['catid'] ? $row['catid'] : 0;
61 61
         $categories[$catid] = array('name' => stripslashes($row['category']));
62 62
         $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);
@@ -64,18 +64,18 @@  discard block
 block discarded – undo
64 64
 
65 65
     // Now render categories / panel-collapse
66 66
     $panelGroup = '';
67
-    foreach($elements as $catid => $elList) {
67
+    foreach ($elements as $catid => $elList) {
68 68
         // Add panel-heading / category-collapse to output
69 69
         $panelGroup .= parsePh($tpl['panelHeading'], array(
70 70
             'tab' => $resourceTable,
71 71
             'category' => $categories[$catid]['name'],
72
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
72
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
73 73
             'catid' => $catid,
74 74
         ));
75 75
 
76 76
         // Prepare content for panel-collapse
77 77
         $panelCollapse = '';
78
-        foreach($elList as $el) {
78
+        foreach ($elList as $el) {
79 79
             $panelCollapse .= parsePh($tpl['elementsRow'], $el);
80 80
         }
81 81
 
@@ -97,30 +97,30 @@  discard block
 block discarded – undo
97 97
  * @param mgrResources $resources
98 98
  * @return string
99 99
  */
100
-function createCombinedView($resources) {
100
+function createCombinedView($resources){
101 101
     $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;
102 102
 
103 103
     $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;
104 104
     $types = isset($resources->types) ? $resources->types : false;
105 105
     $categories = isset($resources->categories) ? $resources->categories : false;
106 106
 
107
-    if(!$itemsPerCategory) {
107
+    if (!$itemsPerCategory) {
108 108
         return $_lang['no_results'];
109 109
     }
110 110
 
111 111
     $tpl = array(
112
-        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),
113
-        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),
114
-        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),
115
-        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),
112
+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelGroup.tpl'),
113
+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelHeading.tpl'),
114
+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_panelCollapse.tpl'),
115
+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH.'actions/resources/tpl_elementsRow.tpl'),
116 116
     );
117 117
 
118 118
     // Easily loop through $itemsPerCategory-Array
119 119
     $panelGroup = '';
120
-    foreach($categories as $catid => $category) {
120
+    foreach ($categories as $catid => $category) {
121 121
         // Prepare collapse content / elements-list
122 122
         $panelCollapse = '';
123
-        foreach($itemsPerCategory[$catid] as $el) {
123
+        foreach ($itemsPerCategory[$catid] as $el) {
124 124
             $resourceTable = $el['type'];
125 125
             $ph = prepareElementRowPh($el, $resourceTable, $resources);
126 126
             $panelCollapse .= parsePh($tpl['elementsRow'], $ph);
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
         $panelGroup .= parsePh($tpl['panelHeading'], array(
131 131
             'tab' => 'categories_list',
132 132
             'category' => $categories[$catid],
133
-            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',
133
+            'categoryid' => $catid != '' ? ' <small>('.$catid.')</small>' : '',
134 134
             'catid' => $catid,
135 135
         ));
136 136
 
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
  * @param mgrResources $resources
155 155
  * @return array
156 156
  */
157
-function prepareElementRowPh($row, $resourceTable, $resources) {
157
+function prepareElementRowPh($row, $resourceTable, $resources){
158 158
     $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;
159 159
 
160 160
     $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;
161 161
 
162 162
     $_lang["confirm_delete"] = $_lang["delete"];
163 163
 
164
-    switch($resourceTable){
164
+    switch ($resourceTable) {
165 165
         case 'site_templates':
166 166
             $class = $row['selectable'] ? '' : 'disabledPlugin';
167 167
             $lockElementType = 1;
@@ -198,65 +198,65 @@  discard block
 block discarded – undo
198 198
     // Prepare displaying user-locks
199 199
     $lockedByUser = '';
200 200
     $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);
201
-    if($rowLock && $modx->hasPermission('display_locks')) {
202
-        if($rowLock['sid'] == $modx->sid) {
201
+    if ($rowLock && $modx->hasPermission('display_locks')) {
202
+        if ($rowLock['sid'] == $modx->sid) {
203 203
             $title = $modx->parseText($_lang["lock_element_editing"], array(
204
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
204
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
205 205
                 'lasthit_df' => $rowLock['lasthit_df']
206 206
             ));
207
-            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';
207
+            $lockedByUser = '<span title="'.$title.'" class="editResource" style="cursor:context-menu;">'.$_style['tree_preview_resource'].'</span>&nbsp;';
208 208
         } else {
209 209
             $title = $modx->parseText($_lang["lock_element_locked_by"], array(
210
-                'element_type' => $_lang["lock_element_type_" . $lockElementType],
210
+                'element_type' => $_lang["lock_element_type_".$lockElementType],
211 211
                 'username' => $rowLock['username'],
212 212
                 'lasthit_df' => $rowLock['lasthit_df']
213 213
             ));
214
-            if($modx->hasPermission('remove_locks')) {
215
-                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';
214
+            if ($modx->hasPermission('remove_locks')) {
215
+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement('.$lockElementType.', '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource"><i class="'.$_style['icons_secured'].'"></i></a>';
216 216
             } else {
217
-                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';
217
+                $lockedByUser = '<span title="'.$title.'" class="lockedResource" style="cursor:context-menu;"><i class="'.$_style['icons_secured'].'"></i></span>';
218 218
             }
219 219
         }
220 220
     }
221
-    if($lockedByUser) {
222
-        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';
221
+    if ($lockedByUser) {
222
+        $lockedByUser = '<div class="lockCell">'.$lockedByUser.'</div>';
223 223
     }
224 224
 
225 225
     // Caption
226
-    if($resourceTable == 'site_tmplvars') {
227
-        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];
226
+    if ($resourceTable == 'site_tmplvars') {
227
+        $caption = !empty($row['description']) ? ' '.$row['caption'].' &nbsp; <small>('.$row['description'].')</small>' : ' '.$row['caption'];
228 228
     } else {
229
-        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';
229
+        $caption = !empty($row['description']) ? ' '.$row['description'] : '';
230 230
     }
231 231
 
232 232
     // Special marks
233 233
     $tplInfo = array();
234
-    if($row['locked']) {
234
+    if ($row['locked']) {
235 235
         $tplInfo[] = $_lang['locked'];
236 236
     }
237
-    if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
237
+    if ($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
238 238
         $tplInfo[] = $_lang['defaulttemplate_title'];
239 239
     }
240
-    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
240
+    $marks = !empty($tplInfo) ? ' <em>('.implode(', ', $tplInfo).')</em>' : '';
241 241
 
242 242
     /* row buttons */
243 243
     $buttons = '';
244
-    if($modx->hasPermission($types['actions']['edit'][1])) {
245
-        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';
244
+    if ($modx->hasPermission($types['actions']['edit'][1])) {
245
+        $buttons .= '<li><a title="'.$_lang["edit_resource"].'" href="index.php?a='.$types['actions']['edit'][0].'&amp;id='.$row['id'].'"><i class="fa fa-edit fa-fw"></i></a></li>';
246 246
     }
247
-    if($modx->hasPermission($types['actions']['duplicate'][1])) {
248
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';
247
+    if ($modx->hasPermission($types['actions']['duplicate'][1])) {
248
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_duplicate_record"].'\')" title="'.$_lang["resource_duplicate"].'" href="index.php?a='.$types['actions']['duplicate'][0].'&amp;id='.$row['id'].'"><i class="fa fa-clone fa-fw"></i></a></li>';
249 249
     }
250
-    if($modx->hasPermission($types['actions']['remove'][1])) {
251
-        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';
250
+    if ($modx->hasPermission($types['actions']['remove'][1])) {
251
+        $buttons .= '<li><a onclick="return confirm(\''.$_lang["confirm_delete"].'\')" title="'.$_lang["delete"].'" href="index.php?a='.$types['actions']['remove'][0].'&amp;id='.$row['id'].'"><i class="fa fa-trash fa-fw"></i></a></li>';
252 252
     }
253
-    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';
253
+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">'.$buttons.'</ul></div>' : '';
254 254
 
255 255
     $catid = $row['catid'] ? $row['catid'] : 0;
256 256
 
257 257
     // Placeholders for elements-row
258 258
     return array(
259
-        'class' => $class ? ' class="' . $class . '"' : '',
259
+        'class' => $class ? ' class="'.$class.'"' : '',
260 260
         'lockedByUser' => $lockedByUser,
261 261
         'name' => $row['name'],
262 262
         'caption' => $caption,
Please login to merge, or discard this patch.
manager/includes/functions/actions/help.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!function_exists('createList')) {
2
+if (!function_exists('createList')) {
3 3
     /**
4 4
      * @param string $sectionHeader
5 5
      * @param array $linkArr
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
      */
8 8
     function createList($sectionHeader, $linkArr)
9 9
     {
10
-        $output = '<div class="sectionHeader">' . $sectionHeader . '</div><div class="sectionBody">' . "\n";
11
-        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">' . "\n";
10
+        $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
11
+        $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
12 12
         $links = '';
13 13
         foreach ($linkArr as $row) {
14 14
             if (!is_array($row['link'])) {
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
             }
17 17
             foreach ($row['link'] as $link) {
18 18
                 $links .= $links != '' ? '<br/>' : '';
19
-                $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
19
+                $links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
20 20
             }
21 21
             $output .= '
22 22
 		<tr>
23
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
24
-			<td align="left">' . $links . '</td>
23
+			<td align="left"><strong>' . $row["title"].'</strong></td>
24
+			<td align="left">' . $links.'</td>
25 25
 		</tr>';
26 26
             $links = '';
27 27
         }
28
-        $output .= '</table></div>' . "\n";
28
+        $output .= '</table></div>'."\n";
29 29
 
30 30
         return $output;
31 31
     }
Please login to merge, or discard this patch.
manager/includes/functions/actions/mutate_plugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@
 block discarded – undo
16 16
     {
17 17
         echo '<div class="row form-row">
18 18
                 <div class="col-sm-6 col-md-4 col-lg-3">' .
19
-                    implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) .
20
-                '</div>' .
19
+                    implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).
20
+                '</div>'.
21 21
         '</div>';
22 22
 
23 23
         $evtnames = array();
Please login to merge, or discard this patch.
manager/includes/functions/actions/mutate_content.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!function_exists('getDefaultTemplate')) {
3
+if (!function_exists('getDefaultTemplate')) {
4 4
     /**
5 5
      * @return string
6 6
      */
Please login to merge, or discard this patch.
manager/includes/functions/actions/settings.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!function_exists('get_lang_keys')) {
2
+if (!function_exists('get_lang_keys')) {
3 3
     /**
4 4
      * get_lang_keys
5 5
      *
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
      */
9 9
     function get_lang_keys($filename)
10 10
     {
11
-        $file = MODX_MANAGER_PATH . 'includes/lang' . DIRECTORY_SEPARATOR . $filename;
11
+        $file = MODX_MANAGER_PATH.'includes/lang'.DIRECTORY_SEPARATOR.$filename;
12 12
         if (is_file($file) && is_readable($file)) {
13 13
             include($file);
14 14
             $out = isset($_lang) ? array_keys($_lang) : array();
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     }
21 21
 }
22 22
 
23
-if(!function_exists('get_langs_by_key')) {
23
+if (!function_exists('get_langs_by_key')) {
24 24
     /**
25 25
      * get_langs_by_key
26 26
      *
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     }
42 42
 }
43 43
 
44
-if(!function_exists('get_lang_options')) {
44
+if (!function_exists('get_lang_options')) {
45 45
     /**
46 46
      * get_lang_options
47 47
      *
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
58 58
         if (!empty($key)) {
59 59
             $languages = get_langs_by_key($key);
60 60
             sort($languages);
61
-            $lang_options .= '<option value="">' . $_lang['language_title'] . '</option>';
61
+            $lang_options .= '<option value="">'.$_lang['language_title'].'</option>';
62 62
 
63 63
             foreach ($languages as $language_name) {
64 64
                 $uclanguage_name = ucwords(str_replace("_", " ", $language_name));
65
-                $lang_options .= '<option value="' . $language_name . '">' . $uclanguage_name . '</option>';
65
+                $lang_options .= '<option value="'.$language_name.'">'.$uclanguage_name.'</option>';
66 66
             }
67 67
 
68 68
             return $lang_options;
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
             foreach ($languages as $language_name) {
73 73
                 $uclanguage_name = ucwords(str_replace("_", " ", $language_name));
74 74
                 $sel = $language_name === $selected_lang ? ' selected="selected"' : '';
75
-                $lang_options .= '<option value="' . $language_name . '" ' . $sel . '>' . $uclanguage_name . '</option>';
75
+                $lang_options .= '<option value="'.$language_name.'" '.$sel.'>'.$uclanguage_name.'</option>';
76 76
             }
77 77
 
78 78
             return $lang_options;
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     }
81 81
 }
82 82
 
83
-if(!function_exists('form_radio')) {
83
+if (!function_exists('form_radio')) {
84 84
     /**
85 85
      * @param string $name
86 86
      * @param string $value
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
             $disabled = '';
100 100
         }
101 101
         if ($add) {
102
-            $add = ' ' . $add;
102
+            $add = ' '.$add;
103 103
         }
104 104
 
105 105
         return sprintf('<input onchange="documentDirty=true;" type="radio" name="%s" value="%s" %s %s %s />', $name,
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     }
109 109
 }
110 110
 
111
-if(!function_exists('wrap_label')) {
111
+if (!function_exists('wrap_label')) {
112 112
     /**
113 113
      * @param string $str
114 114
      * @param string $object
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
 }
123 123
 
124
-if(!function_exists('parseText')) {
124
+if (!function_exists('parseText')) {
125 125
     /**
126 126
      * @param string $tpl
127 127
      * @param array $ph
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     }
143 143
 }
144 144
 
145
-if(!function_exists('showHide')) {
145
+if (!function_exists('showHide')) {
146 146
     /**
147 147
      * @param bool $cond
148 148
      * @return string
Please login to merge, or discard this patch.
manager/includes/functions/actions/search.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!function_exists('highlightingCoincidence')) {
3
+if (!function_exists('highlightingCoincidence')) {
4 4
     /**
5 5
      * @param string $text
6 6
      * @param string $search
@@ -8,19 +8,19 @@  discard block
 block discarded – undo
8 8
      */
9 9
     function highlightingCoincidence($text, $search)
10 10
     {
11
-        $regexp = '!(' . str_replace(array(
11
+        $regexp = '!('.str_replace(array(
12 12
                 '(',
13 13
                 ')'
14 14
             ), array(
15 15
                 '\(',
16 16
                 '\)'
17
-            ), trim($search)) . ')!isu';
17
+            ), trim($search)).')!isu';
18 18
 
19 19
         return preg_replace($regexp, '<span class="text-danger">$1</span>', $text);
20 20
     }
21 21
 }
22 22
 
23
-if(!function_exists('addClassForItemList')) {
23
+if (!function_exists('addClassForItemList')) {
24 24
     /**
25 25
      * @param string $locked
26 26
      * @param string $disabled
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             $class .= ' deleted';
41 41
         }
42 42
         if ($class) {
43
-            $class = ' class="' . trim($class) . '"';
43
+            $class = ' class="'.trim($class).'"';
44 44
         }
45 45
 
46 46
         return $class;
Please login to merge, or discard this patch.
manager/includes/functions/actions/logging.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!function_exists('array_unique_multi')) {
2
+if (!function_exists('array_unique_multi')) {
3 3
     /**
4 4
      * @param array $array
5 5
      * @param string $checkKey
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     }
28 28
 }
29 29
 
30
-if(!function_exists('record_sort')) {
30
+if (!function_exists('record_sort')) {
31 31
     /**
32 32
      * @param array $array
33 33
      * @param string $key
Please login to merge, or discard this patch.
manager/includes/functions/actions/files.php 1 patch
Spacing   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!function_exists('add_dot')) {
2
+if (!function_exists('add_dot')) {
3 3
     /**
4 4
      * @param array $array
5 5
      * @return array
@@ -8,14 +8,14 @@  discard block
 block discarded – undo
8 8
     {
9 9
         $count = count($array);
10 10
         for ($i = 0; $i < $count; $i++) {
11
-            $array[$i] = '.' . strtolower(trim($array[$i])); // add a dot :)
11
+            $array[$i] = '.'.strtolower(trim($array[$i])); // add a dot :)
12 12
         }
13 13
 
14 14
         return $array;
15 15
     }
16 16
 }
17 17
 
18
-if(!function_exists('determineIcon')) {
18
+if (!function_exists('determineIcon')) {
19 19
     /**
20 20
      * @param string $file
21 21
      * @param string $selFile
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
             $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
35 35
         }
36 36
 
37
-        return '<i class="' . $icon . ' FilesPage"></i>';
37
+        return '<i class="'.$icon.' FilesPage"></i>';
38 38
     }
39 39
 }
40 40
 
41
-if(!function_exists('markRow')) {
41
+if (!function_exists('markRow')) {
42 42
     /**
43 43
      * @param string $file
44 44
      * @param string $selFile
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
         if ($file == $selFile) {
56 56
             $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
57 57
 
58
-            return ' class="' . $class . '"';
58
+            return ' class="'.$class.'"';
59 59
         }
60 60
 
61 61
         return '';
62 62
     }
63 63
 }
64 64
 
65
-if(!function_exists('ls')) {
65
+if (!function_exists('ls')) {
66 66
     /**
67 67
      * @param string $curpath
68 68
      */
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
         global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
73 73
         $dircounter = 0;
74 74
         $filecounter = 0;
75
-        $curpath = str_replace('//', '/', $curpath . '/');
75
+        $curpath = str_replace('//', '/', $curpath.'/');
76 76
 
77 77
         if (!is_dir($curpath)) {
78 78
             echo 'Invalid path "', $curpath, '"<br />';
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
         // first, get info
85 85
         foreach ($dir as $file) {
86
-            $newpath = $curpath . $file;
86
+            $newpath = $curpath.$file;
87 87
             if ($file === '..' || $file === '.') {
88 88
                 continue;
89 89
             }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
                 if ($file === '..' || $file === '.') {
94 94
                     continue;
95 95
                 } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) {
96
-                    $dirs_array[$dircounter]['text'] = '<i class="' . $_style['files_folder'] . ' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path=' . urlencode($newpath) . '"><b>' . $file . '</b></a>';
96
+                    $dirs_array[$dircounter]['text'] = '<i class="'.$_style['files_folder'].' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path='.urlencode($newpath).'"><b>'.$file.'</b></a>';
97 97
 
98 98
                     $dfiles = scandir($newpath);
99 99
                     foreach ($dfiles as $i => $infile) {
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
                     }
107 107
                     $file_exists = (0 < count($dfiles)) ? 'file_exists' : '';
108 108
 
109
-                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\'' . urlencode($file) . '\',\'' . $file_exists . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></a>' : '';
109
+                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\''.urlencode($file).'\',\''.$file_exists.'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></a>' : '';
110 110
                 } else {
111
-                    $dirs_array[$dircounter]['text'] = '<span><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> ' . $file . '</span>';
112
-                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></span>' : '';
111
+                    $dirs_array[$dircounter]['text'] = '<span><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> '.$file.'</span>';
112
+                    $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></span>' : '';
113 113
                 }
114 114
 
115
-                $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" title="' . $_lang['rename'] . '"></i></a> ' : '';
115
+                $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" title="'.$_lang['rename'].'"></i></a> ' : '';
116 116
 
117 117
                 // increment the counter
118 118
                 $dircounter++;
@@ -121,24 +121,24 @@  discard block
 block discarded – undo
121 121
                 $files_array[$filecounter]['file'] = $newpath;
122 122
                 $files_array[$filecounter]['stats'] = lstat($newpath);
123 123
                 $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'],
124
-                        $_REQUEST['mode']) . ' ' . $file;
124
+                        $_REQUEST['mode']).' '.$file;
125 125
                 $files_array[$filecounter]['view'] = (in_array($type,
126
-                    $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\'' . $webstart_path . substr($newpath,
126
+                    $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\''.$webstart_path.substr($newpath,
127 127
                         $len,
128
-                        strlen($newpath)) . '\');"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : (($enablefiledownload && in_array($type,
129
-                        $uploadablefiles)) ? '<a href="' . $webstart_path . implode('/', array_map('rawurlencode',
128
+                        strlen($newpath)).'\');"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : (($enablefiledownload && in_array($type,
129
+                        $uploadablefiles)) ? '<a href="'.$webstart_path.implode('/', array_map('rawurlencode',
130 130
                         explode('/', substr($newpath, $len,
131
-                            strlen($newpath))))) . '" style="cursor:pointer;"><i class="' . $_style['files_download'] . '" title="' . $_lang['file_download_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></span>');
131
+                            strlen($newpath))))).'" style="cursor:pointer;"><i class="'.$_style['files_download'].'" title="'.$_lang['file_download_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></span>');
132 132
                 $files_array[$filecounter]['view'] = (in_array($type,
133
-                    $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path=' . urlencode($newpath) . '"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : $files_array[$filecounter]['view'];
134
-                $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_unzip'] . '" title="' . $_lang['file_download_unzip'] . '"></i></a>' : '';
133
+                    $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path='.urlencode($newpath).'"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : $files_array[$filecounter]['view'];
134
+                $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\''.urlencode($file).'\');"><i class="'.$_style['files_unzip'].'" title="'.$_lang['file_download_unzip'].'"></i></a>' : '';
135 135
                 $files_array[$filecounter]['edit'] = (in_array($type,
136
-                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path=' . urlencode($newpath) . '#file_editfile"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></span>';
136
+                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path='.urlencode($newpath).'#file_editfile"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></span>';
137 137
                 $files_array[$filecounter]['duplicate'] = (in_array($type,
138
-                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_duplicate'] . '" title="' . $_lang['duplicate'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_duplicate'] . '" align="absmiddle" title="' . $_lang['duplicate'] . '"></i></span>';
138
+                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\''.urlencode($file).'\');"><i class="'.$_style['files_duplicate'].'" title="'.$_lang['duplicate'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_duplicate'].'" align="absmiddle" title="'.$_lang['duplicate'].'"></i></span>';
139 139
                 $files_array[$filecounter]['rename'] = (in_array($type,
140
-                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></span>';
141
-                $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></span>';
140
+                        $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></span>';
141
+                $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\''.urlencode($file).'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></span>';
142 142
 
143 143
                 // increment the counter
144 144
                 $filecounter++;
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
         for ($i = 0; $i < $folders; $i++) {
152 152
             $filesizes += $dirs_array[$i]['stats']['7'];
153 153
             echo '<tr>';
154
-            echo '<td>' . $dirs_array[$i]['text'] . '</td>';
155
-            echo '<td class="text-nowrap">' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>';
156
-            echo '<td class="text-right">' . $modx->nicesize($dirs_array[$i]['stats']['7']) . '</td>';
154
+            echo '<td>'.$dirs_array[$i]['text'].'</td>';
155
+            echo '<td class="text-nowrap">'.$modx->toDateFormat($dirs_array[$i]['stats']['9']).'</td>';
156
+            echo '<td class="text-right">'.$modx->nicesize($dirs_array[$i]['stats']['7']).'</td>';
157 157
             echo '<td class="actions text-right">';
158 158
             echo $dirs_array[$i]['rename'];
159 159
             echo $dirs_array[$i]['delete'];
@@ -166,10 +166,10 @@  discard block
 block discarded – undo
166 166
         sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
167 167
         for ($i = 0; $i < $files; $i++) {
168 168
             $filesizes += $files_array[$i]['stats']['7'];
169
-            echo '<tr ' . markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']) . '>';
170
-            echo '<td>' . $files_array[$i]['text'] . '</td>';
171
-            echo '<td class="text-nowrap">' . $modx->toDateFormat($files_array[$i]['stats']['9']) . '</td>';
172
-            echo '<td class="text-right">' . $modx->nicesize($files_array[$i]['stats']['7']) . '</td>';
169
+            echo '<tr '.markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']).'>';
170
+            echo '<td>'.$files_array[$i]['text'].'</td>';
171
+            echo '<td class="text-nowrap">'.$modx->toDateFormat($files_array[$i]['stats']['9']).'</td>';
172
+            echo '<td class="text-right">'.$modx->nicesize($files_array[$i]['stats']['7']).'</td>';
173 173
             echo '<td class="actions text-right">';
174 174
             echo $files_array[$i]['unzip'];
175 175
             echo $files_array[$i]['view'];
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     }
186 186
 }
187 187
 
188
-if(!function_exists('removeLastPath')) {
188
+if (!function_exists('removeLastPath')) {
189 189
     /**
190 190
      * @param string $string
191 191
      * @return bool|string
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     }
204 204
 }
205 205
 
206
-if(!function_exists('getExtension')) {
206
+if (!function_exists('getExtension')) {
207 207
     /**
208 208
      * @param string $string
209 209
      * @return bool|string
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
     }
223 223
 }
224 224
 
225
-if(!function_exists('checkExtension')) {
225
+if (!function_exists('checkExtension')) {
226 226
     /**
227 227
      * @param string $path
228 228
      * @return bool
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
     }
240 240
 }
241 241
 
242
-if(!function_exists('mkdirs')) {
242
+if (!function_exists('mkdirs')) {
243 243
     /**
244 244
      * recursive mkdir function
245 245
      *
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
     }
262 262
 }
263 263
 
264
-if(!function_exists('logFileChange')) {
264
+if (!function_exists('logFileChange')) {
265 265
     /**
266 266
      * @param string $type
267 267
      * @param string $filename
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
     }
298 298
 }
299 299
 
300
-if(!function_exists('unzip')) {
300
+if (!function_exists('unzip')) {
301 301
     /**
302 302
      * by patrick_allaert - php user notes
303 303
      *
@@ -321,17 +321,17 @@  discard block
 block discarded – undo
321 321
         $zip = zip_open($file);
322 322
         if ($zip) {
323 323
             $old_umask = umask(0);
324
-            $path = rtrim($path, '/') . '/';
324
+            $path = rtrim($path, '/').'/';
325 325
             while ($zip_entry = zip_read($zip)) {
326 326
                 if (zip_entry_filesize($zip_entry) > 0) {
327 327
                     // str_replace must be used under windows to convert "/" into "\"
328 328
                     $zip_entry_name = zip_entry_name($zip_entry);
329
-                    $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name));
330
-                    $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
329
+                    $complete_path = $path.str_replace('\\', '/', dirname($zip_entry_name));
330
+                    $complete_name = $path.str_replace('\\', '/', $zip_entry_name);
331 331
                     if (!file_exists($complete_path)) {
332 332
                         $tmp = '';
333 333
                         foreach (explode('/', $complete_path) AS $k) {
334
-                            $tmp .= $k . '/';
334
+                            $tmp .= $k.'/';
335 335
                             if (!is_dir($tmp)) {
336 336
                                 mkdir($tmp, 0777);
337 337
                             }
@@ -352,14 +352,14 @@  discard block
 block discarded – undo
352 352
     }
353 353
 }
354 354
 
355
-if(!function_exists('rrmdir')) {
355
+if (!function_exists('rrmdir')) {
356 356
     /**
357 357
      * @param string $dir
358 358
      * @return bool
359 359
      */
360 360
     function rrmdir($dir)
361 361
     {
362
-        foreach (glob($dir . '/*') as $file) {
362
+        foreach (glob($dir.'/*') as $file) {
363 363
             if (is_dir($file)) {
364 364
                 rrmdir($file);
365 365
             } else {
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
     }
372 372
 }
373 373
 
374
-if(!function_exists('fileupload')) {
374
+if (!function_exists('fileupload')) {
375 375
     /**
376 376
      * @return string
377 377
      */
@@ -401,13 +401,13 @@  discard block
 block discarded – undo
401 401
             $userfile['type'] = $_FILES['userfile']['type'][$i];
402 402
 
403 403
             // this seems to be an upload action.
404
-            $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath));
405
-            $path = rtrim($path, '/') . '/' . $userfile['name'];
404
+            $path = $modx->config['site_url'].substr($startpath, strlen($filemanager_path), strlen($startpath));
405
+            $path = rtrim($path, '/').'/'.$userfile['name'];
406 406
             $msg .= $path;
407 407
             if ($userfile['error'] == 0) {
408 408
                 $img = (strpos($userfile['type'],
409
-                        'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : '';
410
-                $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '</p>';
409
+                        'image') !== false) ? '<br /><img src="'.$path.'" height="75" />' : '';
410
+                $msg .= "<p>".$_lang['files_file_type'].$userfile['type'].", ".$modx->nicesize(filesize($userfile['tmp_name'])).$img.'</p>';
411 411
             }
412 412
 
413 413
             $userfilename = $userfile['tmp_name'];
@@ -415,15 +415,15 @@  discard block
 block discarded – undo
415 415
             if (is_uploaded_file($userfilename)) {
416 416
                 // file is uploaded file, process it!
417 417
                 if (!checkExtension($userfile['name'])) {
418
-                    $msg .= '<p><span class="warning">' . $_lang['files_filetype_notok'] . '</span></p>';
418
+                    $msg .= '<p><span class="warning">'.$_lang['files_filetype_notok'].'</span></p>';
419 419
                 } else {
420
-                    if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) {
420
+                    if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'].'/'.$userfile['name'])) {
421 421
                         // Ryan: Repair broken permissions issue with file manager
422 422
                         if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
423
-                            @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions);
423
+                            @chmod($_POST['path']."/".$userfile['name'], $new_file_permissions);
424 424
                         }
425 425
                         // Ryan: End
426
-                        $msg .= '<p><span class="success">' . $_lang['files_upload_ok'] . '</span></p><hr/>';
426
+                        $msg .= '<p><span class="success">'.$_lang['files_upload_ok'].'</span></p><hr/>';
427 427
 
428 428
                         // invoke OnFileManagerUpload event
429 429
                         $modx->invokeEvent('OnFileManagerUpload', array(
@@ -431,13 +431,13 @@  discard block
 block discarded – undo
431 431
                             'filename' => $userfile['name']
432 432
                         ));
433 433
                         // Log the change
434
-                        logFileChange('upload', $_POST['path'] . '/' . $userfile['name']);
434
+                        logFileChange('upload', $_POST['path'].'/'.$userfile['name']);
435 435
                     } else {
436
-                        $msg .= '<p><span class="warning">' . $_lang['files_upload_copyfailed'] . '</span> ' . $_lang["files_upload_permissions_error"] . '</p>';
436
+                        $msg .= '<p><span class="warning">'.$_lang['files_upload_copyfailed'].'</span> '.$_lang["files_upload_permissions_error"].'</p>';
437 437
                     }
438 438
                 }
439 439
             } else {
440
-                $msg .= '<br /><span class="warning"><b>' . $_lang['files_upload_error'] . ':</b>';
440
+                $msg .= '<br /><span class="warning"><b>'.$_lang['files_upload_error'].':</b>';
441 441
                 switch ($userfile['error']) {
442 442
                     case 0: //no error; possible file attack!
443 443
                         $msg .= $_lang['files_upload_error0'];
@@ -462,11 +462,11 @@  discard block
 block discarded – undo
462 462
             }
463 463
         }
464 464
 
465
-        return $msg . '<br/>';
465
+        return $msg.'<br/>';
466 466
     }
467 467
 }
468 468
 
469
-if(!function_exists('textsave')) {
469
+if (!function_exists('textsave')) {
470 470
     /**
471 471
      * @return string
472 472
      */
@@ -480,9 +480,9 @@  discard block
 block discarded – undo
480 480
 
481 481
         // Write $content to our opened file.
482 482
         if (file_put_contents($filename, $content) === false) {
483
-            $msg .= '<span class="warning"><b>' . $_lang['file_not_saved'] . '</b></span><br /><br />';
483
+            $msg .= '<span class="warning"><b>'.$_lang['file_not_saved'].'</b></span><br /><br />';
484 484
         } else {
485
-            $msg .= '<span class="success"><b>' . $_lang['file_saved'] . '</b></span><br /><br />';
485
+            $msg .= '<span class="success"><b>'.$_lang['file_saved'].'</b></span><br /><br />';
486 486
             $_REQUEST['mode'] = 'edit';
487 487
         }
488 488
         // Log the change
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
     }
493 493
 }
494 494
 
495
-if(!function_exists('delete_file')) {
495
+if (!function_exists('delete_file')) {
496 496
     /**
497 497
      * @return string
498 498
      */
@@ -504,9 +504,9 @@  discard block
 block discarded – undo
504 504
 
505 505
         $file = $_REQUEST['path'];
506 506
         if (!$token_check || !@unlink($file)) {
507
-            $msg .= '<span class="warning"><b>' . $_lang['file_not_deleted'] . '</b></span><br /><br />';
507
+            $msg .= '<span class="warning"><b>'.$_lang['file_not_deleted'].'</b></span><br /><br />';
508 508
         } else {
509
-            $msg .= '<span class="success"><b>' . $_lang['file_deleted'] . '</b></span><br /><br />';
509
+            $msg .= '<span class="success"><b>'.$_lang['file_deleted'].'</b></span><br /><br />';
510 510
         }
511 511
 
512 512
         // Log the change
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
     }
517 517
 }
518 518
 
519
-if(!function_exists('parsePlaceholder')) {
519
+if (!function_exists('parsePlaceholder')) {
520 520
     /**
521 521
      * @param string $tpl
522 522
      * @param array $ph
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
     }
534 534
 }
535 535
 
536
-if(!function_exists('checkToken')) {
536
+if (!function_exists('checkToken')) {
537 537
     /**
538 538
      * @return bool
539 539
      */
@@ -558,7 +558,7 @@  discard block
 block discarded – undo
558 558
     }
559 559
 }
560 560
 
561
-if(!function_exists('makeToken')) {
561
+if (!function_exists('makeToken')) {
562 562
     /**
563 563
      * @return string
564 564
      */
Please login to merge, or discard this patch.