@@ -20,7 +20,7 @@ |
||
20 | 20 | <form name="install" id="install_form" action="index.php?action=options" method="post"> |
21 | 21 | <?php |
22 | 22 | if ($errors == 0) { |
23 | - // check if install folder is removeable |
|
23 | + // check if install folder is removeable |
|
24 | 24 | if (is_writable("../install")) { ?> |
25 | 25 | <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span> |
26 | 26 | <?php |
@@ -8,10 +8,10 @@ |
||
8 | 8 | $self = 'install/connection.databasetest.php'; |
9 | 9 | $base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
10 | 10 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
11 | - include_once("{$base_path}assets/cache/siteManager.php"); |
|
11 | + include_once("{$base_path}assets/cache/siteManager.php"); |
|
12 | 12 | } |
13 | 13 | if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
14 | - define('MGR_DIR','manager'); |
|
14 | + define('MGR_DIR','manager'); |
|
15 | 15 | } |
16 | 16 | require_once("lang.php"); |
17 | 17 |
@@ -16,10 +16,10 @@ |
||
16 | 16 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED); |
17 | 17 | |
18 | 18 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
19 | - include_once("{$base_path}assets/cache/siteManager.php"); |
|
19 | + include_once("{$base_path}assets/cache/siteManager.php"); |
|
20 | 20 | } |
21 | 21 | if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
22 | - define('MGR_DIR', 'manager'); |
|
22 | + define('MGR_DIR', 'manager'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 |
@@ -177,9 +177,9 @@ |
||
177 | 177 | <td colspan="2"><div class="split"></div></td> |
178 | 178 | </tr> |
179 | 179 | <?php |
180 | - // Check for GD before allowing captcha to be enabled |
|
181 | - $gdAvailable = extension_loaded('gd'); |
|
182 | - ?> |
|
180 | + // Check for GD before allowing captcha to be enabled |
|
181 | + $gdAvailable = extension_loaded('gd'); |
|
182 | + ?> |
|
183 | 183 | <?php |
184 | 184 | $gdAvailable = extension_loaded('gd'); |
185 | 185 | if(!$gdAvailable) $use_captcha = 0; |
@@ -7,10 +7,10 @@ discard block |
||
7 | 7 | |
8 | 8 | // invoke OnBeforeManagerLogout event |
9 | 9 | $modx->invokeEvent("OnBeforeManagerLogout", |
10 | - array( |
|
11 | - "userid" => $internalKey, |
|
12 | - "username" => $username |
|
13 | - )); |
|
10 | + array( |
|
11 | + "userid" => $internalKey, |
|
12 | + "username" => $username |
|
13 | + )); |
|
14 | 14 | |
15 | 15 | //// Unset all of the session variables. |
16 | 16 | //$_SESSION = array(); |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | |
34 | 34 | // invoke OnManagerLogout event |
35 | 35 | $modx->invokeEvent("OnManagerLogout", |
36 | - array( |
|
37 | - "userid" => $internalKey, |
|
38 | - "username" => $username |
|
39 | - )); |
|
36 | + array( |
|
37 | + "userid" => $internalKey, |
|
38 | + "username" => $username |
|
39 | + )); |
|
40 | 40 | |
41 | 41 | // show login screen |
42 | 42 | header('Location: ' . MODX_MANAGER_URL); |
@@ -66,111 +66,111 @@ |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | switch ($_POST['mode']) { |
69 | - case '23': // Save new snippet |
|
70 | - |
|
71 | - // invoke OnBeforeSnipFormSave event |
|
72 | - $modx->invokeEvent("OnBeforeSnipFormSave", array( |
|
73 | - "mode" => "new", |
|
74 | - "id" => $id |
|
75 | - )); |
|
76 | - |
|
77 | - // disallow duplicate names for new snippets |
|
78 | - $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'"); |
|
79 | - $count = $modx->db->getValue($rs); |
|
80 | - if ($count > 0) { |
|
81 | - $modx->manager->saveFormValues(23); |
|
82 | - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23"); |
|
83 | - } |
|
84 | - |
|
85 | - //do stuff to save the new doc |
|
86 | - $newid = $modx->db->insert(array( |
|
87 | - 'name' => $name, |
|
88 | - 'description' => $description, |
|
89 | - 'snippet' => $snippet, |
|
90 | - 'moduleguid' => $moduleguid, |
|
91 | - 'locked' => $locked, |
|
92 | - 'properties' => $properties, |
|
93 | - 'category' => $categoryid, |
|
94 | - 'disabled' => $disabled, |
|
95 | - 'createdon' => $currentdate, |
|
96 | - 'editedon' => $currentdate |
|
97 | - ), $modx->getFullTableName('site_snippets')); |
|
98 | - |
|
99 | - // invoke OnSnipFormSave event |
|
100 | - $modx->invokeEvent("OnSnipFormSave", array( |
|
101 | - "mode" => "new", |
|
102 | - "id" => $newid |
|
103 | - )); |
|
104 | - |
|
105 | - // Set the item name for logger |
|
106 | - $_SESSION['itemname'] = $name; |
|
107 | - |
|
108 | - // empty cache |
|
109 | - $modx->clearCache('full'); |
|
110 | - |
|
111 | - // finished emptying cache - redirect |
|
112 | - if ($_POST['stay'] != '') { |
|
113 | - $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23"; |
|
114 | - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; |
|
115 | - header($header); |
|
116 | - } else { |
|
117 | - $header = "Location: index.php?a=76&r=2"; |
|
118 | - header($header); |
|
119 | - } |
|
120 | - break; |
|
121 | - case '22': // Save existing snippet |
|
122 | - // invoke OnBeforeSnipFormSave event |
|
123 | - $modx->invokeEvent("OnBeforeSnipFormSave", array( |
|
124 | - "mode" => "upd", |
|
125 | - "id" => $id |
|
126 | - )); |
|
127 | - |
|
128 | - // disallow duplicate names for snippets |
|
129 | - $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'"); |
|
130 | - if ($modx->db->getValue($rs) > 0) { |
|
131 | - $modx->manager->saveFormValues(22); |
|
132 | - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}"); |
|
133 | - } |
|
134 | - |
|
135 | - //do stuff to save the edited doc |
|
136 | - $modx->db->update(array( |
|
137 | - 'name' => $name, |
|
138 | - 'description' => $description, |
|
139 | - 'snippet' => $snippet, |
|
140 | - 'moduleguid' => $moduleguid, |
|
141 | - 'locked' => $locked, |
|
142 | - 'properties' => $properties, |
|
143 | - 'category' => $categoryid, |
|
144 | - 'disabled' => $disabled, |
|
145 | - 'editedon' => $currentdate |
|
146 | - ), $modx->getFullTableName('site_snippets'), "id='{$id}'"); |
|
147 | - |
|
148 | - // invoke OnSnipFormSave event |
|
149 | - $modx->invokeEvent("OnSnipFormSave", array( |
|
150 | - "mode" => "upd", |
|
151 | - "id" => $id |
|
152 | - )); |
|
153 | - |
|
154 | - // Set the item name for logger |
|
155 | - $_SESSION['itemname'] = $name; |
|
156 | - |
|
157 | - // empty cache |
|
158 | - $modx->clearCache('full'); |
|
159 | - |
|
160 | - if ($_POST['runsnippet']) { |
|
161 | - run_snippet($snippet); |
|
162 | - } |
|
163 | - // finished emptying cache - redirect |
|
164 | - if ($_POST['stay'] != '') { |
|
165 | - $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23"; |
|
166 | - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; |
|
167 | - header($header); |
|
168 | - } else { |
|
169 | - $modx->unlockElement(4, $id); |
|
170 | - $header = "Location: index.php?a=76&r=2"; |
|
171 | - header($header); |
|
172 | - } |
|
173 | - break; |
|
174 | - default: |
|
175 | - $modx->webAlertAndQuit("No operation set in request."); |
|
69 | + case '23': // Save new snippet |
|
70 | + |
|
71 | + // invoke OnBeforeSnipFormSave event |
|
72 | + $modx->invokeEvent("OnBeforeSnipFormSave", array( |
|
73 | + "mode" => "new", |
|
74 | + "id" => $id |
|
75 | + )); |
|
76 | + |
|
77 | + // disallow duplicate names for new snippets |
|
78 | + $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'"); |
|
79 | + $count = $modx->db->getValue($rs); |
|
80 | + if ($count > 0) { |
|
81 | + $modx->manager->saveFormValues(23); |
|
82 | + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23"); |
|
83 | + } |
|
84 | + |
|
85 | + //do stuff to save the new doc |
|
86 | + $newid = $modx->db->insert(array( |
|
87 | + 'name' => $name, |
|
88 | + 'description' => $description, |
|
89 | + 'snippet' => $snippet, |
|
90 | + 'moduleguid' => $moduleguid, |
|
91 | + 'locked' => $locked, |
|
92 | + 'properties' => $properties, |
|
93 | + 'category' => $categoryid, |
|
94 | + 'disabled' => $disabled, |
|
95 | + 'createdon' => $currentdate, |
|
96 | + 'editedon' => $currentdate |
|
97 | + ), $modx->getFullTableName('site_snippets')); |
|
98 | + |
|
99 | + // invoke OnSnipFormSave event |
|
100 | + $modx->invokeEvent("OnSnipFormSave", array( |
|
101 | + "mode" => "new", |
|
102 | + "id" => $newid |
|
103 | + )); |
|
104 | + |
|
105 | + // Set the item name for logger |
|
106 | + $_SESSION['itemname'] = $name; |
|
107 | + |
|
108 | + // empty cache |
|
109 | + $modx->clearCache('full'); |
|
110 | + |
|
111 | + // finished emptying cache - redirect |
|
112 | + if ($_POST['stay'] != '') { |
|
113 | + $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23"; |
|
114 | + $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; |
|
115 | + header($header); |
|
116 | + } else { |
|
117 | + $header = "Location: index.php?a=76&r=2"; |
|
118 | + header($header); |
|
119 | + } |
|
120 | + break; |
|
121 | + case '22': // Save existing snippet |
|
122 | + // invoke OnBeforeSnipFormSave event |
|
123 | + $modx->invokeEvent("OnBeforeSnipFormSave", array( |
|
124 | + "mode" => "upd", |
|
125 | + "id" => $id |
|
126 | + )); |
|
127 | + |
|
128 | + // disallow duplicate names for snippets |
|
129 | + $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'"); |
|
130 | + if ($modx->db->getValue($rs) > 0) { |
|
131 | + $modx->manager->saveFormValues(22); |
|
132 | + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}"); |
|
133 | + } |
|
134 | + |
|
135 | + //do stuff to save the edited doc |
|
136 | + $modx->db->update(array( |
|
137 | + 'name' => $name, |
|
138 | + 'description' => $description, |
|
139 | + 'snippet' => $snippet, |
|
140 | + 'moduleguid' => $moduleguid, |
|
141 | + 'locked' => $locked, |
|
142 | + 'properties' => $properties, |
|
143 | + 'category' => $categoryid, |
|
144 | + 'disabled' => $disabled, |
|
145 | + 'editedon' => $currentdate |
|
146 | + ), $modx->getFullTableName('site_snippets'), "id='{$id}'"); |
|
147 | + |
|
148 | + // invoke OnSnipFormSave event |
|
149 | + $modx->invokeEvent("OnSnipFormSave", array( |
|
150 | + "mode" => "upd", |
|
151 | + "id" => $id |
|
152 | + )); |
|
153 | + |
|
154 | + // Set the item name for logger |
|
155 | + $_SESSION['itemname'] = $name; |
|
156 | + |
|
157 | + // empty cache |
|
158 | + $modx->clearCache('full'); |
|
159 | + |
|
160 | + if ($_POST['runsnippet']) { |
|
161 | + run_snippet($snippet); |
|
162 | + } |
|
163 | + // finished emptying cache - redirect |
|
164 | + if ($_POST['stay'] != '') { |
|
165 | + $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23"; |
|
166 | + $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; |
|
167 | + header($header); |
|
168 | + } else { |
|
169 | + $modx->unlockElement(4, $id); |
|
170 | + $header = "Location: index.php?a=76&r=2"; |
|
171 | + header($header); |
|
172 | + } |
|
173 | + break; |
|
174 | + default: |
|
175 | + $modx->webAlertAndQuit("No operation set in request."); |
|
176 | 176 | } |
@@ -236,9 +236,9 @@ |
||
236 | 236 | lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?> |
237 | 237 | }; |
238 | 238 | <?php |
239 | - $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray']))); |
|
240 | - echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n"; |
|
241 | - ?> |
|
239 | + $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray']))); |
|
240 | + echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n"; |
|
241 | + ?> |
|
242 | 242 | </script> |
243 | 243 | <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script> |
244 | 244 | <?php if ($modx->config['show_picker'] != "0") { ?> |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | /** This file is part of KCFinder project |
4 | - * |
|
5 | - * @desc Image detection class |
|
6 | - * @package KCFinder |
|
7 | - * @version 2.54 |
|
8 | - * @author Pavel Tzonkov <[email protected]> |
|
9 | - * @copyright 2010-2014 KCFinder Project |
|
10 | - * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
11 | - * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
12 | - * @link http://kcfinder.sunhater.com |
|
13 | - */ |
|
4 | + * |
|
5 | + * @desc Image detection class |
|
6 | + * @package KCFinder |
|
7 | + * @version 2.54 |
|
8 | + * @author Pavel Tzonkov <[email protected]> |
|
9 | + * @copyright 2010-2014 KCFinder Project |
|
10 | + * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
11 | + * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
12 | + * @link http://kcfinder.sunhater.com |
|
13 | + */ |
|
14 | 14 | |
15 | 15 | class type_img { |
16 | 16 |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | /** This file is part of KCFinder project |
4 | - * |
|
5 | - * @desc MIME type detection class |
|
6 | - * @package KCFinder |
|
7 | - * @version 2.54 |
|
8 | - * @author Pavel Tzonkov <[email protected]> |
|
9 | - * @copyright 2010-2014 KCFinder Project |
|
10 | - * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
11 | - * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
12 | - * @link http://kcfinder.sunhater.com |
|
13 | - */ |
|
4 | + * |
|
5 | + * @desc MIME type detection class |
|
6 | + * @package KCFinder |
|
7 | + * @version 2.54 |
|
8 | + * @author Pavel Tzonkov <[email protected]> |
|
9 | + * @copyright 2010-2014 KCFinder Project |
|
10 | + * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
11 | + * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
12 | + * @link http://kcfinder.sunhater.com |
|
13 | + */ |
|
14 | 14 | |
15 | 15 | class type_mime { |
16 | 16 |