-
'); // Issue 1340
+ break;
+ case 'OnTempFormSave':
+ case 'OnTVFormSave':
+ case 'OnChunkFormSave':
+ case 'OnSnipFormSave':
+ case 'OnPluginFormSave':
+ case 'OnModFormSave':
+ case 'OnTempFormDelete':
+ case 'OnTVFormDelete':
+ case 'OnChunkFormDelete':
+ case 'OnSnipFormDelete':
+ case 'OnPluginFormDelete':
+ case 'OnModFormDelete':
+ // Set reloadTree = true for this events
+ $_SESSION['elementsInTree']['reloadTree'] = true; break;
+ default:
+ if($_GET['r'] == 2) $_SESSION['elementsInTree']['reloadTree'] = true;
+ return;
}
return;
\ No newline at end of file
diff --git a/assets/plugins/managermanager/widgets/showimagetvs/jquery.ddMM.mm_widget_showimagetvs.js b/assets/plugins/managermanager/widgets/showimagetvs/jquery.ddMM.mm_widget_showimagetvs.js
index 691a15fbf6..b8332bb63e 100755
--- a/assets/plugins/managermanager/widgets/showimagetvs/jquery.ddMM.mm_widget_showimagetvs.js
+++ b/assets/plugins/managermanager/widgets/showimagetvs/jquery.ddMM.mm_widget_showimagetvs.js
@@ -67,7 +67,7 @@ $.fn.mm_widget_showimagetvs = function(params){
$this.data('lastvalue', url);
- if (url.length > 0 && url.search(/http:\/\//i) == -1 && url.search(/\//) != 0){
+ if (url.length > 0 && url.search(/https?:\/\//i) == -1 && url.search(/\//) != 0){
url = $.ddMM.config.site_url + url;
}
// If we have a PHPThumb URL
diff --git a/assets/plugins/qm/qm.inc.php b/assets/plugins/qm/qm.inc.php
index 846205b4c6..dd276f9a46 100755
--- a/assets/plugins/qm/qm.inc.php
+++ b/assets/plugins/qm/qm.inc.php
@@ -4,7 +4,7 @@
*
* @author Mikko Lammi, www.maagit.fi, updated by Dmi3yy and Nicola1971
* @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
- * @version 1.5.7 updated 21/01/2017
+ * @version 1.5.8 updated 21/08/2017
*/
if(!class_exists('Qm')) {
@@ -13,7 +13,7 @@ class Qm {
var $modx;
//_______________________________________________________
- function __construct(&$modx, $jqpath='', $loadmanagerjq='', $loadfrontendjq='', $noconflictjq='', $loadtb='', $tbwidth='', $tbheight='', $hidefields='', $hidetabs='', $hidesections='', $addbutton='', $tpltype='', $tplid='', $custombutton='', $managerbutton='', $logout='', $autohide='', $position='', $editbuttons='', $editbclass='', $newbuttons='', $newbclass='', $tvbuttons='', $tvbclass='', $buttonStyle='', $removeBg='') {
+ function __construct(&$modx, $jqpath='', $loadmanagerjq='', $loadfrontendjq='', $noconflictjq='', $loadfa='', $loadtb='', $tbwidth='', $tbheight='', $hidefields='', $hidetabs='', $hidesections='', $addbutton='', $tpltype='', $tplid='', $custombutton='', $managerbutton='', $logout='', $autohide='', $position='', $editbuttons='', $editbclass='', $newbuttons='', $newbclass='', $tvbuttons='', $tvbclass='', $buttonStyle='', $removeBg='') {
$this->modx = $modx;
// Get plugin parameters
@@ -21,6 +21,7 @@ function __construct(&$modx, $jqpath='', $loadmanagerjq='', $loadfrontendjq='',
$this->loadmanagerjq = $loadmanagerjq;
$this->loadfrontendjq = $loadfrontendjq;
$this->noconflictjq = $noconflictjq;
+ $this->loadfa = $loadfa;
$this->loadtb = $loadtb;
$this->tbwidth = $tbwidth;
$this->tbheight = $tbheight;
@@ -481,11 +482,17 @@ function Run() {
$MGR_DIR = $this->modx->getManagerPath( );
$css = '
';
-
+
$css .= '
-
';
+
+ // font-awesome
+ if ($this->loadfa == 'true') {
+ $css .= '
+
+ ';
+ }
// Buttons Styles
if ($this->buttonStyle == 'actionButtons') {
$css .= '
diff --git a/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php b/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php
index 876b34ffc2..1a51803705 100644
--- a/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php
+++ b/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php
@@ -1,6 +1,6 @@
'', 'skinsDirectory'=>'');
// Hold general settings based on old Modx TinyMCE-Settings
// Settings interface rows configuration
diff --git a/assets/plugins/updater/lang/russian-UTF8.php b/assets/plugins/updater/lang/russian-UTF8.php
index ca9511d57a..eb901c467a 100644
--- a/assets/plugins/updater/lang/russian-UTF8.php
+++ b/assets/plugins/updater/lang/russian-UTF8.php
@@ -15,7 +15,7 @@
$_lang['pluginname'] = 'Updater';
$_lang['system_update'] = 'Обновление системы';
$_lang["cms_outdated_msg"] = 'Система управления сайтом устарела. Для обновления обратитесь к разработчикам сайта. Актуальная версия';
-$_lang['bkp_before_msg'] = 'Настоятельно рекомендую сделать бекап перед обновлением системы, обновление выполняете на свой страх и риск!!';
+$_lang['bkp_before_msg'] = 'Настоятельно рекомендуется сделать бекап перед обновлением системы, обновление выполняется на свой страх и риск!';
$_lang['updateButton_txt'] = 'Обновить до версии';
//Error Messages
$_lang['error_curl'] = 'Необходимо включить функцию CURL в PHP';
diff --git a/assets/plugins/updater/lang/russian.php b/assets/plugins/updater/lang/russian.php
index ca9511d57a..eb901c467a 100644
--- a/assets/plugins/updater/lang/russian.php
+++ b/assets/plugins/updater/lang/russian.php
@@ -15,7 +15,7 @@
$_lang['pluginname'] = 'Updater';
$_lang['system_update'] = 'Обновление системы';
$_lang["cms_outdated_msg"] = 'Система управления сайтом устарела. Для обновления обратитесь к разработчикам сайта. Актуальная версия';
-$_lang['bkp_before_msg'] = 'Настоятельно рекомендую сделать бекап перед обновлением системы, обновление выполняете на свой страх и риск!!';
+$_lang['bkp_before_msg'] = 'Настоятельно рекомендуется сделать бекап перед обновлением системы, обновление выполняется на свой страх и риск!';
$_lang['updateButton_txt'] = 'Обновить до версии';
//Error Messages
$_lang['error_curl'] = 'Необходимо включить функцию CURL в PHP';
diff --git a/assets/plugins/updater/plugin.updater.php b/assets/plugins/updater/plugin.updater.php
index b0a0b3c907..aa9d3020ea 100644
--- a/assets/plugins/updater/plugin.updater.php
+++ b/assets/plugins/updater/plugin.updater.php
@@ -7,6 +7,7 @@
*/
if(!defined('MODX_BASE_PATH')){die('What are you doing? Get out of here!');}
+if (empty($_SESSION['mgrInternalKey'])) return;
$version = 'evolution-cms/evolution';
$type = isset($type) ? $type: 'tags';
@@ -32,6 +33,7 @@
if (!extension_loaded('curl')){
$errorsMessage .= '-'.$_lang['error_curl'].'[+lang.DM_range_title+]
-
-
-
- [+lang.DM_select_range_text+] - +[+lang.DM_module_title+]
-
-
-
-
-
-
+
+
+
+
- [+onManagerMainFrameHeaderHTMLBlock+]
+ return true;
+ }
+
+ [+onManagerMainFrameHeaderHTMLBlock+]
- [+lang.DM_select_range_text+] - +
+
\ No newline at end of file
diff --git a/assets/modules/docmanager/templates/main.tpl b/assets/modules/docmanager/templates/main.tpl
index 5354c52dfe..81d9b610cc 100644
--- a/assets/modules/docmanager/templates/main.tpl
+++ b/assets/modules/docmanager/templates/main.tpl
@@ -1,103 +1,132 @@
-
+
+
[+lang.DM_range_title+]
+
+
+
+ [+lang.DM_select_range_text+] +
+ + [+lang.DM_select_range_text+] +
- [+lang.DM_module_title+] + [+lang.DM_module_title+]
-
+
-
-
-
+
+
-
-
+
+
\ No newline at end of file diff --git a/assets/modules/docmanager/templates/templatevars.tpl b/assets/modules/docmanager/templates/templatevars.tpl index 7578c391ac..947122aa8e 100644 --- a/assets/modules/docmanager/templates/templatevars.tpl +++ b/assets/modules/docmanager/templates/templatevars.tpl @@ -2,11 +2,12 @@
\ No newline at end of file diff --git a/assets/modules/docmanager/templates/update.tpl b/assets/modules/docmanager/templates/update.tpl index 9d3216dae6..14f0688cdb 100644 --- a/assets/modules/docmanager/templates/update.tpl +++ b/assets/modules/docmanager/templates/update.tpl @@ -1,46 +1,48 @@ -[+lang.DM_update_title+]
-
-
-
-
-
+ [+lang.DM_update_title+]
+
+
+
+
+
'); // Issue 1340
- break;
- case 'OnTempFormSave':
- case 'OnTVFormSave':
- case 'OnChunkFormSave':
- case 'OnSnipFormSave':
- case 'OnPluginFormSave':
- case 'OnModFormSave':
- case 'OnTempFormDelete':
- case 'OnTVFormDelete':
- case 'OnChunkFormDelete':
- case 'OnSnipFormDelete':
- case 'OnPluginFormDelete':
- case 'OnModFormDelete':
- // Set reloadTree = true for this events
- $_SESSION['elementsInTree']['reloadTree'] = true; break;
- default:
- if($_GET['r'] == 2) $_SESSION['elementsInTree']['reloadTree'] = true;
- return;
+ case 'OnManagerMainFrameHeaderHTMLBlock': // Trigger reloading tree for relevant actions
+ include_once($eit_base_path.'includes/on_manager_main_frame_header_html_block.inc.php'); break;
+ case 'OnManagerTreePrerender': // Main elementsInTree-part
+ include_once($eit_base_path.'includes/on_manager_tree_prerender.inc.php'); break;
+ case 'OnManagerTreeRender':
+ if(hasAnyPermission()) include_once($eit_base_path.'includes/on_manager_tree_render.inc.php');
+ else $e->output('
-
+
+
[+view.documents+]
[+view.tab+]
diff --git a/assets/modules/docmanager/templates/misc.tpl b/assets/modules/docmanager/templates/misc.tpl
index 0bc98caef0..3e4574b03b 100644
--- a/assets/modules/docmanager/templates/misc.tpl
+++ b/assets/modules/docmanager/templates/misc.tpl
@@ -1,67 +1,67 @@
-
+
-
+
-
+ [+lang.DM_change_template+]
- - [+view.templates+] -
+
- [+lang.DM_change_template+]
+ +
+ [+view.templates+]
+
+
-
+ [+lang.DM_template_variables+]
- - [+view.templatevars+] -
+
- [+lang.DM_template_variables+]
+ +
+ [+view.templatevars+]
+
+
-
+ [+lang.DM_doc_permissions+]
- - [+view.documentgroups+] -
+
- [+lang.DM_doc_permissions+]
+ +
+ [+view.documentgroups+]
+
+
-
- [+lang.DM_other+]
- - [+view.misc+] - [+view.changeauthors+] -
+
[+lang.DM_other+]
+ +
+ [+view.misc+]
+ [+view.changeauthors+]
+
+ [+lang.DM_adjust_dates_header+]
-
[+lang.DM_adjust_dates_desc+]
+
+
[+lang.DM_adjust_dates_header+]
+[+lang.DM_adjust_dates_desc+]
--
[+lang.DM_other_header+]
-
[+lang.DM_misc_desc+]
+
[+lang.DM_other_header+]
+[+lang.DM_misc_desc+]
\ No newline at end of file diff --git a/assets/modules/docmanager/templates/templates.tpl b/assets/modules/docmanager/templates/templates.tpl index 7511b332cd..9026b84379 100644 --- a/assets/modules/docmanager/templates/templates.tpl +++ b/assets/modules/docmanager/templates/templates.tpl @@ -1,13 +1,16 @@ -[+lang.DM_tpl_desc+]
+
[+lang.DM_tpl_desc+]
+\ No newline at end of file diff --git a/assets/modules/docmanager/templates/templatevars.tpl b/assets/modules/docmanager/templates/templatevars.tpl index 7578c391ac..947122aa8e 100644 --- a/assets/modules/docmanager/templates/templatevars.tpl +++ b/assets/modules/docmanager/templates/templatevars.tpl @@ -2,11 +2,12 @@
\ No newline at end of file diff --git a/assets/modules/docmanager/templates/update.tpl b/assets/modules/docmanager/templates/update.tpl index 9d3216dae6..14f0688cdb 100644 --- a/assets/modules/docmanager/templates/update.tpl +++ b/assets/modules/docmanager/templates/update.tpl @@ -1,46 +1,48 @@ -
[+lang.DM_module_title+]
-
+
-
- ";
- $i = 0;
- while ($row = $modx->db->getRow($rs)) {
+$output = '';
- if($i++>0) $output .= '
';
+ //$output.= '
'.$dm->lang['DM_tv_ignore_tv'].' '; + } else { + print $dm->lang['DM_tv_no_tv']; + } + + print $output; +} else { + print ''; +} -function renderFormElement($field_type, $field_id, $default_text, $field_elements, $field_value, $field_style='') { - global $modx; - global $dm; - global $base_url; - global $rb_base_url; +function renderFormElement($field_type, $field_id, $default_text, $field_elements, $field_value, $field_style = '') +{ + global $modx; + global $dm; + global $base_url; + global $rb_base_url; - $field_html =''; - $field_value = ($field_value!="" ? $field_value : $default_text); + $field_html = ''; + $field_value = ($field_value != "" ? $field_value : $default_text); - switch ($field_type) { - case "text": // handler for regular text boxes - case "rawtext"; // non-htmlentity converted text boxes - case "email": // handles email input fields - case "number": // handles the input of numbers - $field_html .= ''; - break; - case "textareamini": // handler for textarea mini boxes - $field_html .= ''; - break; - case "textarea": // handler for textarea boxes - case "rawtextarea": // non-htmlentity convertex textarea boxes - case "htmlarea": // handler for textarea boxes (deprecated) - case "richtext": // handler for textarea boxes - $field_html .= ''; - break; - case "date": - $field_id = str_replace(array('-', '.'),'_', urldecode($field_id)); - if($field_value=='') $field_value=0; - $field_html .= ''; - $field_html .= '
';
+ switch ($field_type) {
+ case "text": // handler for regular text boxes
+ case "rawtext"; // non-htmlentity converted text boxes
+ case "email": // handles email input fields
+ case "number": // handles the input of numbers
+ $field_html .= '';
+ break;
+ case "textareamini": // handler for textarea mini boxes
+ $field_html .= '';
+ break;
+ case "textarea": // handler for textarea boxes
+ case "rawtextarea": // non-htmlentity convertex textarea boxes
+ case "htmlarea": // handler for textarea boxes (deprecated)
+ case "richtext": // handler for textarea boxes
+ $field_html .= '';
+ break;
+ case "date":
+ $field_id = str_replace(array('-', '.'), '_', urldecode($field_id));
+ if ($field_value == '') {
+ $field_value = 0;
+ }
+ $field_html .= '';
+ $field_html .= ' 
';
- break;
- case "dropdown": // handler for select boxes
- $field_html .= '";
- break;
- case "listbox": // handler for select boxes
- $field_html .= '";
- break;
- case "listbox-multiple": // handler for select boxes where you can choose multiple items
- $field_value = explode("||",$field_value);
- $field_html .= '";
- break;
- case "url": // handles url input fields
- $urls= array(''=>'--', 'http://'=>'http://', 'https://'=>'https://', 'ftp://'=>'ftp://', 'mailto:'=>'mailto:');
- $field_html ='
';
- break;
- case "checkbox": // handles check boxes
- $field_value = !is_array($field_value) ? explode("||",$field_value) : $field_value;
- $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id));
- static $i=0;
- while (list($item, $itemvalue) = each ($index_list))
- {
- list($item,$itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==",$itemvalue);
- if (strlen($itemvalue)==0) $itemvalue = $item;
- $field_html .= '
'; - $i++; - } - break; - case "option": // handles radio buttons - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id)); - while (list($item, $itemvalue) = each ($index_list)) - { - list($item,$itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==",$itemvalue); - if (strlen($itemvalue)==0) $itemvalue = $item; - $field_html .= ''.$item.'
'; - } - break; - case "image": // handles image fields using htmlarea image manager - global $ResourceManagerLoaded; - global $content,$use_editor,$which_editor,$which_browser; - if (!$ResourceManagerLoaded && !(($content['richtext']==1 || $_GET['a']==4) && $use_editor==1 && $which_editor==3)){ - $field_html .=" + break; + case "dropdown": // handler for select boxes + $field_html .= '"; + break; + case "listbox": // handler for select boxes + $field_html .= '"; + break; + case "listbox-multiple": // handler for select boxes where you can choose multiple items + $field_value = explode("||", $field_value); + $field_html .= '"; + break; + case "url": // handles url input fields + $urls = array('' => '--', 'http://' => 'http://', 'https://' => 'https://', 'ftp://' => 'ftp://', 'mailto:' => 'mailto:'); + $field_html = '
';
+ break;
+ case "checkbox": // handles check boxes
+ $field_value = !is_array($field_value) ? explode("||", $field_value) : $field_value;
+ $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id));
+ static $i = 0;
+ while (list($item, $itemvalue) = each($index_list)) {
+ list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+ if (strlen($itemvalue) == 0) {
+ $itemvalue = $item;
+ }
+ $field_html .= '
'; + $i++; + } + break; + case "option": // handles radio buttons + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id)); + while (list($item, $itemvalue) = each($index_list)) { + list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); + if (strlen($itemvalue) == 0) { + $itemvalue = $item; + } + $field_html .= '' . $item . '
'; + } + break; + case "image": // handles image fields using htmlarea image manager + global $ResourceManagerLoaded; + global $content, $use_editor, $which_editor, $which_browser; + if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $_GET['a'] == 4) && $use_editor == 1 && $which_editor == 3)) { + $field_html .= " "; - $ResourceManagerLoaded = true; - } - $field_html .=' '; - break; - case "file": // handles the input of file uploads - /* Modified by Timon for use with resource browser */ - global $ResourceManagerLoaded; - global $content,$use_editor,$which_editor; - if (!$ResourceManagerLoaded && !(($content['richtext']==1 || $_GET['a']==4) && $use_editor==1 && $which_editor==3)){ - /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */ - $field_html .=" + $ResourceManagerLoaded = true; + } + $field_html .= ' '; + break; + case "file": // handles the input of file uploads + /* Modified by Timon for use with resource browser */ + global $ResourceManagerLoaded; + global $content, $use_editor, $which_editor, $which_browser; + if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $_GET['a'] == 4) && $use_editor == 1 && $which_editor == 3)) { + /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */ + $field_html .= " "; - $ResourceManagerLoaded = true; - } - $field_html .=' '; - - break; - default: // the default handler -- for errors, mostly - $field_html .= ''; - } // end switch statement - return $field_html; + $ResourceManagerLoaded = true; + } + $field_html .= ' '; + + break; + default: // the default handler -- for errors, mostly + $field_html .= ''; + } // end switch statement + return $field_html; } // end renderFormElement function -function ParseIntputOptions($v) { - global $modx; - $a = array(); - if(is_array($v)) return $v; - else if($modx->db->isResult($v)) { - $a = $modx->db->makeArray($v); - } - else $a = explode("||", $v); - return $a; +function ParseIntputOptions($v) +{ + global $modx; + $a = array(); + if (is_array($v)) { + return $v; + } else if ($modx->db->isResult($v)) { + $a = $modx->db->makeArray($v); + } else { + $a = explode("||", $v); + } + return $a; } diff --git a/assets/modules/store/core.php b/assets/modules/store/core.php index 215b44f50a..d5aec6269a 100644 --- a/assets/modules/store/core.php +++ b/assets/modules/store/core.php @@ -208,6 +208,7 @@ public static function copyFolder($src, $dest) { $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST); foreach($objects as $name => $object) { + if (!$objects->getDepth() && $object->isFile()) continue; $startsAt = substr(dirname($name), strlen($path)); self::mkDir($dest.$startsAt); if ( $object->isDir() ) { diff --git a/assets/modules/store/installer/index.php b/assets/modules/store/installer/index.php index f3c59924e0..5ea0c64115 100755 --- a/assets/modules/store/installer/index.php +++ b/assets/modules/store/installer/index.php @@ -4,8 +4,10 @@ define('MODX_BASE_PATH',realpath('../../../../').'/'); include_once(MODX_BASE_PATH."assets/cache/siteManager.php"); define('MGR',MODX_BASE_PATH.MGR_DIR); - - +$autoloader = realpath(MODX_BASE_PATH . 'vendor/autoload.php'); +if (file_exists($autoloader) && is_readable($autoloader)) { + include_once($autoloader); +} define('MODX_API_MODE', true); include_once MGR.'/includes/config.inc.php'; @@ -15,16 +17,9 @@ $modx->getSettings(); startCMSSession(); $modx->minParserPasses=2; - +$modx->invokeEvent('OnManagerPageInit'); if(IN_MANAGER_MODE!='true' && !$modx->hasPermission('exec_module')) die('INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.'); - - - -if (version_compare(phpversion(), "5.3") < 0) { - @ ini_set('magic_quotes_runtime', 0); - @ ini_set('magic_quotes_sybase', 0); -} $moduleurl = $modx->config['site_url'].'assets/modules/store/installer/index.php'; $modulePath = MODX_BASE_PATH.'assets/modules/store/installer/'; $self = $modulePath.'/index.php'; diff --git a/assets/modules/store/installer/instprocessor-fast.php b/assets/modules/store/installer/instprocessor-fast.php index 812862345e..c81180fdee 100644 --- a/assets/modules/store/installer/instprocessor-fast.php +++ b/assets/modules/store/installer/instprocessor-fast.php @@ -5,10 +5,9 @@ define('MODX_BASE_PATH',realpath('../../../../').'/'); include_once(MODX_BASE_PATH."assets/cache/siteManager.php"); define('MGR',MODX_BASE_PATH.MGR_DIR); - -if (version_compare(phpversion(), "5.3") < 0) { - @ ini_set('magic_quotes_runtime', 0); - @ ini_set('magic_quotes_sybase', 0); +$autoloader = realpath(MODX_BASE_PATH .'vendor/autoload.php'); +if (file_exists($autoloader) && is_readable($autoloader)) { + include_once($autoloader); } $moduleurl = 'assets/modules/store/installer/index.php'; $modulePath = dirname(__FILE__); @@ -61,7 +60,7 @@ $modx->getSettings(); startCMSSession(); $modx->minParserPasses=2; - +$modx->invokeEvent('OnManagerPageInit'); global $moduleName; global $moduleVersion; global $moduleSQLBaseFile; diff --git a/assets/modules/store/installer/instprocessor.php b/assets/modules/store/installer/instprocessor.php index 64a84d3a30..5aea76e05e 100644 --- a/assets/modules/store/installer/instprocessor.php +++ b/assets/modules/store/installer/instprocessor.php @@ -6,6 +6,10 @@ $sqlParser = ''; define('MODX_API_MODE', true); +$autoloader = realpath(MODX_BASE_PATH .'vendor/autoload.php'); +if (file_exists($autoloader) && is_readable($autoloader)) { + include_once($autoloader); +} include_once MGR.'/includes/protect.inc.php'; include_once MGR.'/includes/config.inc.php'; include_once MGR.'/includes/document.parser.class.inc.php'; @@ -14,7 +18,7 @@ $modx->getSettings(); startCMSSession(); $modx->minParserPasses=2; - +$modx->invokeEvent('OnManagerPageInit'); global $moduleName; global $moduleVersion; global $moduleSQLBaseFile; diff --git a/assets/modules/store/installer/sqlParser.class.php b/assets/modules/store/installer/sqlParser.class.php index 6d80fc4438..6395b140e9 100755 --- a/assets/modules/store/installer/sqlParser.class.php +++ b/assets/modules/store/installer/sqlParser.class.php @@ -8,7 +8,7 @@ class SqlParser { var $mode, $fileManagerPath, $imgPath, $imgUrl; var $connection_charset, $connection_method; - function SqlParser( ) { + public function __construct() { $adminname=''; $adminemail=''; $adminpass=''; diff --git a/assets/modules/store/update.php b/assets/modules/store/update.php deleted file mode 100755 index 8aad258729..0000000000 --- a/assets/modules/store/update.php +++ /dev/null @@ -1,40 +0,0 @@ -open(dirname(__FILE__).'/update.zip'); -$zip->extractTo( dirname(__FILE__) ); -$zip->close(); -echo dirname(__FILE__).'/update.zip'; -unlink('update.zip'); -?> \ No newline at end of file diff --git a/assets/plugins/codemirror/cm/theme/one-dark.css b/assets/plugins/codemirror/cm/theme/one-dark.css index d521d0f682..d7aa0a3d56 100644 --- a/assets/plugins/codemirror/cm/theme/one-dark.css +++ b/assets/plugins/codemirror/cm/theme/one-dark.css @@ -7,7 +7,7 @@ /* UI Theme /----------------------------------------------------------------------------------- */ .cm-s-one-dark.CodeMirror { -border: none; +border-color: transparent; font-size: 1em; } .cm-s-one-dark.CodeMirror pre { diff --git a/assets/plugins/codemirror/codemirror.plugin.php b/assets/plugins/codemirror/codemirror.plugin.php index 78b0d0d16b..10c962348e 100644 --- a/assets/plugins/codemirror/codemirror.plugin.php +++ b/assets/plugins/codemirror/codemirror.plugin.php @@ -19,7 +19,7 @@ $textarea_name = 'post'; $mode = 'htmlmixed'; $lang = 'htmlmixed'; -$readOnly = isset( $readOnly ) && $readOnly === true ? 'true' : 'false'; +$readOnly = isset($readOnly) && $readOnly === true ? 'true' : 'false'; /* * Default Plugin configuration */ @@ -51,96 +51,103 @@ /* * Switch event */ -switch ($modx->Event->name) { - case 'OnTempFormRender' : - $object_name = $content['templatename']; - $rte = ($prte ? $prte : 'none'); - break; - case 'OnChunkFormRender' : - $rte = isset($which_editor) ? $which_editor : 'none'; - break; +switch($modx->Event->name) { + case 'OnTempFormRender' : + $object_name = $content['templatename']; + $rte = ($prte ? $prte : 'none'); + break; + case 'OnChunkFormRender' : + $rte = isset($which_editor) ? $which_editor : 'none'; + break; - case 'OnRichTextEditorInit': - if ($editor !== 'Codemirror') return; - $textarea_name = $modx->event->params['elements']; - $object_name = $content['pagetitle']; - $rte = 'none'; - $tvMode = true; - $contentType = $content['contentType'] ? $content['contentType'] : $modx->event->params['contentType']; + case 'OnRichTextEditorInit': + if($editor !== 'Codemirror') { + return; + } + $textarea_name = $modx->event->params['elements']; + $object_name = $content['pagetitle']; + $rte = 'none'; + $tvMode = true; + $contentType = $content['contentType'] ? $content['contentType'] : $modx->event->params['contentType']; - /* - * Switch contentType for doc - */ - switch ($contentType) { - case "text/css": - $mode = "text/css"; - $lang = "css"; - break; - case "text/javascript": - $mode = "text/javascript"; - $lang = "javascript"; - break; - case "application/json": - $mode = "application/json"; - $lang = "javascript"; - break; - case "application/x-httpd-php": - $mode = "application/x-httpd-php"; - $lang = "php"; - break; - } - break; - case 'OnDocFormRender' : - if($content['type'] == 'reference') return; - $textarea_name = 'ta'; - $object_name = $content['pagetitle']; - $xrte = (('htmlmixed' == $mode) ? $xrte : 0); - $rte = ($prte ? $prte : ($content['id'] ? ($xrte ? $srte : 'none') : $srte)); - $contentType = $content['contentType']; - /* - * Switch contentType for doc - */ - switch ($contentType) { - case "text/css": - $mode = "text/css"; - $lang = "css"; - break; - case "text/javascript": - $mode = "text/javascript"; - $lang = "javascript"; - break; - case "application/json": - $mode = "application/json"; - $lang = "javascript"; - break; - } - break; + /* + * Switch contentType for doc + */ + switch($contentType) { + case "text/css": + $mode = "text/css"; + $lang = "css"; + break; + case "text/javascript": + $mode = "text/javascript"; + $lang = "javascript"; + break; + case "application/json": + $mode = "application/json"; + $lang = "javascript"; + break; + case "application/x-httpd-php": + $mode = "application/x-httpd-php"; + $lang = "php"; + break; + } + break; + case 'OnDocFormRender' : + if($content['type'] == 'reference') { + return; + } + $textarea_name = 'ta'; + $object_name = $content['pagetitle']; + $xrte = (('htmlmixed' == $mode) ? $xrte : 0); + $rte = ($prte ? $prte : ($content['id'] ? ($xrte ? $srte : 'none') : $srte)); + $contentType = $content['contentType']; + /* + * Switch contentType for doc + */ + switch($contentType) { + case "text/css": + $mode = "text/css"; + $lang = "css"; + break; + case "text/javascript": + $mode = "text/javascript"; + $lang = "javascript"; + break; + case "application/json": + $mode = "application/json"; + $lang = "javascript"; + break; + } + break; - case 'OnSnipFormRender' : - case 'OnPluginFormRender' : - case 'OnModFormRender' : - $tvMode = true; - // $limitedHeight = true; // No limited height since MODX 1.2 - $elements = array($textarea_name,'properties'); - $mode = 'application/x-httpd-php-open'; - $rte = ($prte ? $prte : 'none'); - $lang = "php"; - break; + case 'OnSnipFormRender' : + case 'OnPluginFormRender' : + case 'OnModFormRender' : + $tvMode = true; + // $limitedHeight = true; // No limited height since MODX 1.2 + $elements = array( + $textarea_name, + 'properties' + ); + $mode = 'application/x-httpd-php-open'; + $rte = ($prte ? $prte : 'none'); + $lang = "php"; + break; - case 'OnManagerPageRender': - if ((31 == $action) && (('view' == $_REQUEST['mode']) || ('edit' == $_REQUEST['mode']))) { - $textarea_name = 'content'; - $rte = 'none'; - } - break; + case 'OnManagerPageRender': + if((31 == $action) && (('view' == $_REQUEST['mode']) || ('edit' == $_REQUEST['mode']))) { + $textarea_name = 'content'; + $rte = 'none'; + } + break; - default: - $this->logEvent(1, 2, 'Undefined event : ' . $modx->Event->name . ' in ' . $this->Event->activePlugin . ' Plugin', 'CodeMirror Plugin : ' . $modx->Event->name); + default: + $this->logEvent(1, 2, 'Undefined event : ' . $modx->Event->name . ' in ' . $this->Event->activePlugin . ' Plugin', 'CodeMirror Plugin : ' . $modx->Event->name); } $output = ''; -if (('none' == $rte) && $mode && !defined('INIT_CODEMIRROR')) { - define('INIT_CODEMIRROR', 1); - $output = <<< HEREDOC +if(('none' == $rte) && $mode && !defined('INIT_CODEMIRROR')) { + define('INIT_CODEMIRROR', 1); + $output = <<< HEREDOC @@ -264,26 +271,44 @@ function makeMarker(symbol) { undoDepth: {$undoDepth}, historyEventDelay: {$historyEventDelay}, extraKeys:{ + // add marker "Ctrl-Space": function(cm){ var n = cm.getCursor().line; var info = cm.lineInfo(n); foldFunc(cm, n); cm.setGutterMarker(n, "breakpoints", info.gutterMarkers ? null : makeMarker("+")); }, + // save "Ctrl-S": function(cm) { - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + if(el) el.onclick(); }, + // save and continue "Ctrl-E": function(cm) { - document.getElementById('Button1').getElementsByTagName('select')[0].options[1].selected = true; - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + var el2 = document.querySelector('#stay'); + if(el && el2) { + el2.options[1].selected = true; + el.onclick(); + } }, + // save and new "Ctrl-B": function(cm) { - document.getElementById('Button1').getElementsByTagName('select')[0].options[0].selected = true; - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + var el2 = document.querySelector('#stay'); + if(el && el2) { + el2.options[0].selected = true; + el.onclick(); + } }, + // save and quit "Ctrl-Q": function(cm) { - document.getElementById('Button1').getElementsByTagName('select')[0].options[2].selected = true; - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + var el2 = document.querySelector('#stay'); + if(el && el2) { + el2.options[2].selected = true; + el.onclick(); + } } } }; @@ -292,81 +317,81 @@ function makeMarker(symbol) { HEREDOC; } -if (!$tvMode) { - $elements = array($textarea_name); +if(!$tvMode) { + $elements = array($textarea_name); } -if (('none' == $rte) && $mode && $elements !== NULL) { - foreach ($elements as $el) { +if(('none' == $rte) && $mode && $elements !== NULL) { + foreach($elements as $el) { - if($el != $textarea_name && $limitedHeight) { - $setHeight = "myCodeMirrors['{$el}'].setSize('98%', 260);"; - } else { - $setHeight = ''; - }; - - $object_id = md5($evt->name . '-' . $content['id'] . '-' . $el); - - $output .= " - \n"; - }; + $object_id = md5($evt->name . '-' . $content['id'] . '-' . $el); + + $output .= " + \n"; + }; }; -$modx->Event->output($output); \ No newline at end of file +$modx->Event->output($output); diff --git a/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl b/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl index ed93d2ef25..47b661b93e 100644 --- a/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl +++ b/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl @@ -1,33 +1,34 @@ - /* Tree Buttons in Tab */ - #treeHolder { - padding-top: 10px; - padding-left: 10px; - } - - #treeMenu { - display: none; - margin-left: 0; - margin-bottom: 6px; - background-color: transparent !important; - border-bottom-width: 0; - } +/* Tree Buttons in Tab */ - #treeMenu.is-intab { - display: table; - } +#treeHolder { + padding-top: 10px; + padding-left: 10px; +} - .treeButton, - .treeButtonDisabled { - padding: 2px 3px; - } +#treeMenu { + display: none; + margin-left: 0; + margin-bottom: 6px; + background-color: transparent !important; + border-bottom-width: 0; +} - #tabDoc { - padding-top: 11px !important; - padding-left: 13px !important; - padding-right: 13px !important; - } - - #floater { - width: 99%; - top: 94px; - } +#treeMenu.is-intab { + display: table; +} + +.treeButton, +.treeButtonDisabled { + padding: 2px 3px; +} + +#tabDoc { + padding-top: 11px !important; + padding-left: 13px !important; + padding-right: 13px !important; +} + +#floater { + width: 99%; + top: 94px; +} diff --git a/assets/plugins/elementsintree/assets/css_unifyFrames.tpl b/assets/plugins/elementsintree/assets/css_unifyFrames.tpl index 387473829a..adbef0d032 100644 --- a/assets/plugins/elementsintree/assets/css_unifyFrames.tpl +++ b/assets/plugins/elementsintree/assets/css_unifyFrames.tpl @@ -1,16 +1,17 @@ - /* Unify Frames */ - body, - div.treeframebody { - background-color: #f2f2f2 !important; - } +/* Unify frames */ - div.treeframebody { - background-color: transparent !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; - } +body, +div.treeframebody { + background-color: #f2f2f2 !important; +} - #treeMenu { - background-color: transparent !important; - border-bottom-color: transparent !important; - } +div.treeframebody { + background-color: transparent !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} + +#treeMenu { + background-color: transparent !important; + border-bottom-color: transparent !important; +} diff --git a/assets/plugins/elementsintree/assets/txt_content.tpl b/assets/plugins/elementsintree/assets/txt_content.tpl index 274e6aa9e8..ae538aa72c 100644 --- a/assets/plugins/elementsintree/assets/txt_content.tpl +++ b/assets/plugins/elementsintree/assets/txt_content.tpl @@ -1,198 +1,356 @@ @@ -286,22 +444,22 @@ } // Issue #20 - Keep HTTP_REFERER - function reloadElementsInTree() { - // http://stackoverflow.com/a/7917528/2354531 - var url = "index.php?a=1&f=tree"; - var a = document.createElement("a"); - if (a.click) - { - // HTML5 browsers and IE support click() on , early FF does not. - a.setAttribute("href", url); - a.style.display = "none"; - document.body.appendChild(a); - a.click(); - } else { - // Early FF can, however, use this usual method where IE cannot with secure links. - window.location = url; - } - } +// function reloadElementsInTree() { +// // http://stackoverflow.com/a/7917528/2354531 +// var url = "index.php?a=1&f=tree"; +// var a = document.createElement("a"); +// if (a.click) +// { +// // HTML5 browsers and IE support click() on , early FF does not. +// a.setAttribute("href", url); +// a.style.display = "none"; +// document.body.appendChild(a); +// a.click(); +// } else { +// // Early FF can, however, use this usual method where IE cannot with secure links. +// window.location = url; +// } +// } ///////////////////////////////////////////////////////////// // Prepare "remember scroll-position" functions diff --git a/assets/plugins/elementsintree/plugin.elementsintree.php b/assets/plugins/elementsintree/plugin.elementsintree.php index 83c6dc0a06..ef716b4f41 100644 --- a/assets/plugins/elementsintree/plugin.elementsintree.php +++ b/assets/plugins/elementsintree/plugin.elementsintree.php @@ -8,39 +8,47 @@ if(!defined('MODX_BASE_PATH')) die('What are you doing? Get out of here!'); +$role = $_SESSION['mgrRole']; + +if ( $adminRoleOnly == 'yes' && $role != 1 ) { + return; +} + $eit_base_path = str_replace('\\','/',dirname(__FILE__)) . '/'; + include_once($eit_base_path.'includes/functions.inc.php'); global $_lang; + $e = &$modx->event; if(!isset($_SESSION['elementsInTree'])) $_SESSION['elementsInTree'] = array(); switch($e->name) { - case 'OnManagerMainFrameHeaderHTMLBlock': // Trigger reloading tree for relevant actions - include_once($eit_base_path.'includes/on_manager_main_frame_header_html_block.inc.php'); break; - case 'OnManagerTreePrerender': // Main elementsInTree-part - include_once($eit_base_path.'includes/on_manager_tree_prerender.inc.php'); break; - case 'OnManagerTreeRender': - if(hasAnyPermission()) include_once($eit_base_path.'includes/on_manager_tree_render.inc.php'); - else $e->output('
[+lang.DM_update_title+]
-
-
+[+update.message+]
- -
+
+
\ No newline at end of file
diff --git a/assets/modules/docmanager/tv.ajax.php b/assets/modules/docmanager/tv.ajax.php
index a67d6e491c..35ea6dd2ba 100644
--- a/assets/modules/docmanager/tv.ajax.php
+++ b/assets/modules/docmanager/tv.ajax.php
@@ -5,164 +5,172 @@
include_once("../../cache/siteManager.php");
-require_once '../../../'.MGR_DIR.'/includes/protect.inc.php';
-include_once ('../../../'.MGR_DIR.'/includes/config.inc.php');
-include_once (MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-include_once (MODX_BASE_PATH.'assets/modules/docmanager/classes/docmanager.class.php');
+require_once '../../../' . MGR_DIR . '/includes/protect.inc.php';
+include_once('../../../' . MGR_DIR . '/includes/config.inc.php');
+include_once(MODX_MANAGER_PATH . 'includes/document.parser.class.inc.php');
+include_once(MODX_BASE_PATH . 'assets/modules/docmanager/classes/docmanager.class.php');
$modx = new DocumentParser;
$modx->getSettings();
$dm = new DocManager($modx);
$dm->getLang();
$dm->getTheme();
-
- $output = '';
-
- if(isset($_POST['tplID']) && is_numeric($_POST['tplID'])) {
- $rs = $modx->db->select(
- '*',
- $modx->getFullTableName('site_tmplvars')." tv
- LEFT JOIN ".$modx->getFullTableName('site_tmplvar_templates')." AS tvt ON tv.id = tvt.tmplvarid",
- "tvt.templateid ='{$_POST['tplID']}'"
- );
- $limit = $modx->db->getRecordCount($rs);
-
- if ($limit > 0) {
- require (MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
- $output.= "
+ [+lang.DM_update_title+]
+
[+update.message+]
+ +|
- '.$row['caption'].' '.$row['description'].' + ' . $row['caption'] . ' ' . $row['description'] . ' |
'; - $base_url = str_replace("assets/modules/docmanager/", "", MODX_BASE_URL); - $output.= renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $row['value'], ' style="width:300px;"'); - $output.= ' |
'.$dm->lang['DM_tv_ignore_tv'].' '; - } else { - print $dm->lang['DM_tv_no_tv']; - } - - print $output; - } else { - print ''; - } - + $base_url = str_replace("assets/modules/docmanager/", "", MODX_BASE_URL); + $output .= renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $row['value'], ' style="width:300px;"'); + $output .= '
'.$dm->lang['DM_tv_ignore_tv'].' '; + } else { + print $dm->lang['DM_tv_no_tv']; + } + + print $output; +} else { + print ''; +} -function renderFormElement($field_type, $field_id, $default_text, $field_elements, $field_value, $field_style='') { - global $modx; - global $dm; - global $base_url; - global $rb_base_url; +function renderFormElement($field_type, $field_id, $default_text, $field_elements, $field_value, $field_style = '') +{ + global $modx; + global $dm; + global $base_url; + global $rb_base_url; - $field_html =''; - $field_value = ($field_value!="" ? $field_value : $default_text); + $field_html = ''; + $field_value = ($field_value != "" ? $field_value : $default_text); - switch ($field_type) { - case "text": // handler for regular text boxes - case "rawtext"; // non-htmlentity converted text boxes - case "email": // handles email input fields - case "number": // handles the input of numbers - $field_html .= ''; - break; - case "textareamini": // handler for textarea mini boxes - $field_html .= ''; - break; - case "textarea": // handler for textarea boxes - case "rawtextarea": // non-htmlentity convertex textarea boxes - case "htmlarea": // handler for textarea boxes (deprecated) - case "richtext": // handler for textarea boxes - $field_html .= ''; - break; - case "date": - $field_id = str_replace(array('-', '.'),'_', urldecode($field_id)); - if($field_value=='') $field_value=0; - $field_html .= ''; - $field_html .= '
';
+ switch ($field_type) {
+ case "text": // handler for regular text boxes
+ case "rawtext"; // non-htmlentity converted text boxes
+ case "email": // handles email input fields
+ case "number": // handles the input of numbers
+ $field_html .= '';
+ break;
+ case "textareamini": // handler for textarea mini boxes
+ $field_html .= '';
+ break;
+ case "textarea": // handler for textarea boxes
+ case "rawtextarea": // non-htmlentity convertex textarea boxes
+ case "htmlarea": // handler for textarea boxes (deprecated)
+ case "richtext": // handler for textarea boxes
+ $field_html .= '';
+ break;
+ case "date":
+ $field_id = str_replace(array('-', '.'), '_', urldecode($field_id));
+ if ($field_value == '') {
+ $field_value = 0;
+ }
+ $field_html .= '';
+ $field_html .= ' ';
- break;
- case "dropdown": // handler for select boxes
- $field_html .= '";
- break;
- case "listbox": // handler for select boxes
- $field_html .= '";
- break;
- case "listbox-multiple": // handler for select boxes where you can choose multiple items
- $field_value = explode("||",$field_value);
- $field_html .= '";
- break;
- case "url": // handles url input fields
- $urls= array(''=>'--', 'http://'=>'http://', 'https://'=>'https://', 'ftp://'=>'ftp://', 'mailto:'=>'mailto:');
- $field_html ='| '; - $field_html .= ' |
'; - $i++; - } - break; - case "option": // handles radio buttons - $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id)); - while (list($item, $itemvalue) = each ($index_list)) - { - list($item,$itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==",$itemvalue); - if (strlen($itemvalue)==0) $itemvalue = $item; - $field_html .= ''.$item.'
'; - } - break; - case "image": // handles image fields using htmlarea image manager - global $ResourceManagerLoaded; - global $content,$use_editor,$which_editor,$which_browser; - if (!$ResourceManagerLoaded && !(($content['richtext']==1 || $_GET['a']==4) && $use_editor==1 && $which_editor==3)){ - $field_html .=" + break; + case "dropdown": // handler for select boxes + $field_html .= '"; + break; + case "listbox": // handler for select boxes + $field_html .= '"; + break; + case "listbox-multiple": // handler for select boxes where you can choose multiple items + $field_value = explode("||", $field_value); + $field_html .= '"; + break; + case "url": // handles url input fields + $urls = array('' => '--', 'http://' => 'http://', 'https://' => 'https://', 'ftp://' => 'ftp://', 'mailto:' => 'mailto:'); + $field_html = '
| '; + $field_html .= ' |
'; + $i++; + } + break; + case "option": // handles radio buttons + $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id)); + while (list($item, $itemvalue) = each($index_list)) { + list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue); + if (strlen($itemvalue) == 0) { + $itemvalue = $item; + } + $field_html .= '' . $item . '
'; + } + break; + case "image": // handles image fields using htmlarea image manager + global $ResourceManagerLoaded; + global $content, $use_editor, $which_editor, $which_browser; + if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $_GET['a'] == 4) && $use_editor == 1 && $which_editor == 3)) { + $field_html .= " "; - $ResourceManagerLoaded = true; - } - $field_html .=' '; - break; - case "file": // handles the input of file uploads - /* Modified by Timon for use with resource browser */ - global $ResourceManagerLoaded; - global $content,$use_editor,$which_editor; - if (!$ResourceManagerLoaded && !(($content['richtext']==1 || $_GET['a']==4) && $use_editor==1 && $which_editor==3)){ - /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */ - $field_html .=" + $ResourceManagerLoaded = true; + } + $field_html .= ' '; + break; + case "file": // handles the input of file uploads + /* Modified by Timon for use with resource browser */ + global $ResourceManagerLoaded; + global $content, $use_editor, $which_editor, $which_browser; + if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $_GET['a'] == 4) && $use_editor == 1 && $which_editor == 3)) { + /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */ + $field_html .= " "; - $ResourceManagerLoaded = true; - } - $field_html .=' '; - - break; - default: // the default handler -- for errors, mostly - $field_html .= ''; - } // end switch statement - return $field_html; + $ResourceManagerLoaded = true; + } + $field_html .= ' '; + + break; + default: // the default handler -- for errors, mostly + $field_html .= ''; + } // end switch statement + return $field_html; } // end renderFormElement function -function ParseIntputOptions($v) { - global $modx; - $a = array(); - if(is_array($v)) return $v; - else if($modx->db->isResult($v)) { - $a = $modx->db->makeArray($v); - } - else $a = explode("||", $v); - return $a; +function ParseIntputOptions($v) +{ + global $modx; + $a = array(); + if (is_array($v)) { + return $v; + } else if ($modx->db->isResult($v)) { + $a = $modx->db->makeArray($v); + } else { + $a = explode("||", $v); + } + return $a; } diff --git a/assets/modules/store/core.php b/assets/modules/store/core.php index 215b44f50a..d5aec6269a 100644 --- a/assets/modules/store/core.php +++ b/assets/modules/store/core.php @@ -208,6 +208,7 @@ public static function copyFolder($src, $dest) { $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST); foreach($objects as $name => $object) { + if (!$objects->getDepth() && $object->isFile()) continue; $startsAt = substr(dirname($name), strlen($path)); self::mkDir($dest.$startsAt); if ( $object->isDir() ) { diff --git a/assets/modules/store/installer/index.php b/assets/modules/store/installer/index.php index f3c59924e0..5ea0c64115 100755 --- a/assets/modules/store/installer/index.php +++ b/assets/modules/store/installer/index.php @@ -4,8 +4,10 @@ define('MODX_BASE_PATH',realpath('../../../../').'/'); include_once(MODX_BASE_PATH."assets/cache/siteManager.php"); define('MGR',MODX_BASE_PATH.MGR_DIR); - - +$autoloader = realpath(MODX_BASE_PATH . 'vendor/autoload.php'); +if (file_exists($autoloader) && is_readable($autoloader)) { + include_once($autoloader); +} define('MODX_API_MODE', true); include_once MGR.'/includes/config.inc.php'; @@ -15,16 +17,9 @@ $modx->getSettings(); startCMSSession(); $modx->minParserPasses=2; - +$modx->invokeEvent('OnManagerPageInit'); if(IN_MANAGER_MODE!='true' && !$modx->hasPermission('exec_module')) die('INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.'); - - - -if (version_compare(phpversion(), "5.3") < 0) { - @ ini_set('magic_quotes_runtime', 0); - @ ini_set('magic_quotes_sybase', 0); -} $moduleurl = $modx->config['site_url'].'assets/modules/store/installer/index.php'; $modulePath = MODX_BASE_PATH.'assets/modules/store/installer/'; $self = $modulePath.'/index.php'; diff --git a/assets/modules/store/installer/instprocessor-fast.php b/assets/modules/store/installer/instprocessor-fast.php index 812862345e..c81180fdee 100644 --- a/assets/modules/store/installer/instprocessor-fast.php +++ b/assets/modules/store/installer/instprocessor-fast.php @@ -5,10 +5,9 @@ define('MODX_BASE_PATH',realpath('../../../../').'/'); include_once(MODX_BASE_PATH."assets/cache/siteManager.php"); define('MGR',MODX_BASE_PATH.MGR_DIR); - -if (version_compare(phpversion(), "5.3") < 0) { - @ ini_set('magic_quotes_runtime', 0); - @ ini_set('magic_quotes_sybase', 0); +$autoloader = realpath(MODX_BASE_PATH .'vendor/autoload.php'); +if (file_exists($autoloader) && is_readable($autoloader)) { + include_once($autoloader); } $moduleurl = 'assets/modules/store/installer/index.php'; $modulePath = dirname(__FILE__); @@ -61,7 +60,7 @@ $modx->getSettings(); startCMSSession(); $modx->minParserPasses=2; - +$modx->invokeEvent('OnManagerPageInit'); global $moduleName; global $moduleVersion; global $moduleSQLBaseFile; diff --git a/assets/modules/store/installer/instprocessor.php b/assets/modules/store/installer/instprocessor.php index 64a84d3a30..5aea76e05e 100644 --- a/assets/modules/store/installer/instprocessor.php +++ b/assets/modules/store/installer/instprocessor.php @@ -6,6 +6,10 @@ $sqlParser = ''; define('MODX_API_MODE', true); +$autoloader = realpath(MODX_BASE_PATH .'vendor/autoload.php'); +if (file_exists($autoloader) && is_readable($autoloader)) { + include_once($autoloader); +} include_once MGR.'/includes/protect.inc.php'; include_once MGR.'/includes/config.inc.php'; include_once MGR.'/includes/document.parser.class.inc.php'; @@ -14,7 +18,7 @@ $modx->getSettings(); startCMSSession(); $modx->minParserPasses=2; - +$modx->invokeEvent('OnManagerPageInit'); global $moduleName; global $moduleVersion; global $moduleSQLBaseFile; diff --git a/assets/modules/store/installer/sqlParser.class.php b/assets/modules/store/installer/sqlParser.class.php index 6d80fc4438..6395b140e9 100755 --- a/assets/modules/store/installer/sqlParser.class.php +++ b/assets/modules/store/installer/sqlParser.class.php @@ -8,7 +8,7 @@ class SqlParser { var $mode, $fileManagerPath, $imgPath, $imgUrl; var $connection_charset, $connection_method; - function SqlParser( ) { + public function __construct() { $adminname=''; $adminemail=''; $adminpass=''; diff --git a/assets/modules/store/update.php b/assets/modules/store/update.php deleted file mode 100755 index 8aad258729..0000000000 --- a/assets/modules/store/update.php +++ /dev/null @@ -1,40 +0,0 @@ -open(dirname(__FILE__).'/update.zip'); -$zip->extractTo( dirname(__FILE__) ); -$zip->close(); -echo dirname(__FILE__).'/update.zip'; -unlink('update.zip'); -?> \ No newline at end of file diff --git a/assets/plugins/codemirror/cm/theme/one-dark.css b/assets/plugins/codemirror/cm/theme/one-dark.css index d521d0f682..d7aa0a3d56 100644 --- a/assets/plugins/codemirror/cm/theme/one-dark.css +++ b/assets/plugins/codemirror/cm/theme/one-dark.css @@ -7,7 +7,7 @@ /* UI Theme /----------------------------------------------------------------------------------- */ .cm-s-one-dark.CodeMirror { -border: none; +border-color: transparent; font-size: 1em; } .cm-s-one-dark.CodeMirror pre { diff --git a/assets/plugins/codemirror/codemirror.plugin.php b/assets/plugins/codemirror/codemirror.plugin.php index 78b0d0d16b..10c962348e 100644 --- a/assets/plugins/codemirror/codemirror.plugin.php +++ b/assets/plugins/codemirror/codemirror.plugin.php @@ -19,7 +19,7 @@ $textarea_name = 'post'; $mode = 'htmlmixed'; $lang = 'htmlmixed'; -$readOnly = isset( $readOnly ) && $readOnly === true ? 'true' : 'false'; +$readOnly = isset($readOnly) && $readOnly === true ? 'true' : 'false'; /* * Default Plugin configuration */ @@ -51,96 +51,103 @@ /* * Switch event */ -switch ($modx->Event->name) { - case 'OnTempFormRender' : - $object_name = $content['templatename']; - $rte = ($prte ? $prte : 'none'); - break; - case 'OnChunkFormRender' : - $rte = isset($which_editor) ? $which_editor : 'none'; - break; +switch($modx->Event->name) { + case 'OnTempFormRender' : + $object_name = $content['templatename']; + $rte = ($prte ? $prte : 'none'); + break; + case 'OnChunkFormRender' : + $rte = isset($which_editor) ? $which_editor : 'none'; + break; - case 'OnRichTextEditorInit': - if ($editor !== 'Codemirror') return; - $textarea_name = $modx->event->params['elements']; - $object_name = $content['pagetitle']; - $rte = 'none'; - $tvMode = true; - $contentType = $content['contentType'] ? $content['contentType'] : $modx->event->params['contentType']; + case 'OnRichTextEditorInit': + if($editor !== 'Codemirror') { + return; + } + $textarea_name = $modx->event->params['elements']; + $object_name = $content['pagetitle']; + $rte = 'none'; + $tvMode = true; + $contentType = $content['contentType'] ? $content['contentType'] : $modx->event->params['contentType']; - /* - * Switch contentType for doc - */ - switch ($contentType) { - case "text/css": - $mode = "text/css"; - $lang = "css"; - break; - case "text/javascript": - $mode = "text/javascript"; - $lang = "javascript"; - break; - case "application/json": - $mode = "application/json"; - $lang = "javascript"; - break; - case "application/x-httpd-php": - $mode = "application/x-httpd-php"; - $lang = "php"; - break; - } - break; - case 'OnDocFormRender' : - if($content['type'] == 'reference') return; - $textarea_name = 'ta'; - $object_name = $content['pagetitle']; - $xrte = (('htmlmixed' == $mode) ? $xrte : 0); - $rte = ($prte ? $prte : ($content['id'] ? ($xrte ? $srte : 'none') : $srte)); - $contentType = $content['contentType']; - /* - * Switch contentType for doc - */ - switch ($contentType) { - case "text/css": - $mode = "text/css"; - $lang = "css"; - break; - case "text/javascript": - $mode = "text/javascript"; - $lang = "javascript"; - break; - case "application/json": - $mode = "application/json"; - $lang = "javascript"; - break; - } - break; + /* + * Switch contentType for doc + */ + switch($contentType) { + case "text/css": + $mode = "text/css"; + $lang = "css"; + break; + case "text/javascript": + $mode = "text/javascript"; + $lang = "javascript"; + break; + case "application/json": + $mode = "application/json"; + $lang = "javascript"; + break; + case "application/x-httpd-php": + $mode = "application/x-httpd-php"; + $lang = "php"; + break; + } + break; + case 'OnDocFormRender' : + if($content['type'] == 'reference') { + return; + } + $textarea_name = 'ta'; + $object_name = $content['pagetitle']; + $xrte = (('htmlmixed' == $mode) ? $xrte : 0); + $rte = ($prte ? $prte : ($content['id'] ? ($xrte ? $srte : 'none') : $srte)); + $contentType = $content['contentType']; + /* + * Switch contentType for doc + */ + switch($contentType) { + case "text/css": + $mode = "text/css"; + $lang = "css"; + break; + case "text/javascript": + $mode = "text/javascript"; + $lang = "javascript"; + break; + case "application/json": + $mode = "application/json"; + $lang = "javascript"; + break; + } + break; - case 'OnSnipFormRender' : - case 'OnPluginFormRender' : - case 'OnModFormRender' : - $tvMode = true; - // $limitedHeight = true; // No limited height since MODX 1.2 - $elements = array($textarea_name,'properties'); - $mode = 'application/x-httpd-php-open'; - $rte = ($prte ? $prte : 'none'); - $lang = "php"; - break; + case 'OnSnipFormRender' : + case 'OnPluginFormRender' : + case 'OnModFormRender' : + $tvMode = true; + // $limitedHeight = true; // No limited height since MODX 1.2 + $elements = array( + $textarea_name, + 'properties' + ); + $mode = 'application/x-httpd-php-open'; + $rte = ($prte ? $prte : 'none'); + $lang = "php"; + break; - case 'OnManagerPageRender': - if ((31 == $action) && (('view' == $_REQUEST['mode']) || ('edit' == $_REQUEST['mode']))) { - $textarea_name = 'content'; - $rte = 'none'; - } - break; + case 'OnManagerPageRender': + if((31 == $action) && (('view' == $_REQUEST['mode']) || ('edit' == $_REQUEST['mode']))) { + $textarea_name = 'content'; + $rte = 'none'; + } + break; - default: - $this->logEvent(1, 2, 'Undefined event : ' . $modx->Event->name . ' in ' . $this->Event->activePlugin . ' Plugin', 'CodeMirror Plugin : ' . $modx->Event->name); + default: + $this->logEvent(1, 2, 'Undefined event : ' . $modx->Event->name . ' in ' . $this->Event->activePlugin . ' Plugin', 'CodeMirror Plugin : ' . $modx->Event->name); } $output = ''; -if (('none' == $rte) && $mode && !defined('INIT_CODEMIRROR')) { - define('INIT_CODEMIRROR', 1); - $output = <<< HEREDOC +if(('none' == $rte) && $mode && !defined('INIT_CODEMIRROR')) { + define('INIT_CODEMIRROR', 1); + $output = <<< HEREDOC @@ -264,26 +271,44 @@ function makeMarker(symbol) { undoDepth: {$undoDepth}, historyEventDelay: {$historyEventDelay}, extraKeys:{ + // add marker "Ctrl-Space": function(cm){ var n = cm.getCursor().line; var info = cm.lineInfo(n); foldFunc(cm, n); cm.setGutterMarker(n, "breakpoints", info.gutterMarkers ? null : makeMarker("+")); }, + // save "Ctrl-S": function(cm) { - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + if(el) el.onclick(); }, + // save and continue "Ctrl-E": function(cm) { - document.getElementById('Button1').getElementsByTagName('select')[0].options[1].selected = true; - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + var el2 = document.querySelector('#stay'); + if(el && el2) { + el2.options[1].selected = true; + el.onclick(); + } }, + // save and new "Ctrl-B": function(cm) { - document.getElementById('Button1').getElementsByTagName('select')[0].options[0].selected = true; - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + var el2 = document.querySelector('#stay'); + if(el && el2) { + el2.options[0].selected = true; + el.onclick(); + } }, + // save and quit "Ctrl-Q": function(cm) { - document.getElementById('Button1').getElementsByTagName('select')[0].options[2].selected = true; - document.getElementById('Button1').getElementsByTagName('a')[0].onclick(); + var el = document.querySelector('a#Button1') || document.querySelector('#Button1 > a'); + var el2 = document.querySelector('#stay'); + if(el && el2) { + el2.options[2].selected = true; + el.onclick(); + } } } }; @@ -292,81 +317,81 @@ function makeMarker(symbol) { HEREDOC; } -if (!$tvMode) { - $elements = array($textarea_name); +if(!$tvMode) { + $elements = array($textarea_name); } -if (('none' == $rte) && $mode && $elements !== NULL) { - foreach ($elements as $el) { +if(('none' == $rte) && $mode && $elements !== NULL) { + foreach($elements as $el) { - if($el != $textarea_name && $limitedHeight) { - $setHeight = "myCodeMirrors['{$el}'].setSize('98%', 260);"; - } else { - $setHeight = ''; - }; - - $object_id = md5($evt->name . '-' . $content['id'] . '-' . $el); - - $output .= " - \n"; - }; + $object_id = md5($evt->name . '-' . $content['id'] . '-' . $el); + + $output .= " + \n"; + }; }; -$modx->Event->output($output); \ No newline at end of file +$modx->Event->output($output); diff --git a/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl b/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl index ed93d2ef25..47b661b93e 100644 --- a/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl +++ b/assets/plugins/elementsintree/assets/css_treeButtonsInTab.tpl @@ -1,33 +1,34 @@ - /* Tree Buttons in Tab */ - #treeHolder { - padding-top: 10px; - padding-left: 10px; - } - - #treeMenu { - display: none; - margin-left: 0; - margin-bottom: 6px; - background-color: transparent !important; - border-bottom-width: 0; - } +/* Tree Buttons in Tab */ - #treeMenu.is-intab { - display: table; - } +#treeHolder { + padding-top: 10px; + padding-left: 10px; +} - .treeButton, - .treeButtonDisabled { - padding: 2px 3px; - } +#treeMenu { + display: none; + margin-left: 0; + margin-bottom: 6px; + background-color: transparent !important; + border-bottom-width: 0; +} - #tabDoc { - padding-top: 11px !important; - padding-left: 13px !important; - padding-right: 13px !important; - } - - #floater { - width: 99%; - top: 94px; - } +#treeMenu.is-intab { + display: table; +} + +.treeButton, +.treeButtonDisabled { + padding: 2px 3px; +} + +#tabDoc { + padding-top: 11px !important; + padding-left: 13px !important; + padding-right: 13px !important; +} + +#floater { + width: 99%; + top: 94px; +} diff --git a/assets/plugins/elementsintree/assets/css_unifyFrames.tpl b/assets/plugins/elementsintree/assets/css_unifyFrames.tpl index 387473829a..adbef0d032 100644 --- a/assets/plugins/elementsintree/assets/css_unifyFrames.tpl +++ b/assets/plugins/elementsintree/assets/css_unifyFrames.tpl @@ -1,16 +1,17 @@ - /* Unify Frames */ - body, - div.treeframebody { - background-color: #f2f2f2 !important; - } +/* Unify frames */ - div.treeframebody { - background-color: transparent !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; - } +body, +div.treeframebody { + background-color: #f2f2f2 !important; +} - #treeMenu { - background-color: transparent !important; - border-bottom-color: transparent !important; - } +div.treeframebody { + background-color: transparent !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; +} + +#treeMenu { + background-color: transparent !important; + border-bottom-color: transparent !important; +} diff --git a/assets/plugins/elementsintree/assets/txt_content.tpl b/assets/plugins/elementsintree/assets/txt_content.tpl index 274e6aa9e8..ae538aa72c 100644 --- a/assets/plugins/elementsintree/assets/txt_content.tpl +++ b/assets/plugins/elementsintree/assets/txt_content.tpl @@ -1,198 +1,356 @@ @@ -286,22 +444,22 @@ } // Issue #20 - Keep HTTP_REFERER - function reloadElementsInTree() { - // http://stackoverflow.com/a/7917528/2354531 - var url = "index.php?a=1&f=tree"; - var a = document.createElement("a"); - if (a.click) - { - // HTML5 browsers and IE support click() on , early FF does not. - a.setAttribute("href", url); - a.style.display = "none"; - document.body.appendChild(a); - a.click(); - } else { - // Early FF can, however, use this usual method where IE cannot with secure links. - window.location = url; - } - } +// function reloadElementsInTree() { +// // http://stackoverflow.com/a/7917528/2354531 +// var url = "index.php?a=1&f=tree"; +// var a = document.createElement("a"); +// if (a.click) +// { +// // HTML5 browsers and IE support click() on , early FF does not. +// a.setAttribute("href", url); +// a.style.display = "none"; +// document.body.appendChild(a); +// a.click(); +// } else { +// // Early FF can, however, use this usual method where IE cannot with secure links. +// window.location = url; +// } +// } ///////////////////////////////////////////////////////////// // Prepare "remember scroll-position" functions diff --git a/assets/plugins/elementsintree/plugin.elementsintree.php b/assets/plugins/elementsintree/plugin.elementsintree.php index 83c6dc0a06..ef716b4f41 100644 --- a/assets/plugins/elementsintree/plugin.elementsintree.php +++ b/assets/plugins/elementsintree/plugin.elementsintree.php @@ -8,39 +8,47 @@ if(!defined('MODX_BASE_PATH')) die('What are you doing? Get out of here!'); +$role = $_SESSION['mgrRole']; + +if ( $adminRoleOnly == 'yes' && $role != 1 ) { + return; +} + $eit_base_path = str_replace('\\','/',dirname(__FILE__)) . '/'; + include_once($eit_base_path.'includes/functions.inc.php'); global $_lang; + $e = &$modx->event; if(!isset($_SESSION['elementsInTree'])) $_SESSION['elementsInTree'] = array(); switch($e->name) { - case 'OnManagerMainFrameHeaderHTMLBlock': // Trigger reloading tree for relevant actions - include_once($eit_base_path.'includes/on_manager_main_frame_header_html_block.inc.php'); break; - case 'OnManagerTreePrerender': // Main elementsInTree-part - include_once($eit_base_path.'includes/on_manager_tree_prerender.inc.php'); break; - case 'OnManagerTreeRender': - if(hasAnyPermission()) include_once($eit_base_path.'includes/on_manager_tree_render.inc.php'); - else $e->output('
'; $errors += 1; + $curlNotReady = true; } if (!extension_loaded('zip')){ $errorsMessage .= '-'.$_lang['error_zip'].'
'; @@ -46,6 +48,23 @@ $errors += 1; } + // Avoid "Fatal error: Call to undefined function curl_init()" + if(isset($curlNotReady)) { + $output = '
+ '.$errorsMessage.'
';
+
+ $widgets['updater'] = array(
+ 'menuindex' =>'1',
+ 'id' => 'updater',
+ 'cols' => 'col-sm-12',
+ 'icon' => 'fa-exclamation-triangle',
+ 'title' => $_lang['system_update'],
+ 'body' => $output
+ );
+ $e->output(serialize($widgets));
+ return;
+ }
+
$output = '';
if(!file_exists(MODX_BASE_PATH . 'assets/cache/updater/check_'.date("d").'.json')){
$ch = curl_init();
@@ -73,7 +92,7 @@
$_SESSION['updatelink'] = md5(time());
$_SESSION['updateversion'] = $git['version'];
- if ($git['version'] != $currentVersion['version'] && $git['version'] != '') {
+ if (version_compare($git['version'], $currentVersion['version'],'>') && $git['version'] != '') {
// get manager role
$role = $_SESSION['mgrRole'];
if(($role!=1) AND ($showButton == 'AdminOnly') OR ($showButton == 'hide') OR ($errors > 0)) {
@@ -190,11 +209,11 @@ function mmkDir($folder, $perm = 0777)
downloadFile("https://github.com/".$version."/archive/" . $_GET["version"] . ".zip", "evo.zip");
$zip = new ZipArchive;
-$res = $zip->open(dirname(__FILE__) . "/evo.zip");
-$zip->extractTo(dirname(__FILE__) . "/temp");
+$res = $zip->open(__DIR__ . "/evo.zip");
+$zip->extractTo(__DIR__ . "/temp");
$zip->close();
-if ($handle = opendir(dirname(__FILE__) . "/temp")) {
+if ($handle = opendir(__DIR__ . "/temp")) {
while (false !== ($name = readdir($handle))) {
if ($name != "." && $name != "..") {
$dir = $name;
@@ -202,29 +221,30 @@ function mmkDir($folder, $perm = 0777)
}
closedir($handle);
}
-removeFolder(dirname(__FILE__) . "/temp/" . $dir . "/install/assets/chunks");
-removeFolder(dirname(__FILE__) . "/temp/" . $dir . "/install/assets/tvs");
-removeFolder(dirname(__FILE__) . "/temp/" . $dir . "/install/assets/templates");
-unlink(dirname(__FILE__) . "/temp/" . $dir . "/.htaccess");
-unlink(dirname(__FILE__) . "/temp/" . $dir . "/ht.access");
-unlink(dirname(__FILE__) . "/temp/" . $dir . "/robots.txt");
+removeFolder(__DIR__ . "/temp/" . $dir . "/install/assets/chunks");
+removeFolder(__DIR__ . "/temp/" . $dir . "/install/assets/tvs");
+removeFolder(__DIR__ . "/temp/" . $dir . "/install/assets/templates");
+unlink(__DIR__ . "/temp/" . $dir . "/ht.access");
+unlink(__DIR__ . "/temp/" . $dir . "/README.md");
+unlink(__DIR__ . "/temp/" . $dir . "/sample-robots.txt");
+
-if(is_file(dirname(__FILE__) . "/assets/cache/siteManager.php")){
+if(is_file(__DIR__ . "/assets/cache/siteManager.php")){
- unlink(dirname(__FILE__) . "/temp/" . $dir . "/assets/cache/siteManager.php");
- include_once(dirname(__FILE__) . "/assets/cache/siteManager.php");
+ unlink(__DIR__ . "/temp/" . $dir . "/assets/cache/siteManager.php");
+ include_once(__DIR__ . "/assets/cache/siteManager.php");
if(!defined("MGR_DIR")){ define("MGR_DIR","manager"); }
if(MGR_DIR != "manager"){
- mmkDir(dirname(__FILE__)."/temp/".$dir."/".MGR_DIR);
- copyFolder(dirname(__FILE__)."/temp/".$dir."/manager", dirname(__FILE__)."/temp/".$dir."/".MGR_DIR);
- removeFolder(dirname(__FILE__)."/temp/".$dir."/manager");
+ mmkDir(__DIR__."/temp/".$dir."/".MGR_DIR);
+ copyFolder(__DIR__."/temp/".$dir."/manager", __DIR__."/temp/".$dir."/".MGR_DIR);
+ removeFolder(__DIR__."/temp/".$dir."/manager");
}
- echo dirname(__FILE__)."/temp/".$dir."/".MGR_DIR;
+ echo __DIR__."/temp/".$dir."/".MGR_DIR;
}
-copyFolder(dirname(__FILE__)."/temp/".$dir, dirname(__FILE__)."/");
-removeFolder(dirname(__FILE__)."/temp");
-unlink(dirname(__FILE__)."/evo.zip");
-unlink(dirname(__FILE__)."/update.php");
+copyFolder(__DIR__."/temp/".$dir, __DIR__."/");
+removeFolder(__DIR__."/temp");
+unlink(__DIR__."/evo.zip");
+unlink(__DIR__."/update.php");
header("Location: /install/index.php?action=mode");');
diff --git a/assets/snippets/DLUsers/lang/russian-UTF8.php b/assets/snippets/DLUsers/lang/russian-UTF8.php
deleted file mode 100755
index 658e6c9e64..0000000000
--- a/assets/snippets/DLUsers/lang/russian-UTF8.php
+++ /dev/null
@@ -1,14 +0,0 @@
- array(
- 'incorrect_mail' => 'Указан (если вообще указан) не корректный email',
- 'no_user' => 'Пользователь не обнаружен или заблокирован',
- 'incorrect_password' => 'Не удалось авторизоваться. Пароль указан не верно или в плагине отказали в авторизации'
- )
-);
-
-return $_lang;
diff --git a/assets/snippets/DLUsers/plugin.DLLogout.php b/assets/snippets/DLUsers/plugin.DLLogout.php
deleted file mode 100755
index 7be5bb9bae..0000000000
--- a/assets/snippets/DLUsers/plugin.DLLogout.php
+++ /dev/null
@@ -1,10 +0,0 @@
-event->name == 'OnWebPagePrerender' && $modx->getLoginUserID('web')) {
- $snippetName = (isset($snippetName) && is_string($snippetName)) ? $snippetName : 'DLUsers';
- $modx->runSnippet($snippetName, array(
- 'action' => 'logout'
- ));
-}
diff --git a/assets/snippets/DLUsers/snippet.DLUsers.php b/assets/snippets/DLUsers/snippet.DLUsers.php
deleted file mode 100755
index c56b1f329c..0000000000
--- a/assets/snippets/DLUsers/snippet.DLUsers.php
+++ /dev/null
@@ -1,14 +0,0 @@
-event->params) ? $modx->event->params : array();
-$action = APIHelpers::getkey($params, 'action', '');
-$lang = APIHelpers::getkey($params, 'lang', $modx->getConfig('manager_language'));
-$userClass = APIHelpers::getkey($params, 'userClass', 'modUsers');
-$DLUsers = \DLUsers\Actions::getInstance($modx, $lang, $userClass);
-$out = '';
-if ( ! empty($action) && method_exists($DLUsers, $action)) {
- $out = call_user_func_array(array($DLUsers, $action), array($params));
-}
-
-return $out;
diff --git a/assets/snippets/DLUsers/src/Actions.php b/assets/snippets/DLUsers/src/Actions.php
deleted file mode 100755
index c67a2c3e43..0000000000
--- a/assets/snippets/DLUsers/src/Actions.php
+++ /dev/null
@@ -1,578 +0,0 @@
-modx = $modx;
- $this->userObj = new $userClass($this->modx, $debug);
- $this->url = new DLCollection($this->modx);
-
- $site_url = $this->modx->getConfig('site_url');
- $site_start = $this->modx->getConfig('site_start', 1);
- $error_page = $this->modx->getConfig('error_page', $site_start);
- $unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);
-
- $this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');
- }
-
- /**
- * prevent the instance from being cloned
- *
- * @return void
- */
- private function __clone()
- {
-
- }
-
- /**
- * prevent from being unserialized
- *
- * @return void
- */
- private function __wakeup()
- {
-
- }
-
- /**
- * Сброс авторизации и обновление страницы
- */
- public function logout($params)
- {
- $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
- if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
- $userID = $this->UserID('web');
- if ($userID) {
- $this->userObj->edit($userID);
- $params = array();
- if ($this->userObj->getID()) {
- $params = array(
- "userid" => $this->userObj->getID(),
- "username" => $this->userObj->get('username')
- );
- $this->modx->invokeEvent("OnBeforeWebLogout", $params);
- }
- $this->userObj->logOut();
- if ($this->userObj->getID()) {
- $this->modx->invokeEvent("OnWebLogout", $params);
- }
-
- $go = APIHelpers::getkey($params, 'url', '');
- if (empty($go)) {
- $go = str_replace(
- array("?" . $LogoutName, "&" . $LogoutName),
- array("", ""),
- $_SERVER['REQUEST_URI']
- );
- }
-
- $start = $this->makeUrl($this->config['site_start']);
- if ($start == $go) {
- $go = $this->config['site_url'];
- } else {
- $go = $this->config['site_url'] . ltrim($go, '/');
- }
- $this->moveTo(array('url' => $go));
- } else {
- //Если юзер не авторизован, то показываем ему 404 ошибку
- $this->modx->sendErrorPage();
- }
- }
-
- return true;
- }
-
- /**
- * Генерация ссылки под кнопку выход
- * @return string
- */
- public function logoutUrl($params)
- {
- $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
- $request = parse_url($_SERVER['REQUEST_URI']);
-
- //Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path
- $query = '?' . $LogoutName;
-
- return $request['path'] . $query;
- }
-
- /**
- * Авторизация из блока
- * если указан параметр authId, то данные из формы перекидываются в метод AuthPage
- * В противном случае вся работа происходит внутри самого блока
- */
- public function AuthBlock($params)
- {
- $POST = array('backUrl' => $_SERVER['REQUEST_URI']);
-
- $error = $errorCode = '';
-
- $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
- $emailField = APIHelpers::getkey($params, 'emailField', 'email');
- $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
-
- if ($this->UserID('web')) {
- $tpl = APIHelpers::getkey($params, 'tplProfile', '');
- if (empty($tpl)) {
- $tpl = $this->getTemplate('tplProfile');
- }
- $dataTPL = $this->userObj->toArray();
- $dataTPL['url.logout'] = $this->logoutUrl($params);
- $homeID = APIHelpers::getkey($params, 'homeID');
- if (!empty($homeID)) {
- $dataTPL['url.profile'] = $this->makeUrl($homeID);
- }
- } else {
- $tpl = APIHelpers::getkey($params, 'tplForm', '');
- if (empty($tpl)) {
- $tpl = $this->getTemplate('authForm');
- }
- $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error,
- $errorCode, $params);
- $dataTPL = array(
- 'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
- 'emailValue' => APIHelpers::getkey($POST, 'email', ''),
- 'emailField' => $emailField,
- 'pwdField' => $pwdField,
- 'method' => strtolower(__METHOD__),
- 'error' => $error,
- 'errorCode' => $errorCode
- );
- $authId = APIHelpers::getkey($params, 'authId');
- if (!empty($authId)) {
- $dataTPL['authPage'] = $this->makeUrl($authId);
- $dataTPL['method'] = strtolower(__CLASS__ . '::' . 'authpage');
- }
- }
-
- return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
- }
-
- /**
- * Авторизация на сайте со страницы авторизации
- * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
- */
- public function AuthPage($params)
- {
- $homeID = APIHelpers::getkey($params, 'homeID');
- $this->isAuthGoHome(array('id' => $homeID));
-
- $error = $errorCode = '';
- $POST = array('backUrl' => '');
-
- $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
- $emailField = APIHelpers::getkey($params, 'emailField', 'email');
- $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
-
- $tpl = APIHelpers::getkey($params, 'tpl', '');
- if (empty($tpl)) {
- $tpl = $this->getTemplate('authForm');
- }
-
- $request = parse_url($_SERVER['REQUEST_URI']);
- if ($request === false) {
- $request = array();
- }
- if (!empty($_SERVER['HTTP_REFERER'])) {
- /**
- * Thank you for super protection against hacking in protect.inc.php:-)
- */
- $refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
- } else {
- $refer = $this->getBackUrl($request);
- }
-
- if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
- if (!is_scalar($backUrl)) {
- $backUrl = $refer;
- } else {
- $backUrl = urldecode($backUrl);
- }
- } else {
- $backUrl = $refer;
- }
- $backUrl = parse_url($backUrl);
- if ($backUrl === false) {
- $backUrl = array();
- }
- if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
- $POST['backUrl'] = $backUrl['path'];
- } else {
- $POST['backUrl'] = $this->getBackUrl($backUrl);
- }
- if (!empty($POST['backUrl'])) {
- $idURL = $this->moveTo(array(
- 'url' => '/' . ltrim($POST['backUrl'], '/'),
- 'validate' => true
- ));
- } else {
- $idURL = 0;
- }
- if (empty($idURL)) {
- if (empty($homeID)) {
- $homeID = $this->config['site_start'];
- }
- $POST['backUrl'] = $this->makeUrl($homeID);
- }
- $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode,
- $params);
-
- return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(
- 'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
- 'emailValue' => APIHelpers::getkey($POST, 'email', ''),
- 'emailField' => $emailField,
- 'pwdField' => $pwdField,
- 'method' => strtolower(__METHOD__),
- 'error' => $error,
- 'errorCode' => $errorCode
- ));
- }
-
- /**
- * @param array $request
- * @return string
- */
- protected function getBackUrl(array $request = array())
- {
- $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
- if (empty($request['host']) || $request['host'] == $selfHost) {
- $query = !empty($request['query']) ? '?' . $request['query'] : '';
- $out = !empty($request['path']) ? $request['path'] . $query : '';
- } else {
- $out = '';
- }
-
- return $out;
- }
-
- /**
- * @param $pwdField
- * @param $emailField
- * @param $rememberField
- * @param $backUrl
- * @param $method
- * @param $error
- * @param $errorCode
- * @param array $params
- * @return array
- */
- protected function Auth(
- $pwdField,
- $emailField,
- $rememberField,
- $backUrl,
- $method,
- &$error,
- &$errorCode,
- $params = array()
- ) {
- $POST = array(
- 'backUrl' => urlencode($backUrl)
- );
- $userObj = &$this->userObj;
- if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {
- $POST = array_merge($POST, array(
- 'password' => APIHelpers::getkey($_POST, $pwdField, ''),
- 'email' => APIHelpers::getkey($_POST, $emailField, ''),
- 'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
- ));
- if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'],
- false)
- ) {
- $userObj->edit($POST['email']);
-
- $this->modx->invokeEvent("OnBeforeWebLogin", array(
- "username" => $POST['email'],
- "userpassword" => $POST['password'],
- "rememberme" => $POST['remember'],
- 'userObj' => $userObj
- ));
- if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {
- $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
- "userid" => $userObj->getID(),
- "username" => $userObj->get('username'),
- "userpassword" => $POST['password'],
- "savedpassword" => $userObj->get('password'),
- "rememberme" => $POST['remember'],
- ));
- if (
- ($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
- &&
- $userObj->authUser($userObj->getID(), $POST['remember'])
- ) {
- $userObj->set('logincount', (int)$userObj->get('logincount') + 1);
- $userObj->set('lastlogin', time());
- $userObj->set('failedlogincount', 0);
- $userObj->save(false, false);
-
- $this->modx->invokeEvent("OnWebLogin", array(
- "userid" => $userObj->getID(),
- "username" => $userObj->get('username'),
- "userpassword" => $POST['password'],
- "rememberme" => $POST['remember'],
- ));
- $this->moveTo(array('url' => urldecode($POST['backUrl'])));
- } else {
- $userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
- $userObj->save(false, false);
-
- $error = 'error.incorrect_password';
- }
- } else {
- $error = 'error.no_user';
- }
- } else {
- $error = 'error.incorrect_mail';
- $POST['email'] = '';
- }
- }
- if (!empty($error)) {
- $errorCode = $error;
- $error = APIHelpers::getkey($params, $error, '');
- $error = static::getLangMsg($error, $error);
- }
-
- return $POST;
- }
-
- /**
- * Информация о пользователе
- * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
- */
- public function UserInfo($params)
- {
- $out = '';
- $userID = APIHelpers::getkey($params, 'id', 0);
- if (empty($userID)) {
- $userID = $this->UserID('web');
- }
- $field = APIHelpers::getkey($params, 'field', 'username');
- if ($userID > 0) {
- $this->userObj->edit($userID);
- switch (true) {
- case ($field == $this->userObj->fieldPKName()):
- $out = $this->userObj->getID();
- break;
- case ($this->userObj->issetField($field)):
- $out = $this->userObj->get($field);
- break;
- }
- }
-
- return $out;
- }
-
- /**
- * ID пользователя
- */
- public function UserID($type = 'web')
- {
- return $this->modx->getLoginUserID($type);
- }
-
- /**
- * Если не авторизован - то отправить на страницу
- */
- public function isGuestGoHome($params)
- {
- if (!$this->UserID('web')) {
- /**
- * @see : http://modx.im/blog/triks/105.html
- */
- $this->modx->invokeEvent('OnPageUnauthorized');
- $id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);
- $this->moveTo(compact('id'));
- }
-
- return;
- }
-
- /**
- * Если авторизован - то открыть личный кабинет
- */
- public function isAuthGoHome($params)
- {
- $userID = $this->UserID('web');
- if ($userID > 0) {
- $id = APIHelpers::getkey($params, 'homeID');
- if (empty($id)) {
- $id = $this->modx->getConfig('login_home', $this->config['site_start']);
- }
- $this->moveTo(compact('id'));
- }
-
- return;
- }
-
- /**
- * Редирект
- */
- public function moveTo($params)
- {
- $id = (int)APIHelpers::getkey($params, 'id', 0);
- $uri = APIHelpers::getkey($params, 'url', '');
- if ((empty($uri) && !empty($id)) || !is_string($uri)) {
- $uri = $this->makeUrl($id);
- }
- $code = (int)APIHelpers::getkey($params, 'code', 0);
- $addUrl = APIHelpers::getkey($params, 'addUrl', '');
- if (is_scalar($addUrl) && $addUrl != '') {
- $uri .= "?" . $addUrl;
- }
- if (APIHelpers::getkey($params, 'validate', false)) {
- if (isset($this->modx->snippetCache['getPageID'])) {
- $out = $this->modx->runSnippet('getPageID', compact('uri'));
- if (empty($out)) {
- $uri = '';
- }
- } else {
- $uri = APIhelpers::sanitarTag($uri);
- }
- } else {
- header("Location: " . $uri, true, ($code > 0 ? $code : 307));
- }
-
- return $uri;
- }
-
- /**
- * Создание ссылки на страницу
- *
- * @param int $id ID документа
- * @return string
- */
- protected function makeUrl($id = null)
- {
- $id = (int)$id;
- if ($id <= 0) {
- $id = $this->modx->documentObject['id'];
- }
- if ($this->url->containsKey($id)) {
- $url = $this->url->get($id);
- } else {
- $url = $this->modx->makeUrl($id);
- $this->url->set($id, $url);
- }
-
- return $url;
- }
-
- /**
- * @param $name
- * @return string
- */
- protected function getTemplate($name)
- {
- $out = '';
- $file = dirname(dirname(__FILE__)) . '/tpl/' . $name . '.html';
- if (FS::getInstance()->checkFile($file)) {
- $out = '@CODE: ' . file_get_contents($file);
- }
-
- return $out;
- }
-
- /**
- * @param $lang
- * @return bool
- */
- protected static function loadLang($lang)
- {
- $file = dirname(dirname(__FILE__)) . '/lang/' . $lang . '.php';
- if (!FS::getInstance()->checkFile($file)) {
- $file = false;
- }
- if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {
- static::$langDic[$lang] = include_once($file);
- if (is_array(static::$langDic[$lang])) {
- static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
- } else {
- static::$langDic[$lang] = array();
- }
- }
-
- return !(empty($lang) || empty(static::$langDic[$lang]));
- }
-
- /**
- * @param $key
- * @param $default
- * @return string
- */
- protected static function getLangMsg($key, $default)
- {
- $out = $default;
- $lng = static::$lang;
- $dic = static::$langDic;
- if (isset($dic[$lng], $dic[$lng][$lng . '.' . $key])) {
- $out = $dic[$lng][$lng . '.' . $key];
- }
- if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {
- $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.' . $key));
- if (!empty($msg)) {
- $out = $msg;
- }
- }
-
- return $out;
- }
-}
diff --git a/assets/snippets/DLUsers/tpl/authForm.html b/assets/snippets/DLUsers/tpl/authForm.html
deleted file mode 100755
index bc4ac5e802..0000000000
--- a/assets/snippets/DLUsers/tpl/authForm.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[+error:isnotempty=`
-[+error+]
`+]
-
\ No newline at end of file
diff --git a/assets/snippets/DLUsers/tpl/tplProfile.html b/assets/snippets/DLUsers/tpl/tplProfile.html
deleted file mode 100755
index 543bf5c2db..0000000000
--- a/assets/snippets/DLUsers/tpl/tplProfile.html
+++ /dev/null
@@ -1,3 +0,0 @@
-[+fullname+]
-[+url.profile:isnotempty=`Личный кабинет`+]
-Выход
\ No newline at end of file
diff --git a/assets/snippets/DocLister/config/core/sitemap.json b/assets/snippets/DocLister/config/core/sitemap.json
new file mode 100644
index 0000000000..0ab1abe337
--- /dev/null
+++ b/assets/snippets/DocLister/config/core/sitemap.json
@@ -0,0 +1,12 @@
+{
+ "idType": "documents",
+ "ignoreEmpty": 1,
+ "addWhereList": "c.published = 1 AND c.deleted=0 AND c.searchable=1 AND c.type='document'",
+ "selectFields": "id,editedon,createdon,type",
+ "dateSource":"",
+ "tpl": "@CODE:\n'); } if ($tpl != '') { - $date = $this->getCFGDef('dateSource', 'pub_date'); - $this->toPlaceholders(count($this->_docs), 1, "display"); // [+display+] - сколько показано на странице. $i = 1; @@ -111,15 +118,6 @@ public function _render($tpl = '') */ $extPrepare = $this->getExtender('prepare'); - /** - * @var $extJotCount jotcount_DL_Extender - */ - $extJotCount = $this->getCFGdef('jotcount', 0) ? $this->getExtender('jotcount', true) : null; - - if ($extJotCount) { - $comments = $extJotCount->countComments(array_keys($this->_docs)); - } - $this->skippedDocs = 0; foreach ($this->_docs as $item) { $this->renderTPL = $tpl; @@ -129,10 +127,6 @@ public function _render($tpl = '') $item['summary'] = $extSummary ? $this->getSummary($item, $extSummary, 'introtext', 'content') : ''; - if ($extJotCount) { - $item['jotcount'] = APIHelpers::getkey($comments, $item['id'], 0); - } - $item = array_merge($item, $sysPlh); //inside the chunks available all placeholders set via $modx->toPlaceholders with prefix id, and with prefix sysKey $item['iteration'] = $i; //[+iteration+] - Number element. Starting from zero @@ -147,7 +141,7 @@ public function _render($tpl = '') $item['url'] = $this->modx->makeUrl($item['id'], '', '', $this->getCFGDef('urlScheme', '')); } } - + $date = $this->getCFGDef('dateSource', 'pub_date'); if (isset($item[$date])) { if (!$item[$date] && $date == 'pub_date' && isset($item['createdon'])) { $date = 'createdon'; @@ -245,16 +239,17 @@ public function getJSON($data, $fields, $array = array()) } } - if (array('1') == $fields || in_array(array('menutitle', 'pagetitle'), $fields)) { - $row['title'] = ($row['menutitle'] == '' ? $row['pagetitle'] : $row['menutitle']); + if (array('1') == $fields || in_array('title', $fields)) { + if (isset($row['pagetitle'])) { + $row['title'] = empty($row['menutitle']) ? $row['pagetitle'] : $row['menutitle']; + } } - if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array(array('content', 'type'), - $fields)) + if ((bool)$this->getCFGDef('makeUrl', 1) && (array('1') == $fields || in_array('url',$fields)) ) { - if ($row['type'] == 'reference') { + if (isset($row['type']) && $row['type'] == 'reference' && isset($row['content'])) { $row['url'] = is_numeric($row['content']) ? $this->modx->makeUrl($row['content'], '', '', $this->getCFGDef('urlScheme', '')) : $row['content']; - } else { + } elseif (isset($row['id'])) { $row['url'] = $this->modx->makeUrl($row['id'], '', '', $this->getCFGDef('urlScheme', '')); } } @@ -348,14 +343,13 @@ public function getChildrenCount() if (trim($where) == 'WHERE') { $where = ''; } - $group = $this->getGroupSQL($this->getCFGDef('groupBy', '')); - $sort = $this->SortOrderSQL("if(c.pub_date=0,c.createdon,c.pub_date)"); - list($from) = $this->injectSortByTV($from, $sort); + $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id')); $q_true = $q_true ? $q_true : $group != ''; - if ( $q_true ){ - $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group}) as `tmp`"); + $maxDocs = $this->getCFGDef('maxDocs', 0); + $limit = $maxDocs > 0 ? $this->LimitSQL($this->getCFGDef('maxDocs', 0)) : ''; + $rs = $this->dbQuery("SELECT count(*) FROM (SELECT count(*) FROM {$from} {$where} {$group} {$limit}) as `tmp`"); $out = $this->modx->db->getValue($rs); } else { @@ -412,11 +406,9 @@ protected function getDocList() $rs = $this->dbQuery("SELECT {$fields} FROM {$tbl_site_content} {$where} {$group} {$sort} {$limit}"); - $rows = $this->modx->db->makeArray($rs); - - foreach ($rows as $item) { + while ($item = $this->modx->db->getRow($rs)) { $out[$item['id']] = $item; - } + }; } return $out; @@ -428,6 +420,7 @@ protected function getDocList() */ public function getChildrenFolder($id) { + $out = array(); $where = $this->getCFGDef('addWhereFolder', ''); $where = sqlHelper::trimLogicalOp($where); if ($where != '') { @@ -444,9 +437,7 @@ public function getChildrenFolder($id) $rs = $this->dbQuery("SELECT id FROM {$tbl_site_content} {$where}"); - $rows = $this->modx->db->makeArray($rs); - $out = array(); - foreach ($rows as $item) { + while ($item = $this->modx->db->getRow($rs)) { $out[] = $item['id']; } @@ -531,15 +522,13 @@ protected function getChildrenList() $group = $this->getGroupSQL($this->getCFGDef('groupBy', '')); if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) { - $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " . + $rs = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " . $group . " " . $sort . " " . $this->LimitSQL($this->getCFGDef('queryLimit', 0)) ); - $rows = $this->modx->db->makeArray($sql); - - foreach ($rows as $item) { + while ($item = $this->modx->db->getRow($rs)) { $out[$item['id']] = $item; } } diff --git a/assets/snippets/DocLister/core/controller/site_content_menu.php b/assets/snippets/DocLister/core/controller/site_content_menu.php index 507d4c5ef2..ee2cd1d4ba 100644 --- a/assets/snippets/DocLister/core/controller/site_content_menu.php +++ b/assets/snippets/DocLister/core/controller/site_content_menu.php @@ -17,6 +17,7 @@ class site_content_menuDocLister extends site_contentDocLister protected $IDs = array(); protected $activeBranch = array(); protected $countChildren = array(); + protected $display = array(); /** * Очистка массива $IDs по которому потом будет производиться выборка документов @@ -40,9 +41,14 @@ public function setIDs($IDs) public function getDocs($tvlist = '') { $maxDepth = $this->getCFGDef('maxDepth', 10); + $this->extTV->getAllTV_Name(); //TODO кэширование if ($this->getCFGDef('hideSubMenus', 0) && empty($this->getCFGDef('openIds'))) { - $maxDepth = $this->setActiveBranch($this->getHereId()); + $maxDepth = min($maxDepth, $this->setActiveBranch($this->getHereId())); + if (empty(array_intersect($this->IDs, $this->activeBranch))) { + $maxDepth = 1; + $this->config->setConfig(array('hideSubMenus' => 0)); + }; } else { $this->setActiveBranch($this->getHereId()); } @@ -62,23 +68,46 @@ public function getDocs($tvlist = '') if ($this->getCFGDef('showParent', 0) && in_array(0, $this->IDs)) { $this->config->setConfig(array('showParent' => 0)); } - if ($this->getCFGDef('showParent', 0)) { - $orderBy = $this->getCFGDef('orderBy'); - $docs = $this->getDocList(); - $this->config->setConfig(array('orderBy' => $orderBy)); - $this->levels[$currentLevel++] = $docs; - $this->IDs = $ids = array_keys($docs); - $this->config->setConfig(array('showParent' => 0)); - } + $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParents', 0); while ($currentLevel <= $maxDepth) { $orderBy = $this->getCFGDef('orderBy'); - $docs = $this->getChildrenList(); + if ($this->getCFGDef('showParent', 0) && $currentLevel == 1) { + $docs = $this->getDocList(); + $this->config->setConfig(array('showParent' => 0)); + } else { + $docs = $this->getChildrenList(); + } + if ($currentLevel == 1 && $joinMenus) { + $tmp = array(); + $display = 0; + $iteration = 1; + foreach ($docs as $id => $item) { + $tmp[$item['parent']][] = $item['id']; + $display++; + } + foreach ($tmp as $id => $item) { + foreach ($item as $_id) { + $docs[$_id]['_display'] = $display; + $docs[$_id]['iteration'] = $iteration++; + } + } + unset($tmp); + } else { + foreach ($docs as $id => &$item) { + $parent = $item['parent']; + if (!isset($this->display[$parent])) { + $this->display[$parent] = 1; + } + $item['iteration'] = $this->display[$parent]++; + } + } $this->config->setConfig(array('orderBy' => $orderBy)); if (empty($docs)) { break; } $this->levels[$currentLevel++] = $docs; $this->IDs = array_keys($docs); + $this->AddTable = array(); } if ($tvlist == '') { @@ -86,7 +115,6 @@ public function getDocs($tvlist = '') } if ($tvlist != '') { - $this->extTV->getAllTV_Name(); $ids = array(); foreach ($this->levels as $level => $docs) { $ids = array_merge($ids, array_keys($docs)); @@ -205,7 +233,6 @@ public function _render($tpl = '') $docs = $this->levels; /** @var prepare_DL_Extender_ $extPrepare */ $extPrepare = $this->getExtender('prepare'); - while ($currentLevel > 0) { foreach ($docs[$currentLevel] as $id => &$data) { if ($out = $this->prepareData($data)) { @@ -213,14 +240,9 @@ public function _render($tpl = '') $data = $out; } }; - if (!isset($data['maxLevel'])) { $data['maxLevel'] = 1; - $docs[$currentLevel - 1][$data[$this->parentField]]['maxLevel'] = 0; - } - - if (isset($data['here']) || isset($data['active'])) { - $docs[$currentLevel - 1][$data[$this->parentField]]['active'] = 1; + $docs[$currentLevel - 1][$data['parent']]['maxLevel'] = 0; } if ($extPrepare) { @@ -238,18 +260,19 @@ public function _render($tpl = '') $data['wrap'] = $this->parseOuter($data); } $hideSubMenus = $this->getCFGDef('hideSubMenus', 0); - $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data[$this->parentField], + $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'], $this->activeBranch)); if ($hideSubMenus) { - $docs[$currentLevel - 1][$data[$this->parentField]]['wrap'][] = $data; + $docs[$currentLevel - 1][$data['parent']]['wrap'][] = $data; } } unset($docs[$currentLevel]); $currentLevel--; } unset($data); + $out = ''; - $joinMenus = $this->getCFGDef('joinMenus',0) && !$this->getCFGDef('showParents',0); + $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParents', 0); foreach ($docs[0] as $id => $data) { if (isset($data['wrap'])) { if ($joinMenus) { @@ -260,7 +283,9 @@ public function _render($tpl = '') } } } - if ($joinMenus) $out = $this->parseOuter(array('wrap'=>$out)); + if ($joinMenus) { + $out = $this->parseOuter(array('wrap' => $out)); + } return $out; } @@ -283,18 +308,28 @@ public function prepareData($data) if ($id == $this->getHereId()) { $data['here'] = 1; } - if (in_array($id,$this->activeBranch)) { + if (!isset($data['here']) && in_array($id, $this->activeBranch)) { $data['active'] = 1; } if ($this->getCFGDef('hideSubMenus') && isset($data['isfolder']) && $data['isfolder']) { $data['state'] = in_array($data['id'], $this->activeBranch) ? 'open' : 'closed'; } + if (!isset($data['_display'])) { + $data['_display'] = $this->display[$data['parent']] - 1; + } + if ($data['iteration'] == 1) { + $data['first'] = 1; + } + if ($data['iteration'] == $data['_display']) { + $data['last'] = 1; + } + $titleField = $this->getCFGDef('titleField', 'title'); $data[$titleField] = isset($data['menutitle']) && !empty($data['menutitle']) ? $data['menutitle'] : $data['pagetitle']; $data['level'] = $this->currentLevel; $data['url'] = $this->makeUrl($data); - if ($this->getCFGDef('countChildren', 1)) { + if ($this->getCFGDef('countChildren', 0)) { $data['count'] = isset($this->countChildren[$data['id']]) ? $this->countChildren[$data['id']] : 0; } @@ -340,15 +375,7 @@ public function parseOuter($data = array()) public function parseRow($data = array()) { $out = ''; - $maxIteration = count($data) - 1; foreach ($data as $iteration => $item) { - $item['iteration'] = $iteration + 1; - if ($iteration == 0) { - $item['first'] = 1; - } - if ($iteration == $maxIteration) { - $item['last'] = 1; - } $tpl = isset($item['_renderRowTpl']) ? $item['_renderRowTpl'] : $this->getRowTemplate($item); $item = array_merge($item, $this->getClasses($item)); $out .= $this->parseChunk($tpl, $item); @@ -504,7 +531,7 @@ public function getJSON($data, $fields, $array = array()) }; if (isset($data['here']) || isset($data['active'])) { - $docs[$currentLevel - 1][$data[$this->parentField]]['active'] = 1; + $docs[$currentLevel - 1][$data['parent']]['active'] = 1; } if ($extPrepare) { @@ -518,18 +545,27 @@ public function getJSON($data, $fields, $array = array()) } $hideSubMenus = $this->getCFGDef('hideSubMenus', 0); - $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data[$this->parentField], + $hideSubMenus = !$hideSubMenus || ($hideSubMenus && in_array((int)$data['parent'], $this->activeBranch)); if ($hideSubMenus) { - $docs[$currentLevel - 1][$data[$this->parentField]]['children'][] = $data; + $docs[$currentLevel - 1][$data['parent']]['children'][] = $data; } } unset($docs[$currentLevel]); $currentLevel--; } unset($data); - - $out = $docs[0][0]['children']; + $out = array(); + $joinMenus = $this->getCFGDef('joinMenus', 0) && !$this->getCFGDef('showParents', 0); + foreach ($docs[0] as $id => $data) { + if (isset($data['children'])) { + if ($joinMenus) { + $out = array_merge($out, $data['children']); + } else { + $out[] = $data['children']; + } + } + } unset($docs); return json_encode($out, JSON_UNESCAPED_UNICODE); diff --git a/assets/snippets/DocLister/core/extender/jotcount.extender.inc b/assets/snippets/DocLister/core/extender/jotcount.extender.inc old mode 100755 new mode 100644 index 7fc620d24c..cc2a3a6b95 --- a/assets/snippets/DocLister/core/extender/jotcount.extender.inc +++ b/assets/snippets/DocLister/core/extender/jotcount.extender.inc @@ -17,26 +17,13 @@ class jotcount_DL_Extender extends extDocLister */ protected function run() { - return true; - } - - /** - * @param $docs - * @return array - */ - public function countComments($docs) - { - $comments = array(); - if (count($docs)) { - $from = $this->DocLister->getTable('jot_content'); - $rs = $this->DocLister->dbQuery("SELECT uparent, COUNT(*) as total FROM {$from} WHERE uparent IN (" . implode(',', - $docs) . ") AND published=1 AND deleted=0 GROUP BY uparent"); - $counts = $this->modx->db->makeArray($rs); - foreach ($counts as $v) { - $comments[$v['uparent']] = $v['total']; - } - } + $join = "LEFT JOIN (SELECT `uparent`, COUNT(`id`) AS `jotcount` FROM {$this->DocLister->getTable('jot_content')} WHERE `published`=1 AND `deleted`=0 GROUP BY `uparent`) `jc` ON `jc`.`uparent` = {$this->DocLister->getPK()}"; + $this->DocLister->setFiltersJoin($join); + $fields = $this->DocLister->getCFGDef('selectFields', 'c.*'); + $this->DocLister->config->setConfig(array( + "selectFields" => $fields . ",IFNULL(`jc`.`jotcount`,0) AS `jotcount`" + )); - return $comments; + return true; } -} \ No newline at end of file +} diff --git a/assets/snippets/DocLister/core/extender/paginate.extender.inc b/assets/snippets/DocLister/core/extender/paginate.extender.inc index 17dde0e9ae..dda09f088b 100644 --- a/assets/snippets/DocLister/core/extender/paginate.extender.inc +++ b/assets/snippets/DocLister/core/extender/paginate.extender.inc @@ -12,6 +12,7 @@ if (!defined('MODX_BASE_PATH')) { * @see http://mis-algoritmos.com/2007/05/27/digg-style-pagination-class */ include_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/DLpaginate.class.php"); +include_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/DLpaginateReversed.class.php"); /** * Class paginate_DL_Extender @@ -22,7 +23,8 @@ class paginate_DL_Extender extends extDocLister * @var bool */ protected $lang = true; - + protected $reverse = false; + protected $count = 0; /** * @var array */ @@ -38,40 +40,77 @@ class paginate_DL_Extender extends extDocLister if (($paginate = $this->DocLister->getCFGDef('paginate', '')) == '') { $this->DocLister->config->setConfig(array('start' => 0)); } - $pages = 0; + $this->reverse = $this->DocLister->getCFGDef('reversePagination', 0); + $pages = $this->getListPages($paginate, 'total'); $display = $this->DocLister->getCFGDef('display', 0); switch ($paginate) { case 'offset': $requestName = $this->getRequestName('start'); $start = (isset($_GET[$requestName]) && intval($_GET[$requestName]) > 1) ? intval($_GET[$requestName]) : 0; $this->_pages['current'] = ceil($start / $display) + 1; + if ($this->reverse && $this->_pages['current'] > 1) { + $offset = $pages * $display - $this->count; + $start -= $offset; + } $this->DocLister->config->setConfig(array('start' => $start)); break; case 'pages': default: $paginate = 'pages'; $requestName = $this->getRequestName('page'); - if ( + if ( isset($_GET[$requestName]) - && intval($_GET[$requestName]) <= 1 - && !$this->DocLister->getCFGDef('noRedirect',0) + && !$this->DocLister->getCFGDef('noRedirect', 0) ) { - $this->modx->sendRedirect($this->getUrl()); + if ((!$this->reverse && (intval($_GET[$requestName]) <= 1 || intval($_GET[$requestName]) > $pages)) || ($this->reverse && (intval($_GET[$requestName]) >= $pages || intval($_GET[$requestName]) < 1))) { + $this->modx->sendRedirect($this->getUrl()); + } } - $start = (isset($_GET[$requestName]) && intval($_GET[$requestName]) > 1) ? (intval($_GET[$requestName]) - 1) : 0; - $this->_pages['current'] = $start + 1; - $this->DocLister->config->setConfig(array('start' => $start * $display)); + if ($this->reverse) { + $start = (isset($_GET[$requestName]) && intval($_GET[$requestName]) <= $pages) ? ($pages - intval($_GET[$requestName])) : 0; + $this->_pages['current'] = $start + 1; + $offset = $pages * $display - $this->count; + if ($this->_pages['current'] > 1) { + $this->DocLister->config->setConfig(array('start' => $start * $display - $offset)); + } else { + $display = $display - $offset; + $this->DocLister->config->setConfig(array('display' => $display)); + } + } else { + $start = (isset($_GET[$requestName]) && intval($_GET[$requestName]) > 1) ? (intval($_GET[$requestName]) - 1) : 0; + $this->_pages['current'] = $start + 1; + $this->DocLister->config->setConfig(array('start' => $start * $display)); + } + + break; } - $pages = $this->getListPages($paginate, 'total'); - $this->DocLister->toPlaceholders($this->currentPage(), 1, "current"); + + $this->DocLister->toPlaceholders($pages + 1 - $this->currentPage(), 1, "current"); $this->DocLister->toPlaceholders($this->renderPages($paginate), 1, "pages"); $this->DocLister->toPlaceholders(($this->currentPage() == 1 ? 1 : 0), 1, "isstart"); //[+isstart+] – is start page $this->DocLister->toPlaceholders(($this->currentPage() == $pages ? 1 : 0), 1, "isstop"); //[+isstop+] – is end page $this->DocLister->toPlaceholders($pages, 1, "totalPages"); // [+totalPages+] - total page. + + $limit = $this->DocLister->getCFGDef('maxDocs', 0); + if ($limit > 0 && !$this->reverse) { + switch ($paginate) { + case 'offset': + $offset = $start; + break; + case 'pages': + default: + $offset = $start * $display; + break; + } + if (($offset + $display) > $limit) { + $this->DocLister->config->setConfig(array('display' => $limit - $offset)); + } + } + return $pages; } @@ -90,7 +129,7 @@ class paginate_DL_Extender extends extDocLister $this->_pages['total'] = 1; } else { $addTables = $this->DocLister->AddTable; - $tmp = $this->DocLister->getChildrenCount(); + $tmp = $this->count = $this->DocLister->getChildrenCount(); $this->DocLister->AddTable = $addTables; $display = $this->DocLister->getCFGDef('display', 0); @@ -129,14 +168,22 @@ class paginate_DL_Extender extends extDocLister return (int)APIHelpers::getkey($this->_pages, 'total', 1); } + /** + * Общее число документов + * @return int + */ + public function totalDocs() + { + return $this->count; + } + /** * @param string $mode * @return string */ private function renderPages($mode = '') { - $out = ''; - $p = new DLpaginate; + $p = $this->reverse ? new DLpaginateReversed : new DLpaginate; $p->nextT = $this->DocLister->getChunkByParam('TplNextP', '@CODE:[%paginate.next%] >'); $p->prevT = $this->DocLister->getChunkByParam('TplPrevP', '@CODE:< [%paginate.prev%]'); $p->firstT = $this->DocLister->getChunkByParam('TplFirstP'); @@ -166,8 +213,13 @@ class paginate_DL_Extender extends extDocLister switch (true) { case ($mode == 'offset' && $this->totalPage() > 1): + $display = $this->DocLister->getCFGDef('display', 0); + $offset = $this->reverse ? $this->totalPage() * $display - $this->count : 0; + if ($this->currentPage() == 1) { + $this->DocLister->config->setConfig(array('display'=>$display - $offset)); + } $p->setMode('offset', array( - 'display' => $this->DocLister->getCFGDef('display', 0) + 'display' => $display ))->parameterName($this->getRequestName('start')); break; case ($mode == 'pages' && $this->totalPage() > 1): @@ -196,21 +248,28 @@ class paginate_DL_Extender extends extDocLister case 'pages': default: $requestName = 'page'; - $call = $this->DocLister->getCFGDef('makePaginateUrl', ''); - if((is_object($call) && ($call instanceof Closure)) || is_callable($call)){ + $call = $this->DocLister->getCFGDef('makePaginateUrl', ''); + if ((is_object($call) && ($call instanceof Closure)) || is_callable($call)) { $url = call_user_func($call, compact('url', 'params'), $this->modx, $this->DocLister, $this); - }else{ + } else { $url = $this->buildUrl($url, $requestName, $params); } break; } } - + return $url; } - public function buildUrl($url, $requestName, $params){ + /** + * @param $url + * @param $requestName + * @param $params + * @return array|string + */ + public function buildUrl($url, $requestName, $params) + { if ($requestName != '' && is_array($params)) { $q = http_build_query(array_merge($params, array($this->getRequestName($requestName) => null))); $url = explode("?", $url, 2); @@ -219,9 +278,10 @@ class paginate_DL_Extender extends extDocLister $url .= "?" . $q; } } + return $url; } - + /** * Имя REQUEST переменной в пагинаторе * diff --git a/assets/snippets/DocLister/lib/DLTemplate.class.php b/assets/snippets/DocLister/lib/DLTemplate.class.php old mode 100755 new mode 100644 diff --git a/assets/snippets/DocLister/lib/DLpaginateReversed.class.php b/assets/snippets/DocLister/lib/DLpaginateReversed.class.php new file mode 100644 index 0000000000..7c78d1e1ca --- /dev/null +++ b/assets/snippets/DocLister/lib/DLpaginateReversed.class.php @@ -0,0 +1,59 @@ +mode) { + case 'offset': + $display = isset($this->modeConfig['display']) ? $this->modeConfig['display'] : 0; + $out = $display * ($this->total_pages - $page); + break; + case 'back': + case 'pages': + default: + $out = $page; + break; + } + + return $out; + } + + /** + * @param $tpl + * @param $num + * @return mixed + */ + protected function renderItemTPL($tpl, $num) + { + $_num = $this->total_pages + 1 - $num; + return str_replace(array('[+num+]', '[+link+]'), array($_num, $this->get_pagenum_link($_num)), $tpl); + } + + /** + * @param $id + * @return mixed|string + */ + public function get_pagenum_link($id) + { + $flag = (strpos($this->target, '?') === false); + $value = $this->getPageQuery($id); + if ($flag && !empty($this->urlF)) { + $out = str_replace($this->urlF, $value, $this->target); + } else { + $out = $this->target; + if ($id > 0 && $id < $this->total_pages) { + $out .= ($flag ? "?" : "&") . $this->parameterName . "=" . $value; + } + } + + return $out; + } +} diff --git a/assets/snippets/DocLister/snippet.DLSitemap.php b/assets/snippets/DocLister/snippet.DLSitemap.php new file mode 100644 index 0000000000..1962dc82bb --- /dev/null +++ b/assets/snippets/DocLister/snippet.DLSitemap.php @@ -0,0 +1,49 @@ +event->params, 'BeforePrepare', ''); +$prepare[] = 'DLSitemap::prepare'; +$prepare[] = \APIhelpers::getkey($modx->event->params, 'AfterPrepare', ''); +$params['prepare'] = trim(implode(",", $prepare), ','); +if(!class_exists("DLSitemap")){ + class DLSitemap{ + public static function prepare(array $data = array(), DocumentParser $modx, $_DocLister) + { + $data['date'] = !empty($data['editedon']) ? $data['editedon'] : $data['createdon']; + $datediff = floor((time() - $data['date']) / 86400); + if ($datediff <= 1) { + $data['priority'] = '1.0'; + $data['update'] = 'daily'; + } elseif (($datediff > 1) && ($datediff <= 7)) { + $data['priority'] = '0.75'; + $data['update'] = 'weekly'; + } elseif (($datediff > 7) && ($datediff <= 30)) { + $data['priority'] = '0.50'; + $data['update'] = 'weekly'; + } else { + $data['priority'] = '0.25'; + $data['update'] = 'monthly'; + } + $data['date'] = date('c', $data['date']); + $priorityField = $_DocLister->getCFGDef('priority', 'tv.sitemap_priority'); + $changefreqField = $_DocLister->getCFGDef('changefreq', 'tv.sitemap_changefreq'); + if (!empty($data[$priorityField])) { + $data['priority'] = $data[$priorityField]; + } + if (!empty($data[$changefreqField])) { + $data['update'] = $data[$changefreqField]; + } + + return $data; + } + } +} + +$out = $modx->runSnippet('DocLister',$params); +if (!empty($out)) { + $out = "config['modx_charset']}\"?>\n
[+message+]
'), array('message' => $message));
+ if (!empty($message)) {
+ $plh[$field . '.error'] = $this->parseChunk($this->getCFGDef('errorTpl',
+ '@CODE:[+message+]
'), array('message' => $message));
+ }
$plh[$field . '.' . $classType . 'Class'] = $this->getCFGDef($field . '.' . $classType . 'Class',
$this->getCFGDef($classType . 'Class', $classType));
+ $plh[$field . '.class'] = "class=\"{$plh[$field . '.' . $classType . 'Class']}\"";
+ $plh[$field . '.classname'] = "{$plh[$field . '.' . $classType . 'Class']}";
}
}
@@ -859,7 +865,7 @@ public function renderMessagesGroup($messages, $wrapper, $splitter)
public function parseChunk($name, $data, $parseDocumentSource = false)
{
$parseDocumentSource = $parseDocumentSource || $this->getCFGDef('parseDocumentSource', 0);
- $rewriteUrls = $this->getCFGDef('rewriteUrls', 0);
+ $rewriteUrls = $this->getCFGDef('rewriteUrls', 1);
$DLTemplate = \DLTemplate::getInstance($this->modx)
->setTemplatePath($this->getCFGDef('templatePath'))
->setTemplateExtension($this->getCFGDef('templateExtension'))
@@ -877,7 +883,7 @@ public function parseChunk($name, $data, $parseDocumentSource = false)
if (!$parseDocumentSource && $rewriteUrls) {
$out = $this->modx->rewriteUrls($out);
}
- if ($this->getCFGDef('removeEmptyPlaceholders', 0)) {
+ if ($this->getCFGDef('removeEmptyPlaceholders', 1)) {
preg_match_all('~\[(\+|\*|\(|%)([^:\+\[\]]+)([^\[\]]*?)(\1|\)|%)\]~s', $out, $matches);
if ($matches[0]) {
$out = str_replace($matches[0], '', $out);
@@ -897,7 +903,9 @@ public function initCaptcha()
$className = ucfirst($captcha . 'Wrapper');
$cfg = $this->config->loadArray($this->getCFGDef('captchaParams', array()));
$cfg['id'] = $this->getFormId();
- $captcha = $this->loadModel($className, MODX_BASE_PATH . "assets/snippets/FormLister/lib/captcha/{$captcha}/wrapper.php",array($this->modx, $cfg));
+ $captcha = $this->loadModel($className,
+ MODX_BASE_PATH . "assets/snippets/FormLister/lib/captcha/{$captcha}/wrapper.php",
+ array($this->modx, $cfg));
if (!is_null($captcha) && $captcha instanceof CaptchaInterface) {
$captcha->init();
@@ -1023,7 +1031,8 @@ public function redirect($param = 'redirectTo', $_query = array())
* @param $url
* @param $header
*/
- public function sendRedirect($url, $header = 'HTTP/1.1 307 Temporary Redirect') {
+ public function sendRedirect($url, $header = 'HTTP/1.1 307 Temporary Redirect')
+ {
if (!$this->getCFGDef('api', 0)) {
$header = $header ? $header : 'HTTP/1.1 307 Temporary Redirect';
$this->modx->sendRedirect($url, 0, 'REDIRECT_HEADER', $header);
@@ -1176,8 +1185,7 @@ protected function removeGpc(&$target, $count = 0)
if (is_array($value)) {
$count++;
if (10 < $count) {
- echo 'GPC Array nested too deep!';
- exit;
+ break;
}
$this->removeGpc($value, $count);
$count--;
diff --git a/assets/snippets/FormLister/core/controller/DeleteUser.php b/assets/snippets/FormLister/core/controller/DeleteUser.php
index 72224c4221..8eb26e2e57 100644
--- a/assets/snippets/FormLister/core/controller/DeleteUser.php
+++ b/assets/snippets/FormLister/core/controller/DeleteUser.php
@@ -52,13 +52,13 @@ public function __construct(\DocumentParser $modx, array $cfg = array())
*/
public function render()
{
- if (!$uid = $this->modx->getLoginUserID('web')) {
+ if (!$this->modx->getLoginUserID('web')) {
$this->redirect('exitTo');
$this->renderTpl = $this->getCFGDef('skipTpl', $this->lexicon->getMsg('deleteUser.default_skipTpl'));
$this->setValid(false);
};
- return parent::render(); // TODO: Change the autogenerated stub
+ return parent::render();
}
diff --git a/assets/snippets/FormLister/core/controller/Form.php b/assets/snippets/FormLister/core/controller/Form.php
index d1ca1b3db2..1ba3f450f5 100644
--- a/assets/snippets/FormLister/core/controller/Form.php
+++ b/assets/snippets/FormLister/core/controller/Form.php
@@ -188,15 +188,16 @@ public function renderReport($tplParam = 'reportTpl')
/**
* Получает тему письма из шаблона или строки
+ * @param string $param
* @return mixed|null|string
*/
- public function renderSubject()
+ public function renderSubject($param = 'subject')
{
- $subject = $this->getCFGDef('subjectTpl');
+ $subject = $this->getCFGDef($param . 'Tpl');
if (!empty($subject)) {
$subject = $this->parseChunk($subject, $this->prerenderForm(true));
} else {
- $subject = $this->getCFGDef('subject');
+ $subject = $this->getCFGDef($param);
}
return $subject;
@@ -310,7 +311,7 @@ public function sendAutosender()
if (empty($to)) {
$out = true;
} else {
- $mailer = new Mailer($this->modx, $this->getMailSendConfig($to, 'autosenderFromName'));
+ $mailer = new Mailer($this->modx, $this->getMailSendConfig($to, 'autosenderFromName', 'autoSubject'));
$report = $this->renderReport('automessageTpl');
$out = $mailer->send($report);
$this->log('Mail autosender report', array(
@@ -335,7 +336,7 @@ public function sendCCSender()
$out = true;
} else {
if ($this->getCFGDef('ccSender', 0)) {
- $mailer = new Mailer($this->modx, $this->getMailSendConfig($to, 'ccSenderFromName'));
+ $mailer = new Mailer($this->modx, $this->getMailSendConfig($to, 'ccSenderFromName', 'ccSubject'));
$report = $this->renderReport('ccSenderTpl');
$out = $mailer->send($report);
$this->log('Mail CC report',
@@ -376,7 +377,7 @@ public function process()
$this->sendAutosender();
$this->setSubmitProtection()->postProcess();
} else {
- $this->addMessage($this->lexicon->getMsg('form.formFailed'));
+ $this->addMessage($this->lexicon->getMsg('form.form_failed'));
}
}
@@ -397,14 +398,17 @@ public function postProcess()
/**
* @param string $to
* @param string $fromParam
+ * @param string $subjectParam
* @return array
*/
- public function getMailSendConfig($to, $fromParam)
+ public function getMailSendConfig($to, $fromParam, $subjectParam = 'subject')
{
+ $subject = empty($this->getCFGDef($subjectParam)) ? $this->renderSubject() : $this->renderSubject($subjectParam);
+
return array_merge(
$this->mailConfig,
array(
- 'subject' => $this->renderSubject(),
+ 'subject' => $subject,
'to' => $to,
'fromName' => $this->getCFGDef($fromParam, $this->modx->config['site_name'])
)
diff --git a/assets/snippets/FormLister/core/controller/Profile.php b/assets/snippets/FormLister/core/controller/Profile.php
index 395d9e17f2..be226e4cd6 100644
--- a/assets/snippets/FormLister/core/controller/Profile.php
+++ b/assets/snippets/FormLister/core/controller/Profile.php
@@ -66,7 +66,6 @@ public function getValidationRules($param = 'rules')
{
$rules = parent::getValidationRules($param);
$password = $this->getField('password');
- var_dump($rules);
if (empty($password)) {
$this->forbiddenFields[] = 'password';
if (isset($rules['password'])) {
diff --git a/assets/snippets/FormLister/docs/history.md b/assets/snippets/FormLister/docs/history.md
index c2b10f7a60..a11937a365 100644
--- a/assets/snippets/FormLister/docs/history.md
+++ b/assets/snippets/FormLister/docs/history.md
@@ -1,4 +1,25 @@
## History
+### 1.7.8
+* [Refactor] Переименованы файлы документации.
+* [Refactor] Параметр removeEmptyPlaceholders по умолчанию включен (Core).
+* [Refactor] Параметр rewriteUrls по умолчанию включен (Core).
+* [Refactor] Плейсхолдеры ошибок [+field.error+] не устанавливаются, если нет сообщения об ошибке (Core).
+* [Enhancement] Плейсхолдеры [+field.class+] (включает class="") и [+field.classname+] (не включает class="") (Core).
+* [Refactor] Параметр lexicon может содержать или имена файлов (без расширения) через запятую или массив с языковыми строками (Lexicon).
+
+### 1.7.7
+* [Enhancement] Возможность указывать разный subject для разных типов писем (Form).
+
+### 1.7.6
+* [Fix] Исправления ошибок.
+
+### 1.7.5
+* [Fix] $this->modx вместо $modx в сниппете.
+
+### 1.7.4
+* [Fix] Ошибка в лексиконе (Form).
+* [Refactor] Версии PHP ниже 5.6 не поддерживаются (Core).
+
### 1.7.3
* [Refactor] Подключать __autoload.php, если не задан другой загрузчик.
* [Fix] Ошибка в обработке параметра редиректа (Core).
diff --git "a/assets/snippets/FormLister/docs/ru/010_\320\232\320\276\320\275\321\202\321\200\320\276\320\273\320\273\320\265\321\200\321\213.md" "b/assets/snippets/FormLister/docs/ru/010_\320\232\320\276\320\275\321\202\321\200\320\276\320\273\320\273\320\265\321\200\321\213.md"
old mode 100644
new mode 100755
diff --git "a/assets/snippets/FormLister/docs/ru/020_\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213.md" "b/assets/snippets/FormLister/docs/ru/020_\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213.md"
index e0046780fa..1cb9acd0bd 100644
--- "a/assets/snippets/FormLister/docs/ru/020_\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213.md"
+++ "b/assets/snippets/FormLister/docs/ru/020_\320\237\320\260\321\200\320\260\320\274\320\265\321\202\321\200\321\213.md"
@@ -242,7 +242,7 @@ myparams:core - загрузить параметры из файла assets/sni
Возможные значения - 0 или 1.
-Значение по умолчанию - 0.
+Значение по умолчанию - 1.
### parseDocumentSource
Обрабатывает чанки MODX-парсером.
diff --git "a/assets/snippets/FormLister/docs/ru/030_\320\222\320\260\320\273\320\270\320\264\320\260\321\206\320\270\321\217 \320\264\320\260\320\275\320\275\321\213\321\205.md" "b/assets/snippets/FormLister/docs/ru/030_\320\222\320\260\320\273\320\270\320\264\320\260\321\206\320\270\321\217_\320\264\320\260\320\275\320\275\321\213\321\205.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/030_\320\222\320\260\320\273\320\270\320\264\320\260\321\206\320\270\321\217 \320\264\320\260\320\275\320\275\321\213\321\205.md"
rename to "assets/snippets/FormLister/docs/ru/030_\320\222\320\260\320\273\320\270\320\264\320\260\321\206\320\270\321\217_\320\264\320\260\320\275\320\275\321\213\321\205.md"
diff --git "a/assets/snippets/FormLister/docs/ru/035_\320\230\321\201\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\320\275\320\270\320\265 \320\272\320\260\320\277\321\207\320\270.md" "b/assets/snippets/FormLister/docs/ru/035_\320\230\321\201\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\320\275\320\270\320\265_\320\272\320\260\320\277\321\207\320\270.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/035_\320\230\321\201\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\320\275\320\270\320\265 \320\272\320\260\320\277\321\207\320\270.md"
rename to "assets/snippets/FormLister/docs/ru/035_\320\230\321\201\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\320\275\320\270\320\265_\320\272\320\260\320\277\321\207\320\270.md"
diff --git "a/assets/snippets/FormLister/docs/ru/040_\320\222\321\213\320\262\320\276\320\264 \320\264\320\260\320\275\320\275\321\213\321\205.md" "b/assets/snippets/FormLister/docs/ru/040_\320\222\321\213\320\262\320\276\320\264_\320\264\320\260\320\275\320\275\321\213\321\205.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/040_\320\222\321\213\320\262\320\276\320\264 \320\264\320\260\320\275\320\275\321\213\321\205.md"
rename to "assets/snippets/FormLister/docs/ru/040_\320\222\321\213\320\262\320\276\320\264_\320\264\320\260\320\275\320\275\321\213\321\205.md"
diff --git "a/assets/snippets/FormLister/docs/ru/050_\320\236\321\202\320\277\321\200\320\260\320\262\320\272\320\260 \320\277\320\270\321\201\320\265\320\274.md" "b/assets/snippets/FormLister/docs/ru/050_\320\236\321\202\320\277\321\200\320\260\320\262\320\272\320\260_\320\277\320\270\321\201\320\265\320\274.md"
old mode 100644
new mode 100755
similarity index 98%
rename from "assets/snippets/FormLister/docs/ru/050_\320\236\321\202\320\277\321\200\320\260\320\262\320\272\320\260 \320\277\320\270\321\201\320\265\320\274.md"
rename to "assets/snippets/FormLister/docs/ru/050_\320\236\321\202\320\277\321\200\320\260\320\262\320\272\320\260_\320\277\320\270\321\201\320\265\320\274.md"
index 49b1b8e7a2..f501b7d5d8
--- "a/assets/snippets/FormLister/docs/ru/050_\320\236\321\202\320\277\321\200\320\260\320\262\320\272\320\260 \320\277\320\270\321\201\320\265\320\274.md"
+++ "b/assets/snippets/FormLister/docs/ru/050_\320\236\321\202\320\277\321\200\320\260\320\262\320\272\320\260_\320\277\320\270\321\201\320\265\320\274.md"
@@ -64,19 +64,19 @@
Значение по умолчанию - 0.
-### subject
+### subject, ccSubject, autoSubject
Тема письма.
Возможные значения - строка.
Значение по умолчанию - пусто.
-### subjectTpl
+### subjectTpl, ccSubjectTpl, autoSubjectTpl
Шаблон темы письма.
Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-Значение по умолчанию - значение параметра subject.
+Значение по умолчанию - значение параметра subject (ccSubject, autoSubject).
### autosender
Адрес на который отправляется дополнительное письмо.
diff --git "a/assets/snippets/FormLister/docs/ru/060_\320\220\320\262\321\202\320\276\321\200\320\270\320\267\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md" "b/assets/snippets/FormLister/docs/ru/060_\320\220\320\262\321\202\320\276\321\200\320\270\320\267\320\260\321\206\320\270\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
similarity index 54%
rename from "assets/snippets/FormLister/docs/ru/060_\320\220\320\262\321\202\320\276\321\200\320\270\320\267\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
rename to "assets/snippets/FormLister/docs/ru/060_\320\220\320\262\321\202\320\276\321\200\320\270\320\267\320\260\321\206\320\270\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
index 841e652207..8a1203405e 100644
--- "a/assets/snippets/FormLister/docs/ru/060_\320\220\320\262\321\202\320\276\321\200\320\270\320\267\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
+++ "b/assets/snippets/FormLister/docs/ru/060_\320\220\320\262\321\202\320\276\321\200\320\270\320\267\320\260\321\206\320\270\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
@@ -1,6 +1,78 @@
## Авторизация пользователей
-Контроллер Login позволяет авторизировать пользователей как по имени, так и по email. Кроме этого, можно дополнительно использовать плагин userHelper, который ведет учет количества логинов и времени последнего логина, а также реализует автологин и выход из учетной записи.
+Авторизация пользователей в `FormLister` осуществляется с использованием контроллера `Login`.
+
+### Выбор поля для авторизации
+
+Поле для авторизации задается в параметре `loginField` и должно быть **уникальным** для каждого веб-пользователя.
+
+Авторизация может осуществляться:
+* по **базовым** полям средствами класса `modUsers`: `id`, `username` и `email`
+* по любому **другому полю** из учетной записи (с помощью плагина для события `OnWebAuthentication`)
+
+
+Дополнительное использование плагина [userHelper](https://github.com/evolution-cms/evolution/blob/develop/assets/snippets/FormLister/plugin.userHelper.php) позволяет:
+
+* вести учет количества логинов
+* определить время последней авторизации
+* реализовать автологин и выход из учетной записи
+* блокировать пользователей после определенного количества неудачных попыток авторизации
+
+Перед использованием плагина `userHelper` убедитесь что он включен:
+
+
+
+## Пример вызова FormLister для авторизации веб-пользователей
+
+```javascript
+[!FormLister?
+&formid=`login`
+&controller=`Login`
+&loginField=`email`
+&passwordField=`password`
+&rules=`{
+ "email":{
+ "required":"Обязательно введите email"
+ }
+ },
+ "password":{
+ "required":"Обязательно введите пароль",
+ "minLength":{
+ "params":6,
+ "message":"В пароле должно быть больше 6 символов"
+ }
+ },
+}`
+&allowedFields=`email,password`
+&formTpl=`@CODE:
+
+
+
+`
+&messagesOuterTpl=`@CODE:[+messages+]
`
+&successTpl=`@CODE:Поздравляем с успешной авторизацией, [+fullname.value+]!
`
+&errorTpl=`@CODE:[+message+]
`
+&requiredClass=` has-error`
+&errorClass=` has-error`
+&requiredClass=` has-error`
+!]
+```
## Параметры контроллера
@@ -115,3 +187,18 @@
Возможные значения - число секунд с момента последнего логина.
Значение по умолчанию - 157680000 (5 лет).
+
+### maxFails
+Количество попыток для ввода учетных данных.
+
+Возможные значения - число больше 0.
+
+Значение по умолчанию - 3.
+
+### blockTime
+Время блокировки пользователя.
+
+Возможные значения - число секунд с момента последнего логина.
+
+Значение по умолчанию - 3600 (1 час).
+
diff --git "a/assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md" "b/assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
deleted file mode 100644
index 58843c8e7a..0000000000
--- "a/assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
+++ /dev/null
@@ -1,137 +0,0 @@
-## Регистрация пользователей
-
-Контроллер Register позволяет регистрировать пользователей в заданные группы и отправлять уведомления о регистрации. Контроллер является расширением контроллера Form, соответственно можно использовать соответствующие параметры для отправки писем при регистрации.
-
-Имена полей в форме должны соответствовать полям модели [modUsers](http://docs.evolution-cms.com/Extras/Snippets/DocLister/MODxAPI).
-
-Если в форме не задано поле username, то ему присваивается значение поля email. Таким образом можно регистрировать пользователей только по email.
-
-Если в форме не задано поле password, то значение поля генерируется автоматически. То есть регистрацию пользователя можно свести к указанию email.
-
-При регистрации с паролем, в форме может присутствовать поле repeatPassword. Если заданы правила валидации для полей password и repeatPassword, то при наличии для поля repeatPassword правила equals, оно будет автоматически скорректировано для проверки равенства значений полей password и repeatPassword:
-```
-"repeatPassword":{
- "required":"Введите пароль еще раз",
- "equals":{
- "params" : "Этот ключ в описании правила можно не задавать, он будет сформирован контроллером автоматически",
- "message":"Пароли не совпадают"
- }
-}
-```
-
-При регистрации следует проверять уникальность имени пользователя и email. В контроллере предусмотрены соответствующие правила:
-```
-&rules=`{
- "username":{
- "required":"Введите имя пользователя",
- "alphaNumeric":"Только буквы и цифры",
- "custom":{
- "function":"\\FormLister\\Register::uniqueUsername",
- "message":"Имя уже занято"
- }
- },
- "email":{
- "required":"Введите email",
- "email":"Неверный email",
- "custom":{
- "function":"\\FormLister\\Register::uniqueEmail",
- "message":"Этот email уже использует другой пользователь"
- }
- }
-}`
-```
-В шаблонах доступны все поля модели для созданной записи. Дополнительно задается поле user.password с незашифрованным паролем.
-
-## Параметры
-### model
-Класс для работы с пользователями.
-
-Возможные значения - имя класса.
-
-Значение по умолчанию - \modUsers
-
-### modelPath
-Путь к файлу класса для работы с пользователями.
-
-Возможные значения - относительный путь к файлу.
-
-Значение по умолчанию - assets/lib/MODxAPI/modUsers.php
-
-### allowedFields
-Разрешенные для обработки поля. Поля, не указанные в списке, игнорируются. Поля username, email и password всегда разрешены.
-
-Если не задано, то разрешены все поля.
-
-Возможные значения - имена полей формы, разделенные запятой.
-
-Значение по умолчанию - пусто.
-
-### forbiddenFields
-Запрещенные для обработки поля. Поля, указанные в списке, игнорируются. Поля username, email и password удаляются из списка запрещенных.
-
-Возможные значения - имена полей формы, разделенные запятой.
-
-Значение по умолчанию - пусто.
-
-### userGroups
-Добавляет зарегистрированного пользователя в указанные группы.
-
-Возможные значения - имена групп, разделенные запятой (если имена содержат запятую в названии, то можно задать значение параметра массивом).
-
-Значение по умолчанию - пусто.
-
-### checkActivation
-Включает проверку активации учетной записи пользователя (см. "Активация учетных записей"). При этом после сохранения записи будет установлено поле activate.url, содержащее ссылку на страницу с вызовом сниппета для активации учетной записи.
-
-Возможные значения - 1 или 0.
-
-Значение по умолчанию - 0.
-
-### activateTo
-Если включена проверка активации, то в этом параметре необходимо указать id страницы, на которой вызывается сниппет для активации.
-
-Возможные значения - id страницы.
-
-Значение по умолчанию - значение $modx->config['site_start'].
-
-### preparePostProcess
-Позволяет выполнить обработку данных после сохранения.
-
-Возможные значения - имена сниппетов, анонимные функции, статические методы загруженных классов.
-
-Значение по умолчанию - пусто.
-
-### redirectTo
-Перенаправляет пользователя на указанную страницу после регистрации.
-
-Возможные значения - id целевой страницы или массив.
-
-Значение по умолчанию - пусто.
-
-### exitTo
-Перенаправляет уже авторизованного пользователя на указанную страницу.
-
-Возможные значения - id целевой страницы.
-
-Значение по умолчанию - пусто.
-
-### skipTpl
-Шаблон сообщения для уже авторизованного пользователя.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Register с ключом [+register.default_skipTpl+]
-
-### successTpl
-Шаблон сообщения об успешной регистрации.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Register с ключом [+register.default_successTpl+]
-
-### passwordLength
-Длина пароля (если создается автоматически).
-
-Возможные значения - число символов больше 6.
-
-Значение по умолчанию - 6.
diff --git "a/assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\270\314\206.md" "b/assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\270\314\206.md"
rename to "assets/snippets/FormLister/docs/ru/070_\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\260\321\206\320\270\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\320\265\320\271.md"
diff --git "a/assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217 \321\203\321\207\320\265\321\202\320\275\321\213\321\205 \320\267\320\260\320\277\320\270\321\201\320\265\320\271.md" "b/assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217 \321\203\321\207\320\265\321\202\320\275\321\213\321\205 \320\267\320\260\320\277\320\270\321\201\320\265\320\271.md"
deleted file mode 100644
index ce0f37925c..0000000000
--- "a/assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217 \321\203\321\207\320\265\321\202\320\275\321\213\321\205 \320\267\320\260\320\277\320\270\321\201\320\265\320\271.md"
+++ /dev/null
@@ -1,84 +0,0 @@
-## Активация учетных записей
-
-Контроллер Activate реализует активацию учетных записей. Таким образом появляется возможность требовать у пользователя подтверждение учетной записи путем перехода по специальной ссылке из письма, отправленного при регистрации.
-
-Если по какой-то причине пользователь не получил письмо, то c помощью контроллера Activate он может запросить его повторную отправку.
-
-Учетная запись пользователя считается неактивированной если в поле logincount записано -1.
-
-В вызовах сниппета для регистрации и авторизации пользователей должен присутствовать параметр &checkActivation=`1`.
-
-Поэтому если при регистрации пользователь указывал пароль самостоятельно, то нужно запрашивать пароль для отправки письма со ссылкой для активации. Иначе будет генерироваться новый пароль, потому что раз пользователь запрашивает письмо для активации вручную, значит письмо после регистрации он не получил и не знает созданный при регистрации пароль.
-
-В шаблонах доступны все поля модели для обрабатываемой записи. В шаблоне reportTpl задается поле user.password с незашифрованным паролем и поле activate.url со ссылкой для активации.
-
-## Параметры
-### model
-Класс для работы с пользователями.
-
-Возможные значения - имя класса.
-
-Значение по умолчанию - \modUsers
-
-### modelPath
-Путь к файлу класса для работы с пользователями.
-
-Возможные значения - относительный путь к файлу.
-
-Значение по умолчанию - assets/lib/MODxAPI/modUsers.php
-
-### redirectTo
-Перенаправляет пользователя на указанную страницу после активации.
-
-Возможные значения - id целевой страницы или массив.
-
-Значение по умолчанию - пусто.
-
-### exitTo
-Перенаправляет авторизованного пользователя на указанную страницу.
-
-Возможные значения - id целевой страницы или массив.
-
-Значение по умолчанию - пусто.
-
-### skipTpl
-Шаблон сообщения для авторизованного пользователя.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Register с ключом [+register.default_skipTpl+]
-
-### reportTpl
-Шаблон письма с информацией для активации учетной записи.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - пусто.
-
-### reportTpl
-Шаблон письма с информацией для активации учетной записи.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - пусто.
-
-### successTpl
-Шаблон сообщения об успешной отправке письма с данными для активации.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Activate с ключом [+activate.default_successTpl+]
-
-### activateSuccessTpl
-Шаблон сообщения об успешной активации.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Activate с ключом [+activate.default_activateSuccessTpl+]
-
-### passwordLength
-Длина создаваемого пароля.
-
-Возможные значения - число символов больше 6.
-
-Значение по умолчанию - 6.
diff --git "a/assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217 \321\203\321\207\320\265\321\202\320\275\321\213\321\205 \320\267\320\260\320\277\320\270\321\201\320\265\320\270\314\206.md" "b/assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217_\321\203\321\207\320\265\321\202\320\275\321\213\321\205_\320\267\320\260\320\277\320\270\321\201\320\265\320\271.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217 \321\203\321\207\320\265\321\202\320\275\321\213\321\205 \320\267\320\260\320\277\320\270\321\201\320\265\320\270\314\206.md"
rename to "assets/snippets/FormLister/docs/ru/075_\320\220\320\272\321\202\320\270\320\262\320\260\321\206\320\270\321\217_\321\203\321\207\320\265\321\202\320\275\321\213\321\205_\320\267\320\260\320\277\320\270\321\201\320\265\320\271.md"
diff --git "a/assets/snippets/FormLister/docs/ru/080_\320\240\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 \320\277\321\200\320\276\321\204\320\270\320\273\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md" "b/assets/snippets/FormLister/docs/ru/080_\320\240\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265_\320\277\321\200\320\276\321\204\320\270\320\273\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/080_\320\240\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 \320\277\321\200\320\276\321\204\320\270\320\273\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md"
rename to "assets/snippets/FormLister/docs/ru/080_\320\240\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265_\320\277\321\200\320\276\321\204\320\270\320\273\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md"
diff --git "a/assets/snippets/FormLister/docs/ru/085_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265 \320\277\321\200\320\276\321\204\320\270\320\273\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md" "b/assets/snippets/FormLister/docs/ru/085_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265_\320\277\321\200\320\276\321\204\320\270\320\273\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/085_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265 \320\277\321\200\320\276\321\204\320\270\320\273\321\217 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md"
rename to "assets/snippets/FormLister/docs/ru/085_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265_\320\277\321\200\320\276\321\204\320\270\320\273\321\217_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217.md"
diff --git "a/assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265 \320\277\320\260\321\200\320\276\320\273\320\265\320\271 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md" "b/assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265 \320\277\320\260\321\200\320\276\320\273\320\265\320\271 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
deleted file mode 100644
index e9b507dd4f..0000000000
--- "a/assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265 \320\277\320\260\321\200\320\276\320\273\320\265\320\271 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
+++ /dev/null
@@ -1,143 +0,0 @@
-## Восстановление паролей пользователями
-
-Контроллер Reminder позволяет web-пользователям восстанавливать забытые пароли. Расширяет контроллер Form.
-
-Восстановление паролей происходит по следующей схеме:
-
-- пользователь вводит в форме свой идентификатор (им может быть имя пользователя или email);
-- пользователь получает письмо, в котором содержится ссылка для восстановления;
-- при переходе по ссылке пользователь получает возможность ввести новый пароль либо пароль будет сгенерирован автоматически;
-- пользователю отправляется письмо с новым паролем и показыается сообщение (в сообщении можно также вывести новый пароль).
-
-Параметр to перезаписывается значением email пользователя. Обязательно должен быть задан параметр resetTo.
-
-## Параметры
-### model
-Класс для работы с пользователями.
-
-Возможные значения - имя класса.
-
-Значение по умолчанию - \modUsers
-
-### modelPath
-Путь к файлу класса для работы с пользователями.
-
-Возможные значения - относительный путь к файлу.
-
-Значение по умолчанию - assets/lib/MODxAPI/modUsers.php
-
-### hashField
-Имя поля для хранения хэша данных пользователя.
-
-Значение по умолчанию - hash.
-
-### userField
-Имя поля для хранения идентификатора пользователя (имя пользователя или email).
-
-Значение по умолчанию - email.
-
-### uidField
-Имя поля, которое используется для идентификации пользователя при переходе по ссылке.
-
-Значение по умолчанию - id.
-
-### exitTo
-Перенаправляет авторизованного пользователя на указанную страницу.
-
-Возможные значения - id целевой страницы.
-
-Значение по умолчанию - пусто.
-
-### resetTo
-Страница, на которую будет указывать ссылка для восстановления паролей. Обязательный параметр.
-
-Возможные значения - id целевой страницы.
-
-Значение по умолчанию - id документа, в котором вызван контроллер.
-
-### redirectTo
-Перенаправляет на указанную страницу после успешного восстановления пароля.
-
-Возможные значения - id целевой страницы.
-
-Значение по умолчанию - пусто.
-
-### skipTpl
-Шаблон сообщения для авторизованного пользователя.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Reminder с ключом [+reminder.default_skipTpl+].
-
-### formTpl
-Шаблон формы для ввода идентификатора пользователя.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - пусто.
-
-### resetTpl
-Шаблон формы для ввода нового пароля. Если параметр не задан, то пароль будет сгенерирован автоматически.
-
-Поля для ввода паролей должны называться password и repeatPassword. В форме должны также присутствовать скрытые поля с именами из параметров uidField и hashField. Значение для поля hashField задается через плейсхолдер [+user.hash+].
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - пусто.
-
-### successTpl
-Шаблон сообщения об успешной отправке письма со ссылкой для восстановления пароля. В шаблоне можно выводить плейсхолдеры с данными пользователя (username, email и т.д.).
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Reminder с ключом [+reminder.default_successTpl+].
-
-### resetSuccessTpl
-Шаблон сообщения об успешном восстановлении пароля. В шаблоне можно выводить плейсхолдеры с данными пользователя (username, email и т.д.), а также новый пароль (newpassword).
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Reminder с ключом [+reminder.default_resetSuccessTpl+].
-
-### reportTpl
-Шаблон письма со ссылкой для восстановления пароля. В шаблоне можно выводить плейсхолдеры с данными пользователя (username, email и т.д.), а также новый пароль (newpassword). Ссылка для восстановлени пароля в письме задается через плейсхолдер [+reset.url+]
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - запись из лексикона Reminder с ключом [+reminder.default_reportTpl+]..
-
-### resetReportTpl
-Шаблон письма об успешном восстановлении пароля. В шаблоне можно выводить плейсхолдеры с данными пользователя (username, email и т.д.), а также новый пароль (newpassword). Если не задан, то письмо пользователю отправляться не будет.
-
-Возможные значения - имя шаблона, указанное по правилам задания шаблонов в DocLister.
-
-Значение по умолчанию - пусто.
-
-### rules
-Правила валидации для формы идентификации пользователя.
-
-Возможные значения - см. раздел "Валидация данных".
-
-Значение по умолчанию - пусто.
-
-### resetRules
-Правила валидации для формы установки нового пароля. Если заданы правила валидации для полей password и repeatPassword, то при наличии для поля repeatPassword правила equals, оно будет автоматически скорректировано для проверки равенства значений полей password и repeatPassword:
-```
-"repeatPassword":{
- "required":"Введите пароль еще раз",
- "equals":{
- "params" : "Этот ключ в описании правила можно не задавать, он будет сформирован контроллером автоматически",
- "message":"Пароли не совпадают"
- }
-}
-```
-Возможные значения - см. раздел "Валидация данных".
-
-Значение по умолчанию - пусто.
-
-### passwordLength
-Длина пароля (если создается автоматически).
-
-Возможные значения - число символов больше 6.
-
-Значение по умолчанию - 6.
diff --git "a/assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265 \320\277\320\260\321\200\320\276\320\273\320\265\320\270\314\206 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md" "b/assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265_\320\277\320\260\321\200\320\276\320\273\320\265\320\271_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265 \320\277\320\260\321\200\320\276\320\273\320\265\320\270\314\206 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
rename to "assets/snippets/FormLister/docs/ru/090_\320\222\320\276\321\201\321\201\321\202\320\260\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265_\320\277\320\260\321\200\320\276\320\273\320\265\320\271_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
diff --git "a/assets/snippets/FormLister/docs/ru/100_\320\241\320\276\320\267\320\264\320\260\320\275\320\270\320\265 \320\270 \321\200\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 \320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md" "b/assets/snippets/FormLister/docs/ru/100_\320\241\320\276\320\267\320\264\320\260\320\275\320\270\320\265_\320\270_\321\200\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265_\320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/100_\320\241\320\276\320\267\320\264\320\260\320\275\320\270\320\265 \320\270 \321\200\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265 \320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
rename to "assets/snippets/FormLister/docs/ru/100_\320\241\320\276\320\267\320\264\320\260\320\275\320\270\320\265_\320\270_\321\200\320\265\320\264\320\260\320\272\321\202\320\270\321\200\320\276\320\262\320\260\320\275\320\270\320\265_\320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
diff --git "a/assets/snippets/FormLister/docs/ru/105_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265 \320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md" "b/assets/snippets/FormLister/docs/ru/105_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265_\320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
old mode 100644
new mode 100755
similarity index 100%
rename from "assets/snippets/FormLister/docs/ru/105_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265 \320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262 \320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
rename to "assets/snippets/FormLister/docs/ru/105_\320\243\320\264\320\260\320\273\320\265\320\275\320\270\320\265_\320\264\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\262_\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\321\202\320\265\320\273\321\217\320\274\320\270.md"
diff --git "a/assets/snippets/FormLister/docs/ru/110_\320\233\320\265\320\272\321\201\320\270\320\272\320\276\320\275\321\213.md" "b/assets/snippets/FormLister/docs/ru/110_\320\233\320\265\320\272\321\201\320\270\320\272\320\276\320\275\321\213.md"
index dd64c0974b..c9edeba8bc 100644
--- "a/assets/snippets/FormLister/docs/ru/110_\320\233\320\265\320\272\321\201\320\270\320\272\320\276\320\275\321\213.md"
+++ "b/assets/snippets/FormLister/docs/ru/110_\320\233\320\265\320\272\321\201\320\270\320\272\320\276\320\275\321\213.md"
@@ -13,6 +13,20 @@ return $lang;
* langDir - путь к папке с лексиконами;
* lang - язык лексикона (если не указано, то используется параметр конфигурации manager_language);
-* lexicon - название лексикона, можно указать несколько названий через запятую.
+* lexicon - название лексикона, можно указать несколько названий через запятую. Также можно задать значения непосредственно в параметре:
+```
+&lexicon=`{
+ "english":{
+ "test":"Test lexicon value",
+ "foo":"Another lexicon value",
+ "bar":"And one more value"
+ },
+ "russian-UTF8":{
+ "test":"Проверка",
+ "foo":"Еще проверка",
+ "bar":"И еще"
+ }
+}`
+```
После этого в шаблонах можно использовать плейсхолдеры [%ключ%] для подстановки значений из загруженных языковых файлов. Кроме того поддерживаются лексиконы компонента EvoBabel.
\ No newline at end of file
diff --git a/assets/snippets/FormLister/lib/Lexicon.php b/assets/snippets/FormLister/lib/Lexicon.php
index a855a01c82..b6c1ad383a 100644
--- a/assets/snippets/FormLister/lib/Lexicon.php
+++ b/assets/snippets/FormLister/lib/Lexicon.php
@@ -39,9 +39,8 @@ public function loadLang($name = 'core', $lang = '', $langDir = '')
if (is_scalar($name) && !empty($name)) {
$name = array($name);
- } else {
- return $this->_lang;
}
+
foreach ($name as $n) {
if ($lang != 'english') {
$this->loadLangFile($n, 'english', $langDir);
@@ -71,8 +70,9 @@ private function loadLangFile($name = 'core', $lang = '', $langDir = '')
*/
public function fromArray($lang)
{
- if (is_array($lang) && $lang) {
- $this->_lang = array_merge($this->_lang, $lang);
+ $language = \APIhelpers::getkey($this->cfg, 'lang', $this->modx->config['manager_language']);
+ if (is_array($lang) && isset($lang[$language])) {
+ $this->_lang = array_merge($this->_lang, $lang[$language]);
}
return $this->_lang;
diff --git a/assets/snippets/FormLister/lib/captcha/modxCaptcha/modxCaptcha.php b/assets/snippets/FormLister/lib/captcha/modxCaptcha/modxCaptcha.php
index 8b84a6f172..186529883a 100644
--- a/assets/snippets/FormLister/lib/captcha/modxCaptcha/modxCaptcha.php
+++ b/assets/snippets/FormLister/lib/captcha/modxCaptcha/modxCaptcha.php
@@ -19,6 +19,12 @@ class ModxCaptcha
protected $im_width = 0;
protected $im_height = 0;
+ /**
+ * ModxCaptcha constructor.
+ * @param DocumentParser $modx
+ * @param int $width
+ * @param int $height
+ */
public function __construct(DocumentParser $modx, $width = 200, $height = 160)
{
$this->modx = $modx;
@@ -82,45 +88,61 @@ private function drawText()
$dir->close();
$text_font = (string)$fontstmp[array_rand($fontstmp)];
$chars = str_split($this->word);
- /* angle for text inclination */
- /* initial text size */
+ $_chars = array();
+ $maxWidth = $this->im_width / count($chars);
+ $text_size = round(max($maxWidth, $this->im_height) * 3 /4.5 );
+ $maxHeight = 0;
+ $totalWidth = 0;
+ foreach ($chars as $index => $value) {
+ $text_angle = rand(-20, 20);
+ $size = $text_size;
+ $box = imagettfbbox($size, $text_angle, $text_font, $value);
+ $charWidth = $box[2] - $box[0];
+ $charHeight = abs($box[5] - $box[3]);
+ $_chars[] = array(
+ 'angle' => $text_angle,
+ 'size' => $size,
+ 'width' => $charWidth,
+ 'height' => $charHeight
+ );
+ if ($charHeight > $maxHeight) $maxHeight = $charHeight;
+ $totalWidth += $charWidth;
+ }
+
+ $minRatio = min(1, $this->im_width / $totalWidth, $this->im_height / $maxHeight);
+ $size = round($text_size * $minRatio * 0.9);
+
+ $totalWidth = 0;
+ foreach ($_chars as $index => &$data) {
+ $data['size'] = $size;
+ $box = imagettfbbox($data['size'], $data['angle'], $text_font, $chars[$index]);
+ $charWidth = $box[2] - $box[0];
+ $charHeight = abs($box[5] - $box[3]);
+ $data['width'] = $charWidth;
+ $data['height'] = $charHeight;
+ $totalWidth += $charWidth;
+ }
/* create canvas for text drawing */
$im_text = imagecreate($this->im_width, $this->im_height);
$bg_color = imagecolorallocate($im_text, 255, 255, 255);
-
- $len = count($chars);
- foreach ($chars as $index => $value) {
- $text_angle = rand(-30, 30);
- /* initial text size */
- $text_size = 30;
- /* calculate text width and height */
- $box = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
- $text_width = $box[2] - $box[0]; //text width
- /* adjust text size */
- $text_size = round((30 * $this->im_width) / $text_width);
- /* recalculate text width and height */
- $box = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
- $text_width = ($box[2] - $box[0]) / $len; //text width
- $text_height = $box[5] - $box[3]; //text height
-
+ $text_x = ($this->im_width - $totalWidth) / 2;
+ foreach ($_chars as $index => $data) {
/* calculate center position of text */
- $text_x = ($this->im_width - $len * $text_width) / 2 + $index * $text_width;
- $text_y = ($this->im_height - $text_height) / 2;
-
-
+ $text_y = ($this->im_height + $data['height'])/2;
/* pick color for text */
$text_color = imagecolorallocate($im_text, rand(10, 200), rand(10, 200), rand(10, 200));
/* draw text into canvas */
imagettftext(
$im_text,
- $text_size,
- $text_angle,
+ $data['size'],
+ $data['angle'],
$text_x,
$text_y,
$text_color,
$text_font,
- $value);
+ $chars[$index]);
+ $text_x += $data['width'];
}
/* remove background color */
imagecolortransparent($im_text, $bg_color);
diff --git a/assets/snippets/FormLister/lib/captcha/modxCaptcha/wrapper.php b/assets/snippets/FormLister/lib/captcha/modxCaptcha/wrapper.php
index 613e50cb3d..14fab1f791 100644
--- a/assets/snippets/FormLister/lib/captcha/modxCaptcha/wrapper.php
+++ b/assets/snippets/FormLister/lib/captcha/modxCaptcha/wrapper.php
@@ -82,7 +82,7 @@ public static function validate(Core $FormLister, $value, CaptchaInterface $capt
if (empty($value)) {
$out = \APIhelpers::getkey($captcha->cfg, 'errorEmptyCode', 'Введите проверочный код');
} else {
- $out = $value == $captcha->lastValue ? true : \APIhelpers::getkey($captcha->cfg,
+ $out = strtolower($value) == strtolower($captcha->lastValue) ? true : \APIhelpers::getkey($captcha->cfg,
'errorCodeFailed', 'Неверный проверочный код');
}
$FormLister->log('Validate captcha value '.$value.' against '.$captcha->lastValue);
diff --git a/assets/snippets/FormLister/snippet.FormLister.php b/assets/snippets/FormLister/snippet.FormLister.php
index 622d2b0b5d..fb1cde70b4 100644
--- a/assets/snippets/FormLister/snippet.FormLister.php
+++ b/assets/snippets/FormLister/snippet.FormLister.php
@@ -9,7 +9,7 @@
* @var array $params
*/
if (!isset($formid)) {
- $this->modx->logEvent(0, 1, "Parameter &formid is not set", 'FormLister');
+ $modx->logEvent(0, 1, "Parameter &formid is not set", 'FormLister');
return;
}
if (!class_exists('\FormLister\Core')) {
@@ -49,7 +49,7 @@
$FormLister->debug->saveLog();
}
} else {
- $this->modx->logEvent(0, 1, "Controller {$classname} is missing", 'FormLister');
+ $modx->logEvent(0, 1, "Controller {$classname} is missing", 'FormLister');
}
return $out;
diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php
index 7c098ce66b..f2a54ef053 100644
--- a/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php
+++ b/assets/snippets/ajaxSearch/classes/ajaxSearchLog.class.inc.php
@@ -147,7 +147,7 @@ function updateComment($logid, $ascmt) {
//==============================================================================
/* The code below handles comment sent if the $_POST variables are set.
Used when the user post comment from the ajaxSearch results window */
-if ($_POST['logid'] && $_POST['ascmt']) {
+if (!empty($_POST['logid']) && !empty($_POST['ascmt'])) {
$ascmt = strip_tags($_POST['ascmt']);
$logid = intval($_POST['logid']);
$safeCmt = (strlen($ascmt) < CMT_MAX_LENGTH) && (substr_count($ascmt, 'http') < CMT_MAX_LINKS);
diff --git a/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php b/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php
index 2b27c47e6e..1c0e8c9ddf 100644
--- a/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php
+++ b/assets/snippets/ajaxSearch/classes/ajaxSearchUtil.class.inc.php
@@ -102,7 +102,7 @@ function getElapsedTime($start=0) {
*/
function setBacktrackLimit($backtrackLimit) {
$this->_current_pcre_backtrack = ini_get('pcre.backtrack_limit');
- if ($dbg) $this->dbgRecord($current_pcre_backtrack, "AjaxSearch - pcre.backtrack_limit");
+ if (isset($dbg)) $this->dbgRecord($current_pcre_backtrack, "AjaxSearch - pcre.backtrack_limit");
ini_set( 'pcre.backtrack_limit', $backtrackLimit);
}
/*
diff --git a/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php b/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php
index 02842e18a1..a3f587b65e 100644
--- a/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php
+++ b/assets/snippets/ajaxSearch/classes/asPhxParser.class.inc.php
@@ -21,8 +21,8 @@ function __construct($template='',$maxpass=500) {
$this->name = "PHx";
$this->version = "2.1.3";
$this->template = $this->getTemplate($template);
- $this->user["mgrid"] = intval($_SESSION['mgrInternalKey']);
- $this->user["usrid"] = intval($_SESSION['webInternalKey']);
+ $this->user["mgrid"] = !empty($_SESSION['mgrInternalKey']) ? intval($_SESSION['mgrInternalKey']) : '';
+ $this->user["usrid"] = !empty($_SESSION['webInternalKey']) ? intval($_SESSION['webInternalKey']) : '';
$this->user["id"] = ($this->user["usrid"] > 0 ) ? (-$this->user["usrid"]) : $this->user["mgrid"];
$this->cache["cm"] = array();
$this->cache["ui"] = array();
diff --git a/assets/snippets/ajaxSearch/plugin.advSearchHighlight.tpl b/assets/snippets/ajaxSearch/plugin.advSearchHighlight.tpl
index 9a9b1c42cd..aaed4650bf 100644
--- a/assets/snippets/ajaxSearch/plugin.advSearchHighlight.tpl
+++ b/assets/snippets/ajaxSearch/plugin.advSearchHighlight.tpl
@@ -86,17 +86,9 @@ if (isset($_REQUEST['searched']) && isset($_REQUEST['highlight'])) {
$dbCharset = $database_connection_charset;
$pgCharset = array_key_exists($dbCharset,$pageCharset) ? $pageCharset[$dbCharset] : $dbCharset;
- // magic quotes check
- if (get_magic_quotes_gpc()){
- $searched = strip_tags(stripslashes($_REQUEST['searched']));
- $highlight = strip_tags(stripslashes($_REQUEST['highlight']));
- if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags(stripslashes($_REQUEST['advsearch']));
- }
- else {
- $searched = strip_tags($_REQUEST['searched']);
- $highlight = strip_tags($_REQUEST['highlight']);
- if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags($_REQUEST['advsearch']);
- }
+ $searched = strip_tags($_REQUEST['searched']);
+ $highlight = strip_tags($_REQUEST['highlight']);
+ if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags($_REQUEST['advsearch']);
if ($advsearch != 'nowords') {
diff --git a/assets/snippets/ajaxSearch/plugin.searchHighlight.tpl b/assets/snippets/ajaxSearch/plugin.searchHighlight.tpl
index a00f897e36..8aaaac077d 100644
--- a/assets/snippets/ajaxSearch/plugin.searchHighlight.tpl
+++ b/assets/snippets/ajaxSearch/plugin.searchHighlight.tpl
@@ -81,17 +81,9 @@ if (isset($_REQUEST['searched']) && isset($_REQUEST['highlight'])) {
$dbCharset = $database_connection_charset;
$pgCharset = array_key_exists($dbCharset,$pageCharset) ? $pageCharset[$dbCharset] : $dbCharset;
- // magic quotes check
- if (get_magic_quotes_gpc()){
- $searched = strip_tags(stripslashes($_REQUEST['searched']));
- $highlight = strip_tags(stripslashes($_REQUEST['highlight']));
- if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags(stripslashes($_REQUEST['advsearch']));
- }
- else {
- $searched = strip_tags($_REQUEST['searched']);
- $highlight = strip_tags($_REQUEST['highlight']);
- if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags($_REQUEST['advsearch']);
- }
+ $searched = strip_tags($_REQUEST['searched']);
+ $highlight = strip_tags($_REQUEST['highlight']);
+ if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags($_REQUEST['advsearch']);
if ($advsearch != 'nowords') {
diff --git a/assets/snippets/ditto/classes/debug.class.inc.php b/assets/snippets/ditto/classes/debug.class.inc.php
index 287ce4bb16..66324f37fe 100644
--- a/assets/snippets/ditto/classes/debug.class.inc.php
+++ b/assets/snippets/ditto/classes/debug.class.inc.php
@@ -3,153 +3,151 @@
/*
* Title: Debug Class
* Purpose:
- * The Debug class contains all functions relating to Ditto's
- * implimentation of the MODX debug console
+ * The Debug class contains all functions relating to Ditto's
+ * implimentation of the MODX debug console
*/
class debug extends modxDebugConsole {
- var $debug;
-
- // ---------------------------------------------------
- // Function: render_link
- // Render the links to the debug console
- // ---------------------------------------------------
- function render_link($dittoID,$ditto_base) {
- global $ditto_lang,$modx;
- $base_url = str_replace($modx->config["base_path"],$modx->config["site_url"],$ditto_base);
- return $this->makeLink($ditto_lang["debug"],$ditto_lang["open_dbg_console"], $ditto_lang["save_dbg_console"],$base_url.'debug/',"ditto_".$dittoID);
- }
- // ---------------------------------------------------
- // Function: render_popup
- // Render the contents of the debug console
- // ---------------------------------------------------
- function render_popup($ditto,$ditto_base,$ditto_version, $ditto_params, $IDs, $fields, $summarize, $templates, $orderBy, $start, $stop, $total,$filter,$resource) {
- global $ditto_lang,$modx;
- $tabs = array();
- $fields = (count($fields["db"]) > 0 && count($fields["tv"]) > 0) ? array_merge_recursive($ditto->fields,array("retrieved"=>$fields)) : $ditto->fields;
-
- $tabs[$ditto_lang["info"]] = $this->prepareBasicInfo($ditto,$ditto_version, $IDs, $summarize, $orderBy, $start, $stop, $total);
- $tabs[$ditto_lang["params"]] = $this->makeParamTable($ditto_params,$ditto_lang["params"]);
- $tabs[$ditto_lang["fields"]] = "".$this->array2table($this->cleanArray($fields), true, true)."
";
- $tabs[$ditto_lang["templates"]] = $this->makeParamTable($this->prepareTemplates($templates),$ditto_lang["templates"]);
-
- if ($filter !== false) {
- $tabs[$ditto_lang["filters"]] = $this->prepareFilters($this->cleanArray($filter));
- }
+ var $debug;
+
+ // ---------------------------------------------------
+ // Function: render_link
+ // Render the links to the debug console
+ // ---------------------------------------------------
+ function render_link($dittoID,$ditto_base) {
+ global $ditto_lang,$modx;
+ $base_url = str_replace($modx->config['base_path'],$modx->config['site_url'],$ditto_base);
+ return $this->makeLink($ditto_lang['debug'],$ditto_lang['open_dbg_console'], $ditto_lang['save_dbg_console'],$base_url.'debug/','ditto_'.$dittoID);
+ }
+ // ---------------------------------------------------
+ // Function: render_popup
+ // Render the contents of the debug console
+ // ---------------------------------------------------
+ function render_popup($ditto,$ditto_base,$ditto_version, $ditto_params, $IDs, $fields, $summarize, $templates, $orderBy, $start, $stop, $total,$filter,$resource) {
+ global $ditto_lang,$modx;
+ $tabs = array();
+ $fields = (count($fields['db']) > 0 && count($fields['tv']) > 0) ? array_merge_recursive($ditto->fields,array('retrieved'=>$fields)) : $ditto->fields;
+
+ $tabs[$ditto_lang['info']] = $this->prepareBasicInfo($ditto,$ditto_version, $IDs, $summarize, $orderBy, $start, $stop, $total);
+ $tabs[$ditto_lang['params']] = $this->makeParamTable($ditto_params,$ditto_lang['params']);
+ $tabs[$ditto_lang['fields']] = "".$this->array2table($this->cleanArray($fields), true, true).'
';
+ $tabs[$ditto_lang['templates']] = $this->makeParamTable($this->prepareTemplates($templates),$ditto_lang['templates']);
+
+ if ($filter !== false) {
+ $tabs[$ditto_lang['filters']] = $this->prepareFilters($this->cleanArray($filter));
+ }
- if ($ditto->prefetch == true) {
- $tabs[$ditto_lang["prefetch_data"]] = $this->preparePrefetch($ditto->prefetch);
- }
- if (count($resource) > 0 && $resource) {
- $tabs[$ditto_lang["retrieved_data"]] = $this->prepareDocumentInfo($resource);
- }
- $base_url = str_replace($modx->config["base_path"],$modx->config["site_url"],$ditto_base);
- $generatedOn = "\r\n\r\n".'';
- return $this->render($tabs,$ditto_lang['debug'],$base_url).$generatedOn;
- }
-
- // ---------------------------------------------------
- // Function: preparePrefetch
- // Create the content of the Prefetch tab
- // ---------------------------------------------------
- function preparePrefetch($prefetch) {
- global $ditto_lang;
- $ditto_IDs = array();
- if (count($prefetch["dbg_IDs_pre"]) > 0) {
- $ditto_IDs[$ditto_lang["ditto_IDs_all"]." (".count($prefetch["dbg_IDs_pre"]).")"] = implode(",",$prefetch["dbg_IDs_pre"]);
- }
- if (count($prefetch["dbg_IDs_post"]) > 0) {
- $ditto_IDs[$ditto_lang["ditto_IDs_selected"]." (".count($prefetch["dbg_IDs_post"]).")"] = implode(", ",$prefetch["dbg_IDs_post"]);
- } else {
- $ditto_IDs[$ditto_lang["ditto_IDs_selected"]." (0)"] = strip_tags($ditto_lang["no_documents"]);
- }
- $out = $this->array2table(array($ditto_lang["prefetch_data"]=>$ditto_IDs),true,true);
- return $out.$this->prepareDocumentInfo($prefetch["dbg_resource"]);
- }
+ if ($ditto->prefetch == true) {
+ $tabs[$ditto_lang['prefetch_data']] = $this->preparePrefetch($ditto->prefetch);
+ }
+ if (count($resource) > 0 && $resource) {
+ $tabs[$ditto_lang['retrieved_data']] = $this->prepareDocumentInfo($resource);
+ }
+ $base_url = str_replace($modx->config['base_path'],$modx->config['site_url'],$ditto_base);
+ $generatedOn = "\r\n\r\n".'';
+ return $this->render($tabs,$ditto_lang['debug'],$base_url).$generatedOn;
+ }
+
+ // ---------------------------------------------------
+ // Function: preparePrefetch
+ // Create the content of the Prefetch tab
+ // ---------------------------------------------------
+ function preparePrefetch($prefetch) {
+ global $ditto_lang;
+ $ditto_IDs = array();
+ if (count($prefetch['dbg_IDs_pre']) > 0) {
+ $ditto_IDs[$ditto_lang['ditto_IDs_all'].' ('.count($prefetch['dbg_IDs_pre']).')'] = implode(',',$prefetch['dbg_IDs_pre']);
+ }
+ if (count($prefetch['dbg_IDs_post']) > 0) {
+ $ditto_IDs[$ditto_lang['ditto_IDs_selected'].' ('.count($prefetch['dbg_IDs_post']).')'] = implode(', ',$prefetch['dbg_IDs_post']);
+ } else {
+ $ditto_IDs[$ditto_lang['ditto_IDs_selected'].' (0)'] = strip_tags($ditto_lang['no_documents']);
+ }
+ $out = $this->array2table(array($ditto_lang['prefetch_data']=>$ditto_IDs),true,true);
+ return $out.$this->prepareDocumentInfo($prefetch['dbg_resource']);
+ }
- // ---------------------------------------------------
- // Function: prepareFilters
- // Create the content of the Filters tab
- // ---------------------------------------------------
- function prepareFilters($filter) {
- $output = "";
- foreach ($filter as $name=>$value) {
- if ($name == "custom") {
- foreach ($value as $name=>$value) {
- $output .= $this->array2table(array($name=>$value), true, true);
- }
- } else {
- $output .= $this->array2table(array($name=>$value), true, true);
- }
- }
- return $output;
- }
-
- // ---------------------------------------------------
- // Function: prepareDocumentInfo
- // Create the output for the Document Info tab
- // ---------------------------------------------------
- function prepareDocumentInfo($resource) {
- global $ditto_lang;
- $output = "";
- if (count($resource) > 0) {
- foreach ($resource as $item) {
- $header = str_replace(array('[+pagetitle+]','[+id+]'),array($item['pagetitle'],$item['id']),$this->templates["item"]);
- $output .= $this->makeParamTable($item,$header,true,true,true,"resource");
- }
- }
- return $output;
- }
+ // ---------------------------------------------------
+ // Function: prepareFilters
+ // Create the content of the Filters tab
+ // ---------------------------------------------------
+ function prepareFilters($filter) {
+ $output = '';
+ foreach ($filter as $name=>$value) {
+ if ($name == 'custom') {
+ foreach ($value as $name=>$value) {
+ $output .= $this->array2table(array($name=>$value), true, true);
+ }
+ } else {
+ $output .= $this->array2table(array($name=>$value), true, true);
+ }
+ }
+ return $output;
+ }
+
+ // ---------------------------------------------------
+ // Function: prepareDocumentInfo
+ // Create the output for the Document Info tab
+ // ---------------------------------------------------
+ function prepareDocumentInfo($resource) {
+ global $ditto_lang;
+ $output = '';
+ if (count($resource) > 0) {
+ foreach ($resource as $item) {
+ $header = str_replace(array('[+pagetitle+]','[+id+]'),array($item['pagetitle'],$item['id']),$this->templates['item']);
+ $output .= $this->makeParamTable($item,$header,true,true,true,'resource');
+ }
+ }
+ return $output;
+ }
- // ---------------------------------------------------
- // Function: prepareBasicInfo
- // Create the outut for the Info ta
- // ---------------------------------------------------
- function prepareBasicInfo($ditto,$ditto_version, $IDs, $summarize, $orderBy, $start, $stop, $total) {
- global $ditto_lang,$dittoID,$modx;
- $items[$ditto_lang['version']] = $ditto_version;
- $items[$ditto_lang['summarize']] = $summarize;
- $items[$ditto_lang['total']] = $total;
- $items[$ditto_lang['start']] = $start;
- $items[$ditto_lang['stop']] = $stop;
- $items[$ditto_lang['ditto_IDs']] = (count($IDs) > 0) ? wordwrap(implode(", ",$IDs),100, "") : $ditto_lang['none']; - $output = ''; - if (is_array($orderBy['parsed']) && count($orderBy['parsed']) > 0) { - $sort = array(); - foreach ($orderBy['parsed'] as $key=>$value) { - $sort[$key] = array($ditto_lang['sortBy']=>$value[0],$ditto_lang['sortDir']=>$value[1]); - } - $output = $this->array2table($this->cleanArray($sort), true, true); - } - return $this->makeParamTable($items,$ditto_lang["basic_info"],false,false).$output; - } + // --------------------------------------------------- + // Function: prepareBasicInfo + // Create the outut for the Info ta + // --------------------------------------------------- + function prepareBasicInfo($ditto,$ditto_version, $IDs, $summarize, $orderBy, $start, $stop, $total) { + global $ditto_lang,$dittoID,$modx; + $items[$ditto_lang['version']] = $ditto_version; + $items[$ditto_lang['summarize']] = $summarize; + $items[$ditto_lang['total']] = $total; + $items[$ditto_lang['start']] = $start; + $items[$ditto_lang['stop']] = $stop; + $items[$ditto_lang['ditto_IDs']] = (count($IDs) > 0) ? wordwrap(implode(', ',$IDs),100, '
') : $ditto_lang['none']; + $output = ''; + if (is_array($orderBy['parsed']) && count($orderBy['parsed']) > 0) { + $sort = array(); + foreach ($orderBy['parsed'] as $key=>$value) { + $sort[$key] = array($ditto_lang['sortBy']=>$value[0],$ditto_lang['sortDir']=>$value[1]); + } + $output = $this->array2table($this->cleanArray($sort), true, true); + } + return $this->makeParamTable($items,$ditto_lang['basic_info'],false,false).$output; + } - // --------------------------------------------------- - // Function: prepareTemplates - // Create the output for the Templates tab - // --------------------------------------------------- - function prepareTemplates($templates) { - global $ditto_lang; - $displayTPLs = array(); - foreach ($templates as $name=>$value) { - switch ($name) { - case "base": - $displayName = "tpl"; - break; + // --------------------------------------------------- + // Function: prepareTemplates + // Create the output for the Templates tab + // --------------------------------------------------- + function prepareTemplates($templates) { + global $ditto_lang; + $displayTPLs = array(); + foreach ($templates as $name=>$value) { + switch ($name) { + case 'base': + $displayName = 'tpl'; + break; - case "default": - $displayName = "tpl"; - break; + case 'default': + $displayName = 'tpl'; + break; - default: - $displayName = "tpl".strtoupper($name{0}).substr($name,1); - break; - } - $displayTPLs[$displayName] = $value; - } - return $displayTPLs; - } + default: + $displayName = 'tpl'.strtoupper($name{0}).substr($name,1); + break; + } + $displayTPLs[$displayName] = $value; + } + return $displayTPLs; + } } - -?> \ No newline at end of file diff --git a/assets/snippets/ditto/classes/ditto.class.inc.php b/assets/snippets/ditto/classes/ditto.class.inc.php index bda152c4ea..3c76a09061 100644 --- a/assets/snippets/ditto/classes/ditto.class.inc.php +++ b/assets/snippets/ditto/classes/ditto.class.inc.php @@ -12,21 +12,21 @@ class ditto { function __construct($dittoID,$format,$language,$debug) { $this->format = $format; - $GLOBALS["ditto_lang"] = $language; - $this->prefetch = false; - $this->advSort = false; - $this->sqlOrderBy = array(); - $this->customReset = array(); - $this->constantFields[] = array("db","tv"); - $this->constantFields["db"] = array("id","type","contentType","pagetitle","longtitle","description","alias","link_attributes","published","pub_date","unpub_date","parent","isfolder","introtext","content","richtext","template","menuindex","searchable","cacheable","createdby","createdon","editedby","editedon","deleted","deletedon","deletedby","publishedon","publishedby","menutitle","donthit","haskeywords","hasmetatags","privateweb","privatemgr","content_dispo","hidemenu"); - $this->constantFields["tv"] = $this->getTVList(); - $GLOBALS["ditto_constantFields"] = $this->constantFields; - $this->fields = array("display"=>array(),"backend"=>array("tv"=>array(),"db"=>array("id", "published"))); + $GLOBALS['ditto_lang'] = $language; + $this->prefetch = false; + $this->advSort = false; + $this->sqlOrderBy = array(); + $this->customReset = array(); + $this->constantFields[] = array('db','tv'); + $this->constantFields['db'] = explode(',', 'id,type,contentType,pagetitle,longtitle,description,alias,link_attributes,published,pub_date,unpub_date,parent,isfolder,introtext,content,richtext,template,menuindex,searchable,cacheable,createdby,createdon,editedby,editedon,deleted,deletedon,deletedby,publishedon,publishedby,menutitle,donthit,privateweb,privatemgr,content_dispo,hidemenu'); + $this->constantFields['tv'] = $this->getTVList(); + $GLOBALS['ditto_constantFields'] = $this->constantFields; + $this->fields = array('display'=>array(),'backend'=>array('tv'=>array(),'db'=>array('id', 'published'))); $this->sortOrder = false; $this->customPlaceholdersMap = array(); $this->template = new template(); - if (!is_null($debug)) {$this->debug = new debug($debug);} + if (!is_null($debug)) $this->debug = new debug($debug); } // --------------------------------------------------- @@ -36,9 +36,8 @@ function __construct($dittoID,$format,$language,$debug) { function getTVList() { global $modx; - $table = $modx->getFullTableName("site_tmplvars"); - $tvs = $modx->db->select("name", $table); - // TODO: make it so that it only pulls those that apply to the current template + // TODO: make it so that it only pulls those that apply to the current template + $tvs = $modx->db->select('name', '[+prefix+]site_tmplvars'); $dbfields = $modx->db->getColumn('name', $tvs); return $dbfields; } @@ -52,14 +51,14 @@ function addField($name,$location,$type=false) { if ($type === false) { $type = $this->getDocVarType($name); } - if ($type == "tv:prefix") { - $type = "tv"; + if ($type == 'tv:prefix') { + $type = 'tv'; $name = substr($name, 2); } - if ($location == "*") { - $this->fields["backend"][$type][] = $name; - $this->fields["display"][$type][] = $name; - } else { + if ($location == '*') { + if(!in_array($name,$this->fields['backend'][$type])) $this->fields['backend'][$type][] = $name; + if(!in_array($name,$this->fields['display'][$type])) $this->fields['display'][$type][] = $name; + } elseif(!in_array($name,$this->fields[$location][$type])) { $this->fields[$location][$type][] = $name; } } @@ -73,11 +72,8 @@ function addField($name,$location,$type=false) { function addFields($fields,$location='*',$delimiter=',',$callback=false) { if (empty($fields)) return false; if (!is_array($fields)) { - if (strpos($fields,$delimiter) !== false) { - $fields = explode($delimiter,$fields); - } else { - $fields = array($fields); - } + if (strpos($fields,$delimiter)!==false) $fields = explode($delimiter,$fields); + else $fields = array($fields); } foreach ($fields as $field) { if (is_array($field)) { @@ -89,9 +85,7 @@ function addFields($fields,$location='*',$delimiter=',',$callback=false) { } $this->addField($name,$location,$type); - if ($callback !== false) { - call_user_func_array($callback, array($name)); - } + if ($callback !== false) call_user_func_array($callback, array($name)); } return true; } @@ -103,9 +97,7 @@ function addFields($fields,$location='*',$delimiter=',',$callback=false) { function removeField($name,$location,$type) { $key = array_search ($name, $this->fields[$location][$type]); - if ($key !== false) { - unset($this->fields[$location][$type][$key]); - } + if ($key !== false) unset($this->fields[$location][$type][$key]); } // --------------------------------------------------- @@ -114,13 +106,8 @@ function removeField($name,$location,$type) { // --------------------------------------------------- function setDisplayFields($fields,$hiddenFields) { - $this->fields["display"] = $fields; - if (count($this->fields["display"]['qe']) > 0) { - $this->addField("pagetitle","display","db"); - } - if ($hiddenFields) { - $this->addFields($hiddenFields,"display"); - } + $this->fields['display'] = $fields; + if ($hiddenFields) $this->addFields($hiddenFields,'display'); } // --------------------------------------------------- @@ -130,18 +117,14 @@ function setDisplayFields($fields,$hiddenFields) { function getDocVarType($field) { global $ditto_constantFields; - $tvFields = $ditto_constantFields["tv"]; - $dbFields = $ditto_constantFields["db"]; - if(in_array($field, $tvFields)){ - return "tv"; - }else if(in_array(substr($field,2), $tvFields)) { - return "tv:prefix"; - // TODO: Remove TV Prefix support - } else if(in_array($field, $dbFields)){ - return "db"; - } else { - return "unknown"; - } + + $tvFields = $ditto_constantFields['tv']; + $dbFields = $ditto_constantFields['db']; + + if(in_array($field, $tvFields)) return 'tv'; + elseif(in_array(substr($field,2), $tvFields)) return 'tv:prefix'; // TODO: Remove TV Prefix support + elseif(in_array($field, $dbFields)) return 'db'; + else return 'unknown'; } // --------------------------------------------------- @@ -173,11 +156,11 @@ function parseOrderBy($orderBy,$randomize) { $sortDir = substr($input,$position); $sortDir = !empty($sortDir) ? trim($sortDir) : 'asc'; $sortBy = $this->checkAdvSort($sortBy,$sortDir); - $this->addField($sortBy,"backend"); + $this->addField($sortBy,'backend'); $orderBy['parsed'][] = array($sortBy,strtoupper($sortDir)); } } - $orderBy['sql'] = implode(', ',$this->sqlOrderBy); + $orderBy['sql'] = join(', ',$this->sqlOrderBy); unset($orderBy['unparsed']); return $orderBy; } @@ -187,17 +170,17 @@ function parseOrderBy($orderBy,$randomize) { // Check the advSortString // --------------------------------------------------- function checkAdvSort($sortBy,$sortDir='asc') { - $advSort = array ("pub_date","unpub_date","editedon","deletedon","publishedon"); + $advSort = array ('pub_date','unpub_date','editedon','deletedon','publishedon'); $type = $this->getDocVarType($sortBy); switch($type) { - case "tv:prefix": + case 'tv:prefix': $sortBy = substr($sortBy, 2); $this->advSort = true; break; - case "tv": + case 'tv': $this->advSort = true; break; - case "db": + case 'db': if (in_array($sortBy, $advSort)) { $this->advSort = true; $this->customReset[] = $sortBy; @@ -215,33 +198,33 @@ function checkAdvSort($sortBy,$sortDir='asc') { // --------------------------------------------------- function parseFilters($filter=false,$cFilters=false,$pFilters = false,$globalDelimiter,$localDelimiter) { - $parsedFilters = array("basic"=>array(),"custom"=>array()); + $parsedFilters = array('basic'=>array(),'custom'=>array()); $filters = explode($globalDelimiter, $filter); if ($filter && count($filters) > 0) { foreach ($filters AS $filter) { if (!empty($filter)) { $filterArray = explode($localDelimiter, $filter); $source = $filterArray[0]; - $this->addField($source,"backend"); + $this->addField($source,'backend'); $value = $filterArray[1]; $mode = (isset ($filterArray[2])) ? $filterArray[2] : 1; - $parsedFilters["basic"][] = array("source"=>$source,"value"=>$value,"mode"=>$mode); + $parsedFilters['basic'][] = array('source'=>$source,'value'=>$value,'mode'=>$mode); } } } if ($cFilters) { foreach ($cFilters as $name=>$value) { if (!empty($name) && !empty($value)) { - $parsedFilters["custom"][$name] = $value[1]; - $this->addFields($value[0],"backend"); + $parsedFilters['custom'][$name] = $value[1]; + $this->addFields($value[0],'backend'); } } // TODO: Replace addField with addFields with callback } if($pFilters) { foreach ($pFilters as $filter) { foreach ($filter as $name=>$value) { - $parsedFilters["basic"][] = $value; - $this->addFields($value["source"],"backend"); + $parsedFilters['basic'][] = $value; + $this->addFields($value['source'],'backend'); } } // TODO: Replace addField with addFields with callback } @@ -253,122 +236,110 @@ function parseFilters($filter=false,$cFilters=false,$pFilters = false,$globalDel // Render the document output // --------------------------------------------------- - function render($resource, $template, $removeChunk,$dateSource,$dateFormat,$ph=array(),$phx=1,$x=0,$stop=1) { + function render($doc, $template, $removeChunk,$dateSource,$dateFormat,$customPlaceholders=array(),$phx=1,$x=0,$stop=1) { global $modx,$ditto_lang; - if (!is_array($resource)) { - return $ditto_lang["resource_array_error"]; - } - $placeholders = array(); + if (!is_array($doc)) return $ditto_lang['resource_array_error']; + + $ph = $doc; $contentVars = array(); - foreach ($resource as $name=>$value) { - $placeholders["$name"] = $value; - $contentVars["[*$name*]"] = $value; - } - - // set author placeholder - if (in_array("author",$this->fields["display"]["custom"])) { - $placeholders['author'] = $this->getAuthor($resource['createdby']); - } - - // set title placeholder - if (in_array("title",$this->fields["display"]["custom"])) { - $placeholders['title'] = $resource['pagetitle']; + $exFields =& $this->fields['display']['custom']; + + foreach ($doc as $name=>$value) { + $contentVars["[*{$name}*]"] = $value; } - // set sequence placeholder - if (in_array("ditto_iteration",$this->fields["display"]["custom"])) { - $placeholders['ditto_iteration'] = $x; - } + if (in_array('author',$exFields)) $ph['author'] = $this->getAuthor($doc['createdby']); + if (in_array('title',$exFields)) $ph['title'] = $doc['pagetitle']; + if (in_array('ditto_iteration',$exFields)) $ph['ditto_iteration'] = $x; //Added by Andchir - //if (in_array("ditto_index",$this->fields["display"]["custom"])) { - $r_start = isset($_GET['start']) ? $_GET['start'] : 0; - $placeholders['ditto_index'] = $r_start+$x+1; - //} + $r_start = isset($_GET['start']) ? $_GET['start'] : 0; + $ph['ditto_index'] = $r_start+$x+1; //Added by Dmi3yy placeholder ditto_class - if ($x % 2 == 0) {$class="even";} else {$class="odd";} - if ($x==0) $class.=" first"; - if ($x==($stop -1)) $class.=" last"; - if ($resource['id'] == $modx->documentObject['id']) $class.=" current"; - $placeholders['ditto_class'] = $class; + $class = array(); + if($x % 2 == 0) $class[] = 'even'; + else $class[] = 'odd'; + + if ($x==0) $class[] = 'first'; + if ($x==($stop -1)) $class[] = 'last'; + if ($doc['id'] == $modx->documentIdentifier) $class[] = 'current'; + $ph['ditto_class'] = join(' ', $class); // set url placeholder - if (in_array("url",$this->fields["display"]["custom"])) { - if($resource['id']==$modx->config['site_start']) - $placeholders['url'] = $modx->config['site_url']; - else - $placeholders['url'] = $modx->makeURL($resource['id'],'','','full'); + if (in_array('url',$exFields)) { + if($doc['id']==$modx->config['site_start']) $ph['url'] = $modx->config['site_url']; + else $ph['url'] = $modx->makeURL($doc['id'],'','','full'); } - if (in_array("date",$this->fields["display"]["custom"])) { - $timestamp = ($resource[$dateSource] != "0") ? $resource[$dateSource] : $resource["createdon"]; + if (in_array('date',$exFields)) { + $timestamp = ($doc[$dateSource] != '0') ? $doc[$dateSource] : $doc['createdon']; if (is_array($timestamp)) { - $timestamp[1] = is_int($timestamp[1]) ? $timestamp[1] : strtotime($timestamp[1]); + if(!$this->isNum($timestamp[1])) $timestamp[1] = strtotime($timestamp[1]); $timestamp = $timestamp[1] + $timestamp[0]; } - $placeholders['date'] = strftime($dateFormat,$timestamp); + $ph['date'] = strftime($dateFormat,$timestamp); } - if (in_array("content",$this->fields["display"]["db"]) && $this->format != "html") { - $placeholders['content'] = $this->relToAbs($resource['content'], $modx->config['site_url']); + if (in_array('content',$this->fields['display']['db']) && $this->format != 'html') { + $ph['content'] = $this->relToAbs($doc['content'], $modx->config['site_url']); } - if (in_array("introtext",$this->fields["display"]["db"]) && $this->format != "html") { - $placeholders['introtext'] = $this->relToAbs($resource['introtext'], $modx->config['site_url']); + if (in_array('introtext',$this->fields['display']['db']) && $this->format != 'html') { + $ph['introtext'] = $this->relToAbs($doc['introtext'], $modx->config['site_url']); } - $customPlaceholders = $ph; // set custom placeholder - foreach ($ph as $name=>$value) { - if ($name != "*") { - $placeholders[$name] = call_user_func($value[1],$resource); + foreach ($customPlaceholders as $name=>$value) { + if ($name != '*') { + $ph[$name] = call_user_func($value[1],$doc); unset($customPlaceholders[$name]); } } foreach ($customPlaceholders as $name=>$value) { - $placeholders = call_user_func($value,$placeholders); + $ph = call_user_func($value,$ph); } - if (count($this->fields["display"]['qe']) > 0) { - $placeholders = $this->renderQELinks($this->template->fields['qe'],$resource,$ditto_lang["edit"]." : ".$resource['pagetitle']." : ",$placeholders); - // set QE Placeholders + if ($phx) $output = $this->parseModifiers($template,$ph,$contentVars); + else { + $output = $this->template->replace($ph,$template); + $output = $this->template->replace($contentVars,$output); } - if ($phx == 1 && !$modx->config['enable_filter']) { - $PHs = $placeholders; - foreach($PHs as $key=>$output) { - $placeholders[$key] = str_replace( array_keys( $contentVars ), array_values( $contentVars ), $output ); + if ($removeChunk) { + foreach ($removeChunk as $chunk) { + $output = str_replace('{{'.$chunk.'}}','',$output); + $output = str_replace($modx->getChunk($chunk),'',$output); + // remove chunk that is not wanted } - unset($PHs); - $phx = new prePHx($template); - $phx->setPlaceholders($placeholders); - $output = $phx->output(); } - elseif ($phx == 1 && $modx->config['enable_filter']) { - $output = $template; + return $output; + } + + function parseModifiers($tpl,$ph,$contentVars){ + global $modx; + if ($modx->config['enable_filter']) { + $content = $tpl; $i = 0; while($i<10) { - $_ = $output; - $output = $modx->parseText($output,$placeholders); - if($_===$output) break; + $bt = $content; + if(strpos($content,'[+')!==false) $content = $modx->parseText($content,$ph); + else $content = $modx->parseDocumentSource($content); + if($bt===$content) break; $i++; } - } else { - $output = $this->template->replace($placeholders,$template); - $output = $this->template->replace($contentVars,$output); } - if ($removeChunk) { - foreach ($removeChunk as $chunk) { - $output = str_replace('{{'.$chunk.'}}',"",$output); - $output = str_replace($modx->getChunk($chunk),"",$output); - // remove chunk that is not wanted + else { + foreach($ph as $key=>$content) { + $ph[$key] = str_replace( array_keys($contentVars), array_values($contentVars), $content ); } + $phx = new prePHx($tpl); + $phx->setPlaceholders($ph); + $content = $phx->output(); } - - return $output; + return $content; } // --------------------------------------------------- @@ -380,17 +351,17 @@ function parseFields($placeholders,$seeThruUnpub,$dateSource,$randomize) { $this->parseCustomPlaceholders($placeholders); $this->parseDBFields($seeThruUnpub); if ($randomize != 0) { - $this->addField($randomize,"backend"); + $this->addField($randomize,'backend'); } - $this->addField("id","display","db"); - $this->addField("pagetitle","display","db"); - $this->addField("parent","display","db"); - $checkOptions = array("pub_date","unpub_date","editedon","deletedon","publishedon"); + $this->addField('id','display','db'); + $this->addField('pagetitle','display','db'); + $this->addField('parent','display','db'); + $checkOptions = array('pub_date','unpub_date','editedon','deletedon','publishedon'); if (in_array($dateSource,$checkOptions)) { - $this->addField("createdon","display"); + $this->addField('createdon','display'); } - if (in_array("date",$this->fields["display"]["custom"])) { - $this->addField($dateSource,"display"); + if (in_array('date',$this->fields['display']['custom'])) { + $this->addField($dateSource,'display'); } $this->fields = $this->arrayUnique($this->fields); } @@ -417,34 +388,28 @@ function arrayUnique($array) { function parseCustomPlaceholders($placeholders) { foreach ($placeholders as $name=>$value) { - $this->addField($name,"display","custom"); - $this->removeField($name,"display","unknown"); + $this->addField($name,'display','custom'); + $this->removeField($name,'display','unknown'); $source = $value[0]; - $qe = $value[2]; if(is_array($source)) { - if(strpos($source[0],",")!==false){ + if(strpos($source[0],',')!==false){ $fields = array_filter(array_map('trim', explode(',', $source[0]))); foreach ($fields as $field) { - $this->addField($field,$source[1]); - $this->customPlaceholdersMap[$name] = $field; + $this->addField($field,$source[1]); + $this->customPlaceholdersMap[$name] = $field; } } else { $this->addField($source[0],$source[1]); $this->customPlaceholdersMap[$name] = $source[0]; } // TODO: Replace addField with addFields with callback - } else if(is_array($value)) { + } elseif(is_array($value)) { $fields = array_filter(array_map('trim', explode(',', $source))); foreach ($fields as $field) { - $this->addField($field,"display"); - $this->customPlaceholdersMap[$name] = $field; + $this->addField($field,'display'); + $this->customPlaceholdersMap[$name] = $field; } } - - if (!is_null($qe)) { - $this->customPlaceholdersMap[$name] = array('qe',$qe); - } - } } @@ -455,58 +420,16 @@ function parseCustomPlaceholders($placeholders) { function parseDBFields($seeThruUnpub) { if (!$seeThruUnpub) { - $this->addField("parent","backend","db"); + $this->addField('parent','backend','db'); } - if (in_array("author",$this->fields["display"]["custom"])) { - $this->fields["display"]["db"][] = "createdby"; + if (in_array('author',$this->fields['display']['custom'])) { + $this->fields['display']['db'][] = 'createdby'; } - if (count($this->fields["display"]["tv"]) >= 0) { - $this->addField("published","display","db"); - } - } - - // --------------------------------------------------- - // Function: renderQELinks - // Render QE links when needed - // --------------------------------------------------- - - function renderQELinks($fields, $resource, $QEPrefix,$placeholders) { - global $modx,$dittoID; - $table = $modx->getFullTableName("site_modules"); - $idResult = $modx->db->select("id", $table,"name='QuickEdit'","id","1"); - $id = $modx->db->getValue($idResult); - $custom = array("author","date","url","title"); - $set = $modx->hasPermission('exec_module'); - foreach ($fields as $dv) { - $ds = $dv; - if ($dv == "title") { - $ds = "pagetitle"; - } - if (!in_array($dv,$custom) && in_array($dv,$this->fields["display"]["custom"])) { - $value = $this->customPlaceholdersMap[$dv]; - $ds = $value; - if (is_array($value) && $value[0] == "qe") { - $value = $value[1]; - if (substr($value,0,7) == "@GLOBAL") { - $key = trim(substr($value,7)); - $ds = $GLOBALS[$key]; - } - } - } - - $js = "window.open('".MODX_MANAGER_URL."index.php?a=112&id=".$id."&doc=".$resource["id"]."&var=".$ds."', 'QuickEditor', 'width=525, height=300, toolbar=0, menubar=0, status=0, alwaysRaised=1, dependent=1');"; - $url = $this->buildURL("qe_open=true",$modx->documentIdentifier,$dittoID); - - unset($custom[3]); - if ($set && !in_array($dv,$custom)) { - $placeholders["#$dv"] = $placeholders["$dv"].'« '.$QEPrefix.$dv.''; - } else { - $placeholders["#$dv"] = $placeholders["$dv"]; - } + if (count($this->fields['display']['tv']) >= 0) { + $this->addField('published','display','db'); } - return $placeholders; } // --------------------------------------------------- @@ -527,7 +450,7 @@ public static function getAuthor($createdby) { // get admin user name $user = $modx->getUserInfo(1); } - return ($user['fullname'] != "") ? $user['fullname'] : $user['username']; + return ($user['fullname'] != '') ? $user['fullname'] : $user['username']; } // --------------------------------------------------- @@ -540,10 +463,11 @@ function customSort($data, $fields, $order) { // user contributed $sortfields = array_filter(array_map('trim', explode(',', $fields))); - $code = ""; - for ($c = 0; $c < count($sortfields); $c++) - $code .= "\$retval = strnatcmp(\$a['$sortfields[$c]'], \$b['$sortfields[$c]']); if(\$retval) return \$retval; "; - $code .= "return \$retval;"; + $code = ''; + foreach($sortfields as $field) { + $code .= sprintf('$retval = strnatcmp($a["%s"], $b["%s"]); if($retval) return $retval; ',$field,$field); + } + $code .= 'return $retval;'; $params = ($order == 'ASC') ? '$a,$b' : '$b,$a'; uasort($data, create_function($params, $code)); @@ -570,17 +494,17 @@ function userSort($resource,$sort) { function multiSort($resource,$orderBy) { $sort_arr = array(); - foreach($resource AS $uniqid => $row){ - foreach($row AS $key=>$value){ + foreach($resource as $uniqid => $row){ + foreach($row as $key=>$value){ $sort_arr[$key][$uniqid] = $value; } } - $array_multisort = 'return array_multisort('; + $_ =''; foreach ($orderBy['parsed'] as $sort) { - $array_multisort .= '$sort_arr["'.$sort[0].'"], SORT_'.$sort[1].', '; + $_ .= sprintf('$sort_arr["%s"], SORT_%s, ', $sort[0], $sort[1]); } - $array_multisort .= '$resource);'; + $array_multisort = sprintf('return array_multisort( %s $resource);', $_); eval($array_multisort); return $resource; } @@ -590,31 +514,31 @@ function multiSort($resource,$orderBy) { // Get Document IDs for future use // --------------------------------------------------- - function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, $seeThruUnpub, $hideFolders, $hidePrivate, $showInMenuOnly, $myWhere, $keywords, $dateSource, $limit, $summarize, $filter, $paginate, $randomize) { + function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, $seeThruUnpub, $hideFolders, $hidePrivate, $showInMenuOnly, $myWhere, $dateSource, $limit, $summarize, $filter, $paginate, $randomize) { global $modx; - if (($summarize == 0 && $summarize != "all") || count($IDs) == 0 || ($IDs == false && $IDs != "0")) { + if (($summarize == 0 && $summarize != 'all') || count($IDs) == 0 || ($IDs == false && $IDs != '0')) { return array(); } // Get starting IDs; switch($IDType) { - case "parents": - $IDs = explode(",",$IDs); + case 'parents': + $IDs = explode(',',$IDs); $documentIDs = $this->getChildIDs($IDs, $depth); break; - case "documents": + case 'documents': if(!preg_match('@^[0-9, ]*$@',$IDs)) exit(sprintf('Illegal value of &documents: %s', $IDs)); - $documentIDs = explode(",",$IDs); + $documentIDs = explode(',',$IDs); break; } - if ($this->advSort == false && $hideFolders==0 && $showInMenuOnly==0 && $myWhere == "" && $filter == false && $hidePrivate == 1 && $keywords==0) { + if ($this->advSort == false && $hideFolders==0 && $showInMenuOnly==0 && $myWhere == '' && $filter == false && $hidePrivate == 1) { $this->prefetch = false; $documents = $this->getDocumentsIDs($documentIDs, $showPublishedOnly); $documentIDs = array(); if ($documents) { foreach ($documents as $null=>$doc) { - $documentIDs[] = $doc["id"]; + $documentIDs[] = $doc['id']; } } return $documentIDs; @@ -633,30 +557,15 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, if ($showInMenuOnly) { $where[] = 'hidemenu = 0'; } - $where = implode(" AND ", $where); - $limit = ($limit == 0) ? "" : $limit; + $where = join(' AND ', $where); + $limit = ($limit == 0) ? '' : $limit; // set limit $customReset = $this->customReset; - if ($keywords) {$this->addField("haskeywords","*","db");$this->addField("hasmetatags","*","db");} - if ($this->debug) {$this->addField("pagetitle","backend","db");} -// intersel edit -// Bug when we use a date field ("pub_date","unpub_date","editedon","deletedon","publishedon") -// used to order the results' array in descending order: -// the result of getDocuments is not correct because the result is limited to $limit -// but the array of results was not sorted (see SQL Query in getDocuments) -// (see checkAdvSort function) -// my choice to fix this bug was to set limit to 0 in the getDocuments call when we order with a date field (see customReset), -// then to limit the size of the array after all sorting functions were done (see hereafter) -// I did not get side effects on my modx installs... - -/* - if (count($customReset) > 0) {$this->addField("createdon","backend","db");} - $resource = $this->getDocuments($documentIDs,$this->fields["backend"]["db"],$TVs,$orderBy,$showPublishedOnly,0,$hidePrivate,$where,$limit,$keywords,$randomize,$dateSource); -*/ - $limitSearch=$limit; - if (count($customReset) > 0) {$this->addField("createdon","backend","db"); $limitSearch=0;} - $resource = $this->getDocuments($documentIDs,$this->fields["backend"]["db"],$TVs,$orderBy,$showPublishedOnly,0,$hidePrivate,$where,$limitSearch,$keywords,$randomize,$dateSource); + if ($this->debug) {$this->addField('pagetitle','backend','db');} + + if (count($customReset) > 0) {$this->addField('createdon','backend','db');} + $resource = $this->getDocuments($documentIDs,$this->fields['backend']['db'],$TVs,$orderBy,$showPublishedOnly,0,$hidePrivate,$where,$limit,$randomize,$dateSource); // EPO - End of change (then see line 692 - if ($limit) array_slice($resource, 0, $limit); ) @@ -672,14 +581,14 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, } for ($i = 0; $i < $recordCount; $i++) { if (!$seeThruUnpub) { - $published = $parentList[$resource[$i]["parent"]]; - if ($published == "0") + $published = $parentList[$resource[$i]['parent']]; + if ($published == '0') unset ($resource[$i]); } if (count($customReset) > 0) { foreach ($customReset as $field) { - if ($resource[$i][$field] === "0") { - $resource[$i][$field] = $resource[$i]["createdon"]; + if ($resource[$i][$field] === '0') { + $resource[$i][$field] = $resource[$i]['createdon']; } } } @@ -701,9 +610,9 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, } //intersel - see above in order to limit the array to $limit. - if ($limit) $resource=array_slice($resource, 0, $limit); + if ($limit) $resource=array_slice($resource, 0, $limit); - $fields = (array_intersect($this->fields["backend"],$this->fields["display"])); + $fields = (array_intersect($this->fields['backend'],$this->fields['display'])); $readyFields = array(); foreach ($fields as $field) { $readyFields = array_merge($readyFields,$field); @@ -717,7 +626,7 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, if (in_array($key,$readyFields)) { $keep[$iKey][$key] = $v; } - if ($this->getDocVarType($key) == "tv:prefix") { + if ($this->getDocVarType($key) == 'tv:prefix') { if (in_array(substr($key,2),$readyFields)) { $keep[$iKey][$key] = $v; } @@ -725,11 +634,11 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, } } - $this->prefetch = array("resource"=>$keep,"fields"=>$fields); + $this->prefetch = array('resource'=>$keep,'fields'=>$fields); if ($this->debug) { - $this->prefetch["dbg_resource"] = $dbg_resource; - $this->prefetch["dbg_IDs_pre"] = $documentIDs; - $this->prefetch["dbg_IDs_post"] = $processedIDs; + $this->prefetch['dbg_resource'] = $dbg_resource; + $this->prefetch['dbg_IDs_pre'] = $documentIDs; + $this->prefetch['dbg_IDs_post'] = $processedIDs; } if (count($processedIDs) > 0) { if ($randomize != 0) {shuffle($processedIDs);} @@ -750,7 +659,7 @@ function determineIDs($IDs, $IDType, $TVs, $orderBy, $depth, $showPublishedOnly, function weightedRandom($resource,$field,$show) { $type = $this->getDocVarType($field); - if ($type == "unknown") { + if ($type == 'unknown') { return $resource; // handle vad field passed } @@ -781,11 +690,11 @@ function getParentList() { $parents = array(); foreach ($kids as $item => $value) { if ($item != 0) { - $pInfo = $modx->getPageInfo($item,0,"published"); + $pInfo = $modx->getPageInfo($item,0,'published'); } else { - $pInfo["published"] = "1"; + $pInfo['published'] = '1'; } - $parents[$item] = $pInfo["published"]; + $parents[$item] = $pInfo['published']; } return $parents; } @@ -795,82 +704,47 @@ function getParentList() { // Apeend a TV to the documents array // --------------------------------------------------- - function appendTV($tvname="",$docIDs){ + function appendTV($tvname='',$docIDs){ global $modx; - $baspath= MODX_MANAGER_PATH."/includes"; - include_once $baspath . "/tmplvars.format.inc.php"; - include_once $baspath . "/tmplvars.commands.inc.php"; + $baspath= MODX_MANAGER_PATH.'/includes'; + include_once $baspath . '/tmplvars.format.inc.php'; + include_once $baspath . '/tmplvars.commands.inc.php'; - $tb1 = $modx->getFullTableName("site_tmplvar_contentvalues"); - $tb2 = $modx->getFullTableName("site_tmplvars"); + $fields = 'stv.name,stc.tmplvarid,stc.contentid,stv.type,stv.display,stv.display_params,stc.value'; + $from[] = '[+prefix+]site_tmplvar_contentvalues AS stc'; + $from[] = 'LEFT JOIN [+prefix+]site_tmplvars AS stv ON stv.id=stc.tmplvarid'; + $where = sprintf("stv.name='%s' AND stc.contentid IN (%s)", $modx->db->escape($tvname), join($docIDs,',')); + $rs= $modx->db->select($fields, $from, $where, 'stc.contentid ASC'); - $rs= $modx->db->select( - "stv.name,stc.tmplvarid,stc.contentid,stv.type,stv.display,stv.display_params,stc.value", - "{$tb1} AS stc LEFT JOIN {$tb2} AS stv ON stv.id=stc.tmplvarid", - "stv.name='{$tvname}' AND stc.contentid IN (".implode($docIDs,",").")", - "stc.contentid ASC" - ); - $resourceArray = array(); + $docs = array(); while ($row = $modx->db->getRow($rs)) { - $resourceArray["#".$row['contentid']][$row['name']] = getTVDisplayFormat($row['name'], $row['value'], $row['display'], $row['display_params'], $row['type'],$row['contentid']); - $resourceArray["#".$row['contentid']]["tv".$row['name']] = $resourceArray["#".$row['contentid']][$row['name']]; + $docs["#".$row['contentid']][$row['name']] = getTVDisplayFormat($row['name'], $row['value'], $row['display'], $row['display_params'], $row['type'],$row['contentid']); + $docs["#".$row['contentid']]["tv".$row['name']] = $docs["#".$row['contentid']][$row['name']]; } - if (count($resourceArray) != count($docIDs)) { - $rs = $modx->db->select("name,type,display,display_params,default_text", $tb2, "name='{$tvname}'", '', 1); + if (count($docs) != count($docIDs)) { + $rs = $modx->db->select("name,type,display,display_params,default_text", '[+prefix+]site_tmplvars', "name='{$tvname}'", '', 1); $row = $modx->db->getRow($rs); if (strtoupper($row['default_text']) == '@INHERIT') { foreach ($docIDs as $id) { $defaultOutput = getTVDisplayFormat($row['name'], $row['default_text'], $row['display'], $row['display_params'], $row['type'], $id); if (!isset($resourceArray["#".$id])) { - $resourceArray["#$id"][$tvname] = $defaultOutput; - $resourceArray["#$id"]["tv".$tvname] = $resourceArray["#$id"][$tvname]; + $docs["#$id"][$tvname] = $defaultOutput; + $docs["#$id"]["tv".$tvname] = $docs["#$id"][$tvname]; } } } else { + $row['contentid'] = isset($row['contentid']) ? $row['contentid'] : ''; $defaultOutput = getTVDisplayFormat($row['name'], $row['default_text'], $row['display'], $row['display_params'], $row['type'],$row['contentid']); foreach ($docIDs as $id) { - if (!isset($resourceArray["#".$id])) { - $resourceArray["#$id"][$tvname] = $defaultOutput; - $resourceArray["#$id"]["tv".$tvname] = $resourceArray["#$id"][$tvname]; + if (!isset($docs["#".$id])) { + $docs["#$id"][$tvname] = $defaultOutput; + $docs["#$id"]["tv".$tvname] = $docs["#$id"][$tvname]; } } } } - return $resourceArray; - } - - // --------------------------------------------------- - // Function: appendKeywords - // Append keywords's to the resource array - // --------------------------------------------------- - - function appendKeywords($resource) { - $keys = $this->fetchKeywords($resource); - $resource["keywords"] = "$keys"; - return $resource; - } - - // --------------------------------------------------- - // Function: fetchKeywords - // Helper function to
- Bad list
- \n" : $tabs . "
- " . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t \n"; + } else { + $listhtml .= $tabs . "\t
- " . $value . " \n"; + } + } + $listhtml .= $ordered == true ? $tabs . "
- \n";
+ foreach ($array as $key => $value) {
+ if (is_array($value)) {
+ $listhtml .= $tabs . "\t
- Bad list
- \n" : $tabs . "
- " . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t \n"; - } else { - $listhtml .= $tabs . "\t
- " . $value . " \n"; - } - } - $listhtml .= $ordered == true ? $tabs . "
- \n";
- foreach ($array as $key => $value) {
- if (is_array($value)) {
- $listhtml .= $tabs . "\t
".$tpls[0]."
";
$tpl.= "";
$tpl = str_replace("[+action+]",preserveUrl($modx->documentIdentifier,"",$ref),$tpl);
- $tpl = str_replace("[+rememberme+]",($_POST['rememberme'] ? 1 : 0),$tpl);
+ $tpl = str_replace("[+rememberme+]",(!empty($_POST['rememberme']) ? 1 : 0),$tpl);
$tpl = str_replace("[+username+]",$uid,$tpl);
- $tpl = str_replace("[+checkbox+]",($_POST['rememberme'] ? "checked='checked'" : ""),$tpl);
+ $tpl = str_replace("[+checkbox+]",(!empty($_POST['rememberme']) ? "checked='checked'" : ""),$tpl);
$tpl = str_replace("[+logintext+]",$loginText,$tpl);
echo $tpl;
@@ -97,7 +97,7 @@ function webLoginEnter(nextfield,event) {
INCLUDE_ORDERING_ERRORPlease use the MODX Content Manager instead of accessing this file directly."); - -$downloadLinks = array( - 0=>array('title'=>$_lang["information"],'link'=>'https://modx.com/community/modx-evolution'), - 1=>array('title'=>$_lang["download"],'link'=>'https://modx.com/download/evolution/'), - 2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'), - 3=>array('title'=>$_lang["extras"],'link'=>array( - 'https://modx.com/extras/?product=evolution', - 'http://extras.evolution-cms.com/', - 'https://github.com/extras-evolution' - )), -); - -$translationLinks = array( - 0=>array('title'=>'MODX Evolution','link'=>'https://www.transifex.com/modx/modx-evolution/'), - 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/modx/modx-evolution-extras/'), -); - -function createList($sectionHeader, $linkArr) { - $output = '
'.$sectionHeader.'
'."\n";
- $output .= ''."\n";
- $links = '';
- foreach($linkArr as $row) {
- if (!is_array($row['link'])) $row['link'] = array($row['link']);
- foreach ($row['link'] as $link) {
- $links .= $links != '' ? '
'."\n";
- return $output;
-}
-
-echo createList($_lang['evo_downloads_title'], $downloadLinks);
-echo createList($_lang['help_translating_title'], $translationLinks);
-
-?>
-
-| ' . $row["title"] . ' | -' . $links . ' | -
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/index.php b/index.php
index bbdc63e953..f55531a249 100644
--- a/index.php
+++ b/index.php
@@ -82,7 +82,6 @@
* Function: This file loads and executes the parser. *
*/
-define("IN_ETOMITE_PARSER", "true"); // provides compatibility with etomite 0.6 and maybe later versions
define("IN_PARSER_MODE", "true");
if (!defined('IN_MANAGER_MODE')) {
define("IN_MANAGER_MODE", "false");
@@ -107,7 +106,6 @@
// initiate a new document parser
include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
$modx = new DocumentParser;
-$etomite = &$modx; // for backward compatibility
// set some parser options
$modx->minParserPasses = 1; // min number of parser recursive loops or passes
diff --git a/install/actions/action_summary.php b/install/actions/action_summary.php
index 6d3de9a77b..973b2d1b49 100644
--- a/install/actions/action_summary.php
+++ b/install/actions/action_summary.php
@@ -14,15 +14,6 @@
} else {
echo "" . $_lang['ok'] . "";
}
-// check php register globals off
-echo " |
-  |
-  |
-  |
-
" . $_lang['checking_registerglobals']; -$register_globals = (int) ini_get('register_globals'); -if ($register_globals == '1'){ - echo "" . $_lang['failed']. "
".$_lang['checking_registerglobals_note']."
"; - // $errors += 1; // comment out for now so we still allow installs if folks are simply stubborn -} else { - echo "" . $_lang['ok'] . ""; -} // check if iconv is available echo "" . $_lang['checking_iconv']; $iconv = (int) function_exists('iconv'); diff --git a/install/assets/plugins/ElementsInTree.tpl b/install/assets/plugins/ElementsInTree.tpl index 1f3f3ca223..0088ad8fe8 100644 --- a/install/assets/plugins/ElementsInTree.tpl +++ b/install/assets/plugins/ElementsInTree.tpl @@ -5,9 +5,9 @@ * Get access to all Elements and Modules inside Manager sidebar * * @category plugin - * @version 1.5.7 + * @version 1.5.8 * @license http://creativecommons.org/licenses/GPL/2.0/ GNU Public License (GPL v2) - * @internal @properties &tabTreeTitle=Tree Tab Title;text;Docs;;Custom title of Site Tree tab. &useIcons=Use icons in tabs;list;yes,no;yes;;Icons available in EVO version 1.2 or newer. &treeButtonsInTab=Tree Buttons in tab;list;yes,no;yes;;Move Tree Buttons into Site Tree tab. &unifyFrames=Unify Frames;list;yes,no;yes;;Unify Tree and Main frame style. + * @internal @properties &adminRoleOnly=Administrators only;list;yes,no;yes;;Show tabs only for users with administrator role. &treeButtonsInTab=Tree buttons in tab;list;yes,no;yes;;Move Tree buttons into Site Tree tab. &useIcons=Tab icons;list;yes,no;yes;;Use icons in tabs. &unifyFrames=Unify frames;list;yes,no;yes;;Unify style of Tree and Main frame style. &tabTreeTitle=Tree tab title;text;Site;;Custom title of Site Tree tab. * @internal @events OnManagerTreePrerender,OnManagerTreeRender,OnManagerMainFrameHeaderHTMLBlock,OnTempFormSave,OnTVFormSave,OnChunkFormSave,OnSnipFormSave,OnPluginFormSave,OnModFormSave,OnTempFormDelete,OnTVFormDelete,OnChunkFormDelete,OnSnipFormDelete,OnPluginFormDelete,OnModFormDelete * @internal @modx_category Manager and Admin * @internal @installset base @@ -20,7 +20,7 @@ * @author Nicola1971 https://github.com/Nicola1971 * @author Deesen https://github.com/Deesen * @author yama https://github.com/yama - * @lastupdate 27/12/2016 + * @lastupdate 31/08/2017 */ require MODX_BASE_PATH.'assets/plugins/elementsintree/plugin.elementsintree.php'; diff --git a/install/assets/plugins/qm.tpl b/install/assets/plugins/qm.tpl index 2ec520d45c..546e08963d 100644 --- a/install/assets/plugins/qm.tpl +++ b/install/assets/plugins/qm.tpl @@ -5,9 +5,9 @@ * Enables QuickManager+ front end content editing support * * @category plugin - * @version 1.5.7 + * @version 1.5.8 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL v3) - * @internal @properties &jqpath=Path to jQuery;text;assets/js/jquery.min.js &loadmanagerjq=Load jQuery in manager;list;true,false;false &loadfrontendjq=Load jQuery in front-end;list;true,false;true &noconflictjq=jQuery noConflict mode in front-end;list;true,false;true &loadtb=Load modal box in front-end;list;true,false;true &tbwidth=Modal box window width;text;80% &tbheight=Modal box window height;text;90% &hidefields=Hide document fields from front-end editors;text;parent &hidetabs=Hide document tabs from front-end editors;text; &hidesections=Hide document sections from front-end editors;text; &addbutton=Show add document here button;list;true,false;true &tpltype=New document template type;list;parent,id,selected;parent &tplid=New document template id;int;3 &custombutton=Custom buttons;textarea; &managerbutton=Show go to manager button;list;true,false;true &logout=Logout to;list;manager,front-end;manager &disabled=Plugin disabled on documents;text; &autohide=Autohide toolbar;list;true,false;true &position= Toolbar position;list;top,right,bottom,left,before;top &editbuttons=Inline edit buttons;list;true,false;false &editbclass=Edit button CSS class;text;qm-edit &newbuttons=Inline new resource buttons;list;true,false;false &newbclass=New resource button CSS class;text;qm-new &tvbuttons=Inline template variable buttons;list;true,false;false &tvbclass=Template variable button CSS class;text;qm-tv &removeBg=Remove toolbar background;list;yes,no;no &buttonStyle=QuickManager buttons CSS stylesheet;list;actionButtons,navButtons;actionButtons + * @internal @properties &jqpath=Path to jQuery;text;assets/js/jquery.min.js &loadmanagerjq=Load jQuery in manager;list;true,false;false &loadfrontendjq=Load jQuery in front-end;list;true,false;true &noconflictjq=jQuery noConflict mode in front-end;list;true,false;true &loadfa=Load Font Awesome css in front-end;list;true,false;true &loadtb=Load modal box in front-end;list;true,false;true &tbwidth=Modal box window width;text;80% &tbheight=Modal box window height;text;90% &hidefields=Hide document fields from front-end editors;text;parent &hidetabs=Hide document tabs from front-end editors;text; &hidesections=Hide document sections from front-end editors;text; &addbutton=Show add document here button;list;true,false;true &tpltype=New document template type;list;parent,id,selected;parent &tplid=New document template id;int;3 &custombutton=Custom buttons;textarea; &managerbutton=Show go to manager button;list;true,false;true &logout=Logout to;list;manager,front-end;manager &disabled=Plugin disabled on documents;text; &autohide=Autohide toolbar;list;true,false;true &position= Toolbar position;list;top,right,bottom,left,before;top &editbuttons=Inline edit buttons;list;true,false;false &editbclass=Edit button CSS class;text;qm-edit &newbuttons=Inline new resource buttons;list;true,false;false &newbclass=New resource button CSS class;text;qm-new &tvbuttons=Inline template variable buttons;list;true,false;false &tvbclass=Template variable button CSS class;text;qm-tv &removeBg=Remove toolbar background;list;yes,no;no &buttonStyle=QuickManager buttons CSS stylesheet;list;actionButtons,navButtons;actionButtons * @internal @events OnParseDocument,OnWebPagePrerender,OnDocFormPrerender,OnDocFormSave,OnManagerLogout * @internal @modx_category Manager and Admin * @internal @legacy_names QM+,QuickEdit @@ -18,7 +18,7 @@ * @link http://www.maagit.fi/modx/quickmanager-plus * @author Mikko Lammi * @author Since 2011: yama, dmi3yy, segr, Nicola1971. - * @lastupdate 23/01/2017 + * @lastupdate 21/08/2017 */ // In manager @@ -43,5 +43,5 @@ if ($show) { } } include_once($modx->config['base_path'].'assets/plugins/qm/qm.inc.php'); - $qm = new Qm($modx, $jqpath, $loadmanagerjq, $loadfrontendjq, $noconflictjq, $loadtb, $tbwidth, $tbheight, $hidefields, $hidetabs, $hidesections, $addbutton, $tpltype, $tplid, $custombutton, $managerbutton, $logout, $autohide, $position, $editbuttons, $editbclass, $newbuttons, $newbclass, $tvbuttons, $tvbclass, $buttonStyle, $removeBg); + $qm = new Qm($modx, $jqpath, $loadmanagerjq, $loadfrontendjq, $noconflictjq, $loadfa, $loadtb, $tbwidth, $tbheight, $hidefields, $hidetabs, $hidesections, $addbutton, $tpltype, $tplid, $custombutton, $managerbutton, $logout, $autohide, $position, $editbuttons, $editbclass, $newbuttons, $newbclass, $tvbuttons, $tvbclass, $buttonStyle, $removeBg); } diff --git a/install/assets/plugins/searchhighlight.tpl b/install/assets/plugins/searchhighlight.tpl index 932062c411..5099f73a60 100644 --- a/install/assets/plugins/searchhighlight.tpl +++ b/install/assets/plugins/searchhighlight.tpl @@ -83,17 +83,10 @@ if (isset($_REQUEST['searched']) && isset($_REQUEST['highlight'])) { $dbCharset = $database_connection_charset; $pgCharset = array_key_exists($dbCharset,$pageCharset) ? $pageCharset[$dbCharset] : $dbCharset; - // magic quotes check - if (get_magic_quotes_gpc()){ - $searched = strip_tags(stripslashes($_REQUEST['searched'])); - $highlight = strip_tags(stripslashes($_REQUEST['highlight'])); - if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags(stripslashes($_REQUEST['advsearch'])); - } - else { - $searched = strip_tags($_REQUEST['searched']); - $highlight = strip_tags($_REQUEST['highlight']); - if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags($_REQUEST['advsearch']); - } + $searched = strip_tags($_REQUEST['searched']); + $highlight = strip_tags($_REQUEST['highlight']); + if (isset($_REQUEST['advsearch'])) $advsearch = strip_tags($_REQUEST['advsearch']); + if ($advsearch != 'nowords') { diff --git a/install/assets/plugins/userHelper.tpl b/install/assets/plugins/userHelper.tpl index ffc96893a7..527dbcd9a1 100644 --- a/install/assets/plugins/userHelper.tpl +++ b/install/assets/plugins/userHelper.tpl @@ -5,7 +5,7 @@ * addition to FormLister * * @category plugin - * @version 1.7.3 + * @version 1.7.8 * @internal @properties &logoutKey=Request key;text;logout &cookieName=Cookie Name;text;WebLoginPE &cookieLifetime=Cookie Lifetime, seconds;text;157680000 &maxFails=Max failed logins;text;3 &blockTime=Block for, seconds;text;3600 * @internal @events OnWebPageInit,OnPageNotFound,OnWebLogin * @internal @disabled 1 diff --git a/install/assets/snippets/DLMenu.tpl b/install/assets/snippets/DLMenu.tpl index 511c8132ce..0cd138feb9 100644 --- a/install/assets/snippets/DLMenu.tpl +++ b/install/assets/snippets/DLMenu.tpl @@ -5,7 +5,7 @@ * Snippet to build menu with DocLister * * @category snippet - * @version 1.1.1 + * @version 1.2.0 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL) * @internal @properties * @internal @modx_category Content diff --git a/install/assets/snippets/DLBuildMenu.tpl b/install/assets/snippets/DLSitemap.tpl similarity index 77% rename from install/assets/snippets/DLBuildMenu.tpl rename to install/assets/snippets/DLSitemap.tpl index 333f13606d..469142e56d 100644 --- a/install/assets/snippets/DLBuildMenu.tpl +++ b/install/assets/snippets/DLSitemap.tpl @@ -1,15 +1,15 @@ //=')) { - return session_status() === PHP_SESSION_ACTIVE ? TRUE : FALSE; - } else { - return session_id() === '' ? FALSE : TRUE; - } - } - return FALSE; - } function startCMSSession(){ - - if ( is_session_started() !== FALSE ) return; global $site_sessionname, $https_port; diff --git a/install/connection.collation.php b/install/connection.collation.php index 4d80000ddd..a91eac19df 100644 --- a/install/connection.collation.php +++ b/install/connection.collation.php @@ -14,41 +14,46 @@ } require_once('lang.php'); -if ($conn = mysqli_connect($host, $uid, $pwd)) { - // get collation - $rs = mysqli_query($conn, "SHOW COLLATION"); - if (mysqli_num_rows($rs) > 0) { - $output = ''; +$conn = mysqli_connect($host, $uid, $pwd); +if(!$conn) exit('can not connect'); + +// get collation +$rs = mysqli_query($conn, "SHOW COLLATION"); +if (mysqli_num_rows($rs) > 0) { + $output = ''; } + echo $output; +exit; + + function sortItem($array=array(),$order='utf8mb4,utf8') { $rs = array('recommend'=>''); diff --git a/install/connection.databasetest.php b/install/connection.databasetest.php index e5403a700e..f11b1d0fca 100644 --- a/install/connection.databasetest.php +++ b/install/connection.databasetest.php @@ -20,14 +20,6 @@ $output .= ''.$_lang['status_failed'].''; } else { - if (version_compare(phpversion(), "5.3") < 0) { - if(get_magic_quotes_gpc()) { - $_POST['database_name'] = stripslashes($_POST['database_name']); - $_POST['tableprefix'] = stripslashes($_POST['tableprefix']); - $_POST['database_collation'] = stripslashes($_POST['database_collation']); - $_POST['database_connection_method'] = stripslashes($_POST['database_connection_method']); - } - } $database_name = mysqli_real_escape_string($conn, $_POST['database_name']); $database_name = str_replace("`", "", $database_name); $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']); diff --git a/install/functions.php b/install/functions.php index 47fb063253..1f39dc99d3 100644 --- a/install/functions.php +++ b/install/functions.php @@ -52,7 +52,7 @@ function ph() $ph['pagetitle'] = $_lang['modx_install']; $ph['textdir'] = $modx_textdir ? ' id="rtl"':''; $ph['help_link'] = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd']; - $ph['version'] = $moduleName.' '.$moduleVersion; + $ph['version'] = $moduleVersion; $ph['release_date'] = ($modx_textdir ? '':'') . $modx_release_date; $ph['footer1'] = $_lang['modx_footer1']; $ph['footer2'] = $_lang['modx_footer2']; diff --git a/install/index.php b/install/index.php index 4f4f4cdf18..dbdb283f0f 100644 --- a/install/index.php +++ b/install/index.php @@ -1,12 +1,7 @@ ". $_lang['setup_database_create_connection']; if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) { - echo "".$_lang["setup_database_create_connection_failed"]."
".$_lang['setup_database_create_connection_failed_note']."
"; + echo ''.$_lang["setup_database_create_connection_failed"]."".$_lang['setup_database_create_connection_failed_note']."
"; return; } else { - echo "".$_lang['ok'].""; + echo ''.$_lang['ok'].""; } // select database @@ -87,7 +87,7 @@ } else { if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset); mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}"); - echo "".$_lang['ok'].""; + echo ''.$_lang['ok'].""; } // try to create the database @@ -95,7 +95,7 @@ echo "".$_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: "; // if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) { if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { - echo "".$_lang['setup_database_creation_failed']."".$_lang['setup_database_creation_failed_note']."
"; + echo ''.$_lang['setup_database_creation_failed']."".$_lang['setup_database_creation_failed_note'].""; $errors += 1; ?>
@@ -107,7 +107,7 @@
return;
} else {
- echo "".$_lang['ok']."";
+ echo ''.$_lang['ok']."";
}
}
@@ -115,12 +115,12 @@
if ($installMode == 0) {
echo "" . $_lang['checking_table_prefix'] . $table_prefix . "`: ";
if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
- echo "" . $_lang['failed'] . "" . $_lang['table_prefix_already_inuse'] . "
";
+ echo '' . $_lang['failed'] . "" . $_lang['table_prefix_already_inuse'] . "";
$errors += 1;
echo "" . $_lang['table_prefix_already_inuse_note'] . "
";
return;
} else {
- echo "" . $_lang['ok'] . "";
+ echo ''.$_lang['ok']."";
}
}
@@ -203,7 +203,7 @@ function parseProperties($propertyString) {
echo "" . $_lang['some_tables_not_updated'] . "
";
return;
} else {
- echo "".$_lang['ok']."";
+ echo ''.$_lang['ok']."";
}
}
@@ -247,7 +247,7 @@ function parseProperties($propertyString) {
$chmodSuccess = @chmod($filename, 0404);
if ($configFileFailed == true) {
- echo "" . $_lang['failed'] . "";
+ echo '' . $_lang['failed'] . "";
$errors += 1;
?>
/includes/config.inc.php
@@ -258,7 +258,7 @@ function parseProperties($propertyString) {
" . $_lang['ok'] . "";
+ echo ''.$_lang['ok']."";
}
// generate new site_id and set manager theme to default
@@ -295,7 +295,7 @@ function parseProperties($propertyString) {
echo "" . $_lang['some_tables_not_updated'] . "
";
return;
} else {
- echo "".$_lang['ok']."";
+ echo ''.$_lang['ok']."";
}
}
@@ -581,7 +581,7 @@ function parseProperties($propertyString) {
}
}
if($insert === true) {
- $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
+ $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
echo "".mysqli_error($sqlParser->conn)."
";
return;
@@ -681,7 +681,7 @@ function parseProperties($propertyString) {
$sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']);
mysqli_query($sqlParser->conn, $sql);
}
- echo "".$_lang['ok']."";
+ echo ''.$_lang['ok']."";
}
}
diff --git a/install/lang/italian.inc.php b/install/lang/italian.inc.php
index 72d51a91c9..5ebe19acb8 100644
--- a/install/lang/italian.inc.php
+++ b/install/lang/italian.inc.php
@@ -31,10 +31,12 @@
$_lang["btnback_value"] = 'Indietro';
$_lang["btnclose_value"] = 'Chiudi';
$_lang["btnnext_value"] = 'Avanti';
-$_lang["cant_write_config_file"] = 'MODX non è riuscito a salvare il file di configurazione. Vi preghiamo di copiare il seguente testo nel file ';
-$_lang["cant_write_config_file_note"] = 'Una volta completata l\'operazione potrete accedere a MODX inserendo nel browser l\'indirizzo vostrosito.it/[+MGR_DIR+]/.';
+$_lang["cant_write_config_file"] = 'EVO non é riuscito a salvare il file di configurazione. Vi preghiamo di copiare il seguente testo nel file ';
+$_lang["cant_write_config_file_note"] = 'Una volta completata l\'operazione potrete accedere a EVO inserendo nel browser l\'indirizzo vostrosito.it/[+MGR_DIR+]/.';
$_lang["checkbox_select_options"] = 'Opzioni Checkbox:';
$_lang["checking_if_cache_exist"] = 'Verifico se esistono le directories /assets/cache e /assets/cache/rss : ';
+$_lang["checking_iconv"] = 'Controllo se l\'estensione iconv é disponibile: ';
+$_lang["checking_iconv_note"] = 'E\' importante installare/abilitare l\'estensione iconv. Contattate il vostro hosting provider se non sapete come fare.';
$_lang["checking_if_cache_file_writable"] = 'Controllo i permessi di scrittura sul file /assets/cache/siteCache.idx.php : ';
$_lang["checking_if_cache_file2_writable"] = 'Controllo i permessi di scrittura sul file /assets/cache/sitePublishing.idx.php : ';
$_lang["checking_if_cache_writable"] = 'Controllo i permessi di scrittura sulle directories /assets/cache e /assets/cache/rss : ';
@@ -43,11 +45,11 @@
$_lang["checking_if_export_writable"] = 'Controllo i permessi di scrittura della directory /assets/export : ';
$_lang["checking_if_images_exist"] = 'Controllo se esistono le directories /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup e /assets/.thumbs : ';
$_lang["checking_if_images_writable"] = 'Controllo i permessi di scrittura delle directories /assets/images, /assets/files, /assets/flash, /assets/media, /assets/backup e /assets/.thumbs : ';
-$_lang["checking_mysql_strict_mode"] = 'Controllo la modalità strict sql_mode di MySQL: ';
+$_lang["checking_mysql_strict_mode"] = 'Controllo la modalità strict sql_mode di MySQL: ';
$_lang["checking_mysql_version"] = 'Controllo la versione di MySQL: ';
$_lang["checking_php_version"] = 'Controllo la versione di PHP: ';
-$_lang["checking_registerglobals"] = 'Controllo se Register_Globals è disattivato: ';
-$_lang["checking_registerglobals_note"] = 'Con questa configurazione il vostro sito potrebbe essere vittima di attacchi Cross Site Scripting (XSS). Per disabilitare Register_Globals ci sono diverse alternative: modificare il file php.ini globale, modificare il file .htaccess nella root della vostra installazione MODX, oppure aggiungere dei files php.ini in ogni directory della vostra installazione MODX (ma ci sono molte directories). Potete continuare con l\'installazione, ma non dite che non vi abbiamo avvertito.';
+$_lang["checking_registerglobals"] = 'Controllo se Register_Globals é disattivato: ';
+$_lang["checking_registerglobals_note"] = 'Con questa configurazione il vostro sito potrebbe essere vittima di attacchi Cross Site Scripting (XSS). Per disabilitare Register_Globals ci sono diverse alternative: modificare il file php.ini globale, modificare il file .htaccess nella root della vostra installazione EVO, oppure aggiungere dei files php.ini in ogni directory della vostra installazione EVO (ma ci sono molte directories). Potete continuare con l\'installazione, ma non dite che non vi abbiamo avvertito.';
$_lang["checking_sessions"] = 'Controllo se le sessioni sono configurate correttamente: ';
$_lang["checking_table_prefix"] = 'Controllo il prefisso per le tabelle `';
$_lang["choose_language"] = 'Scegli la lingua';
@@ -56,7 +58,7 @@
$_lang["connection_screen_collation"] = 'Collation:';
$_lang["connection_screen_connection_method"] = 'Tipo di connessione:';
$_lang["connection_screen_database_connection_information"] = 'Informazioni sul Database';
-$_lang["connection_screen_database_connection_note"] = 'Inserite il nome del database da usare o che volete creare per questa installazione MODX. Se il database non esiste, il programma di installazione proverà a crearlo. Questa operazione potrebbe non riuscire in funzione della vostra configurazione di MySQL.';
+$_lang["connection_screen_database_connection_note"] = 'Inserite il nome del database da usare o che volete creare per questa installazione EVO. Se il database non esiste, il programma di installazione proverà a crearlo. Questa operazione potrebbe non riuscire in funzione della vostra configurazione di MySQL.';
$_lang["connection_screen_database_host"] = 'Server del Database:';
$_lang["connection_screen_database_info"] = 'Informazioni sul Database';
$_lang["connection_screen_database_login"] = 'Nome utente del Database:';
@@ -76,12 +78,12 @@
$_lang["connection_screen_table_prefix"] = 'Prefisso per la Tabella:';
$_lang["creating_database_connection"] = 'Creo la connessione al database: ';
$_lang["database_alerts"] = 'Avvisi e Errori del Database!';
-$_lang["database_connection_failed"] = 'La connessione al Database è fallita!';
+$_lang["database_connection_failed"] = 'La connessione al Database é fallita!';
$_lang["database_connection_failed_note"] = 'Vi preghiamo di controllare i dettagli della connessione al database e riprovare.';
$_lang["database_use_failed"] = 'Impossibile selezionare il Database!';
$_lang["database_use_failed_note"] = 'Vi preghiamo di controllare i permessi dell\'utente specificato e riprovare.';
$_lang["default_language"] = 'Lingua di default per il Manager';
-$_lang["default_language_description"] = 'Questa è la lingua che verrà usata nel Manager di MODX.';
+$_lang["default_language_description"] = 'Questa é la lingua che verrà usata nel Manager di EVO.';
$_lang["depedency_create"] = 'Dipendenza creata';
$_lang["depedency_update"] = 'Dipendenza aggiornata';
$_lang["during_execution_of_sql"] = ' durante l\'esecuzione del comando SQL ';
@@ -92,8 +94,8 @@
$_lang["guid_set"] = 'GUID impostata';
$_lang["help"] = 'Aiuto!';
$_lang["help_link"] = 'http://forums.modx.com/';
-$_lang["help_title"] = 'Assistenza per l\'installazione nei forums MODX';
-$_lang["iagree_box"] = 'Accetto i termini della licenza MODX. Per una traduzione della licenza GPL versione 2, vi preghiamo di visitare il sito GNU.';
+$_lang["help_title"] = 'Assistenza per l\'installazione nei forums EVO';
+$_lang["iagree_box"] = 'Accetto i termini della licenza EVO. Per una traduzione della licenza GPL versione 2, vi preghiamo di visitare il sito GNU.';
$_lang["install"] = 'Installazione';
$_lang["install_overwrite"] = 'Installazione/Ripristino';
$_lang["install_results"] = 'Risultato dell\'Installazione';
@@ -101,12 +103,12 @@
$_lang["installation_error_occured"] = 'Si sono verificati i seguenti errori durante l\'installazione';
$_lang["installation_install_new_copy"] = 'Installare una nuova copia di ';
$_lang["installation_install_new_note"] = 'Vi preghiamo di notare che questa opzione può sovrascrivere i dati preesistenti nel vostro database.';
-$_lang["installation_mode"] = 'Modalità di Installazione';
+$_lang["installation_mode"] = 'Modalità di Installazione';
$_lang["installation_new_installation"] = 'Nuova Installazione';
-$_lang["installation_note"] = 'Nota: Dopo l\'accesso al Manager dovete modificare e salvare la Configurazione di Sistema selezionando Strumenti -> Configurazione di Sistema nel Manager MODX.';
-$_lang["installation_successful"] = 'L\'Installazione è terminata con successo!';
+$_lang["installation_note"] = 'Nota: Dopo l\'accesso al Manager dovete modificare e salvare la Configurazione di Sistema selezionando Strumenti -> Configurazione di Sistema nel Manager EVO.';
+$_lang["installation_successful"] = 'L\'Installazione é terminata con successo!';
$_lang["installation_upgrade_advanced"] = 'Aggiornamento Avanzato';
-$_lang["installation_upgrade_advanced_note"] = 'Per amministratori di database esperti oppure quando è necessario migrare a database con un diverso set di caratteri.
Vi occorre conoscere il nome del database, utente, password e i dettagli della connessione e collation utilizzate.';
+$_lang["installation_upgrade_advanced_note"] = 'Per amministratori di database esperti oppure quando é necessario migrare a database con un diverso set di caratteri.
Vi occorre conoscere il nome del database, utente, password e i dettagli della connessione e collation utilizzate.';
$_lang["installation_upgrade_existing"] = 'Aggiornamento di una installazione esistente';
$_lang["installation_upgrade_existing_note"] = 'Aggiornamento dei files esistenti e del database.';
$_lang["installed"] = 'Installato';
@@ -114,20 +116,20 @@
$_lang["language_code"] = 'en';
$_lang["loading"] = 'Sto caricando...';
$_lang["modules"] = 'Moduli';
-$_lang["modx_footer1"] = '© 2005-[+current_year+] MODX Content Management Framework (CMF) project. Tutti i diritti riservati. MODX è sotto la licenza GNU GPL.';
-$_lang["modx_footer2"] = 'MODX è un software libero. Vi incoraggiamo ad essere creativi e usare MODX come vi pare. Se fate delle modifiche al codice e decidete di ridistribuire il vostro MODX modificato, dovrete distribuire gratuitamente il codice sorgente!';
-$_lang["modx_install"] = 'MODX » Installazione';
-$_lang["modx_requires_php"] = ', e MODx richiede PHP [+min_version+] o successivo';
-$_lang["mysql_5051"] = ' la versione di MySQL è 5.0.51!';
+$_lang["modx_footer1"] = '© 2005-[+current_year+] EVO Content Management Framework (CMF) project. Tutti i diritti riservati. EVO é sotto la licenza GNU GPL.';
+$_lang["modx_footer2"] = 'EVO é un software libero. Vi incoraggiamo ad essere creativi e usare EVO come vi pare. Se fate delle modifiche al codice e decidete di ridistribuire il vostro EVO modificato, dovrete distribuire gratuitamente il codice sorgente!';
+$_lang["modx_install"] = 'EVO » Installazione';
+$_lang["modx_requires_php"] = ', e EVO richiede PHP [+min_version+] o successivo';
+$_lang["mysql_5051"] = ' la versione di MySQL é 5.0.51!';
$_lang["mysql_5051_warning"] = 'Ci sono dei problemi noti con MySQL 5.0.51. Vi consigliamo di aggiornarlo prima di continuare.';
-$_lang["mysql_version_is"] = ' La vostra versione di MySQL è: ';
+$_lang["mysql_version_is"] = ' La vostra versione di MySQL é: ';
$_lang["no"] = 'No';
$_lang["none"] = 'Nessuno';
$_lang["not_found"] = 'non trovato';
$_lang["ok"] = 'OK!';
$_lang["optional_items"] = 'Componenti Opzionali';
$_lang["optional_items_note"] = 'Vi preghiamo di scegliere le opzioni di installazione e fare click su Installazione:';
-$_lang["php_security_notice"] = 'Anche se MODX funziona con la vostra versione di PHP, vi suggeriamo di non farlo. La vostra versione di PHP ha numerosi problemi di sicurezza. Un aggiornamento a PHP versione 4.3.8 o successiva correggerà questi problemi. Vi raccomandiamo di farlo per garantire la sicurezza del vostro sito web.
';
+$_lang["php_security_notice"] = 'Anche se EVO funziona con la vostra versione di EVO, vi suggeriamo di non farlo. La vostra versione di EVO ha numerosi problemi di sicurezza. Un aggiornamento a PHP versione 4.3.8 o successiva correggerà questi problemi. Vi raccomandiamo di farlo per garantire la sicurezza del vostro sito web.
';
$_lang["please_correct_error"] = '. Vi preghiamo di correggere l\'errore';
$_lang["please_correct_errors"] = '. Vi preghiamo di correggere gli errori';
$_lang["plugins"] = 'Plugins';
@@ -136,30 +138,30 @@
$_lang["recommend_collations_order"] = 'utf8mb4_unicode_ci,utf8mb4_general_ci,utf8_unicode_ci,utf8_general_ci,utf8mb4_bin,utf8_bin,utf8mb4_unicode_520_ci,utf8_unicode_520_ci,utf8_general_mysql500_ci';
$_lang["recommend_setting_change_title"] = 'Modifiche consigliate alla Configurazione';
$_lang["recommend_setting_change_validate_referer_confirmation"] = 'Modifica: Validazione degli headers HTTP_REFERER?';
-$_lang["recommend_setting_change_validate_referer_description"] = 'Il vostro sito non è stato configurato per validare gli headers HTTP_REFERER degli accessi al Manager. Vi raccomandiamo di abilitare questa impostazione per ridurre il rischio di attacchi CSRF (Cross Site Request Forgery).';
+$_lang["recommend_setting_change_validate_referer_description"] = 'Il vostro sito non é stato configurato per validare gli headers HTTP_REFERER degli accessi al Manager. Vi raccomandiamo di abilitare questa impostazione per ridurre il rischio di attacchi CSRF (Cross Site Request Forgery).';
$_lang["remove_install_folder_auto"] = 'Rimuovere la cartella install e i files in essa contenuti
(Questa operazione richiede i permessi di scrittura nella cartella di installazione).';
-$_lang["remove_install_folder_manual"] = 'Ricordatevi di cancellare la cartella "install" prima di accedere a MODX.';
+$_lang["remove_install_folder_manual"] = 'Ricordatevi di cancellare la cartella "install" prima di accedere a EVO.';
$_lang["resetting_database"] = 'Reset del database per il sito-demo:';
$_lang["retry"] = 'Riprova';
$_lang["running_database_updates"] = 'Esecuzione degli aggiornamenti del database: ';
$_lang["sample_web_site"] = 'Sito Web di Esempio';
-$_lang["sample_web_site_note"] = 'Vi preghiamo di notare che questo cancellerà i documenti e le risorse esistenti.';
+$_lang["sample_web_site_note"] = 'Vi preghiamo di notare che questo cancellerà i documenti e le risorse esistenti.';
$_lang["session_problem"] = 'E\' stato riscontrato un problema cone le sessioni del vostro server. Contattare un amministratore di sistema per risolvere il problema.';
$_lang["session_problem_try_again"] = 'Riprovare?';
-$_lang["setup_cannot_continue"] = 'Sfortunatamente il programma di Installazione non può continuare, perchè; ';
-$_lang["setup_couldnt_install"] = 'MODX non è riuscito ad installare/modificare alcune tabelle del database selezionato.';
-$_lang["setup_database"] = 'MODX tenterà ora di configurare il database:
';
+$_lang["setup_cannot_continue"] = 'Sfortunatamente il programma di Installazione non può continuare, perché; ';
+$_lang["setup_couldnt_install"] = 'EVO non é riuscito ad installare/modificare alcune tabelle del database selezionato.';
+$_lang["setup_database"] = 'EVO tenterà ora di configurare il database:
';
$_lang["setup_database_create_connection"] = 'Creazione della connessione con il database: ';
$_lang["setup_database_create_connection_failed"] = 'Impossibile connettersi con il Database!';
$_lang["setup_database_create_connection_failed_note"] = 'Vi preghiamo di controllare i dettagli della connessione al database e riprovare.';
$_lang["setup_database_creating_tables"] = 'Creazione delle tabelle del database: ';
$_lang["setup_database_creation"] = 'Creazione del database `';
$_lang["setup_database_creation_failed"] = 'Impossibile creare il Database!';
-$_lang["setup_database_creation_failed_note"] = ' - MODX non è riuscito a creare il database!';
-$_lang["setup_database_creation_failed_note2"] = 'MODX non è riuscito a creare il database e non è stato trovato un database con il nome specificato. Probabilmente il vostro hosting provider non consente a degli script esterni di creare un database. Vi preghiamo di creare manualmente un database ed eseguire nuovamente il programma di installazione.';
+$_lang["setup_database_creation_failed_note"] = ' - EVO non é riuscito a creare il database!';
+$_lang["setup_database_creation_failed_note2"] = 'EVO non é riuscito a creare il database e non é stato trovato un database con il nome specificato. Probabilmente il vostro hosting provider non consente a degli script esterni di creare un database. Vi preghiamo di creare manualmente un database ed eseguire nuovamente il programma di installazione.';
$_lang["setup_database_selection"] = 'Selezione del database `';
$_lang["setup_database_selection_failed"] = 'Impossibile selezionare il Database...';
-$_lang["setup_database_selection_failed_note"] = 'Il database specificato non esiste. MODX proverà a crearlo.';
+$_lang["setup_database_selection_failed_note"] = 'Il database specificato non esiste. EVO proverà a crearlo.';
$_lang["snippets"] = 'Snippets';
$_lang["some_tables_not_updated"] = 'Alcune tabelle non sono state aggiornate, probabilmente a causa di precedenti modifiche.';
$_lang["status_checking_database"] = 'Verifica del database: ';
@@ -167,19 +169,19 @@
$_lang["status_failed"] = 'fallita!';
$_lang["status_failed_could_not_create_database"] = 'fallita - impossibile creare il database';
$_lang["status_failed_database_collation_does_not_match"] = 'fallita - problemi con la collation del database; usate SET NAMES o scegliete %s';
-$_lang["status_failed_table_prefix_already_in_use"] = 'fallita - il prefisso scelto per le tabelle è già in uso!';
-$_lang["status_passed"] = 'successo - il database è stato selezionato';
-$_lang["status_passed_database_created"] = 'successo - il database è stato creato';
-$_lang["status_passed_server"] = 'successo - la collation del database è disponibile';
+$_lang["status_failed_table_prefix_already_in_use"] = 'fallita - il prefisso scelto per le tabelle é già in uso!';
+$_lang["status_passed"] = 'successo - il database é stato selezionato';
+$_lang["status_passed_database_created"] = 'successo - il database é stato creato';
+$_lang["status_passed_server"] = 'successo - la collation del database é disponibile';
$_lang["strict_mode"] = ' Il server MySQL ha lo strict sql_mode abilitato!';
-$_lang["strict_mode_error"] = 'Alcune funzionalità di MODX potrebbero non funzionare se STRICT_TRANS_TABLES sql_mode è abilitato. Potete configurare MySQL dal file my.cnf o contattando un amministratore di sistema.';
-$_lang["summary_setup_check"] = 'MODX ha effettuato dei controlli per verificare che tutto sia pronto per l\'installazione.';
+$_lang["strict_mode_error"] = 'Alcune funzionalità di EVO potrebbero non funzionare se STRICT_TRANS_TABLES sql_mode é abilitato. Potete configurare MySQL dal file my.cnf o contattando un amministratore di sistema.';
+$_lang["summary_setup_check"] = 'EVO ha effettuato dei controlli per verificare che tutto sia pronto per l\'installazione.';
$_lang["system_configuration"] = 'Configurazione di Sistema';
-$_lang["system_configuration_validate_referer_description"] = 'L\'opzione di Validazione degli headers HTTP_REFERER è consigliata e vi può proteggere da attacchi CSRF, ma in qualche caso può impedire l\'accesso al Manager.';
-$_lang["table_prefix_already_inuse"] = ' - Il prefisso selezionato per le Tabelle è già in uso in questo database!';
-$_lang["table_prefix_already_inuse_note"] = 'MODX non ha potuto proseguire con l\'installazione nel database selezionato poichè contiene già delle tabelle con il prefisso indicato. Vi preghiamo di scegliere un nuovo prefisso per le tabelle ed eseguire nuovamente il programma di installazione.';
+$_lang["system_configuration_validate_referer_description"] = 'L\'opzione di Validazione degli headers HTTP_REFERER é consigliata e vi può proteggere da attacchi CSRF, ma in qualche caso può impedire l\'accesso al Manager.';
+$_lang["table_prefix_already_inuse"] = ' - Il prefisso selezionato per le Tabelle é già in uso in questo database!';
+$_lang["table_prefix_already_inuse_note"] = 'EVO non ha potuto proseguire con l\'installazione nel database selezionato poiché contiene già delle tabelle con il prefisso indicato. Vi preghiamo di scegliere un nuovo prefisso per le tabelle ed eseguire nuovamente il programma di installazione.';
$_lang["table_prefix_not_exist"] = ' - Il prefisso selezionato per le tabelle non esiste in questo database!';
-$_lang["table_prefix_not_exist_note"] = 'MODX non ha potuto proseguire con l\'installazione nel database selezionato poichè non contiene tabelle da aggiornare con il prefisso indicato. Vi preghiamo di scegliere un prefisso già esistente per le tabelle ed eseguire nuovamente il programma di installazione.';
+$_lang["table_prefix_not_exist_note"] = 'EVO non ha potuto proseguire con l\'installazione nel database selezionato poiché non contiene tabelle da aggiornare con il prefisso indicato. Vi preghiamo di scegliere un prefisso già esistente per le tabelle ed eseguire nuovamente il programma di installazione.';
$_lang["templates"] = 'Templates';
$_lang["to_log_into_content_manager"] = 'Per accedere al Manager ([+MGR_DIR+]/index.php) fate click sul bottone `Chiudi`.';
$_lang["toggle"] = 'Inverti';
@@ -192,11 +194,11 @@
$_lang["upgrade_note"] = 'Nota: Vi preghiamo di accedere al Manager come Amministratore e verificare la Configurazione di Sistema.';
$_lang["upgraded"] = 'Aggiornato';
$_lang["validate_referer_title"] = 'Validazione degli headers HTTP_REFERER?';
-$_lang["visit_forum"] = ', consultate i Forums MODX.';
+$_lang["visit_forum"] = ', consultate i Forums EVO.';
$_lang["warning"] = 'ATTENZIONE!';
-$_lang["welcome_message_start"] = 'Selezionate la modalità di installazione:';
-$_lang["welcome_message_text"] = 'Questo programma vi guiderà attraverso il processo di Installazione.';
-$_lang["welcome_message_welcome"] = 'Benvenuti nel programma di Installazione di MODX.';
+$_lang["welcome_message_start"] = 'Selezionate la modalità di installazione:';
+$_lang["welcome_message_text"] = 'Questo programma vi guiderà attraverso il processo di Installazione.';
+$_lang["welcome_message_welcome"] = 'Benvenuti nel programma di Installazione di EVO.';
$_lang["writing_config_file"] = 'Scrittura del file di configurazione: ';
$_lang["yes"] = 'Si';
$_lang["you_running_php"] = ' - State eseguendo PHP ';
diff --git a/install/setup.data.reset.sql b/install/setup.data.reset.sql
index a52556d71d..7916371d73 100644
--- a/install/setup.data.reset.sql
+++ b/install/setup.data.reset.sql
@@ -7,19 +7,12 @@
# Empty tables first
#
-
-TRUNCATE TABLE `{PREFIX}site_keywords`;
-
-TRUNCATE TABLE `{PREFIX}keyword_xref`;
-
TRUNCATE TABLE `{PREFIX}documentgroup_names`;
TRUNCATE TABLE `{PREFIX}site_content`;
TRUNCATE TABLE `{PREFIX}site_htmlsnippets`;
-TRUNCATE TABLE `{PREFIX}site_keywords`;
-
TRUNCATE TABLE `{PREFIX}site_plugins`;
TRUNCATE TABLE `{PREFIX}site_snippets`;
diff --git a/install/setup.data.sql b/install/setup.data.sql
index eaac800fff..74f7a25edd 100644
--- a/install/setup.data.sql
+++ b/install/setup.data.sql
@@ -2,18 +2,6 @@
#
# Each sql command is separated by double lines
-
-#
-# Dumping data for table `keyword_xref`
-#
-
-
-REPLACE INTO `{PREFIX}keyword_xref` VALUES ('3','1');
-
-
-REPLACE INTO `{PREFIX}keyword_xref` VALUES ('4','1');
-
-
#
# Dumping data for table `documentgroup_names`
#
@@ -29,43 +17,43 @@ REPLACE INTO `{PREFIX}documentgroup_names` VALUES ('1','Site Admin Pages','0','0
# Dumping data for table `site_content`
#
-REPLACE INTO `{PREFIX}site_content` VALUES ('1','document','text/html','Home','Welcome to MODX','Introduction to MODX','index','','1','0','0','0','0','Create and do amazing things with MODX','Install successful!
\nYou have successfully installed and configured MODX. We hope you find this site an adequate starting configuration for many small business, organization or personal websites; just change the template and content, and you\'ll be good to go! This site is preconfigured with a variety of options we hope are helpful, relevant and just plain cool for many marketing or personal sites:
\n- \n
- Simple Blog. When logged into your site, you\'ll be able to create new entries from the front end. This can also be turned into a News publishing or PR publishing system. View example blog \n
- Easy Comments. When logged into your site, your registered site users can comment on your posts. View example \n
- RSS Feeds. Your site visitors can stay up to date using your site feeds. View RSS feed \n
- Automatic User Registration. Those that wish to comment on blogs must first create an account. This comes pre-configured with a \"Captcha\" anti-robot registration feature. View registration form \n
- QuickEdit. When you\'re logged into the manager, you can edit a page directly from the front end! More about CMS features \n
- Integrated Site Search. Allows visitors to search only the pages you wish them to search. Uses Ajax to display results without loading a new page. \n
- Powerful Navigation Builder. Duplicate or build virtually any navigation system with our dynamic menu builder code. The menu above, for example. More about menu features \n
- Ajax ready. You\'re on your way to Web 2.0 and AJAX goodness. More about Ajax features \n
- Custom \"page not found (404)\" page. Help visitors who go astray to find what they\'re looking for. View 404 page \n
- Contact Us form. A highly configurable contact form you should customize to point to the right email address. Comes pre-configured to prevent mail-form-injection so your site does not become a source for spam. View form \n
- Newest documents list. Shows your visitor the most recently added pages (configurable). \n
- Customizable Content Manager. Preview uploaded images, hide or rename fields and lots more. See ManagerManager\'s documentation for details and instructions. Quick start: ManagerManager by default will look for \"rules\" in a Chunk named \"mm_rules\". Simply copy or rename the Chunk named \"mm_demo_rules\" to \"mm_rules\" and try it out! \n
- phpThumb. Examples to use phpThumb to crop images. \n
Full documentation can be found on the official documentation site.
\nTo log into the MODX Control Panel and start customizing this site, point your browser to /manager/.
','1','{BOOTSTRAP_SQL_ID}','0','1','1','1','1144904400','1','1378084284','0','0','0','0','0','Home','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('1','document','text/html','Home','Welcome to MODX','Introduction to MODX','index','','1','0','0','0','0','Create and do amazing things with MODX','Install successful!
\nYou have successfully installed and configured MODX. We hope you find this site an adequate starting configuration for many small business, organization or personal websites; just change the template and content, and you\'ll be good to go! This site is preconfigured with a variety of options we hope are helpful, relevant and just plain cool for many marketing or personal sites:
\n- \n
- Simple Blog. When logged into your site, you\'ll be able to create new entries from the front end. This can also be turned into a News publishing or PR publishing system. View example blog \n
- Easy Comments. When logged into your site, your registered site users can comment on your posts. View example \n
- RSS Feeds. Your site visitors can stay up to date using your site feeds. View RSS feed \n
- Automatic User Registration. Those that wish to comment on blogs must first create an account. This comes pre-configured with a \"Captcha\" anti-robot registration feature. View registration form \n
- QuickEdit. When you\'re logged into the manager, you can edit a page directly from the front end! More about CMS features \n
- Integrated Site Search. Allows visitors to search only the pages you wish them to search. Uses Ajax to display results without loading a new page. \n
- Powerful Navigation Builder. Duplicate or build virtually any navigation system with our dynamic menu builder code. The menu above, for example. More about menu features \n
- Ajax ready. You\'re on your way to Web 2.0 and AJAX goodness. More about Ajax features \n
- Custom \"page not found (404)\" page. Help visitors who go astray to find what they\'re looking for. View 404 page \n
- Contact Us form. A highly configurable contact form you should customize to point to the right email address. Comes pre-configured to prevent mail-form-injection so your site does not become a source for spam. View form \n
- Newest documents list. Shows your visitor the most recently added pages (configurable). \n
- Customizable Content Manager. Preview uploaded images, hide or rename fields and lots more. See ManagerManager\'s documentation for details and instructions. Quick start: ManagerManager by default will look for \"rules\" in a Chunk named \"mm_rules\". Simply copy or rename the Chunk named \"mm_demo_rules\" to \"mm_rules\" and try it out! \n
- phpThumb. Examples to use phpThumb to crop images. \n
Full documentation can be found on the official documentation site.
\nTo log into the MODX Control Panel and start customizing this site, point your browser to /manager/.
','1','{BOOTSTRAP_SQL_ID}','0','1','1','1','1144904400','1','1378084284','0','0','0','0','0','Home','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('2','document','text/html','Blog','My Blog','','blog','','1','0','0','0','1','','[[Ditto? &parents=`2` &display=`2` &removeChunk=`Comments` &tpl=`ditto_blog` &paginate=`1` &extenders=`summary,dateFilter` &paginateAlwaysShowLinks=`1` &tagData=`documentTags`]]\n\nShowing [+start+] - [+stop+] of [+total+] Articles
\n\n [+previous+] [+pages+] [+next+]
\n\nShowing [+start+] - [+stop+] of [+total+] Articles
\n\n [+previous+] [+pages+] [+next+]
\n\nIn order to comment on blog entries, you must be a registered user of [(site_name)]. If you haven\'t already registered, you can request an account.
\n [!WebLogin? &tpl=`WebLogin_tplForm` &loginhomeid=`2`!]
','1','{BOOTSTRAP_SQL_ID}','9','0','0','1','1144904400','1','1144904400','0','0','0','0','0','[*loginName*]','0','0','0','0','0','0','1','1');
+REPLACE INTO `{PREFIX}site_content` VALUES ('4','document','text/html','[*loginName*]','Login to Enable to Comments','','login','','1','0','0','0','0','','In order to comment on blog entries, you must be a registered user of [(site_name)]. If you haven\'t already registered, you can request an account.
\n [!WebLogin? &tpl=`WebLogin_tplForm` &loginhomeid=`2`!]
','1','{BOOTSTRAP_SQL_ID}','9','0','0','1','1144904400','1','1144904400','0','0','0','0','0','[*loginName*]','0','0','0','0','1','1');
-REPLACE INTO `{PREFIX}site_content` VALUES ('5','document','text/html','Request an Account','Sign Up for Full Site Privileges','','request-an-account','','1','0','0','0','0','','[[WebSignup? &tpl=`FormSignup` &groups=`Registered Users`]]','1','{BOOTSTRAP_SQL_ID}','7','0','0','1','1144904400','1','1158320704','0','0','0','0','0','','0','0','0','0','0','0','1','1');
+REPLACE INTO `{PREFIX}site_content` VALUES ('5','document','text/html','Request an Account','Sign Up for Full Site Privileges','','request-an-account','','1','0','0','0','0','','[[WebSignup? &tpl=`FormSignup` &groups=`Registered Users`]]','1','{BOOTSTRAP_SQL_ID}','7','0','0','1','1144904400','1','1158320704','0','0','0','0','0','','0','0','0','0','1','1');
-REPLACE INTO `{PREFIX}site_content` VALUES ('6','document','text/html','Contact Us','Contact [(site_name)]','','contact-us','','1','0','0','0','0','','\n\n[!eForm? \n &formid=`ContactForm`\n &vericode=`1`\n &subject=`[+subject+]`\n &to=`[(emailsender)]` \n &ccsender=`1`\n &tpl=`ContactForm`\n &report=`ContactFormReport`\n &invalidClass=`invalidValue`\n &requiredClass=`requiredValue`\n &gotoid=`46`\n!]\n','0','{BOOTSTRAP_SQL_ID}','5','1','0','1','1144904400','1','1159303922','0','0','0','0','0','Contact us','0','0','0','0','0','0','0','1');
+REPLACE INTO `{PREFIX}site_content` VALUES ('6','document','text/html','Contact Us','Contact [(site_name)]','','contact-us','','1','0','0','0','0','','\n\n[!eForm? \n &formid=`ContactForm`\n &vericode=`1`\n &subject=`[+subject+]`\n &to=`[(emailsender)]` \n &ccsender=`1`\n &tpl=`ContactForm`\n &report=`ContactFormReport`\n &invalidClass=`invalidValue`\n &requiredClass=`requiredValue`\n &gotoid=`46`\n!]\n','0','{BOOTSTRAP_SQL_ID}','5','1','0','1','1144904400','1','1159303922','0','0','0','0','0','Contact us','0','0','0','0','0','1');
-REPLACE INTO `{PREFIX}site_content` VALUES ('7','document','text/html','404 - Document Not Found','Uh oh ... it\'s a 404! (Page Not Found)','','doc-not-found','','1','0','0','0','0','','Looks like you tried to go somewhere that does not exist... perhaps you need to login or you\'d like one of the following pages instead:
\n\n[[Wayfinder? &startId=`0` &showDescription=`1`]]\n\nWant to find it the old fashioned way? Use the site search at the top of this site to find what you seek.
\n\n','1','{BOOTSTRAP_SQL_ID}','12','0','1','1','1144904400','1','1159301173','0','0','0','0','0','','0','0','0','0','0','0','1','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('7','document','text/html','404 - Document Not Found','Uh oh ... it\'s a 404! (Page Not Found)','','doc-not-found','','1','0','0','0','0','','Looks like you tried to go somewhere that does not exist... perhaps you need to login or you\'d like one of the following pages instead:
\n\n[[Wayfinder? &startId=`0` &showDescription=`1`]]\n\nWant to find it the old fashioned way? Use the site search at the top of this site to find what you seek.
\n\n','1','{BOOTSTRAP_SQL_ID}','12','0','1','1','1144904400','1','1159301173','0','0','0','0','0','','0','0','0','0','1','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('8','document','text/html','Search Results','Your Search Results','','search-results','','1','0','0','0','0','','[!AjaxSearch? &showInputForm=`0` &ajaxSearch=`0`!]','0','{BOOTSTRAP_SQL_ID}','10','0','0','1','1144904400','1','1158613055','0','0','0','0','0','','1','0','0','0','0','0','1','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('8','document','text/html','Search Results','Your Search Results','','search-results','','1','0','0','0','0','','[!AjaxSearch? &showInputForm=`0` &ajaxSearch=`0`!]','0','{BOOTSTRAP_SQL_ID}','10','0','0','1','1144904400','1','1158613055','0','0','0','0','0','','1','0','0','0','1','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('9','document','text/html','Mini-Blog HOWTO','How to Start Posting with MODX Mini-Blogs','','article-1126081344','','1','0','0','2','0','','Setting up a mini-blog is relatively simple. Here\'s what you need to do to get started with making new posts:
\n- \n
- Login to the MODX Control Panel. \n
- Press the plus-sign next to the Blog(2) container resource to see the blog entries posted there. \n
- To make a new Blog entry, simply right-click the Blog container document and choose the \"Create Resource here\" menu option. To edit an existing blog article, right click the entry and choose the \"Edit Resource\" menu option. \n\n
- Write or edit the content and press save, making sure the document is published. \n
- Everything else is automatic; you\'re done! \n
Setting up a mini-blog is relatively simple. Here\'s what you need to do to get started with making new posts:
\n- \n
- Login to the MODX Control Panel. \n
- Press the plus-sign next to the Blog(2) container resource to see the blog entries posted there. \n
- To make a new Blog entry, simply right-click the Blog container document and choose the \"Create Resource here\" menu option. To edit an existing blog article, right click the entry and choose the \"Edit Resource\" menu option. \n\n
- Write or edit the content and press save, making sure the document is published. \n
- Everything else is automatic; you\'re done! \n
Manage your content in the backend
\nThe Manager is a skinnable feature-packed tool for admin users. You can add extra users and limit what functions they can access. MODX\'s Manager makes creating content and managing templates and reusable elements easy. Modules can be added to work with other datasets or make management tasks easier.
\nManage your content in the frontend
\nThe QuickEdit bar lets manager users edit content whilst browsing the site. Most content fields and template variables can be edited quickly and easily.
\nEnable web users to add content
\nCustom data entry is easy to code using the MODX API - so you can design forms and collect whatever information you need.
','1','{BOOTSTRAP_SQL_ID}','3','1','1','1','1144904400','1','1378086298','0','0','0','1378086298','1','Manage Content','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('14','document','text/html','Content Management','Ways to manage content','','cms','','1','0','0','15','0','','Manage your content in the backend
\nThe Manager is a skinnable feature-packed tool for admin users. You can add extra users and limit what functions they can access. MODX\'s Manager makes creating content and managing templates and reusable elements easy. Modules can be added to work with other datasets or make management tasks easier.
\nManage your content in the frontend
\nThe QuickEdit bar lets manager users edit content whilst browsing the site. Most content fields and template variables can be edited quickly and easily.
\nEnable web users to add content
\nCustom data entry is easy to code using the MODX API - so you can design forms and collect whatever information you need.
','1','{BOOTSTRAP_SQL_ID}','3','1','1','1','1144904400','1','1378086298','0','0','0','1378086298','1','Manage Content','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('15','document','text/html','MODX Features','MODX Features','','features','','1','0','0','0','1','','[[Wayfinder?startId=`[*id*]` &outerClass=`topnav`]]','1','{BOOTSTRAP_SQL_ID}','2','1','1','1','1144904400','1','1158452722','0','0','0','1144777367','1','Features','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('15','document','text/html','MODX Features','MODX Features','','features','','1','0','0','0','1','','[[Wayfinder?startId=`[*id*]` &outerClass=`topnav`]]','1','{BOOTSTRAP_SQL_ID}','2','1','1','1','1144904400','1','1158452722','0','0','0','1144777367','1','Features','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('16','document','text/html','Ajax','Ajax and Web 2.0 ready','','ajax','','1','1159264800','0','15','0','','Ajax ready out-of-the-box\nMODX empowers users to build engaging sites today, with its pre-integrated Mootools javascript library.
\n\nCheck out the Ajax-powered search in this example site. The libraries are also used with QuickEdit, our front-end editing tool.
\n\nSmart integration means the scripts are only included in the document head when needed - no unnecessary bloat on simple pages!
\n\nWeb 2.0 today\nMODX makes child\'s play of building content managed sites with validating, accessible CSS layouts - so web standards compliance is easy. (You can create a site with excessively nested tables too, if you really want to).
\n','1','{BOOTSTRAP_SQL_ID}','1','1','1','1','1144904400','1','1159307504','0','0','0','0','0','Ajax','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('16','document','text/html','Ajax','Ajax and Web 2.0 ready','','ajax','','1','1159264800','0','15','0','','Ajax ready out-of-the-box\nMODX empowers users to build engaging sites today, with its pre-integrated Mootools javascript library.
\n\nCheck out the Ajax-powered search in this example site. The libraries are also used with QuickEdit, our front-end editing tool.
\n\nSmart integration means the scripts are only included in the document head when needed - no unnecessary bloat on simple pages!
\n\nWeb 2.0 today\nMODX makes child\'s play of building content managed sites with validating, accessible CSS layouts - so web standards compliance is easy. (You can create a site with excessively nested tables too, if you really want to).
\n','1','{BOOTSTRAP_SQL_ID}','1','1','1','1','1144904400','1','1159307504','0','0','0','0','0','Ajax','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('18','document','text/html','Just a pretend, older post','This post should in fact be archived','','article-1128398162','','1','0','0','2','0','','Not so exciting, after all, eh?
Not so exciting, after all, eh?
Your documents - listed how you want them
\nMODX\'s document data structure has been designed to allow many different routines to redisplay the information in ways that suit your needs, such as a dynamic menu in your template.
\nSince the last release of MODX, the community has produced many great snippets - reusable functions that you can call in your content or template. Two of the most widely useful are Ditto and Wayfinder.
\nWayfinder - the menu builder
\nAllows you to template every part of the menu. On this site, Wayfinder is being used to generate the drop-down menus, but many types of menus and sitemaps are possible.
\nDitto - the document lister
\nUses include listing the most recent blog posts, producing a site map, listing related documents (using a TV filter) and generating an RSS feed. You could even write a menu with it. On this site, Ditto is being used for the blog posts list on the Blog page, and the list on the right of some templates.
\nUnlimited Customization
\nIf you can\'t quite get your desired effect using templating and the many options of Ditto and Wayfinder, you can write your own routine, or look for other snippets in the MODX repository. MODX\'s fields for Menu Title, summaries, menu position etc can be used via the API to produce anything you can imagine.
','1','{BOOTSTRAP_SQL_ID}','2','1','1','1','1144904400','1','1160148522','0','0','0','0','0','Menus and Lists','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('22','document','text/html','Menus and Lists','Flexible Menus and Lists','','menus','','1','1159178400','0','15','0','','Your documents - listed how you want them
\nMODX\'s document data structure has been designed to allow many different routines to redisplay the information in ways that suit your needs, such as a dynamic menu in your template.
\nSince the last release of MODX, the community has produced many great snippets - reusable functions that you can call in your content or template. Two of the most widely useful are Ditto and Wayfinder.
\nWayfinder - the menu builder
\nAllows you to template every part of the menu. On this site, Wayfinder is being used to generate the drop-down menus, but many types of menus and sitemaps are possible.
\nDitto - the document lister
\nUses include listing the most recent blog posts, producing a site map, listing related documents (using a TV filter) and generating an RSS feed. You could even write a menu with it. On this site, Ditto is being used for the blog posts list on the Blog page, and the list on the right of some templates.
\nUnlimited Customization
\nIf you can\'t quite get your desired effect using templating and the many options of Ditto and Wayfinder, you can write your own routine, or look for other snippets in the MODX repository. MODX\'s fields for Menu Title, summaries, menu position etc can be used via the API to produce anything you can imagine.
','1','{BOOTSTRAP_SQL_ID}','2','1','1','1','1144904400','1','1160148522','0','0','0','0','0','Menus and Lists','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('24','document','text/html','Extendable by design','Extendable by design','','extendable','','1','1159092732','0','15','0','','The MODX community has created many add-ons which can be found in the Repository, from image galleries and e-commerce to smaller utilities.
\nTemplate Variables with Bindings
\nTVs - Template Variables - are powerful extra fields that you can use with your documents. As an example of an advanced template element that returns a different thing dependent on code or data, we created an @BINDING for the name of the Login menu item. This changes the menu name from Login to Logout based on your logged in state. The @BINDING as follows was placed in the default value as: @EVAL if ($modx->getLoginUserID()) return \'Logout\'; else return \'Login\';
Using jQuery-effects
\nWe used some simple effects to highlight various things on the front/home page to demonstrate how easy it is to create a useful way to draw attention to things. To see them in action on the home page, click the Integrated Site Search, Related Links or Newest Documents headers.
\nCustom Forms
\nTo demonstrate how to link to custom forms, we customized the calls to the Webuser Registration system and the Login system.
\nAnd more
\nRich Text Editor for blog entries. To make it easier to format blog posts with simple text formatting, we modified the blog to use a custom RTE-enabled Template Variable (TV).
\nSmart-Summary logic. When splitting the full blog/news posts you simply insert a \"<!-- splitter -->\" where you want the break to occur. In addition, if that leaves any important tags open, it will try to match them and close them so it doesn\'t mess up your site layout with unclosed OL, UL or DIV tags.
','1','{BOOTSTRAP_SQL_ID}','4','1','1','2','1144904400','1','1159309971','0','0','0','0','0','Extendability','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('24','document','text/html','Extendable by design','Extendable by design','','extendable','','1','1159092732','0','15','0','','The MODX community has created many add-ons which can be found in the Repository, from image galleries and e-commerce to smaller utilities.
\nTemplate Variables with Bindings
\nTVs - Template Variables - are powerful extra fields that you can use with your documents. As an example of an advanced template element that returns a different thing dependent on code or data, we created an @BINDING for the name of the Login menu item. This changes the menu name from Login to Logout based on your logged in state. The @BINDING as follows was placed in the default value as: @EVAL if ($modx->getLoginUserID()) return \'Logout\'; else return \'Login\';
Using jQuery-effects
\nWe used some simple effects to highlight various things on the front/home page to demonstrate how easy it is to create a useful way to draw attention to things. To see them in action on the home page, click the Integrated Site Search, Related Links or Newest Documents headers.
\nCustom Forms
\nTo demonstrate how to link to custom forms, we customized the calls to the Webuser Registration system and the Login system.
\nAnd more
\nRich Text Editor for blog entries. To make it easier to format blog posts with simple text formatting, we modified the blog to use a custom RTE-enabled Template Variable (TV).
\nSmart-Summary logic. When splitting the full blog/news posts you simply insert a \"<!-- splitter -->\" where you want the break to occur. In addition, if that leaves any important tags open, it will try to match them and close them so it doesn\'t mess up your site layout with unclosed OL, UL or DIV tags.
','1','{BOOTSTRAP_SQL_ID}','4','1','1','2','1144904400','1','1159309971','0','0','0','0','0','Extendability','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('32','document','text/html','Design','Site Design','','design','','1','0','0','0','0','','Credits
\nThe MODX Starter-theme is based on Bootstrap 3.3.6 and made by graffx.nl and fuseit.de.
','1','{BOOTSTRAP_SQL_ID}','4','1','1','2','1144904400','1','1160112322','0','0','0','1144912754','1','Design','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('32','document','text/html','Design','Site Design','','design','','1','0','0','0','0','','Credits
\nThe MODX Starter-theme is based on Bootstrap 3.3.6 and made by graffx.nl and fuseit.de.
','1','{BOOTSTRAP_SQL_ID}','4','1','1','2','1144904400','1','1160112322','0','0','0','1144912754','1','Design','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('33','document','text/html','Getting Help','Getting Help with MODX','','getting-help','','1','0','0','0','0','','The team behind MODX strives to constantly add to and refine the documentation to help you get up to speed with MODX:
\n- \n
- For basic instructions on integrating custom templates into MODX, please see the Designer\'s Guide. \n
- For an introduction to working in MODX from the content editors perspectve, see the Content Editor\'s Guide. \n
- For a detailed overview of the backend "manager" and setting up Users and Groups, please peruse the Administration Guide. \n
- For developers, architecture and API documentation can be found in the Developer\'s Guide. \n
- And if someone has installed this site for you, but you\'re curious as to the steps they went through, please see the Getting Started Guide. \n
And don\'t forget, you can always learn and ask questions at the MODX forums. \n','1','{BOOTSTRAP_SQL_ID}','3','1','1','2','1144904400','2','1144904400','0','0','0','0','0','Getting Help','0','0','0','0','0','0','0','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('33','document','text/html','Getting Help','Getting Help with MODX','','getting-help','','1','0','0','0','0','','
The team behind MODX strives to constantly add to and refine the documentation to help you get up to speed with MODX:
\n- \n
- For basic instructions on integrating custom templates into MODX, please see the Designer\'s Guide. \n
- For an introduction to working in MODX from the content editors perspectve, see the Content Editor\'s Guide. \n
- For a detailed overview of the backend "manager" and setting up Users and Groups, please peruse the Administration Guide. \n
- For developers, architecture and API documentation can be found in the Developer\'s Guide. \n
- And if someone has installed this site for you, but you\'re curious as to the steps they went through, please see the Getting Started Guide. \n
And don\'t forget, you can always learn and ask questions at the MODX forums. \n','1','{BOOTSTRAP_SQL_ID}','3','1','1','2','1144904400','2','1144904400','0','0','0','0','0','Getting Help','0','0','0','0','0','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('37','document','text/html','[*loginName*]','The page you\'re trying to reach requires a login','','blog-login','','1','0','0','0','0','','
In order to add a blog entry, you must be logged in as a Site Admin webuser. Also, commenting on posts requires a login. Contact the site owner for permissions to create new post, or create a web user account to automatically receive commenting privileges. If you already have an account, please login below.
\n\n[!WebLogin? &tpl=`WebLogin_tplForm` &loginhomeid=`3`!]','1','{BOOTSTRAP_SQL_ID}','8','0','0','1','1144904400','1','1158599931','0','0','0','0','0','','0','0','0','0','0','0','1','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('37','document','text/html','[*loginName*]','The page you\'re trying to reach requires a login','','blog-login','','1','0','0','0','0','','In order to add a blog entry, you must be logged in as a Site Admin webuser. Also, commenting on posts requires a login. Contact the site owner for permissions to create new post, or create a web user account to automatically receive commenting privileges. If you already have an account, please login below.
\n\n[!WebLogin? &tpl=`WebLogin_tplForm` &loginhomeid=`3`!]','1','{BOOTSTRAP_SQL_ID}','8','0','0','1','1144904400','1','1158599931','0','0','0','0','0','','0','0','0','0','1','1'); -REPLACE INTO `{PREFIX}site_content` VALUES ('46','document','text/html','Thank You','','','thank-you','','1','0','0','0','0','','Thank You!
\nWe do appreciate your feedback. Your comments have been submitted to our office and hopefully someone will bother to actually read it. You should also receive a copy of the message in your inbox.
\nPlease be assured that we will do our best not to ignore you, but if today is a Monday please try again in a few days.
\n','1','{BOOTSTRAP_SQL_ID}','6','1','1','1','1159302141','1','1159302892','0','0','0','1159302182','1','','0','0','0','0','0','0','1','1'); +REPLACE INTO `{PREFIX}site_content` VALUES ('46','document','text/html','Thank You','','','thank-you','','1','0','0','0','0','','Thank You!
\nWe do appreciate your feedback. Your comments have been submitted to our office and hopefully someone will bother to actually read it. You should also receive a copy of the message in your inbox.
\nPlease be assured that we will do our best not to ignore you, but if today is a Monday please try again in a few days.
\n','1','{BOOTSTRAP_SQL_ID}','6','1','1','1','1159302141','1','1159302892','0','0','0','1159302182','1','','0','0','0','0','1','1'); # @@ -73,47 +61,28 @@ REPLACE INTO `{PREFIX}site_content` VALUES ('46','document','text/html','Thank Y # -INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'FormSignup', 'For the weblogin signup', 0, 'none', 2, 0, ' \n\n\n\n\n\n\n\n', 0); - - -INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'nl_sidebar', 'Default Template TPL for Ditto', 0, 'none', 1, 0, '[+title+]
\n[+longtitle+]
', 0); - +INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'FormSignup', 'For the weblogin signup', 0, 'none', 2, 0, ' \n\n\n\n\n
\n\n\n', 0, UNIX_TIMESTAMP(), 0, 0); -INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ditto_blog', 'Blog Template', 0, 'none', 1, 0, '
\n 
\n \n \n \n
','0');
+INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'nl_sidebar', 'Default Template TPL for Ditto', 0, 'none', 1, 0, '[+title+][+title+]
\n\n By [+author+] on [+date+].\n Comments [!Jot?&docid=`[+id+]`&action=`count-comments`!]\n
\n \n [+summary+]\n [+link+]
\n\n[+longtitle+]
', 0, UNIX_TIMESTAMP(), 0, 0); -INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'Comments', 'Comments (Jot) showing beneath a blog entry.', 0, 'none', 1, 0, '
\r\n[!Jot? &customfields=`name,email` &subscribe=`1` &pagination=`4` &badwords=`dotNet` &canmoderate=`Site Admins` &tplForm=`Comments_tplForm` &tplComments=`Comments_tplComments`!]\r\n
', 0);
+INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ditto_blog', 'Blog Template', 0, 'none', 1, 0, '\n \n \n \n \n
','0', UNIX_TIMESTAMP(), 0, 0);
-INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ContactForm', 'eForm-template for showing contact-form', 0, 'none', 1, 0, '\n\n\n', 0);
-
-
-INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ContactFormReport', 'eForm-template for sending form-data by mail', 0, 'none', 1, 0, '[+title+]
\n\n By [+author+] on [+date+].\n Comments [!Jot?&docid=`[+id+]`&action=`count-comments`!]\n
\n \n [+summary+]\n [+link+]
\nThis is a response sent by [+name+] using the feedback form on the website. The details of the message follow below:
\r\n\r\n\r\nName: [+name+]
\r\nEmail: [+email+]
\r\nRegarding: [+subject+]
\r\ncomments:
[+message+]
You can use this link to reply: [+email+]
\r\n', 0); - - -INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'reflect_month_tpl', 'For the yearly archive. Use with Ditto.', 0, 'none', 1, 0, '[+month+] [+year+]', 0); - - -INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ContactStyles', 'Styles for form validation', 0, 'none', 1, 0, '', 0); - - - -# -# Dumping data for table `site_keywords` -# +INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'Comments', 'Comments (Jot) showing beneath a blog entry.', 0, 'none', 1, 0, '\r\n[!Jot? &customfields=`name,email` &subscribe=`1` &pagination=`4` &badwords=`dotNet` &canmoderate=`Site Admins` &tplForm=`Comments_tplForm` &tplComments=`Comments_tplComments`!]\r\n
', 0, UNIX_TIMESTAMP(), 0, 0);
-REPLACE INTO `{PREFIX}site_keywords` VALUES ('1','MODX');
+INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ContactForm', 'eForm-template for showing contact-form', 0, 'none', 1, 0, '\n\n\n', 0, UNIX_TIMESTAMP(), 0, 0);
-REPLACE INTO `{PREFIX}site_keywords` VALUES ('2','content management system');
+INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ContactFormReport', 'eForm-template for sending form-data by mail', 0, 'none', 1, 0, 'This is a response sent by [+name+] using the feedback form on the website. The details of the message follow below:
\r\n\r\n\r\nName: [+name+]
\r\nEmail: [+email+]
\r\nRegarding: [+subject+]
\r\ncomments:
[+message+]
You can use this link to reply: [+email+]
\r\n', 0, UNIX_TIMESTAMP(), 0, 0); -REPLACE INTO `{PREFIX}site_keywords` VALUES ('3','Front End Editing'); +INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'reflect_month_tpl', 'For the yearly archive. Use with Ditto.', 0, 'none', 1, 0, '[+month+] [+year+]', 0, UNIX_TIMESTAMP(), 0, 0); -REPLACE INTO `{PREFIX}site_keywords` VALUES ('4','login'); +INSERT INTO `{PREFIX}site_htmlsnippets` VALUES (NULL, 'ContactStyles', 'Styles for form validation', 0, 'none', 1, 0, '', 0, UNIX_TIMESTAMP(), 0, 0); # # Dumping data for table `site_tmplvar_contentvalues` @@ -150,7 +119,7 @@ REPLACE INTO `{PREFIX}web_groups` VALUES ('1','1','1'); # -REPLACE INTO `{PREFIX}web_user_attributes` VALUES ('1','1','Site Admin','0','you@example.com','','','0','0','0','25','1129049624','1129063123','0','f426f3209310abfddf2ee00e929774b4','0','0','','','','','','','',''); +REPLACE INTO `{PREFIX}web_user_attributes` VALUES ('1','1','Site Admin','0','you@example.com','','','0','0','0','25','1129049624','1129063123','0','f426f3209310abfddf2ee00e929774b4','0','0','','','','','','','','', UNIX_TIMESTAMP(), 0); # diff --git a/install/setup.sql b/install/setup.sql index 7ab59d7645..2616ef5074 100755 --- a/install/setup.sql +++ b/install/setup.sql @@ -52,7 +52,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}document_groups` ( `document` int(10) NOT NULL default '0', PRIMARY KEY (`id`), KEY `document` (`document`), - KEY `document_group` (`document_group`) + KEY `document_group` (`document_group`), + UNIQUE INDEX `ix_dg_id` (`document_group`,`document`) ) ENGINE=MyISAM COMMENT='Contains data used for access permissions.'; CREATE TABLE IF NOT EXISTS `{PREFIX}documentgroup_names` ( @@ -77,15 +78,6 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}event_log` ( KEY `user`(`user`) ) ENGINE=MyISAM COMMENT='Stores event and error logs'; - -CREATE TABLE IF NOT EXISTS `{PREFIX}keyword_xref` ( - `content_id` int(11) NOT NULL default '0', - `keyword_id` int(11) NOT NULL default '0', - KEY `content_id` (`content_id`), - KEY `keyword_id` (`keyword_id`) -) ENGINE=MyISAM COMMENT='Cross reference bewteen keywords and content'; - - CREATE TABLE IF NOT EXISTS `{PREFIX}manager_log` ( `id` int(10) NOT NULL auto_increment, `timestamp` int(20) NOT NULL default '0', @@ -160,8 +152,6 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_content` ( `publishedby` int(10) NOT NULL default '0' COMMENT 'ID of user who published the document', `menutitle` varchar(255) NOT NULL DEFAULT '' COMMENT 'Menu title', `donthit` tinyint(1) NOT NULL default '0' COMMENT 'Disable page hit count', - `haskeywords` tinyint(1) NOT NULL default '0' COMMENT 'has links to keywords', - `hasmetatags` tinyint(1) NOT NULL default '0' COMMENT 'has links to meta tags', `privateweb` tinyint(1) NOT NULL default '0' COMMENT 'Private web document', `privatemgr` tinyint(1) NOT NULL default '0' COMMENT 'Private manager document', `content_dispo` tinyint(1) NOT NULL default '0' COMMENT '0-inline, 1-attachment', @@ -176,14 +166,6 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_content` ( ) ENGINE=MyISAM COMMENT='Contains the site document tree.'; -CREATE TABLE IF NOT EXISTS `{PREFIX}site_content_metatags` ( - `content_id` int(11) NOT NULL default '0', - `metatag_id` int(11) NOT NULL default '0', - KEY `content_id` (`content_id`), - KEY `metatag_id` (`metatag_id`) -) ENGINE=MyISAM COMMENT='Reference table between meta tags and content'; - - CREATE TABLE IF NOT EXISTS `{PREFIX}site_htmlsnippets` ( `id` int(10) NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', @@ -194,28 +176,12 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_htmlsnippets` ( `cache_type` tinyint(1) NOT NULL default '0' COMMENT 'Cache option', `snippet` mediumtext, `locked` tinyint(4) NOT NULL default '0', + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', + `disabled` tinyint NOT NULL DEFAULT '0' COMMENT 'Disables the snippet', PRIMARY KEY (`id`) ) ENGINE=MyISAM COMMENT='Contains the site chunks.'; - -CREATE TABLE IF NOT EXISTS `{PREFIX}site_keywords` ( - `id` int(11) NOT NULL auto_increment, - `keyword` varchar(40) NOT NULL default '', - PRIMARY KEY (`id`), - UNIQUE KEY `keyword` (`keyword`) -) ENGINE=MyISAM COMMENT='Site keyword list'; - - -CREATE TABLE IF NOT EXISTS `{PREFIX}site_metatags` ( - `id` integer NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL DEFAULT '', - `tag` varchar(50) NOT NULL DEFAULT '' COMMENT 'tag name', - `tagvalue` varchar(255) NOT NULL DEFAULT '', - `http_equiv` tinyint NOT NULL DEFAULT 0 COMMENT '1 - use http_equiv tag style, 0 - use name', - PRIMARY KEY(`id`) -) ENGINE=MyISAM COMMENT='Site meta tags'; - - CREATE TABLE IF NOT EXISTS `{PREFIX}site_modules` ( `id` integer NOT NULL AUTO_INCREMENT, `name` varchar(50) NOT NULL DEFAULT '', @@ -264,6 +230,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_plugins` ( `properties` text COMMENT 'Default Properties', `disabled` tinyint NOT NULL DEFAULT '0' COMMENT 'Disables the plugin', `moduleguid` varchar(32) NOT NULL default '' COMMENT 'GUID of module from which to import shared parameters', + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM COMMENT='Contains the site plugins.'; @@ -285,6 +253,9 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_snippets` ( `locked` tinyint(4) NOT NULL default '0', `properties` text COMMENT 'Default Properties', `moduleguid` varchar(32) NOT NULL default '' COMMENT 'GUID of module from which to import shared parameters', + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', + `disabled` tinyint NOT NULL DEFAULT '0' COMMENT 'Disables the snippet', PRIMARY KEY (`id`) ) ENGINE=MyISAM COMMENT='Contains the site snippets.'; @@ -299,6 +270,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_templates` ( `content` mediumtext, `locked` tinyint(4) NOT NULL default '0', `selectable` tinyint(4) NOT NULL default '1', + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=MyISAM COMMENT='Contains the site templates.'; @@ -331,7 +304,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_tmplvar_contentvalues` ( PRIMARY KEY (id), KEY idx_tmplvarid (tmplvarid), KEY idx_id (contentid), - FULLTEXT KEY `value_ft_idx` (`value`) + FULLTEXT KEY `value_ft_idx` (`value`), + UNIQUE INDEX `ix_tvid_contentid` (`tmplvarid`,`contentid`) ) ENGINE=MyISAM COMMENT='Site Template Variables Content Values Link Table'; CREATE TABLE IF NOT EXISTS `{PREFIX}site_tmplvar_templates` ( @@ -355,6 +329,8 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}site_tmplvars` ( `display` varchar(20) NOT NULL default '' COMMENT 'Display Control', `display_params` text COMMENT 'Display Control Properties', `default_text` text, + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', PRIMARY KEY (id), KEY `indx_rank`(`rank`) ) ENGINE=MyISAM COMMENT='Site Template Variables'; @@ -384,7 +360,9 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}user_attributes` ( `zip` varchar(25) NOT NULL default '', `fax` varchar(100) NOT NULL default '', `photo` varchar(255) NOT NULL default '' COMMENT 'link to photo', - `comment` text, + `comment` text, + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `userid` (`internalKey`) ) ENGINE=MyISAM COMMENT='Contains information about the backend users.'; @@ -466,8 +444,6 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}user_roles` ( `exec_module` int(1) NOT NULL DEFAULT 0, `view_eventlog` int(1) NOT NULL DEFAULT 0, `delete_eventlog` int(1) NOT NULL DEFAULT 0, - `manage_metatags` int(1) NOT NULL DEFAULT 0 COMMENT 'manage site meta tags and keywords', - `edit_doc_metatags` int(1) NOT NULL DEFAULT 0 COMMENT 'edit document meta tags and keywords' , `new_web_user` int(1) NOT NULL default '0', `edit_web_user` int(1) NOT NULL default '0', `save_web_user` int(1) NOT NULL default '0', @@ -538,7 +514,9 @@ CREATE TABLE IF NOT EXISTS `{PREFIX}web_user_attributes` ( `zip` varchar(25) NOT NULL default '', `fax` varchar(100) NOT NULL default '', `photo` varchar(255) NOT NULL default '' COMMENT 'link to photo', - `comment` text, + `comment` text, + `createdon` integer NOT NULL DEFAULT '0', + `editedon` integer NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `userid` (`internalKey`) ) ENGINE=MyISAM COMMENT='Contains information for web users.'; @@ -582,21 +560,48 @@ ALTER TABLE `{PREFIX}site_content` ALTER TABLE `{PREFIX}site_htmlsnippets` ADD COLUMN `editor_name` VARCHAR(50) NOT NULL DEFAULT 'none' AFTER `editor_type`; +ALTER TABLE `{PREFIX}site_htmlsnippets` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_htmlsnippets` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_htmlsnippets` + ADD COLUMN `disabled` tinyint NOT NULL DEFAULT '0'; + ALTER TABLE `{PREFIX}site_plugin_events` ADD COLUMN `priority` INT(10) NOT NULL default '0' COMMENT 'determines the run order of the plugin' AFTER `evtid`; ALTER TABLE `{PREFIX}site_templates` ADD COLUMN `selectable` TINYINT(4) NOT NULL DEFAULT '1' AFTER `locked`; +ALTER TABLE `{PREFIX}site_templates` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_templates` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + ALTER TABLE `{PREFIX}site_tmplvar_templates` ADD COLUMN `rank` integer(11) NOT NULL DEFAULT '0' AFTER `templateid`; +ALTER TABLE `{PREFIX}site_tmplvars` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_tmplvars` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + ALTER TABLE `{PREFIX}user_attributes` ADD COLUMN `street` varchar(255) NOT NULL DEFAULT '' AFTER `country`; ALTER TABLE `{PREFIX}user_attributes` ADD COLUMN `city` varchar(255) NOT NULL DEFAULT '' AFTER `street`; +ALTER TABLE `{PREFIX}user_attributes` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}user_attributes` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + ALTER TABLE `{PREFIX}user_roles` ADD COLUMN `edit_chunk` INT(1) NOT NULL DEFAULT '0' AFTER `delete_snippet`; @@ -651,6 +656,33 @@ ALTER TABLE `{PREFIX}web_user_attributes` ALTER TABLE `{PREFIX}web_user_attributes` ADD COLUMN `city` varchar(255) NOT NULL DEFAULT '' AFTER `street`; +ALTER TABLE `{PREFIX}web_user_attributes` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}web_user_attributes` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_snippets` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_snippets` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_snippets` + ADD COLUMN `disabled` tinyint NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_plugins` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_plugins` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_templates` + ADD COLUMN `createdon` integer NOT NULL DEFAULT '0'; + +ALTER TABLE `{PREFIX}site_templates` + ADD COLUMN `editedon` integer NOT NULL DEFAULT '0'; + # Set the private manager group flag UPDATE {PREFIX}documentgroup_names AS dgn @@ -826,6 +858,8 @@ ALTER TABLE `{PREFIX}member_groups` ADD UNIQUE INDEX `ix_group_member` (`user_gr ALTER TABLE `{PREFIX}web_groups` ADD UNIQUE INDEX `ix_group_user` (`webgroup`,`webuser`); +ALTER TABLE `{PREFIX}document_groups` ADD UNIQUE INDEX `ix_dg_id` (`document_group`,`document`); + # ]]upgrade-able @@ -846,7 +880,7 @@ REPLACE INTO `{PREFIX}site_templates` # Default Site Documents -REPLACE INTO `{PREFIX}site_content` VALUES (1,'document','text/html','Evolution CMS Install Success','Welcome to the EVO Content Management System','','minimal-base','',1,0,0,0,0,'','Install Successful!
\r\nYou have successfully installed Evolution CMS.
\r\n\r\nGetting Help
\r\nThe EVO Community provides a great starting point to learn all things Evolution CMS, or you can also see some great learning resources (books, tutorials, blogs and screencasts).
\r\nWelcome to EVO!
\r\n',1,3,0,1,1,1,1130304721,1,1130304927,0,0,0,1130304721,1,'Base Install',0,0,0,0,0,0,0,1); +REPLACE INTO `{PREFIX}site_content` VALUES (1,'document','text/html','Evolution CMS Install Success','Welcome to the EVO Content Management System','','minimal-base','',1,0,0,0,0,'','Install Successful!
\r\nYou have successfully installed Evolution CMS.
\r\n\r\nGetting Help
\r\nThe EVO Community provides a great starting point to learn all things Evolution CMS, or you can also see some great learning resources (books, tutorials, blogs and screencasts).
\r\nWelcome to EVO!
\r\n',1,3,0,1,1,1,1130304721,1,1130304927,0,0,0,1130304721,1,'Base Install',0,0,0,0,0,1); REPLACE INTO `{PREFIX}manager_users` @@ -859,9 +893,9 @@ REPLACE INTO `{PREFIX}user_attributes` REPLACE INTO `{PREFIX}user_roles` -(id,name,description,frames,home,view_document,new_document,save_document,publish_document,delete_document,empty_trash,action_ok,logout,help,messages,new_user,edit_user,logs,edit_parser,save_parser,edit_template,settings,credits,new_template,save_template,delete_template,edit_snippet,new_snippet,save_snippet,delete_snippet,edit_chunk,new_chunk,save_chunk,delete_chunk,empty_cache,edit_document,change_password,error_dialog,about,file_manager,save_user,delete_user,save_password,edit_role,save_role,delete_role,new_role,access_permissions,bk_manager,new_plugin,edit_plugin,save_plugin,delete_plugin,new_module,edit_module,save_module,exec_module,delete_module,view_eventlog,delete_eventlog,manage_metatags,edit_doc_metatags,new_web_user,edit_web_user,save_web_user,delete_web_user,web_access_permissions,view_unpublished,import_static,export_static,remove_locks,assets_images,assets_files,change_resourcetype,display_locks,category_manager) VALUES -(2,'Editor','Limited to managing content',1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,1,0,1,1,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,1,1,1,1,1,0), -(3,'Publisher','Editor with expanded permissions including manage users\, update Elements and site settings',1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,0,0,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,1,1,0,1,0,0,1,1,1,1,1,0); +(id,name,description,frames,home,view_document,new_document,save_document,publish_document,delete_document,empty_trash,action_ok,logout,help,messages,new_user,edit_user,logs,edit_parser,save_parser,edit_template,settings,credits,new_template,save_template,delete_template,edit_snippet,new_snippet,save_snippet,delete_snippet,edit_chunk,new_chunk,save_chunk,delete_chunk,empty_cache,edit_document,change_password,error_dialog,about,file_manager,save_user,delete_user,save_password,edit_role,save_role,delete_role,new_role,access_permissions,bk_manager,new_plugin,edit_plugin,save_plugin,delete_plugin,new_module,edit_module,save_module,exec_module,delete_module,view_eventlog,delete_eventlog,new_web_user,edit_web_user,save_web_user,delete_web_user,web_access_permissions,view_unpublished,import_static,export_static,remove_locks,assets_images,assets_files,change_resourcetype,display_locks,category_manager) VALUES +(2,'Editor','Limited to managing content',1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,1,0,1,1,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,1,1,1,1,0), +(3,'Publisher','Editor with expanded permissions including manage users\, update Elements and site settings',1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,0,0,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,1,1,1,0,1,0,0,1,1,1,1,1,0); # ]]non-upgrade-able @@ -918,8 +952,8 @@ INSERT IGNORE INTO `{PREFIX}system_settings` ('theme_refresher',''); REPLACE INTO `{PREFIX}user_roles` -(id,name,description,frames,home,view_document,new_document,save_document,publish_document,delete_document,empty_trash,action_ok,logout,help,messages,new_user,edit_user,logs,edit_parser,save_parser,edit_template,settings,credits,new_template,save_template,delete_template,edit_snippet,new_snippet,save_snippet,delete_snippet,edit_chunk,new_chunk,save_chunk,delete_chunk,empty_cache,edit_document,change_password,error_dialog,about,file_manager,save_user,delete_user,save_password,edit_role,save_role,delete_role,new_role,access_permissions,bk_manager,new_plugin,edit_plugin,save_plugin,delete_plugin,new_module,edit_module,save_module,exec_module,delete_module,view_eventlog,delete_eventlog,manage_metatags,edit_doc_metatags,new_web_user,edit_web_user,save_web_user,delete_web_user,web_access_permissions,view_unpublished,import_static,export_static,remove_locks,assets_images,assets_files,change_resourcetype,display_locks,category_manager) VALUES -(1, 'Administrator', 'Site administrators have full access to all functions',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); +(id,name,description,frames,home,view_document,new_document,save_document,publish_document,delete_document,empty_trash,action_ok,logout,help,messages,new_user,edit_user,logs,edit_parser,save_parser,edit_template,settings,credits,new_template,save_template,delete_template,edit_snippet,new_snippet,save_snippet,delete_snippet,edit_chunk,new_chunk,save_chunk,delete_chunk,empty_cache,edit_document,change_password,error_dialog,about,file_manager,save_user,delete_user,save_password,edit_role,save_role,delete_role,new_role,access_permissions,bk_manager,new_plugin,edit_plugin,save_plugin,delete_plugin,new_module,edit_module,save_module,exec_module,delete_module,view_eventlog,delete_eventlog,new_web_user,edit_web_user,save_web_user,delete_web_user,web_access_permissions,view_unpublished,import_static,export_static,remove_locks,assets_images,assets_files,change_resourcetype,display_locks,category_manager) VALUES +(1, 'Administrator', 'Site administrators have full access to all functions',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); # 1 - "Parser Service Events", 2 - "Manager Access Events", 3 - "Web Access Service Events", 4 - "Cache Service Events", 5 - "Template Service Events", 6 - Custom Events @@ -1080,8 +1114,6 @@ UPDATE `{PREFIX}user_roles` SET exec_module=1, view_eventlog = 1, delete_eventlog = 1, - manage_metatags = 1, - edit_doc_metatags = 1, new_web_user = 1, edit_web_user = 1, save_web_user = 1, diff --git a/manager/actions/access_permissions.dynamic.php b/manager/actions/access_permissions.dynamic.php index bb3d717022..14908782ad 100644 --- a/manager/actions/access_permissions.dynamic.php +++ b/manager/actions/access_permissions.dynamic.php @@ -39,226 +39,250 @@ } ?> +- +
-
- ' . $_lang['access_permissions_off'] . '' : '' ?>
-
-
-
+
- ' . $_lang['access_permissions_off'] . '
' : '') ?>
-
-
-
+
- echo '';
+
+
+
- ?>
-
-
-
-
+
- | - |
| - - | -
+
+
+
+
+
+
+
db->select('groupnames.*, users.id AS user_id, users.username user_name', "{$tbl_membergroup_names} AS groupnames
- LEFT JOIN {$tbl_member_groups} AS groups ON groups.user_group = groupnames.id
- LEFT JOIN {$tbl_manager_users} AS users ON users.id = groups.member", '', 'groupnames.name, user_name');
+ $rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames
+ LEFT JOIN ' . $tbl_member_groups . ' AS groups ON groups.user_group = groupnames.id
+ LEFT JOIN ' . $tbl_manager_users . ' AS users ON users.id = groups.member', '', 'groupnames.name, user_name');
if($modx->db->getRecordCount($rs) < 1) {
- echo '' . $_lang['no_groups_found'] . '';
+ ?>
+
+ \n";
+ ?>
+
+ db->getRow($rs)) {
- if($row['id'] !== $pid) {
+ if($pid != $row['id']) {
if($pid != '') {
- echo "\n";
- } // close previous one
-
- // display the current user group with a rename/delete form
- echo '';
-
- echo "
- \n";
- echo "\t
- " . $_lang['access_permissions_users_in_group'] . ' '; + echo '
-
-
-
+
+
- echo '';
- ?>
-
-
-
-
+
| - |
| - - | -
+
+
+ ' . $_lang['access_permissions_resource_groups'] . '
+
+
+
db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', "{$tbl_documentgroup_names} AS dgnames
- LEFT JOIN {$tbl_document_groups} AS dg ON dg.document_group = dgnames.id
- LEFT JOIN {$tbl_site_content} AS sc ON sc.id = dg.document", "", "dgnames.name, sc.id");
+ $rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames
+ LEFT JOIN ' . $tbl_document_groups . ' AS dg ON dg.document_group = dgnames.id
+ LEFT JOIN ' . $tbl_site_content . ' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id');
if($modx->db->getRecordCount($rs) < 1) {
- echo '' . $_lang['no_groups_found'] . '';
+ ?>
+
+ ' . "\n" . "\t" . '' . "\n" . "\t" . '
+ db->getRow($rs)) {
- if($row['id'] !== $pid) {
+ if($pid != $row['id']) {
if($pid != '') {
- echo "\n";
- } // close previous one
-
- echo '';
-
- echo ' ' . $_lang['access_permissions_resources_in_group'] . ' ';
+ echo '
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('bk_manager')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('bk_manager')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $dbase = trim($dbase, '`'); -if(!isset($modx->config['snapshot_path'])) { - if(is_dir(MODX_BASE_PATH . 'temp/backup/')) { - $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/'; - } else { - $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/'; - } +if (!isset($modx->config['snapshot_path'])) { + if (is_dir(MODX_BASE_PATH . 'temp/backup/')) { + $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/'; + } else { + $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/'; + } } // Backup Manager by Raymond: $mode = isset($_POST['mode']) ? $_POST['mode'] : ''; -if($mode == 'restore1') { - if(isset($_POST['textarea']) && !empty($_POST['textarea'])) { - $source = trim($_POST['textarea']); - $_SESSION['textarea'] = $source . "\n"; - } else { - $source = file_get_contents($_FILES['sqlfile']['tmp_name']); - } - import_sql($source); - header('Location: index.php?r=9&a=93'); - exit; -} elseif($mode == 'restore2') { - $path = $modx->config['snapshot_path'] . $_POST['filename']; - if(file_exists($path)) { - $source = file_get_contents($path); - import_sql($source); - if(headers_sent()) { - echo "\n"; - } else { - header("Location: index.php?r=9&a=93"); - } - } - exit; -} elseif($mode == 'backup') { - $tables = isset($_POST['chk']) ? $_POST['chk'] : ''; - if(!is_array($tables)) { - $modx->webAlertAndQuit("Please select a valid table from the list below."); - } - - /* - * Code taken from Ralph A. Dahlgren MySQLdumper Snippet - Etomite 0.6 - 2004-09-27 - * Modified by Raymond 3-Jan-2005 - * Perform MySQLdumper data dump - */ - @set_time_limit(120); // set timeout limit to 2 minutes - $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); - $dumper->setDBtables($tables); - $dumper->setDroptables((isset($_POST['droptables']) ? true : false)); - $dumpfinished = $dumper->createDump('dumpSql'); - if($dumpfinished) { - exit; - } else { - $modx->webAlertAndQuit('Unable to Backup Database'); - } - - // MySQLdumper class can be found below -} elseif($mode == 'snapshot') { - if(!is_dir(rtrim($modx->config['snapshot_path'], '/'))) { - mkdir(rtrim($modx->config['snapshot_path'], '/')); - @chmod(rtrim($modx->config['snapshot_path'], '/'), 0777); - } - if(!is_file("{$modx->config['snapshot_path']}.htaccess")) { - $htaccess = "order deny,allow\ndeny from all\n"; - file_put_contents("{$modx->config['snapshot_path']}.htaccess", $htaccess); - } - if(!is_writable(rtrim($modx->config['snapshot_path'], '/'))) { - $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path']))); - } - $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%'"; - $rs = $modx->db->query($sql); - $tables = $modx->db->getColumn('Name', $rs); - //$today = $modx->toDateFormat(time()); - //$today = str_replace(array('/',' '), '-', $today); - //$today = str_replace(':', '', $today); - //$today = strtolower($today); - $today = date('Y-m-d_H-i-s'); - global $path; - $path = "{$modx->config['snapshot_path']}{$today}.sql"; - - @set_time_limit(120); // set timeout limit to 2 minutes - $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); - $dumper->setDBtables($tables); - $dumper->setDroptables(true); - $dumpfinished = $dumper->createDump('snapshot'); - - $pattern = "{$modx->config['snapshot_path']}*.sql"; - $files = glob($pattern, GLOB_NOCHECK); - $total = ($files[0] !== $pattern) ? count($files) : 0; - arsort($files); - while(10 < $total && $limit < 50) { - $del_file = array_pop($files); - unlink($del_file); - $total = count($files); - $limit++; - } - - if($dumpfinished) { - $_SESSION['result_msg'] = 'snapshot_ok'; - header("Location: index.php?a=93"); - exit; - } else { - $modx->webAlertAndQuit('Unable to Backup Database'); - } +if ($mode == 'restore1') { + if (isset($_POST['textarea']) && !empty($_POST['textarea'])) { + $source = trim($_POST['textarea']); + $_SESSION['textarea'] = $source . "\n"; + } else { + $source = file_get_contents($_FILES['sqlfile']['tmp_name']); + } + import_sql($source); + header('Location: index.php?r=9&a=93'); + exit; +} elseif ($mode == 'restore2') { + $path = $modx->config['snapshot_path'] . $_POST['filename']; + if (file_exists($path)) { + $source = file_get_contents($path); + import_sql($source); + if (headers_sent()) { + echo "\n"; + } else { + header("Location: index.php?r=9&a=93"); + } + } + exit; +} elseif ($mode == 'backup') { + $tables = isset($_POST['chk']) ? $_POST['chk'] : ''; + if (!is_array($tables)) { + $modx->webAlertAndQuit("Please select a valid table from the list below."); + } + + /* + * Code taken from Ralph A. Dahlgren MySQLdumper Snippet - Etomite 0.6 - 2004-09-27 + * Modified by Raymond 3-Jan-2005 + * Perform MySQLdumper data dump + */ + @set_time_limit(120); // set timeout limit to 2 minutes + $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); + $dumper->setDBtables($tables); + $dumper->setDroptables((isset($_POST['droptables']) ? true : false)); + $dumpfinished = $dumper->createDump('dumpSql'); + if ($dumpfinished) { + exit; + } else { + $modx->webAlertAndQuit('Unable to Backup Database'); + } + + // MySQLdumper class can be found below +} elseif ($mode == 'snapshot') { + if (!is_dir(rtrim($modx->config['snapshot_path'], '/'))) { + mkdir(rtrim($modx->config['snapshot_path'], '/')); + @chmod(rtrim($modx->config['snapshot_path'], '/'), 0777); + } + if (!is_file("{$modx->config['snapshot_path']}.htaccess")) { + $htaccess = "order deny,allow\ndeny from all\n"; + file_put_contents("{$modx->config['snapshot_path']}.htaccess", $htaccess); + } + if (!is_writable(rtrim($modx->config['snapshot_path'], '/'))) { + $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path']))); + } + $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%'"; + $rs = $modx->db->query($sql); + $tables = $modx->db->getColumn('Name', $rs); + //$today = $modx->toDateFormat(time()); + //$today = str_replace(array('/',' '), '-', $today); + //$today = str_replace(':', '', $today); + //$today = strtolower($today); + $today = date('Y-m-d_H-i-s'); + global $path; + $path = "{$modx->config['snapshot_path']}{$today}.sql"; + + @set_time_limit(120); // set timeout limit to 2 minutes + $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); + $dumper->setDBtables($tables); + $dumper->setDroptables(true); + $dumpfinished = $dumper->createDump('snapshot'); + + $pattern = "{$modx->config['snapshot_path']}*.sql"; + $files = glob($pattern, GLOB_NOCHECK); + $total = ($files[0] !== $pattern) ? count($files) : 0; + arsort($files); + while (10 < $total && $limit < 50) { + $del_file = array_pop($files); + unlink($del_file); + $total = count($files); + $limit++; + } + + if ($dumpfinished) { + $_SESSION['result_msg'] = 'snapshot_ok'; + header("Location: index.php?a=93"); + exit; + } else { + $modx->webAlertAndQuit('Unable to Backup Database'); + } } else { - include_once MODX_MANAGER_PATH . "includes/header.inc.php"; // start normal header + include_once MODX_MANAGER_PATH . "includes/header.inc.php"; // start normal header } -if(isset($_SESSION['result_msg']) && $_SESSION['result_msg'] != '') { - switch($_SESSION['result_msg']) { - case 'import_ok': - $ph['result_msg_import'] = '
+
'; - return; - } - $dir = scandir($curpath); - - // first, get info - foreach($dir as $file) { - $newpath = $curpath . $file; - if($file === '..' || $file === '.') { - continue; - } - if(is_dir($newpath)) { - $dirs_array[$dircounter]['dir'] = $newpath; - $dirs_array[$dircounter]['stats'] = lstat($newpath); - if($file === '..' || $file === '.') { - continue; - } elseif(!in_array($file, $excludes) && !in_array($newpath, $protected_path)) { - $dirs_array[$dircounter]['text'] = ' ' . $file . ''; - - $dfiles = scandir($newpath); - foreach($dfiles as $i => $infile) { - switch($infile) { - case '..': - case '.': - unset($dfiles[$i]); - break; - } - } - $file_exists = (0 < count($dfiles)) ? 'file_exists' : ''; - - $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; - } else { - $dirs_array[$dircounter]['text'] = ' ' . $file . ''; - $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; - } - - $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? ' ' : ''; - - // increment the counter - $dircounter++; - } else { - $type = getExtension($newpath); - $files_array[$filecounter]['file'] = $newpath; - $files_array[$filecounter]['stats'] = lstat($newpath); - $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' '. $file; - $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '' : ''); - $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; - $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '' : ''; - $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; - $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; - $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; - $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '' : ''; - - // increment the counter - $filecounter++; - } - } - - // dump array entries for directories - $folders = count($dirs_array); - sort($dirs_array); // sorting the array alphabetically (Thanks pxl8r!) - for($i = 0; $i < $folders; $i++) { - $filesizes += $dirs_array[$i]['stats']['7']; - echo '';
- echo '' . $dirs_array[$i]['text'] . ' ';
- echo '' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . ' ';
- echo '' . $modx->nicesize($dirs_array[$i]['stats']['7']) . ' ';
- echo '';
- echo $dirs_array[$i]['rename'];
- echo $dirs_array[$i]['delete'];
- echo ' ';
- echo ' ';
- }
-
- // dump array entries for files
- $files = count($files_array);
- sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
- for($i = 0; $i < $files; $i++) {
- $filesizes += $files_array[$i]['stats']['7'];
- echo '';
- echo '' . $files_array[$i]['text'] . ' ';
- echo '' . $modx->toDateFormat($files_array[$i]['stats']['9']) . ' ';
- echo '' . $modx->nicesize($files_array[$i]['stats']['7']) . ' ';
- echo '';
- echo $files_array[$i]['unzip'];
- echo $files_array[$i]['view'];
- echo $files_array[$i]['edit'];
- echo $files_array[$i]['duplicate'];
- echo $files_array[$i]['rename'];
- echo $files_array[$i]['delete'];
- echo ' ';
- echo ' ';
- }
- return;
-}
-
-function removeLastPath($string) {
- $pos = strrpos($string, '/');
- if($pos !== false) {
- $path = substr($string, 0, $pos);
- } else {
- $path = false;
- }
- return $path;
-}
-
-function getExtension($string) {
- $pos = strrpos($string, '.');
- if($pos !== false) {
- $ext = substr($string, $pos);
- $ext = strtolower($ext);
- } else {
- $ext = false;
- }
- return $ext;
-}
-
-function checkExtension($path = '') {
- global $uploadablefiles;
-
- if(in_array(getExtension($path), $uploadablefiles)) {
- return true;
- } else {
- return false;
- }
-}
-
-function mkdirs($strPath, $mode) { // recursive mkdir function
- if(is_dir($strPath)) {
- return true;
- }
- $pStrPath = dirname($strPath);
- if(!mkdirs($pStrPath, $mode)) {
- return false;
- }
- return @mkdir($strPath);
-}
-
-function logFileChange($type, $filename) {
- //global $_lang;
-
- include_once('log.class.inc.php');
- $log = new logHandler();
-
- switch($type) {
- case 'upload':
- $string = 'Uploaded File';
- break;
- case 'delete':
- $string = 'Deleted File';
- break;
- case 'modify':
- $string = 'Modified File';
- break;
- default:
- $string = 'Viewing File';
- break;
- }
-
- $string = sprintf($string, $filename);
- $log->initAndWriteLog($string, '', '', '', $type, $filename);
-
- // HACK: change the global action to prevent double logging
- // @see index.php @ 915
- global $action;
- $action = 1;
+if ($_REQUEST['mode'] == "edit" || $_REQUEST['mode'] == "view") {
+ ?>
+
+
'; + return; + } + $dir = scandir($curpath); + + // first, get info + foreach ($dir as $file) { + $newpath = $curpath . $file; + if ($file === '..' || $file === '.') { + continue; + } + if (is_dir($newpath)) { + $dirs_array[$dircounter]['dir'] = $newpath; + $dirs_array[$dircounter]['stats'] = lstat($newpath); + if ($file === '..' || $file === '.') { + continue; + } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) { + $dirs_array[$dircounter]['text'] = ' ' . $file . ''; + + $dfiles = scandir($newpath); + foreach ($dfiles as $i => $infile) { + switch ($infile) { + case '..': + case '.': + unset($dfiles[$i]); + break; + } + } + $file_exists = (0 < count($dfiles)) ? 'file_exists' : ''; + + $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; + } else { + $dirs_array[$dircounter]['text'] = ' ' . $file . ''; + $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; + } + + $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? ' ' : ''; + + // increment the counter + $dircounter++; + } else { + $type = getExtension($newpath); + $files_array[$filecounter]['file'] = $newpath; + $files_array[$filecounter]['stats'] = lstat($newpath); + $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' ' . $file; + $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '' : ''); + $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; + $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '' : ''; + $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '' : ''; + + // increment the counter + $filecounter++; + } + } + + // dump array entries for directories + $folders = count($dirs_array); + sort($dirs_array); // sorting the array alphabetically (Thanks pxl8r!) + for ($i = 0; $i < $folders; $i++) { + $filesizes += $dirs_array[$i]['stats']['7']; + echo '';
+ echo '' . $dirs_array[$i]['text'] . ' ';
+ echo '' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . ' ';
+ echo '' . $modx->nicesize($dirs_array[$i]['stats']['7']) . ' ';
+ echo '';
+ echo $dirs_array[$i]['rename'];
+ echo $dirs_array[$i]['delete'];
+ echo ' ';
+ echo ' ';
+ }
+
+ // dump array entries for files
+ $files = count($files_array);
+ sort($files_array); // sorting the array alphabetically (Thanks pxl8r!)
+ for ($i = 0; $i < $files; $i++) {
+ $filesizes += $files_array[$i]['stats']['7'];
+ echo '';
+ echo '' . $files_array[$i]['text'] . ' ';
+ echo '' . $modx->toDateFormat($files_array[$i]['stats']['9']) . ' ';
+ echo '' . $modx->nicesize($files_array[$i]['stats']['7']) . ' ';
+ echo '';
+ echo $files_array[$i]['unzip'];
+ echo $files_array[$i]['view'];
+ echo $files_array[$i]['edit'];
+ echo $files_array[$i]['duplicate'];
+ echo $files_array[$i]['rename'];
+ echo $files_array[$i]['delete'];
+ echo ' ';
+ echo ' ';
+ }
+ return;
+}
+
+function removeLastPath($string)
+{
+ $pos = strrpos($string, '/');
+ if ($pos !== false) {
+ $path = substr($string, 0, $pos);
+ } else {
+ $path = false;
+ }
+ return $path;
+}
+
+function getExtension($string)
+{
+ $pos = strrpos($string, '.');
+ if ($pos !== false) {
+ $ext = substr($string, $pos);
+ $ext = strtolower($ext);
+ } else {
+ $ext = false;
+ }
+ return $ext;
+}
+
+function checkExtension($path = '')
+{
+ global $uploadablefiles;
+
+ if (in_array(getExtension($path), $uploadablefiles)) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+function mkdirs($strPath, $mode)
+{ // recursive mkdir function
+ if (is_dir($strPath)) {
+ return true;
+ }
+ $pStrPath = dirname($strPath);
+ if (!mkdirs($pStrPath, $mode)) {
+ return false;
+ }
+ return @mkdir($strPath);
+}
+
+function logFileChange($type, $filename)
+{
+ //global $_lang;
+
+ include_once('log.class.inc.php');
+ $log = new logHandler();
+
+ switch ($type) {
+ case 'upload':
+ $string = 'Uploaded File';
+ break;
+ case 'delete':
+ $string = 'Deleted File';
+ break;
+ case 'modify':
+ $string = 'Modified File';
+ break;
+ default:
+ $string = 'Viewing File';
+ break;
+ }
+
+ $string = sprintf($string, $filename);
+ $log->initAndWriteLog($string, '', '', '', $type, $filename);
+
+ // HACK: change the global action to prevent double logging
+ // @see index.php @ 915
+ global $action;
+ $action = 1;
}
// by patrick_allaert - php user notes
-function unzip($file, $path) {
- global $newfolderaccessmode, $token_check;
-
- if(!$token_check) {
- return false;
- }
-
- // added by Raymond
- if(!extension_loaded('zip')) {
- return 0;
- }
- // end mod
- $zip = zip_open($file);
- if($zip) {
- $old_umask = umask(0);
- $path = rtrim($path, '/') . '/';
- while($zip_entry = zip_read($zip)) {
- if(zip_entry_filesize($zip_entry) > 0) {
- // str_replace must be used under windows to convert "/" into "\"
- $zip_entry_name = zip_entry_name($zip_entry);
- $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name));
- $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
- if(!file_exists($complete_path)) {
- $tmp = '';
- foreach(explode('/', $complete_path) AS $k) {
- $tmp .= $k . '/';
- if(!is_dir($tmp)) {
- mkdir($tmp, 0777);
- }
- }
- }
- if(zip_entry_open($zip, $zip_entry, 'r')) {
- file_put_contents($complete_name, zip_entry_read($zip_entry, zip_entry_filesize($zip_entry)));
- zip_entry_close($zip_entry);
- }
- }
- }
- umask($old_umask);
- zip_close($zip);
- return true;
- }
- zip_close($zip);
-}
-
-function rrmdir($dir) {
- foreach(glob($dir . '/*') as $file) {
- if(is_dir($file)) {
- rrmdir($file);
- } else {
- unlink($file);
- }
- }
- return rmdir($dir);
-}
-
-function fileupload() {
- global $modx, $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions;
- $msg = '';
-
- foreach($_FILES['userfile']['name'] as $i => $name) {
- if(!empty($_FILES['userfile']['tmp_name'][$i])) {
- $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];
- $userfile['error'] = $_FILES['userfile']['error'][$i];
- $name = $_FILES['userfile']['name'][$i];
- if($modx->config['clean_uploaded_filename'] == 1) {
- $nameparts = explode('.', $name);
- $nameparts = array_map(array(
- $modx,
- 'stripAlias'
- ), $nameparts, array('file_manager'));
- $name = implode('.', $nameparts);
- }
- $userfile['name'] = $name;
- $userfile['type'] = $_FILES['userfile']['type'][$i];
-
- // this seems to be an upload action.
- $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath));
- $path = rtrim($path, '/') . '/' . $userfile['name'];
- $msg .= $path;
- if($userfile['error'] == 0) {
- $img = (strpos($userfile['type'], 'image') !== false) ? '
' : '';
- $msg .= "
'; - - // invoke OnFileManagerUpload event - $modx->invokeEvent('OnFileManagerUpload', array( - 'filepath' => $_POST['path'], - 'filename' => $userfile['name'] - )); - // Log the change - logFileChange('upload', $_POST['path'] . '/' . $userfile['name']); - } else { - $msg .= '
' . $_lang['files_upload_error'] . ':'; - switch($userfile['error']) { - case 0: //no error; possible file attack! - $msg .= $_lang['files_upload_error0']; - break; - case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini - $msg .= $_lang['files_upload_error1']; - break; - case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form - $msg .= $_lang['files_upload_error2']; - break; - case 3: //uploaded file was only partially uploaded - $msg .= $_lang['files_upload_error3']; - break; - case 4: //no file was uploaded - $msg .= $_lang['files_upload_error4']; - break; - default: //a default error, just in case! :) - $msg .= $_lang['files_upload_error5']; - break; - } - $msg .= '
'; - } - } - } - return $msg . '
'; -} - -function textsave() { - global $_lang; - - $msg = $_lang['editing_file']; - $filename = $_POST['path']; - $content = $_POST['content']; - - // Write $content to our opened file. - if(file_put_contents($filename, $content) === FALSE) { - $msg .= '' . $_lang['file_not_saved'] . '
'; - } else { - $msg .= '' . $_lang['file_saved'] . '
'; - $_REQUEST['mode'] = 'edit'; - } - // Log the change - logFileChange('modify', $filename); - return $msg; -} - -function delete_file() { - global $_lang, $token_check; - - $msg = sprintf($_lang['deleting_file'], str_replace('\\', '/', $_REQUEST['path'])); - - $file = $_REQUEST['path']; - if(!$token_check || !@unlink($file)) { - $msg .= '' . $_lang['file_not_deleted'] . '
'; - } else { - $msg .= '' . $_lang['file_deleted'] . '
'; - } - - // Log the change - logFileChange('delete', $file); - - return $msg; -} - -function parsePlaceholder($tpl, $ph) { - foreach($ph as $k => $v) { - $k = "[+{$k}+]"; - $tpl = str_replace($k, $v, $tpl); - } - return $tpl; -} - -function checkToken() { - if(isset($_POST['token']) && !empty($_POST['token'])) { - $token = $_POST['token']; - } elseif(isset($_GET['token']) && !empty($_GET['token'])) { - $token = $_GET['token']; - } else { - $token = false; - } - - if(isset($_SESSION['token']) && !empty($_SESSION['token']) && $_SESSION['token'] === $token) { - $rs = true; - } else { - $rs = false; - } - $_SESSION['token'] = ''; - return $rs; -} - -function makeToken() { - $newToken = uniqid(''); - $_SESSION['token'] = $newToken; - return $newToken; +function unzip($file, $path) +{ + global $newfolderaccessmode, $token_check; + + if (!$token_check) { + return false; + } + + // added by Raymond + if (!extension_loaded('zip')) { + return 0; + } + // end mod + $zip = zip_open($file); + if ($zip) { + $old_umask = umask(0); + $path = rtrim($path, '/') . '/'; + while ($zip_entry = zip_read($zip)) { + if (zip_entry_filesize($zip_entry) > 0) { + // str_replace must be used under windows to convert "/" into "\" + $zip_entry_name = zip_entry_name($zip_entry); + $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name)); + $complete_name = $path . str_replace('\\', '/', $zip_entry_name); + if (!file_exists($complete_path)) { + $tmp = ''; + foreach (explode('/', $complete_path) AS $k) { + $tmp .= $k . '/'; + if (!is_dir($tmp)) { + mkdir($tmp, 0777); + } + } + } + if (zip_entry_open($zip, $zip_entry, 'r')) { + file_put_contents($complete_name, zip_entry_read($zip_entry, zip_entry_filesize($zip_entry))); + zip_entry_close($zip_entry); + } + } + } + umask($old_umask); + zip_close($zip); + return true; + } + zip_close($zip); +} + +function rrmdir($dir) +{ + foreach (glob($dir . '/*') as $file) { + if (is_dir($file)) { + rrmdir($file); + } else { + unlink($file); + } + } + return rmdir($dir); +} + +function fileupload() +{ + global $modx, $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions; + $msg = ''; + + foreach ($_FILES['userfile']['name'] as $i => $name) { + if (!empty($_FILES['userfile']['tmp_name'][$i])) { + $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i]; + $userfile['error'] = $_FILES['userfile']['error'][$i]; + $name = $_FILES['userfile']['name'][$i]; + if ($modx->config['clean_uploaded_filename'] == 1) { + $nameparts = explode('.', $name); + $nameparts = array_map(array( + $modx, + 'stripAlias' + ), $nameparts, array('file_manager')); + $name = implode('.', $nameparts); + } + $userfile['name'] = $name; + $userfile['type'] = $_FILES['userfile']['type'][$i]; + + // this seems to be an upload action. + $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath)); + $path = rtrim($path, '/') . '/' . $userfile['name']; + $msg .= $path; + if ($userfile['error'] == 0) { + $img = (strpos($userfile['type'], 'image') !== false) ? '
' : '';
+ $msg .= "
'; + + // invoke OnFileManagerUpload event + $modx->invokeEvent('OnFileManagerUpload', array( + 'filepath' => $_POST['path'], + 'filename' => $userfile['name'] + )); + // Log the change + logFileChange('upload', $_POST['path'] . '/' . $userfile['name']); + } else { + $msg .= '
' . $_lang['files_upload_error'] . ':'; + switch ($userfile['error']) { + case 0: //no error; possible file attack! + $msg .= $_lang['files_upload_error0']; + break; + case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini + $msg .= $_lang['files_upload_error1']; + break; + case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form + $msg .= $_lang['files_upload_error2']; + break; + case 3: //uploaded file was only partially uploaded + $msg .= $_lang['files_upload_error3']; + break; + case 4: //no file was uploaded + $msg .= $_lang['files_upload_error4']; + break; + default: //a default error, just in case! :) + $msg .= $_lang['files_upload_error5']; + break; + } + $msg .= '
'; + } + } + } + return $msg . '
'; +} + +function textsave() +{ + global $_lang; + + $msg = $_lang['editing_file']; + $filename = $_POST['path']; + $content = $_POST['content']; + + // Write $content to our opened file. + if (file_put_contents($filename, $content) === false) { + $msg .= '' . $_lang['file_not_saved'] . '
'; + } else { + $msg .= '' . $_lang['file_saved'] . '
'; + $_REQUEST['mode'] = 'edit'; + } + // Log the change + logFileChange('modify', $filename); + return $msg; +} + +function delete_file() +{ + global $_lang, $token_check; + + $msg = sprintf($_lang['deleting_file'], str_replace('\\', '/', $_REQUEST['path'])); + + $file = $_REQUEST['path']; + if (!$token_check || !@unlink($file)) { + $msg .= '' . $_lang['file_not_deleted'] . '
'; + } else { + $msg .= '' . $_lang['file_deleted'] . '
'; + } + + // Log the change + logFileChange('delete', $file); + + return $msg; +} + +function parsePlaceholder($tpl, $ph) +{ + foreach ($ph as $k => $v) { + $k = "[+{$k}+]"; + $tpl = str_replace($k, $v, $tpl); + } + return $tpl; +} + +function checkToken() +{ + if (isset($_POST['token']) && !empty($_POST['token'])) { + $token = $_POST['token']; + } elseif (isset($_GET['token']) && !empty($_GET['token'])) { + $token = $_GET['token']; + } else { + $token = false; + } + + if (isset($_SESSION['token']) && !empty($_SESSION['token']) && $_SESSION['token'] === $token) { + $rs = true; + } else { + $rs = false; + } + $_SESSION['token'] = ''; + return $rs; +} + +function makeToken() +{ + $newToken = uniqid(''); + $_SESSION['token'] = $newToken; + return $newToken; } diff --git a/manager/actions/help.static.php b/manager/actions/help.static.php index 48b1df1ca4..36ffc4100f 100644 --- a/manager/actions/help.static.php +++ b/manager/actions/help.static.php @@ -2,7 +2,7 @@ if(IN_MANAGER_MODE != "true") { die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -$helpBasePath = MODX_BASE_PATH . "assets/templates/help/"; +$helpBasePath = "actions/help/"; ?>
@@ -16,7 +16,7 @@
INCLUDE_ORDERING_ERROR
- manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) { ?>
- db->select($field, $from, $where, 'tvtpl.rank,tv.rank, tv.id');
- $limit = $modx->db->getRecordCount($rs);
- if($limit > 0) {
- ?>
-
-
-
';
+ }
+ ?>
+
+
+
+
+ htmlspecialchars($row['doc_title']) . '">' . $row['doc_id'] . '';
+ ?>
+
+ ';
- }
- ?>
+ }
+ ?>
+
+
+
+
+
+
-
diff --git a/manager/actions/bkmanager.static.php b/manager/actions/bkmanager.static.php
index 028a369f6b..7993a119f6 100644
--- a/manager/actions/bkmanager.static.php
+++ b/manager/actions/bkmanager.static.php
@@ -1,465 +1,491 @@
INCLUDE_ORDERING_ERROR
-
-
+
+
+
' . $_lang['access_permissions_links_tab'] . '';
-
- $rs = $modx->db->select("groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name", "{$tbl_membergroup_names} AS groupnames
- LEFT JOIN {$tbl_membergroup_access} AS groupacc ON groupacc.membergroup = groupnames.id
- LEFT JOIN {$tbl_documentgroup_names} AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
+ $rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames
+ LEFT JOIN ' . $tbl_membergroup_access . ' AS groupacc ON groupacc.membergroup = groupnames.id
+ LEFT JOIN ' . $tbl_documentgroup_names . ' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name');
if($modx->db->getRecordCount($rs) < 1) {
- echo '' . $_lang['no_groups_found'] . '
'; - } else { ?> -
-
-
-
+ \n"; - $pid = ''; - while($row = $modx->db->getRow($rs)) { - if($row['id'] != $pid) { - if($pid != '') { - echo "\n"; - } // close previous one - echo '' . $row['name'] . '';
-
+ } else {
+ ?>
+
+ ';
+ } // close previous one
+ ?>
+
-
'; - } else { ?> -
| - |
| - - | -
+ \n"; - $pid = ''; - while($row = $modx->db->getRow($rs)) { - if($row['id'] != $pid) { - if($pid != '') { - echo "\n"; - } // close previous one - echo '
+
+
+
+ +
-
+ db->getRow($rs)) {
+ if($row['id'] != $pid) {
+ if($pid != '') {
+ echo '
- ';
+ }
+ }
if(!$row['dg_id']) {
- echo ' » ' . $_lang['no_groups_found'] . "\n";
- $pid = '';
continue;
- } else {
- echo "
- + () + + " . $row['dg_name']; - echo ' ('; - echo $_lang['remove'] . ')'; - echo "\n"; - - $pid = $row['id']; - } - echo '
- \n";
}
+ ?>
+
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('bk_manager')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('bk_manager')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $dbase = trim($dbase, '`'); -if(!isset($modx->config['snapshot_path'])) { - if(is_dir(MODX_BASE_PATH . 'temp/backup/')) { - $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/'; - } else { - $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/'; - } +if (!isset($modx->config['snapshot_path'])) { + if (is_dir(MODX_BASE_PATH . 'temp/backup/')) { + $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/'; + } else { + $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/'; + } } // Backup Manager by Raymond: $mode = isset($_POST['mode']) ? $_POST['mode'] : ''; -if($mode == 'restore1') { - if(isset($_POST['textarea']) && !empty($_POST['textarea'])) { - $source = trim($_POST['textarea']); - $_SESSION['textarea'] = $source . "\n"; - } else { - $source = file_get_contents($_FILES['sqlfile']['tmp_name']); - } - import_sql($source); - header('Location: index.php?r=9&a=93'); - exit; -} elseif($mode == 'restore2') { - $path = $modx->config['snapshot_path'] . $_POST['filename']; - if(file_exists($path)) { - $source = file_get_contents($path); - import_sql($source); - if(headers_sent()) { - echo "\n"; - } else { - header("Location: index.php?r=9&a=93"); - } - } - exit; -} elseif($mode == 'backup') { - $tables = isset($_POST['chk']) ? $_POST['chk'] : ''; - if(!is_array($tables)) { - $modx->webAlertAndQuit("Please select a valid table from the list below."); - } - - /* - * Code taken from Ralph A. Dahlgren MySQLdumper Snippet - Etomite 0.6 - 2004-09-27 - * Modified by Raymond 3-Jan-2005 - * Perform MySQLdumper data dump - */ - @set_time_limit(120); // set timeout limit to 2 minutes - $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); - $dumper->setDBtables($tables); - $dumper->setDroptables((isset($_POST['droptables']) ? true : false)); - $dumpfinished = $dumper->createDump('dumpSql'); - if($dumpfinished) { - exit; - } else { - $modx->webAlertAndQuit('Unable to Backup Database'); - } - - // MySQLdumper class can be found below -} elseif($mode == 'snapshot') { - if(!is_dir(rtrim($modx->config['snapshot_path'], '/'))) { - mkdir(rtrim($modx->config['snapshot_path'], '/')); - @chmod(rtrim($modx->config['snapshot_path'], '/'), 0777); - } - if(!is_file("{$modx->config['snapshot_path']}.htaccess")) { - $htaccess = "order deny,allow\ndeny from all\n"; - file_put_contents("{$modx->config['snapshot_path']}.htaccess", $htaccess); - } - if(!is_writable(rtrim($modx->config['snapshot_path'], '/'))) { - $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path']))); - } - $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%'"; - $rs = $modx->db->query($sql); - $tables = $modx->db->getColumn('Name', $rs); - //$today = $modx->toDateFormat(time()); - //$today = str_replace(array('/',' '), '-', $today); - //$today = str_replace(':', '', $today); - //$today = strtolower($today); - $today = date('Y-m-d_H-i-s'); - global $path; - $path = "{$modx->config['snapshot_path']}{$today}.sql"; - - @set_time_limit(120); // set timeout limit to 2 minutes - $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); - $dumper->setDBtables($tables); - $dumper->setDroptables(true); - $dumpfinished = $dumper->createDump('snapshot'); - - $pattern = "{$modx->config['snapshot_path']}*.sql"; - $files = glob($pattern, GLOB_NOCHECK); - $total = ($files[0] !== $pattern) ? count($files) : 0; - arsort($files); - while(10 < $total && $limit < 50) { - $del_file = array_pop($files); - unlink($del_file); - $total = count($files); - $limit++; - } - - if($dumpfinished) { - $_SESSION['result_msg'] = 'snapshot_ok'; - header("Location: index.php?a=93"); - exit; - } else { - $modx->webAlertAndQuit('Unable to Backup Database'); - } +if ($mode == 'restore1') { + if (isset($_POST['textarea']) && !empty($_POST['textarea'])) { + $source = trim($_POST['textarea']); + $_SESSION['textarea'] = $source . "\n"; + } else { + $source = file_get_contents($_FILES['sqlfile']['tmp_name']); + } + import_sql($source); + header('Location: index.php?r=9&a=93'); + exit; +} elseif ($mode == 'restore2') { + $path = $modx->config['snapshot_path'] . $_POST['filename']; + if (file_exists($path)) { + $source = file_get_contents($path); + import_sql($source); + if (headers_sent()) { + echo "\n"; + } else { + header("Location: index.php?r=9&a=93"); + } + } + exit; +} elseif ($mode == 'backup') { + $tables = isset($_POST['chk']) ? $_POST['chk'] : ''; + if (!is_array($tables)) { + $modx->webAlertAndQuit("Please select a valid table from the list below."); + } + + /* + * Code taken from Ralph A. Dahlgren MySQLdumper Snippet - Etomite 0.6 - 2004-09-27 + * Modified by Raymond 3-Jan-2005 + * Perform MySQLdumper data dump + */ + @set_time_limit(120); // set timeout limit to 2 minutes + $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); + $dumper->setDBtables($tables); + $dumper->setDroptables((isset($_POST['droptables']) ? true : false)); + $dumpfinished = $dumper->createDump('dumpSql'); + if ($dumpfinished) { + exit; + } else { + $modx->webAlertAndQuit('Unable to Backup Database'); + } + + // MySQLdumper class can be found below +} elseif ($mode == 'snapshot') { + if (!is_dir(rtrim($modx->config['snapshot_path'], '/'))) { + mkdir(rtrim($modx->config['snapshot_path'], '/')); + @chmod(rtrim($modx->config['snapshot_path'], '/'), 0777); + } + if (!is_file("{$modx->config['snapshot_path']}.htaccess")) { + $htaccess = "order deny,allow\ndeny from all\n"; + file_put_contents("{$modx->config['snapshot_path']}.htaccess", $htaccess); + } + if (!is_writable(rtrim($modx->config['snapshot_path'], '/'))) { + $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path']))); + } + $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%'"; + $rs = $modx->db->query($sql); + $tables = $modx->db->getColumn('Name', $rs); + //$today = $modx->toDateFormat(time()); + //$today = str_replace(array('/',' '), '-', $today); + //$today = str_replace(':', '', $today); + //$today = strtolower($today); + $today = date('Y-m-d_H-i-s'); + global $path; + $path = "{$modx->config['snapshot_path']}{$today}.sql"; + + @set_time_limit(120); // set timeout limit to 2 minutes + $dumper = new Mysqldumper($database_server, $database_user, $database_password, $dbase); + $dumper->setDBtables($tables); + $dumper->setDroptables(true); + $dumpfinished = $dumper->createDump('snapshot'); + + $pattern = "{$modx->config['snapshot_path']}*.sql"; + $files = glob($pattern, GLOB_NOCHECK); + $total = ($files[0] !== $pattern) ? count($files) : 0; + arsort($files); + while (10 < $total && $limit < 50) { + $del_file = array_pop($files); + unlink($del_file); + $total = count($files); + $limit++; + } + + if ($dumpfinished) { + $_SESSION['result_msg'] = 'snapshot_ok'; + header("Location: index.php?a=93"); + exit; + } else { + $modx->webAlertAndQuit('Unable to Backup Database'); + } } else { - include_once MODX_MANAGER_PATH . "includes/header.inc.php"; // start normal header + include_once MODX_MANAGER_PATH . "includes/header.inc.php"; // start normal header } -if(isset($_SESSION['result_msg']) && $_SESSION['result_msg'] != '') { - switch($_SESSION['result_msg']) { - case 'import_ok': - $ph['result_msg_import'] = '
' . $_lang["bkmgr_import_ok"] . '
';
- $ph['result_msg_snapshot'] = '' . $_lang["bkmgr_import_ok"] . '
';
- break;
- case 'snapshot_ok':
- $ph['result_msg_import'] = '';
- $ph['result_msg_snapshot'] = '' . $_lang["bkmgr_snapshot_ok"] . '
';
- break;
- }
- $_SESSION['result_msg'] = '';
+if (isset($_SESSION['result_msg']) && $_SESSION['result_msg'] != '') {
+ switch ($_SESSION['result_msg']) {
+ case 'import_ok':
+ $ph['result_msg_import'] = '' . $_lang["bkmgr_import_ok"] . '
';
+ $ph['result_msg_snapshot'] = '' . $_lang["bkmgr_import_ok"] . '
';
+ break;
+ case 'snapshot_ok':
+ $ph['result_msg_import'] = '';
+ $ph['result_msg_snapshot'] = '' . $_lang["bkmgr_snapshot_ok"] . '
';
+ break;
+ }
+ $_SESSION['result_msg'] = '';
} else {
- $ph['result_msg_import'] = '';
- $ph['result_msg_snapshot'] = '';
+ $ph['result_msg_import'] = '';
+ $ph['result_msg_snapshot'] = '';
}
?>
-
-
- - -
- - - -
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
';
- }
- ?>
- ' . $_lang["bkmgr_run_sql_result"] . '
' . $result . '
-
-
-
-
-
-
-
-
-
-
-
-
- + +
+ + + +
+
+
+
tpDBM.setSelectedIndex( ' . $_GET['tab'] . ' );';
+if (is_numeric($_GET['tab'])) {
+ echo '';
}
include_once "footer.inc.php"; // send footer
@@ -480,285 +506,300 @@ function checked($cond) {
*
**/
-class Mysqldumper {
- var $_dbtables;
- var $_isDroptables;
- var $database_server;
- var $dbname;
-
- function __construct($database_server, $database_user, $database_password, $dbname) {
- // Don't drop tables by default.
- $this->dbname = $dbname;
- $this->setDroptables(false);
- }
-
- function setDroptables($state) {
- $this->_isDroptables = $state;
- }
-
- // If set to true, it will generate 'DROP TABLE IF EXISTS'-statements for each table.
-
- function setDBtables($dbtables) {
- $this->_dbtables = $dbtables;
- }
-
- function createDump($callBack) {
- global $modx;
-
- // Set line feed
- $lf = "\n";
- $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php';
-
- $result = $modx->db->query('SHOW TABLES');
- $tables = $this->result2Array(0, $result);
- foreach($tables as $tblval) {
- $result = $modx->db->query("SHOW CREATE TABLE `{$tblval}`");
- $createtable[$tblval] = $this->result2Array(1, $result);
- }
-
- $version = $modx->getVersionData();
-
- // Set header
- $output = "#{$lf}";
- $output .= "# " . addslashes($modx->config['site_name']) . " Database Dump{$lf}";
- $output .= "# MODX Version:{$version['version']}{$lf}";
- $output .= "# {$lf}";
- $output .= "# Host: {$this->database_server}{$lf}";
- $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf;
- $output .= "# Server version: " . $modx->db->getVersion() . $lf;
- $output .= "# PHP Version: " . phpversion() . $lf;
- $output .= "# Database: `{$this->dbname}`{$lf}";
- $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}";
- $output .= "#";
- file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
- $output = '';
-
- // Generate dumptext for the tables.
- if(isset($this->_dbtables) && count($this->_dbtables)) {
- $this->_dbtables = implode(',', $this->_dbtables);
- } else {
- unset($this->_dbtables);
- }
- foreach($tables as $tblval) {
- // check for selected table
- if(isset($this->_dbtables)) {
- if(strstr(",{$this->_dbtables},", ",{$tblval},") === false) {
- continue;
- }
- }
- if($callBack === 'snapshot') {
- /*
- switch($tblval)
- {
- case $modx->db->config['table_prefix'].'event_log':
- case $modx->db->config['table_prefix'].'manager_log':
- continue 2;
- }*/
- if(!preg_match('@^' . $modx->db->config['table_prefix'] . '@', $tblval)) {
- continue;
- }
- }
- $output .= "{$lf}{$lf}# --------------------------------------------------------{$lf}{$lf}";
- $output .= "#{$lf}# Table structure for table `{$tblval}`{$lf}";
- $output .= "#{$lf}{$lf}";
- // Generate DROP TABLE statement when client wants it to.
- if($this->isDroptables()) {
- $output .= "SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;{$lf}";
- $output .= "DROP TABLE IF EXISTS `{$tblval}`;{$lf}";
- $output .= "SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;{$lf}{$lf}";
- }
- $output .= "{$createtable[$tblval][0]};{$lf}";
- $output .= $lf;
- $output .= "#{$lf}# Dumping data for table `{$tblval}`{$lf}#{$lf}";
- $result = $modx->db->select('*', $tblval);
- $rows = $this->loadObjectList('', $result);
- foreach($rows as $row) {
- $insertdump = $lf;
- $insertdump .= "INSERT INTO `{$tblval}` VALUES (";
- $arr = $this->object2Array($row);
- foreach($arr as $key => $value) {
- if(is_null($value)) {
- $value = 'NULL';
- } else {
- $value = addslashes($value);
- $value = str_replace(array(
- "\r\n",
- "\r",
- "\n"
- ), '\\n', $value);
- $value = "'{$value}'";
- }
- $insertdump .= $value . ',';
- }
- $output .= rtrim($insertdump, ',') . ");\n";
- if(1048576 < strlen($output)) {
- file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
- $output = '';
- }
- }
- file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
- $output = '';
- }
- $output = file_get_contents($tempfile_path);
- if(!empty($output)) {
- unlink($tempfile_path);
- }
-
- switch($callBack) {
- case 'dumpSql':
- dumpSql($output);
- break;
- case 'snapshot':
- snapshot($output);
- break;
- }
- return true;
- }
-
- function result2Array($numinarray = 0, $resource) {
- global $modx;
- $array = array();
- while($row = $modx->db->getRow($resource, 'num')) {
- $array[] = $row[$numinarray];
- }
- $modx->db->freeResult($resource);
- return $array;
- }
-
- // Private function object2Array.
-
- function isDroptables() {
- return $this->_isDroptables;
- }
-
- // Private function loadObjectList.
-
- function loadObjectList($key = '', $resource) {
- global $modx;
- $array = array();
- while($row = $modx->db->getRow($resource, 'object')) {
- if($key) {
- $array[$row->$key] = $row;
- } else {
- $array[] = $row;
- }
- }
- $modx->db->freeResult($resource);
- return $array;
- }
-
- // Private function result2Array.
-
- function object2Array($obj) {
- $array = null;
- if(is_object($obj)) {
- $array = array();
- foreach(get_object_vars($obj) as $key => $value) {
- if(is_object($value)) {
- $array[$key] = $this->object2Array($value);
- } else {
- $array[$key] = $value;
- }
- }
- }
- return $array;
- }
+class Mysqldumper
+{
+ var $_dbtables;
+ var $_isDroptables;
+ var $database_server;
+ var $dbname;
+
+ function __construct($database_server, $database_user, $database_password, $dbname)
+ {
+ // Don't drop tables by default.
+ $this->dbname = $dbname;
+ $this->setDroptables(false);
+ }
+
+ function setDroptables($state)
+ {
+ $this->_isDroptables = $state;
+ }
+
+ // If set to true, it will generate 'DROP TABLE IF EXISTS'-statements for each table.
+
+ function setDBtables($dbtables)
+ {
+ $this->_dbtables = $dbtables;
+ }
+
+ function createDump($callBack)
+ {
+ global $modx;
+
+ // Set line feed
+ $lf = "\n";
+ $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php';
+
+ $result = $modx->db->query('SHOW TABLES');
+ $tables = $this->result2Array(0, $result);
+ foreach ($tables as $tblval) {
+ $result = $modx->db->query("SHOW CREATE TABLE `{$tblval}`");
+ $createtable[$tblval] = $this->result2Array(1, $result);
+ }
+
+ $version = $modx->getVersionData();
+
+ // Set header
+ $output = "#{$lf}";
+ $output .= "# " . addslashes($modx->config['site_name']) . " Database Dump{$lf}";
+ $output .= "# MODX Version:{$version['version']}{$lf}";
+ $output .= "# {$lf}";
+ $output .= "# Host: {$this->database_server}{$lf}";
+ $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf;
+ $output .= "# Server version: " . $modx->db->getVersion() . $lf;
+ $output .= "# PHP Version: " . phpversion() . $lf;
+ $output .= "# Database: `{$this->dbname}`{$lf}";
+ $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}";
+ $output .= "#";
+ file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
+ $output = '';
+
+ // Generate dumptext for the tables.
+ if (isset($this->_dbtables) && count($this->_dbtables)) {
+ $this->_dbtables = implode(',', $this->_dbtables);
+ } else {
+ unset($this->_dbtables);
+ }
+ foreach ($tables as $tblval) {
+ // check for selected table
+ if (isset($this->_dbtables)) {
+ if (strstr(",{$this->_dbtables},", ",{$tblval},") === false) {
+ continue;
+ }
+ }
+ if ($callBack === 'snapshot') {
+ /*
+ switch($tblval)
+ {
+ case $modx->db->config['table_prefix'].'event_log':
+ case $modx->db->config['table_prefix'].'manager_log':
+ continue 2;
+ }*/
+ if (!preg_match('@^' . $modx->db->config['table_prefix'] . '@', $tblval)) {
+ continue;
+ }
+ }
+ $output .= "{$lf}{$lf}# --------------------------------------------------------{$lf}{$lf}";
+ $output .= "#{$lf}# Table structure for table `{$tblval}`{$lf}";
+ $output .= "#{$lf}{$lf}";
+ // Generate DROP TABLE statement when client wants it to.
+ if ($this->isDroptables()) {
+ $output .= "SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;{$lf}";
+ $output .= "DROP TABLE IF EXISTS `{$tblval}`;{$lf}";
+ $output .= "SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;{$lf}{$lf}";
+ }
+ $output .= "{$createtable[$tblval][0]};{$lf}";
+ $output .= $lf;
+ $output .= "#{$lf}# Dumping data for table `{$tblval}`{$lf}#{$lf}";
+ $result = $modx->db->select('*', $tblval);
+ $rows = $this->loadObjectList('', $result);
+ foreach ($rows as $row) {
+ $insertdump = $lf;
+ $insertdump .= "INSERT INTO `{$tblval}` VALUES (";
+ $arr = $this->object2Array($row);
+ foreach ($arr as $key => $value) {
+ if (is_null($value)) {
+ $value = 'NULL';
+ } else {
+ $value = addslashes($value);
+ $value = str_replace(array(
+ "\r\n",
+ "\r",
+ "\n"
+ ), '\\n', $value);
+ $value = "'{$value}'";
+ }
+ $insertdump .= $value . ',';
+ }
+ $output .= rtrim($insertdump, ',') . ");\n";
+ if (1048576 < strlen($output)) {
+ file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
+ $output = '';
+ }
+ }
+ file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
+ $output = '';
+ }
+ $output = file_get_contents($tempfile_path);
+ if (!empty($output)) {
+ unlink($tempfile_path);
+ }
+
+ switch ($callBack) {
+ case 'dumpSql':
+ dumpSql($output);
+ break;
+ case 'snapshot':
+ snapshot($output);
+ break;
+ }
+ return true;
+ }
+
+ function result2Array($numinarray = 0, $resource)
+ {
+ global $modx;
+ $array = array();
+ while ($row = $modx->db->getRow($resource, 'num')) {
+ $array[] = $row[$numinarray];
+ }
+ $modx->db->freeResult($resource);
+ return $array;
+ }
+
+ // Private function object2Array.
+
+ function isDroptables()
+ {
+ return $this->_isDroptables;
+ }
+
+ // Private function loadObjectList.
+
+ function loadObjectList($key = '', $resource)
+ {
+ global $modx;
+ $array = array();
+ while ($row = $modx->db->getRow($resource, 'object')) {
+ if ($key) {
+ $array[$row->$key] = $row;
+ } else {
+ $array[] = $row;
+ }
+ }
+ $modx->db->freeResult($resource);
+ return $array;
+ }
+
+ // Private function result2Array.
+
+ function object2Array($obj)
+ {
+ $array = null;
+ if (is_object($obj)) {
+ $array = array();
+ foreach (get_object_vars($obj) as $key => $value) {
+ if (is_object($value)) {
+ $array[$key] = $this->object2Array($value);
+ } else {
+ $array[$key] = $value;
+ }
+ }
+ }
+ return $array;
+ }
}
-function import_sql($source, $result_code = 'import_ok') {
- global $modx, $e;
-
- if($modx->getLockedElements() !== array()) {
- $modx->webAlertAndQuit("At least one Resource is still locked or edited right now by any user. Remove locks or ask users to log out before proceeding.");
- }
-
- $settings = getSettings();
-
- if(strpos($source, "\r") !== false) {
- $source = str_replace(array(
- "\r\n",
- "\n",
- "\r"
- ), "\n", $source);
- }
- $sql_array = preg_split('@;[ \t]*\n@', $source);
- foreach($sql_array as $sql_entry) {
- $sql_entry = trim($sql_entry, "\r\n; ");
- if(empty($sql_entry)) {
- continue;
- }
- $rs = $modx->db->query($sql_entry);
- }
- restoreSettings($settings);
-
- $modx->clearCache();
-
- $_SESSION['last_result'] = $modx->db->makeArray($rs);
-
- $_SESSION['result_msg'] = $result_code;
+function import_sql($source, $result_code = 'import_ok')
+{
+ global $modx, $e;
+
+ if ($modx->getLockedElements() !== array()) {
+ $modx->webAlertAndQuit("At least one Resource is still locked or edited right now by any user. Remove locks or ask users to log out before proceeding.");
+ }
+
+ $settings = getSettings();
+
+ if (strpos($source, "\r") !== false) {
+ $source = str_replace(array(
+ "\r\n",
+ "\n",
+ "\r"
+ ), "\n", $source);
+ }
+ $sql_array = preg_split('@;[ \t]*\n@', $source);
+ foreach ($sql_array as $sql_entry) {
+ $sql_entry = trim($sql_entry, "\r\n; ");
+ if (empty($sql_entry)) {
+ continue;
+ }
+ $rs = $modx->db->query($sql_entry);
+ }
+ restoreSettings($settings);
+
+ $modx->clearCache();
+
+ $_SESSION['last_result'] = $modx->db->makeArray($rs);
+
+ $_SESSION['result_msg'] = $result_code;
}
-function dumpSql(&$dumpstring) {
- global $modx;
- $today = $modx->toDateFormat(time(), 'dateOnly');
- $today = str_replace('/', '-', $today);
- $today = strtolower($today);
- $size = strlen($dumpstring);
- if(!headers_sent()) {
- header('Expires: 0');
- header('Cache-Control: private');
- header('Pragma: cache');
- header('Content-type: application/download');
- header("Content-Length: {$size}");
- header("Content-Disposition: attachment; filename={$today}_database_backup.sql");
- }
- echo $dumpstring;
- return true;
+function dumpSql(&$dumpstring)
+{
+ global $modx;
+ $today = $modx->toDateFormat(time(), 'dateOnly');
+ $today = str_replace('/', '-', $today);
+ $today = strtolower($today);
+ $size = strlen($dumpstring);
+ if (!headers_sent()) {
+ header('Expires: 0');
+ header('Cache-Control: private');
+ header('Pragma: cache');
+ header('Content-type: application/download');
+ header("Content-Length: {$size}");
+ header("Content-Disposition: attachment; filename={$today}_database_backup.sql");
+ }
+ echo $dumpstring;
+ return true;
}
-function snapshot(&$dumpstring) {
- global $path;
- file_put_contents($path, $dumpstring, FILE_APPEND);
- return true;
+function snapshot(&$dumpstring)
+{
+ global $path;
+ file_put_contents($path, $dumpstring, FILE_APPEND);
+ return true;
}
-function getSettings() {
- global $modx;
- $tbl_system_settings = $modx->getFullTableName('system_settings');
-
- $rs = $modx->db->select('setting_name, setting_value', $tbl_system_settings);
-
- $settings = array();
- while($row = $modx->db->getRow($rs)) {
- switch($row['setting_name']) {
- case 'rb_base_dir':
- case 'filemanager_path':
- case 'site_url':
- case 'base_url':
- $settings[$row['setting_name']] = $row['setting_value'];
- break;
- }
- }
- return $settings;
+function getSettings()
+{
+ global $modx;
+ $tbl_system_settings = $modx->getFullTableName('system_settings');
+
+ $rs = $modx->db->select('setting_name, setting_value', $tbl_system_settings);
+
+ $settings = array();
+ while ($row = $modx->db->getRow($rs)) {
+ switch ($row['setting_name']) {
+ case 'rb_base_dir':
+ case 'filemanager_path':
+ case 'site_url':
+ case 'base_url':
+ $settings[$row['setting_name']] = $row['setting_value'];
+ break;
+ }
+ }
+ return $settings;
}
-function restoreSettings($settings) {
- global $modx;
- $tbl_system_settings = $modx->getFullTableName('system_settings');
+function restoreSettings($settings)
+{
+ global $modx;
+ $tbl_system_settings = $modx->getFullTableName('system_settings');
- foreach($settings as $k => $v) {
- $modx->db->update(array('setting_value' => $v), $tbl_system_settings, "setting_name='{$k}'");
- }
+ foreach ($settings as $k => $v) {
+ $modx->db->update(array('setting_value' => $v), $tbl_system_settings, "setting_name='{$k}'");
+ }
}
-function parsePlaceholder($tpl = '', $ph = array()) {
- if(empty($ph) || empty($tpl)) {
- return $tpl;
- }
-
- foreach($ph as $k => $v) {
- $k = "[+{$k}+]";
- $tpl = str_replace($k, $v, $tpl);
- }
- return $tpl;
+function parsePlaceholder($tpl = '', $ph = array())
+{
+ if (empty($ph) || empty($tpl)) {
+ return $tpl;
+ }
+
+ foreach ($ph as $k => $v) {
+ $k = "[+{$k}+]";
+ $tpl = str_replace($k, $v, $tpl);
+ }
+ return $tpl;
}
diff --git a/manager/actions/category_mgr/skin/add.tpl.phtml b/manager/actions/category_mgr/skin/add.tpl.phtml
index 7a857666e3..c5b0e49afb 100644
--- a/manager/actions/category_mgr/skin/add.tpl.phtml
+++ b/manager/actions/category_mgr/skin/add.tpl.phtml
@@ -1,29 +1,20 @@
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/actions/category_mgr/skin/categorize.tpl.phtml b/manager/actions/category_mgr/skin/categorize.tpl.phtml
index 2ffc6585a2..5a0522a0e1 100644
--- a/manager/actions/category_mgr/skin/categorize.tpl.phtml
+++ b/manager/actions/category_mgr/skin/categorize.tpl.phtml
@@ -1,30 +1,20 @@
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+ renderView('chunks/categorize/elements_select'); ?>
+
+
+
+
diff --git a/manager/actions/category_mgr/skin/chunks/categorize/drag_element.tpl.phtml b/manager/actions/category_mgr/skin/chunks/categorize/drag_element.tpl.phtml
index 64d1fd0c7c..c8ad6c1eb0 100644
--- a/manager/actions/category_mgr/skin/chunks/categorize/drag_element.tpl.phtml
+++ b/manager/actions/category_mgr/skin/chunks/categorize/drag_element.tpl.phtml
@@ -1,6 +1,6 @@
-
-
-
-
-
-
\ No newline at end of file
+>
+
+
+
+
+
diff --git a/manager/actions/category_mgr/skin/chunks/edit/assigned_elements_collapse.tpl.phtml b/manager/actions/category_mgr/skin/chunks/edit/assigned_elements_collapse.tpl.phtml
index b1c9fc8deb..58eba8adc5 100644
--- a/manager/actions/category_mgr/skin/chunks/edit/assigned_elements_collapse.tpl.phtml
+++ b/manager/actions/category_mgr/skin/chunks/edit/assigned_elements_collapse.tpl.phtml
@@ -1,8 +1,8 @@
-| txt( $element ); ?> | +txt( $element ); ?> | ||||||||||||||||
txt( 'none' ); ?> |
+ txt( 'none' ); ?> |
- + |
+
+
diff --git a/manager/actions/category_mgr/skin/js/categories.js b/manager/actions/category_mgr/skin/js/categories.js
index 6c4010ce84..b433546973 100644
--- a/manager/actions/category_mgr/skin/js/categories.js
+++ b/manager/actions/category_mgr/skin/js/categories.js
@@ -1,157 +1,109 @@
-
-//window.addEvent('domready',function(){
-
/**
- * Tips
+ *
+ * Select Categories
*/
-new Tips($$('.mootooltip'),{className:'custom'} );
-new MooTips($$('.mootooltip_dom'), {
- className :'assigned',
- showOnClick: true,
- showOnMouseEnter: true,
- showDelay: 200,
- hideDelay: 200,
- offsets: {'x': 20, 'y': 20},
- fixed: true
-});
+let ajax_url = 'index.php?a=121';
+let categorizeWorkbench = document.getElementById('categorize-workbench');
+document.getElementById('elements-select').onchange = function(e) {
+ categorizeWorkbench.innerHTML = '';
+ categorizeWorkbench.classList.add('ajax_loading');
+ document.getElementById('categorize-elements').classList.remove('hidden');
+ document.getElementById('categorize-formfields').innerHTML = '';
+ let xhr = new XMLHttpRequest();
+ xhr.open('POST', ajax_url, true);
+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded;');
+ xhr.onload = function() {
+ if (this.readyState === 4) {
+ categorizeWorkbench.classList.remove('ajax_loading');
+ categorizeWorkbench.innerHTML = this.responseText;
+ evo.tooltips('#categorize-elements [data-tooltip]');
+ evo.draggable('.drag', {
+ handle: {
+ start: function() {
+ this.style.opacity = '.5';
+ this.style.zIndex = 10000;
+ }, end: function() {
+ this.style.opacity = 1;
+ this.style.zIndex = 1000;
+ },
+ }, container: {
+ className: 'drop', classOver: 'over', over: function() {
+ this.classList.add('over');
+ }, leave: function() {
+ this.classList.remove('over');
+ }, drop: function(drag) {
+ this.classList.remove('over');
+ drag.classList.add('ok');
+ },
+ },
+ });
+ }
+ };
+ xhr.send(request_key + '[ajax]=1&' + request_key + '[task]=categorize_load_elements&' + request_key + '[elements]=' + e.target.value);
+};
/**
* Sort Categories
*/
-new Sortables($('categories-sort'), {
- //handles:'span.handle',
- onStart: function(element){
- element.toggleClass('move');
- },
- onComplete: function(element){
- element.toggleClass('move');
- // reorder the indexes
- this.list.getChildren().each(function(element, i){
- element.getElement('input.sort').setProperty( 'value', (i+1) );
- element.getElement('span.sort').setHTML( (i+1) );
- element.getElements('td').each(function(td){
- td.removeClass('gridItem').removeClass('gridAltItem');
- td.addClass( ( i%2===0 ) ? 'gridItem' : 'gridAltItem' );
- });
- });
+evo.sortable('.table-sortable tbody > tr', {
+ complete: function() {
+ let els = document.querySelectorAll('.table-sortable tbody > tr');
+ for (let i = 0; i < els.length; i++) {
+ els[i].querySelector('input.sort').value = i + 1;
+ els[i].querySelector('span.sort').innerHTML = i + 1;
}
+ },
});
-/**
- * Categorization
- */
-var reset_position = function( drag ) {
- drag.setStyles({ left:0+"px", top:0+"px" });
-}
-
-var optDrop = {
- over: function(drag) {
- this.addClass('over');
- drag.addClass('ok');
- },
- leave: function(drag) {
- this.removeClass('over');
- drag.removeClass('ok');
- },
- drop: function(drag) {
- this.removeClass('over');
- drag.injectInside(this);
- reset_position(drag);
- }
-}
-
-var optDrag = {
- onStart: function(drag) {
- drag.setOpacity(.5).setStyle('z-index', 10000);
- },
- onComplete: function(drag) {
- drag.setOpacity(1).setStyle('z-index', 1000);
- reset_position(drag);
- }
-}
-
-var init_drag = function() {
-
- optDrag.droppables = $$('div.drop').addEvents( optDrop );
- $$('div#categorize-workbench div.drag').makeDraggable( optDrag );
- $$('div#categorize-workbench div.drag').each(function(element){ reset_position(element) });
-
- /**
- * Make container uncategorized elements movable.... but for what
-
- if( $('categorize-category-0') !== null ){
- var first_click = true;
- var container_uncategorized = $('categorize-category-0');
- container_uncategorized.getElement('h2').addEvent('click',function(){
- if( first_click === true ) {
- this.getParent().setStyles({
- 'top' : '-50px',
- 'left': '0'
- });
- new Drag.Move(container_uncategorized, {
- handle: container_uncategorized.getElement('h2')
- });
- first_click = false;
- }
- });
- }
-
- */
-}
-
/**
* collect the categorization in formfields
- *
+ *
* @TODO collect them within a object and send by jason-request.
- */
-$('categorize-submit').addEvent('mouseenter',function() {
-
- this.setProperty('disabled','disabled');
- this.setProperty('value','wait...');
-
- $('categorize-formfields').empty();
-
- $$('div.categorize_category').each(function(drop) {
-
- category_id = drop.getProperty('id').split('-')[2];
- category_name = drop.getElement('h2').getText().trim();
- elements = drop.getElements('div.drag');
-
- if( elements.length > 0 ) {
- elements.each(function(element,index) {
- var element_id = element.getProperty('id').split('-')[2];
- var element_name = element.getElement('h4').getText();
- var id_input_element = 'input-element-'+element_id;
- var id_input_element_name = 'input-element-name-'+element_id;
- var id_input_category_name = 'input-category-name-'+element_id;
-
- new Element( 'input', {
- 'type' : 'text',
- 'id' : id_input_element_name,
- 'name' : request_key + '[categorize][elements]['+element_id+'][element_name]',
- 'value': element_name.trim()
- }).injectInside( $('categorize-formfields') );
-
- new Element( 'input', {
- 'type' : 'text',
- 'id' : id_input_element,
- 'name' : request_key + '[categorize][elements]['+element_id+'][category_id]',
- 'value': category_id
- }).injectInside( $('categorize-formfields') );
-
- new Element( 'input', {
- 'type' : 'text',
- 'id' : id_input_category_name,
- 'name' : request_key + '[categorize][elements]['+element_id+'][category_name]',
- 'value': category_name.trim()
- }).injectInside( $('categorize-formfields') );
+ */
+document.getElementById('categorize-submit').addEventListener('mouseenter', function() {
+ this.disabled = 'disabled';
+ this.value = 'wait...';
+ let categorizeFormfields = document.getElementById('categorize-formfields');
+ categorizeFormfields.innerHTML = '';
+
+ [].slice.call(document.querySelectorAll('div.categorize_category')).forEach(function(a) {
+ let category_id = a.id.split('-')[2];
+ let category_name = a.querySelector('h2').innerText.replace(/^\s+|\s+$/g, '');
+ let elements = a.querySelectorAll('div.drag');
+
+ if (elements.length > 0) {
+ elements.forEach(function(element) {
+ let element_id = element.id.split('-')[2];
+ let element_name = element.querySelector('h4').innerText.replace(/^\s+|\s+$/g, '');
+ let id_input_element = 'input-element-' + element_id;
+ let id_input_element_name = 'input-element-name-' + element_id;
+ let id_input_category_name = 'input-category-name-' + element_id;
+
+ let input = document.createElement('input');
+ input.type = 'text';
+ input.id = id_input_element_name;
+ input.name = request_key + '[categorize][elements][' + element_id + '][element_name]';
+ input.value = element_name;
+ categorizeFormfields.appendChild(input);
+
+ input = document.createElement('input');
+ input.type = 'text';
+ input.id = id_input_element;
+ input.name = request_key + '[categorize][elements][' + element_id + '][category_id]';
+ input.value = category_id;
+ categorizeFormfields.appendChild(input);
+
+ input = document.createElement('input');
+ input.type = 'text';
+ input.id = id_input_category_name;
+ input.name = request_key + '[categorize][elements][' + element_id + '][category_name]';
+ input.value = category_name;
+ categorizeFormfields.appendChild(input);
+ });
+ }
+ });
- });
- }
- });
+ this.disabled = '';
+ this.value = 'Save categorization';
- this.removeProperty('disabled');
- this.setProperty('value','Save categorization');
});
-
-//});
diff --git a/manager/actions/category_mgr/skin/main.tpl.phtml b/manager/actions/category_mgr/skin/main.tpl.phtml
index f89f2e7e14..28fb9a8fb5 100644
--- a/manager/actions/category_mgr/skin/main.tpl.phtml
+++ b/manager/actions/category_mgr/skin/main.tpl.phtml
@@ -1,102 +1,89 @@
-
-
-js_output)) : ?>
-
-
+
+js_output)) : ?>
+
+
+
+
- get('name') ?> + get('name') ?>-
-
-
- renderView('chunks/db_setup'); ?>
-
-
- renderView('chunks/messages', $view->getMessages('global')); ?>
-
-
+
+ renderView('chunks/db_setup') ?>
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- txt('cm_add_new_category'); ?>- - renderView('chunks/messages', $view->getMessages('add')); ?> - renderView('add'); ?> -
-
-
- txt('cm_edit_categories'); ?>- - renderView('chunks/messages', $view->getMessages('edit')); ?> - renderView('edit', $data); ?> -
-
-
- txt('cm_sort_categories'); ?>- - renderView('chunks/messages', $view->getMessages('sort')); ?> - renderView('sort', $data); ?> -
-
-
-
-
- new_translations[$view->get('manager_language')] && !empty($view->new_translations[$view->get('manager_language')])) : ?>
-
- txt('cm_categorize_elements'); ?>- - renderView('chunks/messages', $view->getMessages('categorize')); ?> - renderView('categorize', $data); ?> -
-
-
-
-
- txt('Translations'); ?>- - renderView('chunks/messages', $view->getMessages('translate')); ?> - renderView('translate', $view->new_translations[$view->get('manager_language')]); ?> -
+
+
+
+
-
\ No newline at end of file
+
diff --git a/manager/actions/category_mgr/skin/sort.tpl.phtml b/manager/actions/category_mgr/skin/sort.tpl.phtml
index be4fd6bffa..0552acf2cb 100644
--- a/manager/actions/category_mgr/skin/sort.tpl.phtml
+++ b/manager/actions/category_mgr/skin/sort.tpl.phtml
@@ -1,41 +1,39 @@
-
diff --git a/manager/actions/document_data.static.php b/manager/actions/document_data.static.php
index 7173f44f66..130c968dd8 100644
--- a/manager/actions/document_data.static.php
+++ b/manager/actions/document_data.static.php
@@ -96,7 +96,7 @@
// $rowHeaderClass = 'gridHeader';
// $rowRegularClass = 'gridItem';
// $rowAlternateClass = 'gridAltItem';
- $tableClass = 'table data';
+ $tableClass = 'table data nowrap';
$columnHeaderClass = array(
'text-center',
'text-left',
@@ -170,16 +170,9 @@
break;
default:
if($children['isfolder']) {
- $isPrivate = ($children['privateweb'] || $children['privatemgr']) ? '1' : '0';
- $icon = $isPrivate ? $_style['tree_folder_secure'] : $_style['tree_folder_new'];
+ $icon = $_style['tree_folder_new'];
} else {
- if($children['privateweb'] || $children['privatemgr']) {
- if(isset($icons[$children['contentType']])) {
- $icon = $icons[$children['contentType']];
- } else {
- $icon = $_style['tree_page_secure'];
- }
- } elseif(isset($icons[$children['contentType']])) {
+ if(isset($icons[$children['contentType']])) {
$icon = $icons[$children['contentType']];
} else {
$icon = $_style['tree_page'];
@@ -187,15 +180,17 @@
}
}
+ $private = ($children['privateweb'] || $children['privatemgr'] ? ' private' : '');
+
// дописываем в заголовок класс для неопубликованных плюс по всем ссылкам обратный путь
// для сохранения сортировки
$class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish'));
//$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary');
//$class .= ($children['isfolder'] ? ' font-weight-bold' : '');
if($modx->hasPermission('edit_document')) {
- $title = '' . $icon . '' . $children['pagetitle'] . '';
+ $title = '' . $icon . '' . '' . $children['pagetitle'] . '';
} else {
- $title = '' . $icon . '' . $children['pagetitle'] . '';
+ $title = '' . $icon . '' . $children['pagetitle'] . '';
}
$icon_pub_unpub = (!$children['published']) ? '' : '';
@@ -308,47 +303,6 @@ class="' . $_style["icons_move_document"] . '">' . $icon_pub_unpub : '')
renderView('chunks/messages', $view->getMessages('global')) ?>
+
+
+
+
+
+
+
+
+
+
+
+ txt('cm_add_new_category') ?>+ +
+ renderView('chunks/messages', $view->getMessages('add')) ?>
+ renderView('add') ?>
+
+
+
+
+ txt('cm_edit_categories') ?>+ +
+ renderView('chunks/messages', $view->getMessages('edit')) ?>
+ renderView('edit', $data) ?>
+
+
+
+
+ txt('cm_sort_categories') ?>+ +
+ renderView('chunks/messages', $view->getMessages('sort')) ?>
+ renderView('sort', $data) ?>
+
+
+
+
+
+
+ new_translations[$view->get('manager_language')] && !empty($view->new_translations[$view->get('manager_language')])) : ?>
+
+ txt('cm_categorize_elements') ?>+ +
+ renderView('chunks/messages', $view->getMessages('categorize')) ?>
+ renderView('categorize', $data) ?>
+
+
+
+
+
+
+ txt('Translations') ?>+ +
+ renderView('chunks/messages', $view->getMessages('translate')) ?>
+ renderView('translate', $view->new_translations[$view->get('manager_language')]) ?>
+
+ | : | " . $_lang['not_set'] . ")" ?> | ||||||||||||
| : | -" . $_lang['not_set'] . ")"; - } - ?> | -||||||||||||||||
| : | -', $metatags_selected); - } else { - echo "(" . $_lang['not_set'] . ")"; - } - ?> | -||||||||||||||||
| - | - | - | - | ' . $_lang['files_directory_is_empty'] . ' | '; - } - ?> -
|---|
-
-
- - ' . $folders . ' '; - echo $_lang['files_files'] . ': ' . $files . ' '; - echo $_lang['files_data'] . ': ' . $modx->nicesize($filesizes) . ' '; - echo $_lang['files_dirwritable'] . ' ' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.' - ?> -
- - - - - " . $_lang['files_upload_inhibited_msg'] . ""; - } - ?> - -+ +
+ +
+
+
+
+
+
+ ">
+
+
+ [+subject+]';
+ $ph['image'] = $_style['files_folder-open'];
+ $ph['subject'] = $_lang['add_folder'];
+ $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name=';
+ $_ = parsePlaceholder($tpl, $ph);
+
+ $tpl = '' . $_lang['files.dynamic.php1'] . '';
+ $ph['image'] = $_style['files_page_html'];
+ $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=';
+ $_ .= parsePlaceholder($tpl, $ph);
+ echo $_;
+ }
+ ?>
+
+ ">
+
+
+
+
+ webAlertAndQuit($_lang["files_access_denied"]);
+ }
+
+ // Unzip .zip files - by Raymond
+ if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) {
+ if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) {
+ echo '' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '
'; + } else { + echo '' . $_lang['file_unzip'] . '
'; + } + } + // End Unzip - Raymond + + + // New Folder & Delete Folder option - Raymond + if (is_writable($startpath)) { + // Delete Folder + if ($_REQUEST['mode'] == 'deletefolder') { + $folder = $_REQUEST['folderpath']; + if (!$token_check || !@rrmdir($folder)) { + echo '' . $_lang['file_folder_not_deleted'] . '
'; + } else { + echo '' . $_lang['file_folder_deleted'] . '
'; + } + } + + // Create folder here + if ($_REQUEST['mode'] == 'newfolder') { + $old_umask = umask(0); + $foldername = str_replace('..\\', '', str_replace('../', '', $_REQUEST['name'])); + if (!mkdirs("{$startpath}/{$foldername}", 0777)) { + echo '', $_lang['file_folder_not_created'], '
'; + } else { + if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) { + echo '' . $_lang['file_folder_chmod_error'] . '
'; + } else { + echo '' . $_lang['file_folder_created'] . '
'; + } + } + umask($old_umask); + } + // Create file here + if ($_REQUEST['mode'] == 'newfile') { + $old_umask = umask(0); + $filename = str_replace('..\\', '', str_replace('../', '', $_REQUEST['name'])); + $filename = $modx->db->escape($filename); + + if (!checkExtension($filename)) { + echo '' . $_lang['files_filetype_notok'] . '
'; + } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) { + echo $_lang['files.dynamic.php3']; + } else { + $rs = file_put_contents("{$startpath}/{$filename}", ''); + if ($rs === false) { + echo '', $_lang['file_folder_not_created'], '
'; + } else { + echo $_lang['files.dynamic.php4']; + } + umask($old_umask); + } + } + // Duplicate file here + if ($_REQUEST['mode'] == 'duplicate') { + $old_umask = umask(0); + $filename = $_REQUEST['path']; + $filename = $modx->db->escape($filename); + $newFilename = str_replace('..\\', '', str_replace('../', '', $_REQUEST['newFilename'])); + $newFilename = $modx->db->escape($newFilename); + + if (!checkExtension($newFilename)) { + echo '' . $_lang['files_filetype_notok'] . '
'; + } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { + echo $_lang['files.dynamic.php3']; + } else { + if (!copy($filename, MODX_BASE_PATH . $newFilename)) { + echo $_lang['files.dynamic.php5']; + } + umask($old_umask); + } + } + // Rename folder here + if ($_REQUEST['mode'] == 'renameFolder') { + $old_umask = umask(0); + $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname']; + $dirname = $modx->db->escape($dirname); + $newDirname = str_replace(array( + '..\\', + '../', + '\\', + '/' + ), '', $_REQUEST['newDirname']); + $newDirname = $modx->db->escape($newDirname); + + if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) { + echo $_lang['files.dynamic.php3']; + } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) { + echo '', $_lang['file_folder_not_created'], '
'; + } + umask($old_umask); + } + // Rename file here + if ($_REQUEST['mode'] == 'renameFile') { + $old_umask = umask(0); + $path = dirname($_REQUEST['path']); + $filename = $_REQUEST['path']; + $filename = $modx->db->escape($filename); + $newFilename = str_replace(array( + '..\\', + '../', + '\\', + '/' + ), '', $_REQUEST['newFilename']); + $newFilename = $modx->db->escape($newFilename); + + if (!checkExtension($newFilename)) { + echo '' . $_lang['files_filetype_notok'] . '
'; + } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { + echo $_lang['files.dynamic.php3']; + } else { + if (!rename($filename, $path . '/' . $newFilename)) { + echo $_lang['files.dynamic.php5']; + } + umask($old_umask); + } + } + } + // End New Folder - Raymond + + $filesize = 0; + $files = 0; + $folders = 0; + $dirs_array = array(); + $files_array = array(); + if (strlen(MODX_BASE_PATH) < strlen($filemanager_path)) { + $len--; + } + + ?> +
-
- '; + } else { + echo '' . $_lang['file_unzip'] . '
'; + } + } + // End Unzip - Raymond + + + // New Folder & Delete Folder option - Raymond + if (is_writable($startpath)) { + // Delete Folder + if ($_REQUEST['mode'] == 'deletefolder') { + $folder = $_REQUEST['folderpath']; + if (!$token_check || !@rrmdir($folder)) { + echo '' . $_lang['file_folder_not_deleted'] . '
'; + } else { + echo '' . $_lang['file_folder_deleted'] . '
'; + } + } + + // Create folder here + if ($_REQUEST['mode'] == 'newfolder') { + $old_umask = umask(0); + $foldername = str_replace('..\\', '', str_replace('../', '', $_REQUEST['name'])); + if (!mkdirs("{$startpath}/{$foldername}", 0777)) { + echo '', $_lang['file_folder_not_created'], '
'; + } else { + if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) { + echo '' . $_lang['file_folder_chmod_error'] . '
'; + } else { + echo '' . $_lang['file_folder_created'] . '
'; + } + } + umask($old_umask); + } + // Create file here + if ($_REQUEST['mode'] == 'newfile') { + $old_umask = umask(0); + $filename = str_replace('..\\', '', str_replace('../', '', $_REQUEST['name'])); + $filename = $modx->db->escape($filename); + + if (!checkExtension($filename)) { + echo '' . $_lang['files_filetype_notok'] . '
'; + } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) { + echo $_lang['files.dynamic.php3']; + } else { + $rs = file_put_contents("{$startpath}/{$filename}", ''); + if ($rs === false) { + echo '', $_lang['file_folder_not_created'], '
'; + } else { + echo $_lang['files.dynamic.php4']; + } + umask($old_umask); + } + } + // Duplicate file here + if ($_REQUEST['mode'] == 'duplicate') { + $old_umask = umask(0); + $filename = $_REQUEST['path']; + $filename = $modx->db->escape($filename); + $newFilename = str_replace('..\\', '', str_replace('../', '', $_REQUEST['newFilename'])); + $newFilename = $modx->db->escape($newFilename); + + if (!checkExtension($newFilename)) { + echo '' . $_lang['files_filetype_notok'] . '
'; + } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { + echo $_lang['files.dynamic.php3']; + } else { + if (!copy($filename, MODX_BASE_PATH . $newFilename)) { + echo $_lang['files.dynamic.php5']; + } + umask($old_umask); + } + } + // Rename folder here + if ($_REQUEST['mode'] == 'renameFolder') { + $old_umask = umask(0); + $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname']; + $dirname = $modx->db->escape($dirname); + $newDirname = str_replace(array( + '..\\', + '../', + '\\', + '/' + ), '', $_REQUEST['newDirname']); + $newDirname = $modx->db->escape($newDirname); + + if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) { + echo $_lang['files.dynamic.php3']; + } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) { + echo '', $_lang['file_folder_not_created'], '
'; + } + umask($old_umask); + } + // Rename file here + if ($_REQUEST['mode'] == 'renameFile') { + $old_umask = umask(0); + $path = dirname($_REQUEST['path']); + $filename = $_REQUEST['path']; + $filename = $modx->db->escape($filename); + $newFilename = str_replace(array( + '..\\', + '../', + '\\', + '/' + ), '', $_REQUEST['newFilename']); + $newFilename = $modx->db->escape($newFilename); + + if (!checkExtension($newFilename)) { + echo '' . $_lang['files_filetype_notok'] . '
'; + } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { + echo $_lang['files.dynamic.php3']; + } else { + if (!rename($filename, $path . '/' . $newFilename)) { + echo $_lang['files.dynamic.php5']; + } + umask($old_umask); + } + } + } + // End New Folder - Raymond + + $filesize = 0; + $files = 0; + $folders = 0; + $dirs_array = array(); + $files_array = array(); + if (strlen(MODX_BASE_PATH) < strlen($filemanager_path)) { + $len--; + } + + ?> +
+
+
+
+
+
+ | + | + | + | + | ' . $_lang['files_directory_is_empty'] . ' | '; + } + ?> +
|---|
+
+
+ + ' . $folders . ' '; + echo $_lang['files_files'] . ': ' . $files . ' '; + echo $_lang['files_data'] . ': ' . $modx->nicesize($filesizes) . ' '; + echo $_lang['files_dirwritable'] . ' ' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.' + ?> +
+ + + + + " . $_lang['files_upload_inhibited_msg'] . ""; + } + ?> + +
-
- webAlertAndQuit("Error opening file for reading.");
- }
- ?>
-
-
- invokeEvent('OnRichTextEditorInit', array(
- 'editor' => 'Codemirror',
- 'elements' => array(
- 'content',
- ),
- 'contentType' => $contentType,
- 'readOnly' => $_REQUEST['mode'] == 'edit' ? false : true
- ));
- if(is_array($evtOut)) {
- echo implode('', $evtOut);
- }
-
-}
-
-function determineIcon($file, $selFile, $mode) {
- $icons = array(
- 'default' => 'fa fa-file-o',
- 'edit' => 'fa fa-pencil-square-o',
- 'view' => 'fa fa-eye'
- );
- $icon = $icons['default'];
- if($file == $selFile) {
- $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
- }
- return '';
-}
-
-function markRow($file, $selFile, $mode) {
- $classNames = array(
- 'default' => '',
- 'edit' => 'editRow',
- 'view' => 'viewRow'
- );
- if($file == $selFile) {
- $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
- return ' class="' . $class . '"';
- }
- return '';
-}
-
-function ls($curpath) {
- global $_lang, $theme_image_path, $_style;
- global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
- $dircounter = 0;
- $filecounter = 0;
- $curpath = str_replace('//', '/', $curpath . '/');
-
- if(!is_dir($curpath)) {
- echo 'Invalid path "', $curpath, '"'; - return; - } - $dir = scandir($curpath); - - // first, get info - foreach($dir as $file) { - $newpath = $curpath . $file; - if($file === '..' || $file === '.') { - continue; - } - if(is_dir($newpath)) { - $dirs_array[$dircounter]['dir'] = $newpath; - $dirs_array[$dircounter]['stats'] = lstat($newpath); - if($file === '..' || $file === '.') { - continue; - } elseif(!in_array($file, $excludes) && !in_array($newpath, $protected_path)) { - $dirs_array[$dircounter]['text'] = ' ' . $file . ''; - - $dfiles = scandir($newpath); - foreach($dfiles as $i => $infile) { - switch($infile) { - case '..': - case '.': - unset($dfiles[$i]); - break; - } - } - $file_exists = (0 < count($dfiles)) ? 'file_exists' : ''; - - $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; - } else { - $dirs_array[$dircounter]['text'] = ' ' . $file . ''; - $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; - } - - $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? ' ' : ''; - - // increment the counter - $dircounter++; - } else { - $type = getExtension($newpath); - $files_array[$filecounter]['file'] = $newpath; - $files_array[$filecounter]['stats'] = lstat($newpath); - $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' '. $file; - $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '' : ''); - $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; - $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '' : ''; - $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; - $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; - $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; - $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '' : ''; - - // increment the counter - $filecounter++; - } - } - - // dump array entries for directories - $folders = count($dirs_array); - sort($dirs_array); // sorting the array alphabetically (Thanks pxl8r!) - for($i = 0; $i < $folders; $i++) { - $filesizes += $dirs_array[$i]['stats']['7']; - echo '
+
+ webAlertAndQuit("Error opening file for reading.");
+ }
+ ?>
+
+
+ invokeEvent('OnRichTextEditorInit', array(
+ 'editor' => 'Codemirror',
+ 'elements' => array(
+ 'content',
+ ),
+ 'contentType' => $contentType,
+ 'readOnly' => $_REQUEST['mode'] == 'edit' ? false : true
+ ));
+ if (is_array($evtOut)) {
+ echo implode('', $evtOut);
+ }
+
+}
+
+function determineIcon($file, $selFile, $mode)
+{
+ $icons = array(
+ 'default' => 'fa fa-file-o',
+ 'edit' => 'fa fa-pencil-square-o',
+ 'view' => 'fa fa-eye'
+ );
+ $icon = $icons['default'];
+ if ($file == $selFile) {
+ $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default'];
+ }
+ return '';
+}
+
+function markRow($file, $selFile, $mode)
+{
+ $classNames = array(
+ 'default' => '',
+ 'edit' => 'editRow',
+ 'view' => 'viewRow'
+ );
+ if ($file == $selFile) {
+ $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default'];
+ return ' class="' . $class . '"';
+ }
+ return '';
+}
+
+function ls($curpath)
+{
+ global $_lang, $theme_image_path, $_style;
+ global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx;
+ $dircounter = 0;
+ $filecounter = 0;
+ $curpath = str_replace('//', '/', $curpath . '/');
+
+ if (!is_dir($curpath)) {
+ echo 'Invalid path "', $curpath, '"'; + return; + } + $dir = scandir($curpath); + + // first, get info + foreach ($dir as $file) { + $newpath = $curpath . $file; + if ($file === '..' || $file === '.') { + continue; + } + if (is_dir($newpath)) { + $dirs_array[$dircounter]['dir'] = $newpath; + $dirs_array[$dircounter]['stats'] = lstat($newpath); + if ($file === '..' || $file === '.') { + continue; + } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) { + $dirs_array[$dircounter]['text'] = ' ' . $file . ''; + + $dfiles = scandir($newpath); + foreach ($dfiles as $i => $infile) { + switch ($infile) { + case '..': + case '.': + unset($dfiles[$i]); + break; + } + } + $file_exists = (0 < count($dfiles)) ? 'file_exists' : ''; + + $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; + } else { + $dirs_array[$dircounter]['text'] = ' ' . $file . ''; + $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '' : ''; + } + + $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? ' ' : ''; + + // increment the counter + $dircounter++; + } else { + $type = getExtension($newpath); + $files_array[$filecounter]['file'] = $newpath; + $files_array[$filecounter]['stats'] = lstat($newpath); + $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' ' . $file; + $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '' : ''); + $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '' : $files_array[$filecounter]['view']; + $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '' : ''; + $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '' : ''; + $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '' : ''; + + // increment the counter + $filecounter++; + } + } + + // dump array entries for directories + $folders = count($dirs_array); + sort($dirs_array); // sorting the array alphabetically (Thanks pxl8r!) + for ($i = 0; $i < $folders; $i++) { + $filesizes += $dirs_array[$i]['stats']['7']; + echo '
" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '
'; - } - - $userfilename = $userfile['tmp_name']; - - if(is_uploaded_file($userfilename)) { - // file is uploaded file, process it! - if(!checkExtension($userfile['name'])) { - $msg .= '' . $_lang['files_filetype_notok'] . '
'; - } else { - if(@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) { - // Ryan: Repair broken permissions issue with file manager - if(strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions); - } - // Ryan: End - $msg .= '' . $_lang['files_upload_ok'] . '
'; - - // invoke OnFileManagerUpload event - $modx->invokeEvent('OnFileManagerUpload', array( - 'filepath' => $_POST['path'], - 'filename' => $userfile['name'] - )); - // Log the change - logFileChange('upload', $_POST['path'] . '/' . $userfile['name']); - } else { - $msg .= '
' . $_lang['files_upload_copyfailed'] . ' ' . $_lang["files_upload_permissions_error"] . '
'; - } - } - } else { - $msg .= '' . $_lang['files_upload_error'] . ':'; - switch($userfile['error']) { - case 0: //no error; possible file attack! - $msg .= $_lang['files_upload_error0']; - break; - case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini - $msg .= $_lang['files_upload_error1']; - break; - case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form - $msg .= $_lang['files_upload_error2']; - break; - case 3: //uploaded file was only partially uploaded - $msg .= $_lang['files_upload_error3']; - break; - case 4: //no file was uploaded - $msg .= $_lang['files_upload_error4']; - break; - default: //a default error, just in case! :) - $msg .= $_lang['files_upload_error5']; - break; - } - $msg .= '
'; - } - } - } - return $msg . '
'; -} - -function textsave() { - global $_lang; - - $msg = $_lang['editing_file']; - $filename = $_POST['path']; - $content = $_POST['content']; - - // Write $content to our opened file. - if(file_put_contents($filename, $content) === FALSE) { - $msg .= '' . $_lang['file_not_saved'] . '
'; - } else { - $msg .= '' . $_lang['file_saved'] . '
'; - $_REQUEST['mode'] = 'edit'; - } - // Log the change - logFileChange('modify', $filename); - return $msg; -} - -function delete_file() { - global $_lang, $token_check; - - $msg = sprintf($_lang['deleting_file'], str_replace('\\', '/', $_REQUEST['path'])); - - $file = $_REQUEST['path']; - if(!$token_check || !@unlink($file)) { - $msg .= '' . $_lang['file_not_deleted'] . '
'; - } else { - $msg .= '' . $_lang['file_deleted'] . '
'; - } - - // Log the change - logFileChange('delete', $file); - - return $msg; -} - -function parsePlaceholder($tpl, $ph) { - foreach($ph as $k => $v) { - $k = "[+{$k}+]"; - $tpl = str_replace($k, $v, $tpl); - } - return $tpl; -} - -function checkToken() { - if(isset($_POST['token']) && !empty($_POST['token'])) { - $token = $_POST['token']; - } elseif(isset($_GET['token']) && !empty($_GET['token'])) { - $token = $_GET['token']; - } else { - $token = false; - } - - if(isset($_SESSION['token']) && !empty($_SESSION['token']) && $_SESSION['token'] === $token) { - $rs = true; - } else { - $rs = false; - } - $_SESSION['token'] = ''; - return $rs; -} - -function makeToken() { - $newToken = uniqid(''); - $_SESSION['token'] = $newToken; - return $newToken; +function unzip($file, $path) +{ + global $newfolderaccessmode, $token_check; + + if (!$token_check) { + return false; + } + + // added by Raymond + if (!extension_loaded('zip')) { + return 0; + } + // end mod + $zip = zip_open($file); + if ($zip) { + $old_umask = umask(0); + $path = rtrim($path, '/') . '/'; + while ($zip_entry = zip_read($zip)) { + if (zip_entry_filesize($zip_entry) > 0) { + // str_replace must be used under windows to convert "/" into "\" + $zip_entry_name = zip_entry_name($zip_entry); + $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name)); + $complete_name = $path . str_replace('\\', '/', $zip_entry_name); + if (!file_exists($complete_path)) { + $tmp = ''; + foreach (explode('/', $complete_path) AS $k) { + $tmp .= $k . '/'; + if (!is_dir($tmp)) { + mkdir($tmp, 0777); + } + } + } + if (zip_entry_open($zip, $zip_entry, 'r')) { + file_put_contents($complete_name, zip_entry_read($zip_entry, zip_entry_filesize($zip_entry))); + zip_entry_close($zip_entry); + } + } + } + umask($old_umask); + zip_close($zip); + return true; + } + zip_close($zip); +} + +function rrmdir($dir) +{ + foreach (glob($dir . '/*') as $file) { + if (is_dir($file)) { + rrmdir($file); + } else { + unlink($file); + } + } + return rmdir($dir); +} + +function fileupload() +{ + global $modx, $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions; + $msg = ''; + + foreach ($_FILES['userfile']['name'] as $i => $name) { + if (!empty($_FILES['userfile']['tmp_name'][$i])) { + $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i]; + $userfile['error'] = $_FILES['userfile']['error'][$i]; + $name = $_FILES['userfile']['name'][$i]; + if ($modx->config['clean_uploaded_filename'] == 1) { + $nameparts = explode('.', $name); + $nameparts = array_map(array( + $modx, + 'stripAlias' + ), $nameparts, array('file_manager')); + $name = implode('.', $nameparts); + } + $userfile['name'] = $name; + $userfile['type'] = $_FILES['userfile']['type'][$i]; + + // this seems to be an upload action. + $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath)); + $path = rtrim($path, '/') . '/' . $userfile['name']; + $msg .= $path; + if ($userfile['error'] == 0) { + $img = (strpos($userfile['type'], 'image') !== false) ? '
" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '
'; + } + + $userfilename = $userfile['tmp_name']; + + if (is_uploaded_file($userfilename)) { + // file is uploaded file, process it! + if (!checkExtension($userfile['name'])) { + $msg .= '' . $_lang['files_filetype_notok'] . '
'; + } else { + if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) { + // Ryan: Repair broken permissions issue with file manager + if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { + @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions); + } + // Ryan: End + $msg .= '' . $_lang['files_upload_ok'] . '
'; + + // invoke OnFileManagerUpload event + $modx->invokeEvent('OnFileManagerUpload', array( + 'filepath' => $_POST['path'], + 'filename' => $userfile['name'] + )); + // Log the change + logFileChange('upload', $_POST['path'] . '/' . $userfile['name']); + } else { + $msg .= '
' . $_lang['files_upload_copyfailed'] . ' ' . $_lang["files_upload_permissions_error"] . '
'; + } + } + } else { + $msg .= '' . $_lang['files_upload_error'] . ':'; + switch ($userfile['error']) { + case 0: //no error; possible file attack! + $msg .= $_lang['files_upload_error0']; + break; + case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini + $msg .= $_lang['files_upload_error1']; + break; + case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form + $msg .= $_lang['files_upload_error2']; + break; + case 3: //uploaded file was only partially uploaded + $msg .= $_lang['files_upload_error3']; + break; + case 4: //no file was uploaded + $msg .= $_lang['files_upload_error4']; + break; + default: //a default error, just in case! :) + $msg .= $_lang['files_upload_error5']; + break; + } + $msg .= '
'; + } + } + } + return $msg . '
'; +} + +function textsave() +{ + global $_lang; + + $msg = $_lang['editing_file']; + $filename = $_POST['path']; + $content = $_POST['content']; + + // Write $content to our opened file. + if (file_put_contents($filename, $content) === false) { + $msg .= '' . $_lang['file_not_saved'] . '
'; + } else { + $msg .= '' . $_lang['file_saved'] . '
'; + $_REQUEST['mode'] = 'edit'; + } + // Log the change + logFileChange('modify', $filename); + return $msg; +} + +function delete_file() +{ + global $_lang, $token_check; + + $msg = sprintf($_lang['deleting_file'], str_replace('\\', '/', $_REQUEST['path'])); + + $file = $_REQUEST['path']; + if (!$token_check || !@unlink($file)) { + $msg .= '' . $_lang['file_not_deleted'] . '
'; + } else { + $msg .= '' . $_lang['file_deleted'] . '
'; + } + + // Log the change + logFileChange('delete', $file); + + return $msg; +} + +function parsePlaceholder($tpl, $ph) +{ + foreach ($ph as $k => $v) { + $k = "[+{$k}+]"; + $tpl = str_replace($k, $v, $tpl); + } + return $tpl; +} + +function checkToken() +{ + if (isset($_POST['token']) && !empty($_POST['token'])) { + $token = $_POST['token']; + } elseif (isset($_GET['token']) && !empty($_GET['token'])) { + $token = $_GET['token']; + } else { + $token = false; + } + + if (isset($_SESSION['token']) && !empty($_SESSION['token']) && $_SESSION['token'] === $token) { + $rs = true; + } else { + $rs = false; + } + $_SESSION['token'] = ''; + return $rs; +} + +function makeToken() +{ + $newToken = uniqid(''); + $_SESSION['token'] = $newToken; + return $newToken; } diff --git a/manager/actions/help.static.php b/manager/actions/help.static.php index 48b1df1ca4..36ffc4100f 100644 --- a/manager/actions/help.static.php +++ b/manager/actions/help.static.php @@ -2,7 +2,7 @@ if(IN_MANAGER_MODE != "true") { die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -$helpBasePath = MODX_BASE_PATH . "assets/templates/help/"; +$helpBasePath = "actions/help/"; ?>
@@ -16,7 +16,7 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+$logo= '
';
+$downloadLinks = array(
+ 0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
+ 1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
+ 2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+ 3=>array('title'=>$_lang["extras"],'link'=>array(
+ 'http://extras.evolution-cms.com/',
+ 'https://github.com/extras-evolution'
+ )),
+);
+
+$translationLinks = array(
+ 0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+ 1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+);
+
+function createList($sectionHeader, $linkArr) {
+ $output = ''.$sectionHeader.''."\n";
+ $output .= ''."\n";
+ $links = '';
+ foreach($linkArr as $row) {
+ if (!is_array($row['link'])) $row['link'] = array($row['link']);
+ foreach ($row['link'] as $link) {
+ $links .= $links != '' ? '
' : '';
+ $links .= '' . $link . '';
+ }
+ $output .= '
+
+ ' . $row["title"] . '
+ ' . $links . '
+ ';
+ $links = '';
+ }
+ $output .= '
'."\n";
+ return $output;
+}
+echo $logo;
+echo createList($_lang['evo_downloads_title'], $downloadLinks);
+echo createList($_lang['help_translating_title'], $translationLinks);
+
+?>
+
+
+
+
+
+
+
+
diff --git a/assets/templates/help/01Documentation.php b/manager/actions/help/02Documentation.php
similarity index 59%
rename from assets/templates/help/01Documentation.php
rename to manager/actions/help/02Documentation.php
index 1e2bc8be04..365faec89f 100644
--- a/assets/templates/help/01Documentation.php
+++ b/manager/actions/help/02Documentation.php
@@ -4,13 +4,12 @@
- What is MODX? Official 1.0 documentation MODX.com Home of MODX MODX Forums General support & discussions What is EVO? Official EVO documentation evo.im Home of EVO EVO Forums General support & discussions docs.evolution-cms.com Google Translate Further documentation API Reference Google Translate Further documentation MODX.im Google Translate MODX by community MODX.com.ua Google Translate Further documentation MODX.im Google Translate Russian community
diff --git a/assets/templates/help/02Version_Notices.php b/manager/actions/help/03Version_Notices.php
similarity index 58%
rename from assets/templates/help/02Version_Notices.php
rename to manager/actions/help/03Version_Notices.php
index b5ed1d9433..07dc4f1576 100644
--- a/assets/templates/help/02Version_Notices.php
+++ b/manager/actions/help/03Version_Notices.php
@@ -1,9 +1,9 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
- if ($handle = opendir(MODX_BASE_PATH . 'assets/templates/help/version_notices')) {
+ if ($handle = opendir('actions/help/version_notices')) {
while (false !== ($file = readdir($handle))) {
- if ($file != "." && $file != ".." && $file != ".svn" && is_readable(MODX_BASE_PATH . "assets/templates/help/version_notices/{$file}")) {
+ if ($file != "." && $file != ".." && $file != ".svn" && is_readable("actions/help/version_notices/{$file}")) {
$notices[] = str_replace('.php', '', $file);
}
}
@@ -14,8 +14,15 @@
$notices = array_reverse($notices);
foreach($notices as $v) {
- echo 'MODX v'.$v.'';
- include(MODX_BASE_PATH . "assets/templates/help/version_notices/{$v}.php");
+ if ($v >= '1.3.0') {
+ $cms = 'EVO';
+ }
+ else {
+ $cms = 'MODX EVO';
+ }
+ echo ' '.$cms.' '.$v.'';
+ include("actions/help/version_notices/{$v}.php");
echo '
';
+
}
?>
\ No newline at end of file
diff --git a/assets/templates/help/03Changelog.php b/manager/actions/help/04Changelog.php
similarity index 100%
rename from assets/templates/help/03Changelog.php
rename to manager/actions/help/04Changelog.php
diff --git a/manager/actions/help/version_notices/1.1.1.php b/manager/actions/help/version_notices/1.1.1.php
new file mode 100644
index 0000000000..aa9868f421
--- /dev/null
+++ b/manager/actions/help/version_notices/1.1.1.php
@@ -0,0 +1,89 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+Resource-Tree
+
+ - Moved "Sort menuindex" from DocManager to Resource-tree (#618, #636)
+
Sort Resources in Root: Click Button "Sort menu index" on top of resource-tree
+ Sort Resources of Parent Resource: Right mouse-click on parent, then choose "Sort menu index"
+
+
+ - New "Manage Elements" Buttons (#669)
+
You can quick-access elements, files and images now directly from ressource-tree. Use Shift-Mouseclick to open multiple windows/elements.
+
+ - Remember last sort-options (#618, #636)
+
The ressource-tree stores now the last set sort-options per user to database (Sort by, Asc/Desc, Display-Name). At manager log-in, last settings of each user get restored.
+
+
+
+MODX Tags
+
+ - New Modifiers/Filters in Core (PHx)
+
Can be disabled in MODX-configuration. More infos at #623
+
+ - Snippet - Shortcut param = true
+
[[snippetName?param1¶m2]] will automatically be handled as [[snippetName?param1=`1`¶m2=`1`]] while param=`` will still be handled as empty value.
+
+ - New Conditional Tags / Modifiers
+
Can be enabled/disabled via Configuration -> "Enable Filters". More examples at #622 and #623. Example:
+ [*longtitle:ifempty=[*pagetitle*]*]
+ <!--@IF:[*id:is('[(site_start)]')*]>
+Top page
+<@ELSE>
+Sub page
+<@ENDIF-->
+
+
+ - New Comment Tag
+
Comment-Tags will be completely removed from output. More infos at #680. Example:
+ <!--@- This is a comment -@-->
+ <!--@- Or HTML-Code / Snippets etc you want to disable temporarily -@-->
+
+
+ - New Chunk Parameters
+
It is possible to pass properties/values to a chunk. More infos at #625. Example:
+ Chunk:
+
+<h1>[+title+]</h1>
+<p>[+body+]</p>
+ Call:
+ {{chunkName? &title='First post' &body='Hello World!'}}
+
+
+ - File-binded Templates via @INCLUDE
+
Templates can be included via @INCLUDE using external PHP- & HTML-files. More infos at #627. Example:
+ MODX-Template:
+ @INCLUDE:assets/templates/mydesign/template.inc.php
+ template.inc.php :
+ switch($modx->documentIdentifier) {
+ case $modx->config['site_start']:
+ return file_get_contents('assets/templates/mydesign/top.html');
+ default:
+ return file_get_contents('assets/templates/mydesign/page.html');
+}
+
+
+
+New Manager Roles
+
+ - change_resourcetype
+
A user with this permission can change resource-type (webpage/weblink). More infos at #531
+
+ - assets_images, assets_files
+
Controls the display of 2 new buttons in resource-tree and grants/blocks access to KCFinder. More infos at #681
+
+
+
+Template-Variables
+
+ - @BINDINGS providing TV-values
+
[*tv_name*] will be replaced by its value taken from actual resource. Beware of SQL-Errors in case no or wrong value is given (set a reasonable default-value to avoid errors). More infos at #699. Example:
+ @SELECT name,value FROM xxx WHERE yyy = [*tv_name*]
+
+
+
+Important Details for Developers
+
+ - jQuery updated to v3.1 and loaded into manager by default.
Known issues: MultiTV 2.0.8 has problems with row-reordering and requires an update.
+
\ No newline at end of file
diff --git a/assets/templates/help/version_notices/1.1.php b/manager/actions/help/version_notices/1.1.php
similarity index 100%
rename from assets/templates/help/version_notices/1.1.php
rename to manager/actions/help/version_notices/1.1.php
diff --git a/assets/templates/help/version_notices/1.2.1.php b/manager/actions/help/version_notices/1.2.1.php
similarity index 100%
rename from assets/templates/help/version_notices/1.2.1.php
rename to manager/actions/help/version_notices/1.2.1.php
diff --git a/assets/templates/help/version_notices/1.2.2.php b/manager/actions/help/version_notices/1.2.2.php
similarity index 100%
rename from assets/templates/help/version_notices/1.2.2.php
rename to manager/actions/help/version_notices/1.2.2.php
diff --git a/assets/templates/help/version_notices/1.2.php b/manager/actions/help/version_notices/1.2.php
similarity index 100%
rename from assets/templates/help/version_notices/1.2.php
rename to manager/actions/help/version_notices/1.2.php
diff --git a/manager/actions/help/version_notices/1.3.0.php b/manager/actions/help/version_notices/1.3.0.php
new file mode 100644
index 0000000000..feb4066f3a
--- /dev/null
+++ b/manager/actions/help/version_notices/1.3.0.php
@@ -0,0 +1,45 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+EVOLUTION CMS 1.3.0
+
+ - The new release of EVO 1.3.0 runs under the name EVOLUTION CMS
+
Now updates will be released more often. About once a month there will be a fresh release instead of 1 release at half a year..
+
+
+
+What's new in 1.3.0:
+
+ - New name and logo
+
+ - New admin panel theme with a lot of innovations
+
+ - Correction of errors and stability
+
+ - Widgets for the main page (OnManagerWelcomeHome)
+
+ - Change the top menu (OnManagerMenuPrerender)
+
+ - Document tree changes (OnManagerNodePrerender)
+
+
+The New admin panel theme
+
+ - Drag & drop in the document tree
+
+ - Dark style, quickly switching the appearance of the admin system
+
+ - Easier and faster
+
+ - Context menu for elements
+
+ - Ajax search in the admin area
+
+ - Remembering paths in admin panel
+
+ - 3 Level menu items with search and the ability to create a new item
+
+ - Support for mobile devices, although there is still some work in progress
+
+
\ No newline at end of file
diff --git a/manager/actions/help/version_notices/1.3.1.php b/manager/actions/help/version_notices/1.3.1.php
new file mode 100644
index 0000000000..cb5767676a
--- /dev/null
+++ b/manager/actions/help/version_notices/1.3.1.php
@@ -0,0 +1,8 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+
+ - fix minor issues
+
+
diff --git a/manager/actions/help/version_notices/1.3.2.php b/manager/actions/help/version_notices/1.3.2.php
new file mode 100644
index 0000000000..cb5767676a
--- /dev/null
+++ b/manager/actions/help/version_notices/1.3.2.php
@@ -0,0 +1,8 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+
+ - fix minor issues
+
+
diff --git a/manager/actions/help/version_notices/1.3.3.php b/manager/actions/help/version_notices/1.3.3.php
new file mode 100644
index 0000000000..cb5767676a
--- /dev/null
+++ b/manager/actions/help/version_notices/1.3.3.php
@@ -0,0 +1,8 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+
+ - fix minor issues
+
+
diff --git a/manager/actions/help/version_notices/1.3.4.php b/manager/actions/help/version_notices/1.3.4.php
new file mode 100644
index 0000000000..b1e44713ac
--- /dev/null
+++ b/manager/actions/help/version_notices/1.3.4.php
@@ -0,0 +1,20 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+
+ - update FormLister to 1.7.8 (dmi3yy)
+ - update DocLister to 1.3.11 (dmi3yy)
+ - @FILE for chunks - {{@FILE:assets/chunks/header.html}}
+ - remove mootols from manage category
+ - added disable/enable snippets and chuncks #126
+ - Depricated keywords and metatags (not used by default from 1.0.8 version) use TV for this.
+ - new settings for group TVs (http://take.ms/OmFYb)
+ - add header("X-XSS-Protection: 0"); for correct work filamanager.
+ - Add DLSitemap and DLMenu snippets
+ - Remove DLBuildMenu
+ - Refactor manager search and fix permision for this
+ - remove etomite "compatibility"
+ - New - $modx->config['enable_cache']
+ - New - [*value:makeUrl*] modifier
+
diff --git a/manager/actions/help/version_notices/1.3.5.php b/manager/actions/help/version_notices/1.3.5.php
new file mode 100644
index 0000000000..96e7b0659e
--- /dev/null
+++ b/manager/actions/help/version_notices/1.3.5.php
@@ -0,0 +1,17 @@
+INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+?>
+
+
+ - ElementsInTree restyled for new theme, version 1.5.8 (Piotr Matysiak)
+ - Fix - <@IF><@ELSEIF><@ELSE><@ENDIF> (yamamoto)
+ - Fix Bugs in Ditto with date and placeholders from version 1.3.4 (yamamoto, Dmi3yy)
+ - Fix tinymce params underfined bug on frontend (dmi3yy)
+ - Fix 65 Plugin parameters are lost after update to the new version (dmi3yy)
+ - no need update.php in extras module (dmi3yy)
+ - Fix variable documentDirty (64j)
+ - Make sortable list more condensed (Piotr Matysiak)
+ - #187 Ditto is missing placeholders when built-in filters are enabled (yamamoto)
+ - Fix saved roles users #130 (64j)
+ - Fix #192 evo.checkConnectionToServer function (64j)
+
diff --git a/manager/actions/logging.static.php b/manager/actions/logging.static.php
index 3cdd927afa..44f1a871b7 100644
--- a/manager/actions/logging.static.php
+++ b/manager/actions/logging.static.php
@@ -1,309 +1,327 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") {
+ die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
}
-if(!$modx->hasPermission('logs')) {
- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!$modx->hasPermission('logs')) {
+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
}
-function array_unique_multi($array, $checkKey) {
- // Use the builtin if we're not a multi-dimensional array
- if(!is_array(current($array)) || empty($checkKey)) {
- return array_unique($array);
- }
+function array_unique_multi($array, $checkKey)
+{
+ // Use the builtin if we're not a multi-dimensional array
+ if (!is_array(current($array)) || empty($checkKey)) {
+ return array_unique($array);
+ }
- $ret = array();
- $checkValues = array(); // contains the unique key Values
- foreach($array as $key => $current) {
- if(in_array($current[$checkKey], $checkValues)) {
- continue;
- } // duplicate
+ $ret = array();
+ $checkValues = array(); // contains the unique key Values
+ foreach ($array as $key => $current) {
+ if (in_array($current[$checkKey], $checkValues)) {
+ continue;
+ } // duplicate
- $checkValues[] = $current[$checkKey];
- $ret[$key] = $current;
- }
- return $ret;
+ $checkValues[] = $current[$checkKey];
+ $ret[$key] = $current;
+ }
+ return $ret;
}
-function record_sort($array, $key) {
- $hash = array();
- foreach($array as $k => $v) $hash[$k] = $v[$key];
+function record_sort($array, $key)
+{
+ $hash = array();
+ foreach ($array as $k => $v) {
+ $hash[$k] = $v[$key];
+ }
- natsort($hash);
+ natsort($hash);
- $records = array();
- foreach($hash as $k => $row) $records[$k] = $array[$k];
+ $records = array();
+ foreach ($hash as $k => $row) {
+ $records[$k] = $array[$k];
+ }
- return $records;
+ return $records;
}
$rs = $modx->db->select('DISTINCT internalKey, username, action, itemid, itemname', $modx->getFullTableName('manager_log'));
$logs = $modx->db->makeArray($rs);
-
?>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
db->escape($_REQUEST['itemname']) . "'";
- }
- if($_REQUEST['message'] != "") {
- $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";
- }
- // date stuff
- if($_REQUEST['datefrom'] != "") {
- $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);
- }
- if($_REQUEST['dateto'] != "") {
- $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);
- }
+if (isset($_REQUEST['log_submit'])) {
+ // get the selections the user made.
+ $sqladd = array();
+ if ($_REQUEST['searchuser'] != 0) {
+ $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'";
+ }
+ if ($_REQUEST['action'] != 0) {
+ $sqladd[] = "action=" . intval($_REQUEST['action']);
+ }
+ if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
+ $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";
+ }
+ if ($_REQUEST['itemname'] != '0') {
+ $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";
+ }
+ if ($_REQUEST['message'] != "") {
+ $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";
+ }
+ // date stuff
+ if ($_REQUEST['datefrom'] != "") {
+ $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);
+ }
+ if ($_REQUEST['dateto'] != "") {
+ $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);
+ }
+
+ // If current position is not set, set it to zero
+ if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
+ $int_cur_position = 0;
+ } else {
+ $int_cur_position = $_REQUEST['int_cur_position'];
+ }
- // If current position is not set, set it to zero
- if(!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
- $int_cur_position = 0;
- } else {
- $int_cur_position = $_REQUEST['int_cur_position'];
- }
+ // Number of result to display on the page, will be in the LIMIT of the sql query also
+ $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;
- // Number of result to display on the page, will be in the LIMIT of the sql query also
- $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;
+ $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
- $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
+ // build the sql
+ $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
- // build the sql
- $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
+ $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
- $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
-if($limit < 1) {
- echo '' . $_lang["mgrlog_emptysrch"] . '
';
+if ($limit < 1) {
+ echo '' . $_lang["mgrlog_emptysrch"] . '
';
} else {
- echo '' . $_lang["mgrlog_sortinst"] . '
';
+ echo '' . $_lang["mgrlog_sortinst"] . '
';
+
+ include_once "paginate.inc.php";
+ // New instance of the Paging class, you can modify the color and the width of the html table
+ $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv);
+
+ // Load up the 2 array in order to display result
+ $array_paging = $p->getPagingArray();
+ $array_row_paging = $p->getPagingRowArray();
+ $current_row = $int_cur_position / $int_num_result;
+
+ // Display the result as you like...
+ print "" . $_lang["paging_showing"] . " " . $array_paging['lower'];
+ print " " . $_lang["paging_to"] . " " . $array_paging['upper'];
+ print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")
";
+ $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? " " : " ");
+ $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? " " : " ");
+ $pagesfound = sizeof($array_row_paging);
+ if ($pagesfound > 6) {
+ $paging .= $array_row_paging[$current_row - 2]; // ." ";
+ $paging .= $array_row_paging[$current_row - 1]; // ." ";
+ $paging .= $array_row_paging[$current_row]; // ." ";
+ $paging .= $array_row_paging[$current_row + 1]; // ." ";
+ $paging .= $array_row_paging[$current_row + 2]; // ." ";
+ } else {
+ for ($i = 0; $i < $pagesfound; $i++) {
+ $paging .= $array_row_paging[$i] . " ";
+ }
+ }
+ $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? " " : " ") . " ";
+ $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? " " : " ") . " ";
+ // The above exemple print somethings like:
+ // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
+ // Of course you can now play with array_row_paging in order to print
+ // only the results you would like...
+ ?>
+
+
- include_once "paginate.inc.php";
- // New instance of the Paging class, you can modify the color and the width of the html table
- $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv);
+
+
+
- // Load up the 2 array in order to display result
- $array_paging = $p->getPagingArray();
- $array_row_paging = $p->getPagingRowArray();
- $current_row = $int_cur_position / $int_num_result;
+
+
+
+
+
+
+
+
+ db->getRow($rs)) {
+ if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
+ $item = '-';
+ } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
+ $item = '' . $logentry['itemname'] . '';
+ } else {
+ $item = $logentry['itemname'];
+ }
+ //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'
+ $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true';
+ ?>
+
+ ' . $logentry['username'] . '' ?>
+ toDateFormat($logentry['timestamp'] + $server_offset_time) ?>
+
+
+
+
+
+
- // Display the result as you like...
- print "" . $_lang["paging_showing"] . " " . $array_paging['lower'];
- print " " . $_lang["paging_to"] . " " . $array_paging['upper'];
- print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")
";
- $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? " " : " ");
- $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? " " : " ");
- $pagesfound = sizeof($array_row_paging);
- if($pagesfound > 6) {
- $paging .= $array_row_paging[$current_row - 2]; // ." ";
- $paging .= $array_row_paging[$current_row - 1]; // ." ";
- $paging .= $array_row_paging[$current_row]; // ." ";
- $paging .= $array_row_paging[$current_row + 1]; // ." ";
- $paging .= $array_row_paging[$current_row + 2]; // ." ";
- } else {
- for($i = 0; $i < $pagesfound; $i++) {
- $paging .= $array_row_paging[$i] . " ";
- }
- }
- $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? " " : " ") . " ";
- $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? " " : " ") . "
";
- echo $paging;
- // The above exemple print somethings like:
- // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
- // Of course you can now play with array_row_paging in order to print
- // only the results you would like...
- ?>
-
-
-
-
-
-
-
- db->getRow($rs)) {
- if(!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
- $item = '-';
- } elseif($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
- $item = '' . '[' . $logentry['itemid'] . '] ' . $logentry['itemname'] . '';
- } else {
- $item = '[' . $logentry['itemid'] . '] ' . $logentry['itemname'];
- }
- //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'
- $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true';
- ?>
-
- ' . $logentry['username'] . ''; ?>
- toDateFormat($logentry['timestamp'] + $server_offset_time); ?>
-
-
-
-
+
+
+
-
-
+
+ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
-if(!$modx->hasPermission('manage_metatags')) {
- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-}
-
-// initialize page view state - the $_PAGE object
-$modx->manager->initPageViewState();
-
-?>
-
-
-
-
diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php
index 768efa5caf..19b077c501 100644
--- a/manager/actions/messages.static.php
+++ b/manager/actions/messages.static.php
@@ -1,324 +1,296 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") {
+ die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
}
-if(!$modx->hasPermission('messages')) {
- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!$modx->hasPermission('messages')) {
+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
}
?>
-
+
-
-
-
-
- db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int) $_REQUEST['id'] . "'");
- $message = $modx->db->getRow($rs);
- if(!$message) {
- echo "Wrong number of messages returned!";
- } else {
- if($message['recipient'] != $modx->getLoginUserID()) {
- echo $_lang['messages_not_allowed_to_read'];
- } else {
- // output message!
- // get the name of the sender
- $sender = $message['sender'];
- if($sender == 0) {
- $sendername = $_lang['messages_system_user'];
- } else {
- $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
- $sendername = $modx->db->getValue($rs2);
- }
- ?>
-
-
-
-
-
-
-
-
-
-
- :
-
-
- :
- toDateFormat($message['postdate'] + $server_offset_time); ?>
-
-
- :
-
-
-
-
-
-
- ", $message['message']);
- $dashcount = substr_count($message, "-----");
- $message = str_replace("-----", "", $message);
- for($i = 0; $i < $dashcount; $i++) {
- $message .= "";
- }
-
- echo $message;
- ?>
-
-
-
-
- db->update(array('messageread' => 1), $modx->getFullTableName('user_messages'), "id='{$_REQUEST['id']}'");
- }
- }
- ?>
-
-
+
+
+
+
+ db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'");
+ $message = $modx->db->getRow($rs);
+ if (!$message) {
+ echo "Wrong number of messages returned!";
+ } else {
+ if ($message['recipient'] != $modx->getLoginUserID()) {
+ echo $_lang['messages_not_allowed_to_read'];
+ } else {
+ // output message!
+ // get the name of the sender
+ $sender = $message['sender'];
+ if ($sender == 0) {
+ $sendername = $_lang['messages_system_user'];
+ } else {
+ $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
+ $sendername = $modx->db->getValue($rs2);
+ }
+ ?>
+
+
+
+ ">
+
+
+
+
+
+
+ :
+
+
+
+ :
+
+ toDateFormat($message['postdate'] + $server_offset_time) ?>
+
+
+ :
+
+
+
+
+ ', $message['message']);
+ $dashcount = substr_count($message, '-----');
+ $message = str_replace('-----', '', $message);
+ for ($i = 0; $i < $dashcount; $i++) {
+ $message .= '';
+ }
+ ?>
+
+
+ db->update(array('messageread' => 1), $modx->getFullTableName('user_messages'), "id='{$_REQUEST['id']}'");
+ }
+ }
+ ?>
+
+
+
-
-
-
- db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
- $num_rows = $modx->db->getValue($rs);
-
- // ==============================================================
- // Exemple Usage
- // Note: I make 2 query to the database for this exemple, it
- // could (and should) be made with only one query...
- // ==============================================================
-
- // If current position is not set, set it to zero
- if(!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
- $int_cur_position = 0;
- } else {
- $int_cur_position = (int) $_REQUEST['int_cur_position'];
- }
+
+
+
+ db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+ $num_rows = $modx->db->getValue($rs);
- // Number of result to display on the page, will be in the LIMIT of the sql query also
- $int_num_result = $number_of_messages;
+ // ==============================================================
+ // Exemple Usage
+ // Note: I make 2 query to the database for this exemple, it
+ // could (and should) be made with only one query...
+ // ==============================================================
+ // If current position is not set, set it to zero
+ if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
+ $int_cur_position = 0;
+ } else {
+ $int_cur_position = (int)$_REQUEST['int_cur_position'];
+ }
- $extargv = "&a=10"; // extra argv here (could be anything depending on your page)
+ // Number of result to display on the page, will be in the LIMIT of the sql query also
+ $int_num_result = $number_of_messages;
- include_once "paginate.inc.php";
- // New instance of the Paging class, you can modify the color and the width of the html table
- $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv);
+ $extargv = "&a=10"; // extra argv here (could be anything depending on your page)
- // Load up the 2 array in order to display result
- $array_paging = $p->getPagingArray();
- $array_row_paging = $p->getPagingRowArray();
+ include_once "paginate.inc.php";
+ // New instance of the Paging class, you can modify the color and the width of the html table
+ $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv);
- // Display the result as you like...
- $pager .= $_lang['showing'] . " " . $array_paging['lower'];
- $pager .= " " . $_lang['to'] . " " . $array_paging['upper'];
- $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")";
- $pager .= "
" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? " " : " ");
- for($i = 0; $i < sizeof($array_row_paging); $i++) {
- $pager .= $array_row_paging[$i] . " ";
- }
- $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "" : "");
+ // Load up the 2 array in order to display result
+ $array_paging = $p->getPagingArray();
+ $array_row_paging = $p->getPagingRowArray();
- // The above exemple print somethings like:
- // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
- // Of course you can now play with array_row_paging in order to print
- // only the results you would like...
+ // Display the result as you like...
+ $pager .= $_lang['showing'] . " " . $array_paging['lower'];
+ $pager .= " " . $_lang['to'] . " " . $array_paging['upper'];
+ $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")";
+ $pager .= "
" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? " " : " ");
+ for ($i = 0; $i < sizeof($array_row_paging); $i++) {
+ $pager .= $array_row_paging[$i] . " ";
+ }
+ $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "" : "");
- $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
- $limit = $modx->db->getRecordCount($rs);
- if($limit < 1) {
- echo $_lang['messages_no_messages'];
- } else {
- echo $pager;
- $dotablestuff = 1;
- ?>
-
-
-
-
-
-
-
- db->getRow($rs)) {
- $sender = $message['sender'];
- if($sender == 0) {
- $sendername = "[System]";
- } else {
- $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
- $sendername = $modx->db->getValue($rs2);
- }
- $messagestyle = $message['messageread'] == 0 ? "messageUnread" : "messageRead";
- ?>
-
- " : ""; ?>
-
- toDateFormat($message['postdate'] + $server_offset_time); ?>
-
- >>
+ // Of course you can now play with array_row_paging in order to print
+ // only the results you would like...
- if($dotablestuff == 1) { ?>
-
-
-
-
+ $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
+ $limit = $modx->db->getRecordCount($rs);
+ if ($limit < 1) {
+ echo $_lang['messages_no_messages'];
+ } else {
+ $dotablestuff = 1;
+ ?>
+
+
+
+
+
+
+
+
+
+
+ db->getRow($rs)) {
+ $sender = $message['sender'];
+ if ($sender == 0) {
+ $sendername = "[System]";
+ } else {
+ $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
+ $sendername = $modx->db->getValue($rs2);
+ }
+ $messagestyle = $message['messageread'] == 0 ? "text-primary" : "";
+ ?>
+
+ ' : "" ?>
+
+ toDateFormat($message['postdate'] + $server_offset_time) ?>
+
+
+
+
+
+
+
+
-
-
-
- db->select('*', $modx->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'");
- $message = $modx->db->getRow($rs);
- if(!$message) {
- echo "Wrong number of messages returned!";
- } else {
- if($message['recipient'] != $modx->getLoginUserID()) {
- echo $_lang['messages_not_allowed_to_read'];
- } else {
- // output message!
- // get the name of the sender
- $sender = $message['sender'];
- if($sender == 0) {
- $sendername = "[System]";
- } else {
- $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
- $sendername = $modx->db->getValue($rs2);
- }
- $subjecttext = $_REQUEST['m'] == 'rp' ? "Re: " : "Fwd: ";
- $subjecttext .= $message['subject'];
- $messagetext = "\n\n\n-----\n" . $_lang['messages_from'] . ": $sendername\n" . $_lang['messages_sent'] . ": " . $modx->toDateFormat($message['postdate'] + $server_offset_time) . "\n" . $_lang['messages_subject'] . ": " . $message['subject'] . "\n\n" . $message['message'];
- if($_REQUEST['m'] == 'rp') {
- $recipientindex = $message['sender'];
- }
- }
- }
- }
- ?>
-
-
hasPermission('messages');
?>
diff --git a/manager/actions/modules.static.php b/manager/actions/modules.static.php
index a3f02bca51..de8980ba0a 100644
--- a/manager/actions/modules.static.php
+++ b/manager/actions/modules.static.php
@@ -1,22 +1,22 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") {
+ die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
}
-if(!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
}
// initialize page view state - the $_PAGE object
$modx->manager->initPageViewState();
// get and save search string
-if($_REQUEST['op'] == 'reset') {
- $query = '';
- $_PAGE['vs']['search'] = '';
+if ($_REQUEST['op'] == 'reset') {
+ $query = '';
+ $_PAGE['vs']['search'] = '';
} else {
- $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
- $sqlQuery = $modx->db->escape($query);
- $_PAGE['vs']['search'] = $query;
+ $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+ $sqlQuery = $modx->db->escape($query);
+ $_PAGE['vs']['search'] = $query;
}
// get & save listmode
@@ -28,7 +28,9 @@
include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
$cm = new ContextMenu("cntxm", 150);
$cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));
-$cm->addSeparator();
+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
+ $cm->addSeparator();
+}
$cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));
$cm->addItem($_lang["duplicate"], "js:menuAction(3)", $_style['actions_duplicate'], (!$modx->hasPermission('new_module') ? 1 : 0));
$cm->addItem($_lang["delete"], "js:menuAction(4)", $_style['actions_delete'], (!$modx->hasPermission('delete_module') ? 1 : 0));
@@ -36,94 +38,113 @@
?>
-
+
-
- db->select("id,name,description,IF(locked,'{$_lang['yes']}','-') as locked,IF(disabled,'{$_lang['yes']}','-') as disabled,IF(icon<>'',icon,'{$_style['icons_modules']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");
- include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
- $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
- $grd->noRecordMsg = $_lang["no_records_found"];
- $grd->cssClass = "table data";
- $grd->columnHeaderClass = "tableHeader";
- $grd->itemClass = "tableItem";
- $grd->altItemClass = "tableAltItem";
- $grd->fields = "icon,name,description,locked,disabled";
- $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];
- $grd->colWidths = "34,,,60,60";
- $grd->colAligns = "center,,,center,center";
- $grd->colTypes = "template:||template:[+value+]";
- if($listmode == '1') {
- $grd->pageSize = 0;
- }
- if($_REQUEST['op'] == 'reset') {
- $grd->pageNumber = 1;
- }
- // render grid
- echo $grd->render();
- ?>
-
+
+ config['use_udperms'])) {
+ $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon
+ FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
+ LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
+ LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
+ WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
+ ORDER BY sm.name');
+ if ($modx->hasPermission('edit_module')) {
+ $title = "[+value+]";
+ } else if ($modx->hasPermission('exec_module')) {
+ $title = "[+value+]";
+ } else {
+ $title = '[+value+]';
+ }
+ } else {
+ $rs = $modx->db->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_modules']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");
+ $title = "[+value+]";
+ }
+ include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+ $grd = new DataGrid('', $rs, $number_of_results); // set page size to 0 t show all items
+ $grd->noRecordMsg = $_lang["no_records_found"];
+ $grd->cssClass = "table data";
+ $grd->columnHeaderClass = "tableHeader";
+ $grd->itemClass = "tableItem";
+ $grd->altItemClass = "tableAltItem";
+ $grd->fields = "icon,name,description,locked,disabled";
+ $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];
+ $grd->colWidths = "34,,,60,60";
+ $grd->colAligns = "center,,,center,center";
+ $grd->colTypes = "template:||template:" . $title;
+ if ($listmode == '1') {
+ $grd->pageSize = 0;
+ }
+ if ($_REQUEST['op'] == 'reset') {
+ $grd->pageNumber = 1;
+ }
+ // render grid
+ echo $grd->render();
+ ?>
+
diff --git a/manager/actions/move_document.dynamic.php b/manager/actions/move_document.dynamic.php
index bd4e66aaff..1caf165976 100644
--- a/manager/actions/move_document.dynamic.php
+++ b/manager/actions/move_document.dynamic.php
@@ -1,15 +1,15 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") {
+ die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly.");
}
-if(!$modx->hasPermission('save_document')) {
- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!$modx->hasPermission('save_document')) {
+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
}
-if(isset($_REQUEST['id'])) {
- $id = intval($_REQUEST['id']);
+if (isset($_REQUEST['id'])) {
+ $id = intval($_REQUEST['id']);
} else {
- $modx->webAlertAndQuit($_lang["error_no_id"]);
+ $modx->webAlertAndQuit($_lang["error_no_id"]);
}
// check permissions on the document
@@ -19,8 +19,8 @@
$udperms->document = $id;
$udperms->role = $_SESSION['mgrRole'];
-if(!$udperms->checkPermissions()) {
- $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+if (!$udperms->checkPermissions()) {
+ $modx->webAlertAndQuit($_lang["access_permission_denied"]);
}
// Set the item name for logger
@@ -28,65 +28,71 @@
$_SESSION['itemname'] = $pagetitle;
?>
-
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php
index 9544f1ed42..2bb87ebcfe 100644
--- a/manager/actions/mutate_content.dynamic.php
+++ b/manager/actions/mutate_content.dynamic.php
@@ -46,11 +46,7 @@
$tbl_member_groups = $modx->getFullTableName('member_groups');
$tbl_membergroup_access = $modx->getFullTableName('membergroup_access');
$tbl_document_groups = $modx->getFullTableName('document_groups');
-$tbl_keyword_xref = $modx->getFullTableName('keyword_xref');
$tbl_site_content = $modx->getFullTableName('site_content');
-$tbl_site_content_metatags = $modx->getFullTableName('site_content_metatags');
-$tbl_site_keywords = $modx->getFullTableName('site_keywords');
-$tbl_site_metatags = $modx->getFullTableName('site_metatags');
$tbl_site_templates = $modx->getFullTableName('site_templates');
$tbl_site_tmplvar_access = $modx->getFullTableName('site_tmplvar_access');
$tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
@@ -276,20 +272,6 @@ function checkParentChildRelation(pId, pName) {
return true;
}
- function clearKeywordSelection() {
- var opt = document.mutate.elements["keywords[]"].options;
- for(var i = 0; i < opt.length; i++) {
- opt[i].selected = false;
- }
- }
-
- function clearMetatagSelection() {
- var opt = document.mutate.elements["metatags[]"].options;
- for(var i = 0; i < opt.length; i++) {
- opt[i].selected = false;
- }
- }
-
var curTemplate = -1;
var curTemplateIndex = 0;
@@ -925,96 +907,226 @@ function SetUrl(url, width, height, alt) {
| ' . $row["title"] . ' | +' . $links . ' | +
| What is MODX? | Official 1.0 documentation | |
| MODX.com | Home of MODX | |
| MODX Forums | General support & discussions | |
| What is EVO? | Official EVO documentation | |
| evo.im | Home of EVO | |
| EVO Forums | General support & discussions | |
| docs.evolution-cms.com | Google Translate | Further documentation |
| API Reference | Google Translate | Further documentation |
| MODX.im | Google Translate | MODX by community |
| MODX.com.ua | Google Translate | Further documentation |
| MODX.im | Google Translate | Russian community |
'.$cms.' '.$v.'
';
+ include("actions/help/version_notices/{$v}.php");
echo '
'; + } ?> \ No newline at end of file diff --git a/assets/templates/help/03Changelog.php b/manager/actions/help/04Changelog.php similarity index 100% rename from assets/templates/help/03Changelog.php rename to manager/actions/help/04Changelog.php diff --git a/manager/actions/help/version_notices/1.1.1.php b/manager/actions/help/version_notices/1.1.1.php new file mode 100644 index 0000000000..aa9868f421 --- /dev/null +++ b/manager/actions/help/version_notices/1.1.1.php @@ -0,0 +1,89 @@ +INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
Resource-Tree
+-
+
- Moved "Sort menuindex" from DocManager to Resource-tree (#618, #636)
+
Sort Resources in Root: Click Button "Sort menu index" on top of resource-tree
+
+ Sort Resources of Parent Resource: Right mouse-click on parent, then choose "Sort menu index" +
+ - New "Manage Elements" Buttons (#669)
+
You can quick-access elements, files and images now directly from ressource-tree. Use Shift-Mouseclick to open multiple windows/elements.
+
+ - Remember last sort-options (#618, #636)
+
The ressource-tree stores now the last set sort-options per user to database (Sort by, Asc/Desc, Display-Name). At manager log-in, last settings of each user get restored.
+
+
MODX Tags
+-
+
- New Modifiers/Filters in Core (PHx)
+
Can be disabled in MODX-configuration. More infos at #623
+
+ - Snippet - Shortcut param = true
+
[[snippetName?param1¶m2]] will automatically be handled as [[snippetName?param1=`1`¶m2=`1`]] while param=`` will still be handled as empty value.
+
+ - New Conditional Tags / Modifiers
+
Can be enabled/disabled via Configuration -> "Enable Filters". More examples at #622 and #623. Example:
+[*longtitle:ifempty=[*pagetitle*]*]
+<!--@IF:[*id:is('[(site_start)]')*]> +Top page +<@ELSE> +Sub page +<@ENDIF-->+
+
+ - New Comment Tag
+
Comment-Tags will be completely removed from output. More infos at #680. Example:
+<!--@- This is a comment -@-->
+<!--@- Or HTML-Code / Snippets etc you want to disable temporarily -@-->
+
+
+ - New Chunk Parameters
+
It is possible to pass properties/values to a chunk. More infos at #625. Example:
+ Chunk: ++<h1>[+title+]</h1> +<p>[+body+]</p>
+ Call: +{{chunkName? &title='First post' &body='Hello World!'}}+
+
+ - File-binded Templates via @INCLUDE
+
Templates can be included via @INCLUDE using external PHP- & HTML-files. More infos at #627. Example:
+MODX-Template:
+@INCLUDE:assets/templates/mydesign/template.inc.php
+template.inc.php :
+switch($modx->documentIdentifier) { + case $modx->config['site_start']: + return file_get_contents('assets/templates/mydesign/top.html'); + default: + return file_get_contents('assets/templates/mydesign/page.html'); +}+
+
New Manager Roles
+-
+
- change_resourcetype
+
A user with this permission can change resource-type (webpage/weblink). More infos at #531
+
+ - assets_images, assets_files
+
Controls the display of 2 new buttons in resource-tree and grants/blocks access to KCFinder. More infos at #681
+
+
Template-Variables
+-
+
- @BINDINGS providing TV-values
+
[*tv_name*] will be replaced by its value taken from actual resource. Beware of SQL-Errors in case no or wrong value is given (set a reasonable default-value to avoid errors). More infos at #699. Example:
+@SELECT name,value FROM xxx WHERE yyy = [*tv_name*]
+
+
Important Details for Developers
+-
+
- jQuery updated to v3.1 and loaded into manager by default.
Known issues: MultiTV 2.0.8 has problems with row-reordering and requires an update.
+
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
EVOLUTION CMS 1.3.0
+-
+
- The new release of EVO 1.3.0 runs under the name EVOLUTION CMS
+
Now updates will be released more often. About once a month there will be a fresh release instead of 1 release at half a year..
+
+
What's new in 1.3.0:
+-
+
- New name and logo + +
- New admin panel theme with a lot of innovations + +
- Correction of errors and stability + +
- Widgets for the main page (OnManagerWelcomeHome) + +
- Change the top menu (OnManagerMenuPrerender) + +
- Document tree changes (OnManagerNodePrerender) + +
The New admin panel theme
+-
+
- Drag & drop in the document tree + +
- Dark style, quickly switching the appearance of the admin system + +
- Easier and faster + +
- Context menu for elements + +
- Ajax search in the admin area + +
- Remembering paths in admin panel + +
- 3 Level menu items with search and the ability to create a new item + +
- Support for mobile devices, although there is still some work in progress + +
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
-
+
- fix minor issues + +
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
-
+
- fix minor issues + +
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
-
+
- fix minor issues + +
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
-
+
- update FormLister to 1.7.8 (dmi3yy) +
- update DocLister to 1.3.11 (dmi3yy) +
- @FILE for chunks - {{@FILE:assets/chunks/header.html}} +
- remove mootols from manage category +
- added disable/enable snippets and chuncks #126 +
- Depricated keywords and metatags (not used by default from 1.0.8 version) use TV for this. +
- new settings for group TVs (http://take.ms/OmFYb) +
- add header("X-XSS-Protection: 0"); for correct work filamanager. +
- Add DLSitemap and DLMenu snippets +
- Remove DLBuildMenu +
- Refactor manager search and fix permision for this +
- remove etomite "compatibility" +
- New - $modx->config['enable_cache'] +
- New - [*value:makeUrl*] modifier +
Please use the MODX Content Manager instead of accessing this file directly."); +?> + +
-
+
- ElementsInTree restyled for new theme, version 1.5.8 (Piotr Matysiak) +
- Fix - <@IF><@ELSEIF><@ELSE><@ENDIF> (yamamoto) +
- Fix Bugs in Ditto with date and placeholders from version 1.3.4 (yamamoto, Dmi3yy) +
- Fix tinymce params underfined bug on frontend (dmi3yy) +
- Fix 65 Plugin parameters are lost after update to the new version (dmi3yy) +
- no need update.php in extras module (dmi3yy) +
- Fix variable documentDirty (64j) +
- Make sortable list more condensed (Piotr Matysiak) +
- #187 Ditto is missing placeholders when built-in filters are enabled (yamamoto) +
- Fix saved roles users #130 (64j) +
- Fix #192 evo.checkConnectionToServer function (64j) +
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('logs')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('logs')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } -function array_unique_multi($array, $checkKey) { - // Use the builtin if we're not a multi-dimensional array - if(!is_array(current($array)) || empty($checkKey)) { - return array_unique($array); - } +function array_unique_multi($array, $checkKey) +{ + // Use the builtin if we're not a multi-dimensional array + if (!is_array(current($array)) || empty($checkKey)) { + return array_unique($array); + } - $ret = array(); - $checkValues = array(); // contains the unique key Values - foreach($array as $key => $current) { - if(in_array($current[$checkKey], $checkValues)) { - continue; - } // duplicate + $ret = array(); + $checkValues = array(); // contains the unique key Values + foreach ($array as $key => $current) { + if (in_array($current[$checkKey], $checkValues)) { + continue; + } // duplicate - $checkValues[] = $current[$checkKey]; - $ret[$key] = $current; - } - return $ret; + $checkValues[] = $current[$checkKey]; + $ret[$key] = $current; + } + return $ret; } -function record_sort($array, $key) { - $hash = array(); - foreach($array as $k => $v) $hash[$k] = $v[$key]; +function record_sort($array, $key) +{ + $hash = array(); + foreach ($array as $k => $v) { + $hash[$k] = $v[$key]; + } - natsort($hash); + natsort($hash); - $records = array(); - foreach($hash as $k => $row) $records[$k] = $array[$k]; + $records = array(); + foreach ($hash as $k => $row) { + $records[$k] = $array[$k]; + } - return $records; + return $records; } $rs = $modx->db->select('DISTINCT internalKey, username, action, itemid, itemname', $modx->getFullTableName('manager_log')); $logs = $modx->db->makeArray($rs); - ?> -
- -
++ +
+ +
+
-
+
+
+
+
+
+
-
-
Please use the MODX Content Manager instead of accessing this file directly."); -if(!$modx->hasPermission('manage_metatags')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); -} - -// initialize page view state - the $_PAGE object -$modx->manager->initPageViewState(); - -?> - - - - diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php index 768efa5caf..19b077c501 100644 --- a/manager/actions/messages.static.php +++ b/manager/actions/messages.static.php @@ -1,324 +1,296 @@ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('messages')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('messages')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } ?>
-
-
-
+
+
+
+
+ INCLUDE_ORDERING_ERROR
-
-
-
+
db->escape($_REQUEST['itemname']) . "'";
- }
- if($_REQUEST['message'] != "") {
- $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";
- }
- // date stuff
- if($_REQUEST['datefrom'] != "") {
- $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);
- }
- if($_REQUEST['dateto'] != "") {
- $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);
- }
+if (isset($_REQUEST['log_submit'])) {
+ // get the selections the user made.
+ $sqladd = array();
+ if ($_REQUEST['searchuser'] != 0) {
+ $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'";
+ }
+ if ($_REQUEST['action'] != 0) {
+ $sqladd[] = "action=" . intval($_REQUEST['action']);
+ }
+ if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
+ $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";
+ }
+ if ($_REQUEST['itemname'] != '0') {
+ $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";
+ }
+ if ($_REQUEST['message'] != "") {
+ $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";
+ }
+ // date stuff
+ if ($_REQUEST['datefrom'] != "") {
+ $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);
+ }
+ if ($_REQUEST['dateto'] != "") {
+ $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);
+ }
+
+ // If current position is not set, set it to zero
+ if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
+ $int_cur_position = 0;
+ } else {
+ $int_cur_position = $_REQUEST['int_cur_position'];
+ }
- // If current position is not set, set it to zero
- if(!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
- $int_cur_position = 0;
- } else {
- $int_cur_position = $_REQUEST['int_cur_position'];
- }
+ // Number of result to display on the page, will be in the LIMIT of the sql query also
+ $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;
- // Number of result to display on the page, will be in the LIMIT of the sql query also
- $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;
+ $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
- $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)
+ // build the sql
+ $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
- // build the sql
- $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
+ $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
- $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
-if($limit < 1) {
- echo '
-
-
+
' . $_lang["mgrlog_emptysrch"] . '
'; +if ($limit < 1) { + echo '' . $_lang["mgrlog_emptysrch"] . '
'; } else { - echo '' . $_lang["mgrlog_sortinst"] . '
'; + echo '' . $_lang["mgrlog_sortinst"] . '
'; + + include_once "paginate.inc.php"; + // New instance of the Paging class, you can modify the color and the width of the html table + $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv); + + // Load up the 2 array in order to display result + $array_paging = $p->getPagingArray(); + $array_row_paging = $p->getPagingRowArray(); + $current_row = $int_cur_position / $int_num_result; + + // Display the result as you like... + print "" . $_lang["paging_showing"] . " " . $array_paging['lower'];
+ print " " . $_lang["paging_to"] . " " . $array_paging['upper'];
+ print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")
";
+ $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? " " : " ");
+ $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? " " : " ");
+ $pagesfound = sizeof($array_row_paging);
+ if ($pagesfound > 6) {
+ $paging .= $array_row_paging[$current_row - 2]; // ." ";
+ $paging .= $array_row_paging[$current_row - 1]; // ." ";
+ $paging .= $array_row_paging[$current_row]; // ." ";
+ $paging .= $array_row_paging[$current_row + 1]; // ." ";
+ $paging .= $array_row_paging[$current_row + 2]; // ." ";
+ } else {
+ for ($i = 0; $i < $pagesfound; $i++) {
+ $paging .= $array_row_paging[$i] . " ";
+ }
+ }
+ $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? " " : " ") . " ";
+ $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? " " : " ") . " ";
+ // The above exemple print somethings like:
+ // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
+ // Of course you can now play with array_row_paging in order to print
+ // only the results you would like...
+ ?>
+
+
- include_once "paginate.inc.php";
- // New instance of the Paging class, you can modify the color and the width of the html table
- $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv);
+
+
+
- // Load up the 2 array in order to display result
- $array_paging = $p->getPagingArray();
- $array_row_paging = $p->getPagingRowArray();
- $current_row = $int_cur_position / $int_num_result;
+
+
- // Display the result as you like...
- print "
+
+
+
+
+ | + | + | + | + | + |
|---|---|---|---|---|
| ' . $logentry['username'] . '' ?> | ++ | + | + | toDateFormat($logentry['timestamp'] + $server_offset_time) ?> | +
" . $_lang["paging_showing"] . " " . $array_paging['lower'];
- print " " . $_lang["paging_to"] . " " . $array_paging['upper'];
- print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")
";
- $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? " " : " ");
- $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? " " : " ");
- $pagesfound = sizeof($array_row_paging);
- if($pagesfound > 6) {
- $paging .= $array_row_paging[$current_row - 2]; // ." ";
- $paging .= $array_row_paging[$current_row - 1]; // ." ";
- $paging .= $array_row_paging[$current_row]; // ." ";
- $paging .= $array_row_paging[$current_row + 1]; // ." ";
- $paging .= $array_row_paging[$current_row + 2]; // ." ";
- } else {
- for($i = 0; $i < $pagesfound; $i++) {
- $paging .= $array_row_paging[$i] . " ";
- }
- }
- $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? " " : " ") . " ";
- $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? " " : " ") . "
| - | - | - | - |
|---|---|---|---|
| ' . $logentry['username'] . ''; ?> | -- | - | toDateFormat($logentry['timestamp'] + $server_offset_time); ?> | -
+
+
- Please use the MODX Content Manager instead of accessing this file directly."); -if(!$modx->hasPermission('manage_metatags')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); -} - -// initialize page view state - the $_PAGE object -$modx->manager->initPageViewState(); - -?> - - - - diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php index 768efa5caf..19b077c501 100644 --- a/manager/actions/messages.static.php +++ b/manager/actions/messages.static.php @@ -1,324 +1,296 @@ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('messages')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('messages')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } ?>
- +
- -
-
-
+
+
- db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int) $_REQUEST['id'] . "'");
- $message = $modx->db->getRow($rs);
- if(!$message) {
- echo "Wrong number of messages returned!";
- } else {
- if($message['recipient'] != $modx->getLoginUserID()) {
- echo $_lang['messages_not_allowed_to_read'];
- } else {
- // output message!
- // get the name of the sender
- $sender = $message['sender'];
- if($sender == 0) {
- $sendername = $_lang['messages_system_user'];
- } else {
- $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
- $sendername = $modx->db->getValue($rs2);
- }
- ?>
-
-
- db->update(array('messageread' => 1), $modx->getFullTableName('user_messages'), "id='{$_REQUEST['id']}'");
- }
- }
- ?>
-
- | - - | -|
| - | |
| : | -- |
| : | -toDateFormat($message['postdate'] + $server_offset_time); ?> | -
| : | -- |
| - | |
| - ", $message['message']); - $dashcount = substr_count($message, "-----"); - $message = str_replace("-----", "", $message); - for($i = 0; $i < $dashcount; $i++) { - $message .= ""; - } - - echo $message; - ?> - - | -|
+
+
-
+
+ db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'");
+ $message = $modx->db->getRow($rs);
+ if (!$message) {
+ echo "Wrong number of messages returned!";
+ } else {
+ if ($message['recipient'] != $modx->getLoginUserID()) {
+ echo $_lang['messages_not_allowed_to_read'];
+ } else {
+ // output message!
+ // get the name of the sender
+ $sender = $message['sender'];
+ if ($sender == 0) {
+ $sendername = $_lang['messages_system_user'];
+ } else {
+ $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
+ $sendername = $modx->db->getValue($rs2);
+ }
+ ?>
+
+
+
+
+ ">
+
+
+
+
+ db->update(array('messageread' => 1), $modx->getFullTableName('user_messages'), "id='{$_REQUEST['id']}'");
+ }
+ }
+ ?>
+
+
+
+
+ ', $message['message']);
+ $dashcount = substr_count($message, '-----');
+ $message = str_replace('-----', '', $message);
+ for ($i = 0; $i < $dashcount; $i++) {
+ $message .= '';
+ }
+ ?>
+
+ | : | ++ | + |
| : | ++ | toDateFormat($message['postdate'] + $server_offset_time) ?> | +
| : | ++ | + |
-
-
- db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
- $num_rows = $modx->db->getValue($rs);
-
- // ==============================================================
- // Exemple Usage
- // Note: I make 2 query to the database for this exemple, it
- // could (and should) be made with only one query...
- // ==============================================================
-
- // If current position is not set, set it to zero
- if(!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
- $int_cur_position = 0;
- } else {
- $int_cur_position = (int) $_REQUEST['int_cur_position'];
- }
+
-
+
+
" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? " " : " "); - for($i = 0; $i < sizeof($array_row_paging); $i++) { - $pager .= $array_row_paging[$i] . " "; - } - $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "" : ""); + // Load up the 2 array in order to display result + $array_paging = $p->getPagingArray(); + $array_row_paging = $p->getPagingRowArray(); - // The above exemple print somethings like: - // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>> - // Of course you can now play with array_row_paging in order to print - // only the results you would like... + // Display the result as you like... + $pager .= $_lang['showing'] . " " . $array_paging['lower']; + $pager .= " " . $_lang['to'] . " " . $array_paging['upper']; + $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")"; + $pager .= "
" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? " " : " "); + for ($i = 0; $i < sizeof($array_row_paging); $i++) { + $pager .= $array_row_paging[$i] . " "; + } + $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "" : ""); - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}"); - $limit = $modx->db->getRecordCount($rs); - if($limit < 1) { - echo $_lang['messages_no_messages']; - } else { - echo $pager; - $dotablestuff = 1; - ?> - -
-
-
-
-
+ $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
+ $limit = $modx->db->getRecordCount($rs);
+ if ($limit < 1) {
+ echo $_lang['messages_no_messages'];
+ } else {
+ $dotablestuff = 1;
+ ?>
+
+
+ + db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . ""); + $num_rows = $modx->db->getValue($rs); - // Number of result to display on the page, will be in the LIMIT of the sql query also - $int_num_result = $number_of_messages; + // ============================================================== + // Exemple Usage + // Note: I make 2 query to the database for this exemple, it + // could (and should) be made with only one query... + // ============================================================== + // If current position is not set, set it to zero + if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { + $int_cur_position = 0; + } else { + $int_cur_position = (int)$_REQUEST['int_cur_position']; + } - $extargv = "&a=10"; // extra argv here (could be anything depending on your page) + // Number of result to display on the page, will be in the LIMIT of the sql query also + $int_num_result = $number_of_messages; - include_once "paginate.inc.php"; - // New instance of the Paging class, you can modify the color and the width of the html table - $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv); + $extargv = "&a=10"; // extra argv here (could be anything depending on your page) - // Load up the 2 array in order to display result - $array_paging = $p->getPagingArray(); - $array_row_paging = $p->getPagingRowArray(); + include_once "paginate.inc.php"; + // New instance of the Paging class, you can modify the color and the width of the html table + $p = new Paging($num_rows, $int_cur_position, $int_num_result, $extargv); - // Display the result as you like... - $pager .= $_lang['showing'] . " " . $array_paging['lower']; - $pager .= " " . $_lang['to'] . " " . $array_paging['upper']; - $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")"; - $pager .= "
" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? " " : " "); - for($i = 0; $i < sizeof($array_row_paging); $i++) { - $pager .= $array_row_paging[$i] . " "; - } - $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "" : ""); + // Load up the 2 array in order to display result + $array_paging = $p->getPagingArray(); + $array_row_paging = $p->getPagingRowArray(); - // The above exemple print somethings like: - // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>> - // Of course you can now play with array_row_paging in order to print - // only the results you would like... + // Display the result as you like... + $pager .= $_lang['showing'] . " " . $array_paging['lower']; + $pager .= " " . $_lang['to'] . " " . $array_paging['upper']; + $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")"; + $pager .= "
" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? " " : " "); + for ($i = 0; $i < sizeof($array_row_paging); $i++) { + $pager .= $array_row_paging[$i] . " "; + } + $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "" : ""); - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}"); - $limit = $modx->db->getRecordCount($rs); - if($limit < 1) { - echo $_lang['messages_no_messages']; - } else { - echo $pager; - $dotablestuff = 1; - ?> - -
| - | - | - | - | - |
|---|---|---|---|---|
| " : ""; ?> | - -- | - | toDateFormat($message['postdate'] + $server_offset_time); ?> | -
+
+
+
+
+
+
+
+ | + | + | + | + | + |
|---|---|---|---|---|
| ' : "" ?> | + ++ | + | toDateFormat($message['postdate'] + $server_offset_time) ?> | +
-
-
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } // initialize page view state - the $_PAGE object $modx->manager->initPageViewState(); // get and save search string -if($_REQUEST['op'] == 'reset') { - $query = ''; - $_PAGE['vs']['search'] = ''; +if ($_REQUEST['op'] == 'reset') { + $query = ''; + $_PAGE['vs']['search'] = ''; } else { - $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; - $sqlQuery = $modx->db->escape($query); - $_PAGE['vs']['search'] = $query; + $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; + $sqlQuery = $modx->db->escape($query); + $_PAGE['vs']['search'] = $query; } // get & save listmode @@ -28,7 +28,9 @@ include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php"; $cm = new ContextMenu("cntxm", 150); $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0)); -$cm->addSeparator(); +if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) { + $cm->addSeparator(); +} $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0)); $cm->addItem($_lang["duplicate"], "js:menuAction(3)", $_style['actions_duplicate'], (!$modx->hasPermission('new_module') ? 1 : 0)); $cm->addItem($_lang["delete"], "js:menuAction(4)", $_style['actions_delete'], (!$modx->hasPermission('delete_module') ? 1 : 0)); @@ -36,94 +38,113 @@ ?>
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('save_document')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('save_document')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } -if(isset($_REQUEST['id'])) { - $id = intval($_REQUEST['id']); +if (isset($_REQUEST['id'])) { + $id = intval($_REQUEST['id']); } else { - $modx->webAlertAndQuit($_lang["error_no_id"]); + $modx->webAlertAndQuit($_lang["error_no_id"]); } // check permissions on the document @@ -19,8 +19,8 @@ $udperms->document = $id; $udperms->role = $_SESSION['mgrRole']; -if(!$udperms->checkPermissions()) { - $modx->webAlertAndQuit($_lang["access_permission_denied"]); +if (!$udperms->checkPermissions()) { + $modx->webAlertAndQuit($_lang["access_permission_denied"]); } // Set the item name for logger @@ -28,65 +28,71 @@ $_SESSION['itemname'] = $pagetitle; ?> -
- db->select('*', $modx->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'");
- $message = $modx->db->getRow($rs);
- if(!$message) {
- echo "Wrong number of messages returned!";
- } else {
- if($message['recipient'] != $modx->getLoginUserID()) {
- echo $_lang['messages_not_allowed_to_read'];
- } else {
- // output message!
- // get the name of the sender
- $sender = $message['sender'];
- if($sender == 0) {
- $sendername = "[System]";
- } else {
- $rs2 = $modx->db->select('username', $modx->getFullTableName('manager_users'), "id='{$sender}'");
- $sendername = $modx->db->getValue($rs2);
- }
- $subjecttext = $_REQUEST['m'] == 'rp' ? "Re: " : "Fwd: ";
- $subjecttext .= $message['subject'];
- $messagetext = "\n\n\n-----\n" . $_lang['messages_from'] . ": $sendername\n" . $_lang['messages_sent'] . ": " . $modx->toDateFormat($message['postdate'] + $server_offset_time) . "\n" . $_lang['messages_subject'] . ": " . $message['subject'] . "\n\n" . $message['message'];
- if($_REQUEST['m'] == 'rp') {
- $recipientindex = $message['sender'];
- }
- }
- }
- }
- ?>
-
-
hasPermission('messages');
?>
diff --git a/manager/actions/modules.static.php b/manager/actions/modules.static.php
index a3f02bca51..de8980ba0a 100644
--- a/manager/actions/modules.static.php
+++ b/manager/actions/modules.static.php
@@ -1,22 +1,22 @@
INCLUDE_ORDERING_ERRORPlease use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } // initialize page view state - the $_PAGE object $modx->manager->initPageViewState(); // get and save search string -if($_REQUEST['op'] == 'reset') { - $query = ''; - $_PAGE['vs']['search'] = ''; +if ($_REQUEST['op'] == 'reset') { + $query = ''; + $_PAGE['vs']['search'] = ''; } else { - $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; - $sqlQuery = $modx->db->escape($query); - $_PAGE['vs']['search'] = $query; + $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; + $sqlQuery = $modx->db->escape($query); + $_PAGE['vs']['search'] = $query; } // get & save listmode @@ -28,7 +28,9 @@ include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php"; $cm = new ContextMenu("cntxm", 150); $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0)); -$cm->addSeparator(); +if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) { + $cm->addSeparator(); +} $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0)); $cm->addItem($_lang["duplicate"], "js:menuAction(3)", $_style['actions_duplicate'], (!$modx->hasPermission('new_module') ? 1 : 0)); $cm->addItem($_lang["delete"], "js:menuAction(4)", $_style['actions_delete'], (!$modx->hasPermission('delete_module') ? 1 : 0)); @@ -36,94 +38,113 @@ ?>
- +
-
diff --git a/manager/actions/move_document.dynamic.php b/manager/actions/move_document.dynamic.php
index bd4e66aaff..1caf165976 100644
--- a/manager/actions/move_document.dynamic.php
+++ b/manager/actions/move_document.dynamic.php
@@ -1,15 +1,15 @@
INCLUDE_ORDERING_ERROR
- db->select("id,name,description,IF(locked,'{$_lang['yes']}','-') as locked,IF(disabled,'{$_lang['yes']}','-') as disabled,IF(icon<>'',icon,'{$_style['icons_modules']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");
- include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
- $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
- $grd->noRecordMsg = $_lang["no_records_found"];
- $grd->cssClass = "table data";
- $grd->columnHeaderClass = "tableHeader";
- $grd->itemClass = "tableItem";
- $grd->altItemClass = "tableAltItem";
- $grd->fields = "icon,name,description,locked,disabled";
- $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];
- $grd->colWidths = "34,,,60,60";
- $grd->colAligns = "center,,,center,center";
- $grd->colTypes = "template:||template:[+value+]";
- if($listmode == '1') {
- $grd->pageSize = 0;
- }
- if($_REQUEST['op'] == 'reset') {
- $grd->pageNumber = 1;
- }
- // render grid
- echo $grd->render();
- ?>
-
+
+ config['use_udperms'])) {
+ $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon
+ FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
+ LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
+ LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
+ WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
+ ORDER BY sm.name');
+ if ($modx->hasPermission('edit_module')) {
+ $title = "[+value+]";
+ } else if ($modx->hasPermission('exec_module')) {
+ $title = "[+value+]";
+ } else {
+ $title = '[+value+]';
+ }
+ } else {
+ $rs = $modx->db->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_modules']}') as icon", $modx->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");
+ $title = "[+value+]";
+ }
+ include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+ $grd = new DataGrid('', $rs, $number_of_results); // set page size to 0 t show all items
+ $grd->noRecordMsg = $_lang["no_records_found"];
+ $grd->cssClass = "table data";
+ $grd->columnHeaderClass = "tableHeader";
+ $grd->itemClass = "tableItem";
+ $grd->altItemClass = "tableAltItem";
+ $grd->fields = "icon,name,description,locked,disabled";
+ $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];
+ $grd->colWidths = "34,,,60,60";
+ $grd->colAligns = "center,,,center,center";
+ $grd->colTypes = "template:||template:" . $title;
+ if ($listmode == '1') {
+ $grd->pageSize = 0;
+ }
+ if ($_REQUEST['op'] == 'reset') {
+ $grd->pageNumber = 1;
+ }
+ // render grid
+ echo $grd->render();
+ ?>
+
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('save_document')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('save_document')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } -if(isset($_REQUEST['id'])) { - $id = intval($_REQUEST['id']); +if (isset($_REQUEST['id'])) { + $id = intval($_REQUEST['id']); } else { - $modx->webAlertAndQuit($_lang["error_no_id"]); + $modx->webAlertAndQuit($_lang["error_no_id"]); } // check permissions on the document @@ -19,8 +19,8 @@ $udperms->document = $id; $udperms->role = $_SESSION['mgrRole']; -if(!$udperms->checkPermissions()) { - $modx->webAlertAndQuit($_lang["access_permission_denied"]); +if (!$udperms->checkPermissions()) { + $modx->webAlertAndQuit($_lang["access_permission_denied"]); } // Set the item name for logger @@ -28,65 +28,71 @@ $_SESSION['itemname'] = $pagetitle; ?> -
- +
- + -
-
-
-
-
-
+
+
diff --git a/manager/actions/mutate_content.dynamic.php b/manager/actions/mutate_content.dynamic.php
index 9544f1ed42..2bb87ebcfe 100644
--- a/manager/actions/mutate_content.dynamic.php
+++ b/manager/actions/mutate_content.dynamic.php
@@ -46,11 +46,7 @@
$tbl_member_groups = $modx->getFullTableName('member_groups');
$tbl_membergroup_access = $modx->getFullTableName('membergroup_access');
$tbl_document_groups = $modx->getFullTableName('document_groups');
-$tbl_keyword_xref = $modx->getFullTableName('keyword_xref');
$tbl_site_content = $modx->getFullTableName('site_content');
-$tbl_site_content_metatags = $modx->getFullTableName('site_content_metatags');
-$tbl_site_keywords = $modx->getFullTableName('site_keywords');
-$tbl_site_metatags = $modx->getFullTableName('site_metatags');
$tbl_site_templates = $modx->getFullTableName('site_templates');
$tbl_site_tmplvar_access = $modx->getFullTableName('site_tmplvar_access');
$tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
@@ -276,20 +272,6 @@ function checkParentChildRelation(pId, pName) {
return true;
}
- function clearKeywordSelection() {
- var opt = document.mutate.elements["keywords[]"].options;
- for(var i = 0; i < opt.length; i++) {
- opt[i].selected = false;
- }
- }
-
- function clearMetatagSelection() {
- var opt = document.mutate.elements["metatags[]"].options;
- for(var i = 0; i < opt.length; i++) {
- opt[i].selected = false;
- }
- }
-
var curTemplate = -1;
var curTemplateIndex = 0;
@@ -925,96 +907,226 @@ function SetUrl(url, width, height, alt) {
+
+
+
- db->makeArray($rs, 'name');
- echo "\t" . '' . "\n";
- require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php');
- require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
- $i = 0;
- foreach($tvsArray as $row) {
- // Go through and display all Template Variables
- if($row['type'] == 'richtext' || $row['type'] == 'htmlarea') {
- // determine TV-options
- $tvOptions = $modx->parseProperties($row['elements']);
- if(!empty($tvOptions)) {
- // Allow different Editor with TV-option {"editor":"CKEditor4"} or &editor=Editor;text;CKEditor4
- $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
- };
- // Add richtext editor to the list
- $richtexteditorIds[$editor][] = "tv" . $row['id'];
- $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
- }
- // splitter
- if($i++ > 0) {
- echo "\t\t", '
\n";
- ?>
-
-
-
- " . $_lang['tmplvars_novars'] . "\n";
- }
- ?>
-
+ manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) {
+ $template = $default_template;
+ $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs'];
+ if (isset ($_REQUEST['newtemplate'])) {
+ $template = $_REQUEST['newtemplate'];
+ } else {
+ if (isset ($content['template'])) {
+ $template = $content['template'];
+ }
+ }
+
+ $field = "DISTINCT tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value, tvtpl.rank as tvrank";
+ $vs = array(
+ $tbl_site_tmplvars,
+ $tbl_site_tmplvar_templates,
+ $tbl_site_tmplvar_contentvalues,
+ $id,
+ $tbl_site_tmplvar_access
+ );
+ $from = vsprintf("%s AS tv INNER JOIN %s AS tvtpl ON tvtpl.tmplvarid = tv.id
+ LEFT JOIN %s AS tvc ON tvc.tmplvarid=tv.id AND tvc.contentid='%s'
+ LEFT JOIN %s AS tva ON tva.tmplvarid=tv.id", $vs);
+ $dgs = $docgrp ? " OR tva.documentgroup IN ({$docgrp})" : '';
+ $vs = array(
+ $template,
+ $_SESSION['mgrRole'],
+ $dgs
+ );
+ $sort = 'tvtpl.rank,tv.rank, tv.id';
+ if ($group_tvs) {
+ $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank';
+ $from .= '
+ LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category';
+ $sort = 'cat.rank,cat.id,' . $sort;
+ }
+ $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs);
+ $rs = $modx->db->select($field, $from, $where, $sort);
+ if ($modx->db->getRecordCount($rs)) {
+ $templateVariables .= '
+ ' . "\n";
+ if (!$group_tvs) {
+ $templateVariables .= '
+ | ', $row['caption'] . $tvName, "\n", "\t\t\t", $tvDescription, $tvInherited, " | \n", "\t\t\t", '' . "\n", "\t\t\t" . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . "\n" . "\t\t |
' . $_lang['settings_templvars'] . '
+
+ ';
+ } else if ($group_tvs == 2) {
+ $templateVariables .= '
+
+
' . $row['category'] . '
+
+ ';
+ }
+ } else if ($group_tvs == 2 || $group_tvs == 4) {
+ if ($i === 0) {
+ $templateVariables .= '
+
+
' . $row['category'] . '
+ + +
+ ';
+ }
+ } else if ($group_tvs == 5) {
+ if ($i === 0) {
+ $templateVariables .= '
+
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -switch($modx->manager->action) { - case 78: - if(!$modx->hasPermission('edit_chunk')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - case 77: - if(!$modx->hasPermission('new_chunk')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - default: - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +switch ($modx->manager->action) { + case 78: + if (!$modx->hasPermission('edit_chunk')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + case 77: + if (!$modx->hasPermission('new_chunk')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + default: + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0; @@ -24,8 +24,8 @@ $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets'); // check to see the snippet editor isn't locked -if($lockedEl = $modx->elementIsLocked(3, $id)) { - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['chunk'])); +if ($lockedEl = $modx->elementIsLocked(3, $id)) { + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['chunk'])); } // end check for lock @@ -33,31 +33,31 @@ $modx->lockElement(3, $id); $content = array(); -if(isset($_REQUEST['id']) && $_REQUEST['id'] != '' && is_numeric($_REQUEST['id'])) { - $rs = $modx->db->select('*', $tbl_site_htmlsnippets, "id='{$id}'"); - $content = $modx->db->getRow($rs); - if(!$content) { - $modx->webAlertAndQuit("Chunk not found for id '{$id}'."); - } - $_SESSION['itemname'] = $content['name']; - if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } -} else if(isset($_REQUEST['itemname'])) { - $content['name'] = $_REQUEST['itemname']; +if (isset($_REQUEST['id']) && $_REQUEST['id'] != '' && is_numeric($_REQUEST['id'])) { + $rs = $modx->db->select('*', $tbl_site_htmlsnippets, "id='{$id}'"); + $content = $modx->db->getRow($rs); + if (!$content) { + $modx->webAlertAndQuit("Chunk not found for id '{$id}'."); + } + $_SESSION['itemname'] = $content['name']; + if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } +} else if (isset($_REQUEST['itemname'])) { + $content['name'] = $_REQUEST['itemname']; } else { - $_SESSION['itemname'] = $_lang["new_htmlsnippet"]; - $content['category'] = intval($_REQUEST['catid']); + $_SESSION['itemname'] = $_lang["new_htmlsnippet"]; + $content['category'] = intval($_REQUEST['catid']); } -if($modx->manager->hasFormValues()) { - $modx->manager->loadFormValues(); +if ($modx->manager->hasFormValues()) { + $modx->manager->loadFormValues(); } -if(isset($_POST['which_editor'])) { - $which_editor = $_POST['which_editor']; +if (isset($_POST['which_editor'])) { + $which_editor = $_POST['which_editor']; } else { - $which_editor = $content['editor_name'] != 'none' ? $content['editor_name'] : 'none'; + $which_editor = $content['editor_name'] != 'none' ? $content['editor_name'] : 'none'; } $content = array_merge($content, $_POST); @@ -69,183 +69,189 @@ // Print RTE Javascript function ?> - - - invokeEvent('OnRichTextEditorInit', array( - 'editor' => $which_editor, - 'elements' => array( - 'post', - ), - )); - if(is_array($evtOut)) { - echo implode('', $evtOut); - } +if ($use_editor == 1) { + $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array( + 'editor' => $which_editor, + 'elements' => array( + 'post', + ), + )); + if (is_array($evtOut)) { + echo implode('', $evtOut); + } } -?> diff --git a/manager/actions/mutate_menuindex_sort.dynamic.php b/manager/actions/mutate_menuindex_sort.dynamic.php index 019ef032a0..fed6a80053 100644 --- a/manager/actions/mutate_menuindex_sort.dynamic.php +++ b/manager/actions/mutate_menuindex_sort.dynamic.php @@ -1,12 +1,12 @@ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('edit_document')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('edit_document')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } -$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : NULL; +$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null; $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0; $items = isset($_POST['list']) ? $_POST['list'] : ''; $ressourcelist = ''; @@ -19,212 +19,165 @@ $udperms->document = $id; $udperms->role = $_SESSION['mgrRole']; -if(!$udperms->checkPermissions()) { - $modx->webAlertAndQuit($_lang["access_permission_denied"]); +if (!$udperms->checkPermissions()) { + $modx->webAlertAndQuit($_lang["access_permission_denied"]); } -if(isset($_POST['listSubmitted'])) { - $updateMsg .= '' . $hasChildren . $item['pagetitle'] . ' (' . $item['id'] . ') ';
- }
- }
+$ressourcelist = '';
+if ($id !== null) {
+ $rs = $modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'");
+ $pagetitle = $modx->db->getValue($rs);
+
+ $rs = $modx->db->select('id, pagetitle, parent, menuindex, published, hidemenu, deleted, isfolder', $modx->getFullTableName('site_content'), "parent='{$id}'", 'menuindex ASC');
+ if ($modx->db->getRecordCount($rs)) {
+ $ressourcelist .= '';
+ } else {
+ $updateMsg = '
+ ';
+ }
+ }
+ $split = 0;
+ } else {
+ $split = 1;
+ }
+ // Go through and display all Template Variables
+ if ($row['type'] == 'richtext' || $row['type'] == 'htmlarea') {
+ // determine TV-options
+ $tvOptions = $modx->parseProperties($row['elements']);
+ if (!empty($tvOptions)) {
+ // Allow different Editor with TV-option {"editor":"CKEditor4"} or &editor=Editor;text;CKEditor4
+ $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
+ };
+ // Add richtext editor to the list
+ $richtexteditorIds[$editor][] = "tv" . $row['id'];
+ $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
+ }
+ // splitter
+ if ($group_tvs) {
+ if ($split && $i) {
+ $templateVariables .= '
+
+
' . "\n";
+ if ($group_tvs == 1) {
+ $templateVariables .= '
+ ' . "\n";
+ } else if ($group_tvs == 2 || $group_tvs == 4) {
+ $templateVariables .= '
+
+
+ ' . "\n";
+ } else if ($group_tvs == 3) {
+ $templateVariables .= '
+
+ ' . "\n";
+ }
+ $templateVariables .= '
+ ' . "\n";
+ } else {
+ // There aren't any Template Variables
+ //$templateVariables .= "\t' . $row['category'] . '
+ + +| ' . $row['caption'] . $tvName . '' . $tvDescription . $tvInherited . ' | +' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . ' |
+
" . $_lang['tmplvars_novars'] . "
\n"; + } + } + + // Template Variables + if ($modx->config['group_tvs'] < 3) { + echo $templateVariables; + } + ?> @@ -1222,82 +1334,14 @@ function SetUrl(url, width, height, alt) { - - - hasPermission('edit_doc_metatags') && $modx->config['show_meta']) { - // get list of site keywords - $keywords = array(); - $ds = $modx->db->select('id, keyword', $tbl_site_keywords, '', 'keyword ASC'); - while($row = $modx->db->getRow($ds)) { - $keywords[$row['id']] = $row['keyword']; - } - // get selected keywords using document's id - if(isset ($content['id']) && count($keywords) > 0) { - $keywords_selected = array(); - $ds = $modx->db->select('keyword_id', $tbl_keyword_xref, "content_id='{$content['id']}'"); - while($row = $modx->db->getRow($ds)) { - $keywords_selected[$row['keyword_id']] = ' selected="selected"'; - } - } - - // get list of site META tags - $metatags = array(); - $ds = $modx->db->select('id, name', $tbl_site_metatags); - while($row = $modx->db->getRow($ds)) { - $metatags[$row['id']] = $row['name']; - } - // get selected META tags using document's id - if(isset ($content['id']) && count($metatags) > 0) { - $metatags_selected = array(); - $ds = $modx->db->select('metatag_id', $tbl_site_content_metatags, "content_id='{$content['id']}'"); - while($row = $modx->db->getRow($ds)) { - $metatags_selected[$row['metatag_id']] = ' selected="selected"'; - } - } - ?> - -
-
-
-
-
-
-
+ config['group_tvs'] > 2) {
+ echo $templateVariables;
+ }
+ ?>
INCLUDE_ORDERING_ERROR-
|
-
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -switch($modx->manager->action) { - case 78: - if(!$modx->hasPermission('edit_chunk')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - case 77: - if(!$modx->hasPermission('new_chunk')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - default: - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +switch ($modx->manager->action) { + case 78: + if (!$modx->hasPermission('edit_chunk')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + case 77: + if (!$modx->hasPermission('new_chunk')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + default: + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0; @@ -24,8 +24,8 @@ $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets'); // check to see the snippet editor isn't locked -if($lockedEl = $modx->elementIsLocked(3, $id)) { - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['chunk'])); +if ($lockedEl = $modx->elementIsLocked(3, $id)) { + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['chunk'])); } // end check for lock @@ -33,31 +33,31 @@ $modx->lockElement(3, $id); $content = array(); -if(isset($_REQUEST['id']) && $_REQUEST['id'] != '' && is_numeric($_REQUEST['id'])) { - $rs = $modx->db->select('*', $tbl_site_htmlsnippets, "id='{$id}'"); - $content = $modx->db->getRow($rs); - if(!$content) { - $modx->webAlertAndQuit("Chunk not found for id '{$id}'."); - } - $_SESSION['itemname'] = $content['name']; - if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } -} else if(isset($_REQUEST['itemname'])) { - $content['name'] = $_REQUEST['itemname']; +if (isset($_REQUEST['id']) && $_REQUEST['id'] != '' && is_numeric($_REQUEST['id'])) { + $rs = $modx->db->select('*', $tbl_site_htmlsnippets, "id='{$id}'"); + $content = $modx->db->getRow($rs); + if (!$content) { + $modx->webAlertAndQuit("Chunk not found for id '{$id}'."); + } + $_SESSION['itemname'] = $content['name']; + if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } +} else if (isset($_REQUEST['itemname'])) { + $content['name'] = $_REQUEST['itemname']; } else { - $_SESSION['itemname'] = $_lang["new_htmlsnippet"]; - $content['category'] = intval($_REQUEST['catid']); + $_SESSION['itemname'] = $_lang["new_htmlsnippet"]; + $content['category'] = intval($_REQUEST['catid']); } -if($modx->manager->hasFormValues()) { - $modx->manager->loadFormValues(); +if ($modx->manager->hasFormValues()) { + $modx->manager->loadFormValues(); } -if(isset($_POST['which_editor'])) { - $which_editor = $_POST['which_editor']; +if (isset($_POST['which_editor'])) { + $which_editor = $_POST['which_editor']; } else { - $which_editor = $content['editor_name'] != 'none' ? $content['editor_name'] : 'none'; + $which_editor = $content['editor_name'] != 'none' ? $content['editor_name'] : 'none'; } $content = array_merge($content, $_POST); @@ -69,183 +69,189 @@ // Print RTE Javascript function ?> - - - invokeEvent('OnRichTextEditorInit', array( - 'editor' => $which_editor, - 'elements' => array( - 'post', - ), - )); - if(is_array($evtOut)) { - echo implode('', $evtOut); - } +if ($use_editor == 1) { + $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array( + 'editor' => $which_editor, + 'elements' => array( + 'post', + ), + )); + if (is_array($evtOut)) { + echo implode('', $evtOut); + } } -?> diff --git a/manager/actions/mutate_menuindex_sort.dynamic.php b/manager/actions/mutate_menuindex_sort.dynamic.php index 019ef032a0..fed6a80053 100644 --- a/manager/actions/mutate_menuindex_sort.dynamic.php +++ b/manager/actions/mutate_menuindex_sort.dynamic.php @@ -1,12 +1,12 @@ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('edit_document')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('edit_document')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } -$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : NULL; +$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null; $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0; $items = isset($_POST['list']) ? $_POST['list'] : ''; $ressourcelist = ''; @@ -19,212 +19,165 @@ $udperms->document = $id; $udperms->role = $_SESSION['mgrRole']; -if(!$udperms->checkPermissions()) { - $modx->webAlertAndQuit($_lang["access_permission_denied"]); +if (!$udperms->checkPermissions()) { + $modx->webAlertAndQuit($_lang["access_permission_denied"]); } -if(isset($_POST['listSubmitted'])) { - $updateMsg .= '
' . $_lang['sort_updated'] . '
';
- if(strlen($items) > 0) {
- $items = explode(';', $items);
- foreach($items as $key => $value) {
- $docid = ltrim($value, 'item_');
- $key = $reset ? 0 : $key;
- if(is_numeric($docid)) {
- $modx->db->update(array('menuindex' => $key), $modx->getFullTableName('site_content'), "id='{$docid}'");
- }
- }
- }
+if (isset($_POST['listSubmitted'])) {
+ $updateMsg .= '' . $_lang['sort_updated'] . '
';
+ if (strlen($items) > 0) {
+ $items = explode(';', $items);
+ foreach ($items as $key => $value) {
+ $docid = ltrim($value, 'item_');
+ $key = $reset ? 0 : $key;
+ if (is_numeric($docid)) {
+ $modx->db->update(array('menuindex' => $key), $modx->getFullTableName('site_content'), "id='{$docid}'");
+ }
+ }
+ }
}
-$limit = 0;
$disabled = 'true';
$pagetitle = '';
-if($id !== NULL) {
- $rs = $modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'");
- $pagetitle = $modx->db->getValue($rs);
-
- $rs = $modx->db->select('id, pagetitle, parent, menuindex, published, hidemenu, deleted', $modx->getFullTableName('site_content'), "parent='{$id}'", 'menuindex ASC');
- $resource = $modx->db->makeArray($rs);
- $limit = count($resource);
- if($limit < 1) {
- $updateMsg = $_lang['sort_nochildren'];
- } else {
- $disabled = 0;
- foreach($resource as $item) {
- // Add classes to determine whether it's published, deleted, not in the menu
- // or has children.
- // Use class names which match the classes in the document tree
- $classes = '';
- $classes .= ($item['hidemenu']) ? ' notInMenuNode ' : ' inMenuNode';
- $classes .= ($item['published']) ? ' publishedNode ' : ' unpublishedNode ';
- $classes = ($item['deleted']) ? ' deletedNode ' : $classes;
- $hasChildren = (count($modx->getChildIds($item['id'], 1)) > 0) ? ' ' : ' ';
- $ressourcelist .= '- ';
+ while ($row = $modx->db->getRow($rs)) {
+ $classes = '';
+ $classes .= ($row['hidemenu']) ? ' notInMenuNode ' : ' inMenuNode';
+ $classes .= ($row['published']) ? ' publishedNode ' : ' unpublishedNode ';
+ $classes = ($row['deleted']) ? ' deletedNode ' : $classes;
+ $icon = $row['isfolder'] ? ' ' : ' ';
+ $ressourcelist .= '
- ' . $icon . $row['pagetitle'] . ' (' . $row['id'] . ') '; + } + $ressourcelist .= '
' . $_lang['sort_nochildren'] . '
'; + } } $pagetitle = $id == 0 ? $site_name : $pagetitle; ?> - -- +
+ + diff --git a/manager/actions/mutate_password.dynamic.php b/manager/actions/mutate_password.dynamic.php index 3f09fd6d2c..a33bd92acb 100644 --- a/manager/actions/mutate_password.dynamic.php +++ b/manager/actions/mutate_password.dynamic.php @@ -24,24 +24,19 @@ -
-
-
+
+
diff --git a/manager/actions/mutate_plugin.dynamic.php b/manager/actions/mutate_plugin.dynamic.php
index 716ba3b275..7f984c609e 100644
--- a/manager/actions/mutate_plugin.dynamic.php
+++ b/manager/actions/mutate_plugin.dynamic.php
@@ -1,21 +1,21 @@
INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -switch($modx->manager->action) { - case 102: - if(!$modx->hasPermission('edit_plugin')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - case 101: - if(!$modx->hasPermission('new_plugin')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - default: - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +switch ($modx->manager->action) { + case 102: + if (!$modx->hasPermission('edit_plugin')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + case 101: + if (!$modx->hasPermission('new_plugin')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + default: + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0; @@ -25,32 +25,32 @@ $tbl_system_eventnames = $modx->getFullTableName('system_eventnames'); // check to see the plugin isn't locked -if($lockedEl = $modx->elementIsLocked(5, $id)) { - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['plugin'])); +if ($lockedEl = $modx->elementIsLocked(5, $id)) { + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['plugin'])); } // end check for lock // Lock plugin for other users to edit $modx->lockElement(5, $id); -if(isset($_GET['id'])) { - $rs = $modx->db->select('*', $tbl_site_plugins, "id='{$id}'"); - $content = $modx->db->getRow($rs); - if(!$content) { - header("Location: {$modx->config['site_url']}"); - } - $_SESSION['itemname'] = $content['name']; - if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - $content['properties'] = str_replace("&", "&", $content['properties']); +if (isset($_GET['id'])) { + $rs = $modx->db->select('*', $tbl_site_plugins, "id='{$id}'"); + $content = $modx->db->getRow($rs); + if (!$content) { + header("Location: {$modx->config['site_url']}"); + } + $_SESSION['itemname'] = $content['name']; + if ($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + $content['properties'] = str_replace("&", "&", $content['properties']); } else { - $_SESSION['itemname'] = $_lang["new_plugin"]; - $content['category'] = intval($_REQUEST['catid']); + $_SESSION['itemname'] = $_lang["new_plugin"]; + $content['category'] = intval($_REQUEST['catid']); } -if($modx->manager->hasFormValues()) { - $modx->manager->loadFormValues(); +if ($modx->manager->hasFormValues()) { + $modx->manager->loadFormValues(); } // Add lock-element JS-Script @@ -58,623 +58,657 @@ $lockElementType = 5; require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); -function bold($cond = false) { - if($cond !== false) { - return ' style="background-color:#777;color:#fff;"'; - } else { - return; - } +function bold($cond = false) +{ + if ($cond !== false) { + return ' style="background-color:#777;color:#fff;"'; + } else { + return; + } } ?> diff --git a/manager/actions/mutate_plugin_priority.dynamic.php b/manager/actions/mutate_plugin_priority.dynamic.php index a627e5e72e..97adb32cd3 100644 --- a/manager/actions/mutate_plugin_priority.dynamic.php +++ b/manager/actions/mutate_plugin_priority.dynamic.php @@ -1,37 +1,37 @@ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('save_plugin')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('save_plugin')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $siteURL = $modx->config['site_url']; $updateMsg = ''; -if(isset($_POST['listSubmitted'])) { - $updateMsg .= '' . $_lang['sort_updated'] . '
'; - $tbl = $modx->getFullTableName('site_plugin_events'); - - foreach($_POST as $listName => $listValue) { - if($listName == 'listSubmitted') { - continue; - } - $orderArray = explode(',', $listValue); - $listName = ltrim($listName, 'list_'); - if(count($orderArray) > 0) { - foreach($orderArray as $key => $item) { - if($item == '') { - continue; - } - $pluginId = ltrim($item, 'item_'); - $modx->db->update(array('priority' => $key), $tbl, "pluginid='{$pluginId}' AND evtid='{$listName}'"); - } - } - } - // empty cache - $modx->clearCache('full'); +if (isset($_POST['listSubmitted'])) { + $updateMsg .= '' . $_lang['sort_updated'] . ''; + $tbl = $modx->getFullTableName('site_plugin_events'); + + foreach ($_POST as $listName => $listValue) { + if ($listName == 'listSubmitted') { + continue; + } + $orderArray = explode(',', $listValue); + $listName = ltrim($listName, 'list_'); + if (count($orderArray) > 0) { + foreach ($orderArray as $key => $item) { + if ($item == '') { + continue; + } + $pluginId = ltrim($item, 'item_'); + $modx->db->update(array('priority' => $key), $tbl, "pluginid='{$pluginId}' AND evtid='{$listName}'"); + } + } + } + // empty cache + $modx->clearCache('full'); } $rs = $modx->db->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames') . " sysevt @@ -40,131 +40,86 @@ $insideUl = 0; $preEvt = ''; -$evtLists = ''; +$sortableList = ''; $sortables = array(); -while($plugins = $modx->db->getRow($rs)) { - if($preEvt !== $plugins['evtid']) { - $sortables[] = $plugins['evtid']; - $evtLists .= $insideUl ? '
' : ''; - $evtLists .= '' . $plugins['evtname'] . '
' : '';
+ $sortableList .= 'Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -switch($modx->manager->action) { - case 102: - if(!$modx->hasPermission('edit_plugin')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - case 101: - if(!$modx->hasPermission('new_plugin')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - break; - default: - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +switch ($modx->manager->action) { + case 102: + if (!$modx->hasPermission('edit_plugin')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + case 101: + if (!$modx->hasPermission('new_plugin')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + break; + default: + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0; @@ -25,32 +25,32 @@ $tbl_system_eventnames = $modx->getFullTableName('system_eventnames'); // check to see the plugin isn't locked -if($lockedEl = $modx->elementIsLocked(5, $id)) { - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['plugin'])); +if ($lockedEl = $modx->elementIsLocked(5, $id)) { + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['plugin'])); } // end check for lock // Lock plugin for other users to edit $modx->lockElement(5, $id); -if(isset($_GET['id'])) { - $rs = $modx->db->select('*', $tbl_site_plugins, "id='{$id}'"); - $content = $modx->db->getRow($rs); - if(!$content) { - header("Location: {$modx->config['site_url']}"); - } - $_SESSION['itemname'] = $content['name']; - if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); - } - $content['properties'] = str_replace("&", "&", $content['properties']); +if (isset($_GET['id'])) { + $rs = $modx->db->select('*', $tbl_site_plugins, "id='{$id}'"); + $content = $modx->db->getRow($rs); + if (!$content) { + header("Location: {$modx->config['site_url']}"); + } + $_SESSION['itemname'] = $content['name']; + if ($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); + } + $content['properties'] = str_replace("&", "&", $content['properties']); } else { - $_SESSION['itemname'] = $_lang["new_plugin"]; - $content['category'] = intval($_REQUEST['catid']); + $_SESSION['itemname'] = $_lang["new_plugin"]; + $content['category'] = intval($_REQUEST['catid']); } -if($modx->manager->hasFormValues()) { - $modx->manager->loadFormValues(); +if ($modx->manager->hasFormValues()) { + $modx->manager->loadFormValues(); } // Add lock-element JS-Script @@ -58,623 +58,657 @@ $lockElementType = 5; require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); -function bold($cond = false) { - if($cond !== false) { - return ' style="background-color:#777;color:#fff;"'; - } else { - return; - } +function bold($cond = false) +{ + if ($cond !== false) { + return ' style="background-color:#777;color:#fff;"'; + } else { + return; + } } ?> diff --git a/manager/actions/mutate_plugin_priority.dynamic.php b/manager/actions/mutate_plugin_priority.dynamic.php index a627e5e72e..97adb32cd3 100644 --- a/manager/actions/mutate_plugin_priority.dynamic.php +++ b/manager/actions/mutate_plugin_priority.dynamic.php @@ -1,37 +1,37 @@ INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); +if (IN_MANAGER_MODE != "true") { + die("INCLUDE_ORDERING_ERROR
Please use the MODX Content Manager instead of accessing this file directly."); } -if(!$modx->hasPermission('save_plugin')) { - $modx->webAlertAndQuit($_lang["error_no_privileges"]); +if (!$modx->hasPermission('save_plugin')) { + $modx->webAlertAndQuit($_lang["error_no_privileges"]); } $siteURL = $modx->config['site_url']; $updateMsg = ''; -if(isset($_POST['listSubmitted'])) { - $updateMsg .= '' . $_lang['sort_updated'] . '
'; - $tbl = $modx->getFullTableName('site_plugin_events'); - - foreach($_POST as $listName => $listValue) { - if($listName == 'listSubmitted') { - continue; - } - $orderArray = explode(',', $listValue); - $listName = ltrim($listName, 'list_'); - if(count($orderArray) > 0) { - foreach($orderArray as $key => $item) { - if($item == '') { - continue; - } - $pluginId = ltrim($item, 'item_'); - $modx->db->update(array('priority' => $key), $tbl, "pluginid='{$pluginId}' AND evtid='{$listName}'"); - } - } - } - // empty cache - $modx->clearCache('full'); +if (isset($_POST['listSubmitted'])) { + $updateMsg .= '' . $_lang['sort_updated'] . ''; + $tbl = $modx->getFullTableName('site_plugin_events'); + + foreach ($_POST as $listName => $listValue) { + if ($listName == 'listSubmitted') { + continue; + } + $orderArray = explode(',', $listValue); + $listName = ltrim($listName, 'list_'); + if (count($orderArray) > 0) { + foreach ($orderArray as $key => $item) { + if ($item == '') { + continue; + } + $pluginId = ltrim($item, 'item_'); + $modx->db->update(array('priority' => $key), $tbl, "pluginid='{$pluginId}' AND evtid='{$listName}'"); + } + } + } + // empty cache + $modx->clearCache('full'); } $rs = $modx->db->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames') . " sysevt @@ -40,131 +40,86 @@ $insideUl = 0; $preEvt = ''; -$evtLists = ''; +$sortableList = ''; $sortables = array(); -while($plugins = $modx->db->getRow($rs)) { - if($preEvt !== $plugins['evtid']) { - $sortables[] = $plugins['evtid']; - $evtLists .= $insideUl ? '
' : ''; - $evtLists .= '' . $plugins['evtname'] . '
- ';
- $insideUl = 1;
- }
- $evtLists .= '
- ' . $plugins['name'] . ($plugins['disabled'] ? ' (hide)' : '') . ' '; - $preEvt = $plugins['evtid']; +while ($plugins = $modx->db->getRow($rs)) { + if ($preEvt !== $plugins['evtid']) { + $sortables[] = $plugins['evtid']; + $sortableList .= $insideUl ? '
' . $plugins['evtname'] . '
';
}
require_once(MODX_MANAGER_PATH . 'includes/header.inc.php');
?>
-
-
-
+- ';
+ $insideUl = 1;
+ }
+ $sortableList .= '
- ' . $plugins['name'] . ($plugins['disabled'] ? ' (hide)' : '') . ' '; + $preEvt = $plugins['evtid']; } -if($insideUl) { - $evtLists .= '
+ +
-
+
+
diff --git a/manager/actions/mutate_role.dynamic.php b/manager/actions/mutate_role.dynamic.php
index 1a185317c9..f6b3fa31a6 100644
--- a/manager/actions/mutate_role.dynamic.php
+++ b/manager/actions/mutate_role.dynamic.php
@@ -131,7 +131,6 @@ function changestate(element) {
echo render_form('publish_document', $_lang['role_publish_doc']);
echo render_form('delete_document', $_lang['role_delete_doc']);
echo render_form('empty_trash', $_lang['role_empty_trash']);
- echo render_form('edit_doc_metatags', $_lang['role_edit_doc_metatags']);
echo render_form('empty_cache', $_lang['role_cache_refresh']);
echo render_form('view_unpublished', $_lang['role_view_unpublished']);
?>
@@ -276,7 +275,6 @@ function changestate(element) {
echo render_form('logs', $_lang['role_view_logs']);
echo render_form('settings', $_lang['role_edit_settings']);
echo render_form('bk_manager', $_lang['role_bk_manager']);
- echo render_form('manage_metatags', $_lang['role_manage_metatags']);
echo render_form('import_static', $_lang['role_import_static']);
echo render_form('export_static', $_lang['role_export_static']);
echo render_form('remove_locks', $_lang['role_remove_locks']);
diff --git a/manager/actions/mutate_settings.dynamic.php b/manager/actions/mutate_settings.dynamic.php
index 63e6e88218..624546f422 100644
--- a/manager/actions/mutate_settings.dynamic.php
+++ b/manager/actions/mutate_settings.dynamic.php
@@ -23,8 +23,8 @@
while($row = $modx->db->getRow($rs)) {
$settings[$row['setting_name']] = $row['setting_value'];
}
-$settings['filemanager_path'] = preg_replace('@^' . MODX_BASE_PATH . '@', '[(base_path)]', $settings['filemanager_path']);
-$settings['rb_base_dir'] = preg_replace('@^' . MODX_BASE_PATH . '@', '[(base_path)]', $settings['rb_base_dir']);
+$settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);
+$settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);
extract($settings, EXTR_OVERWRITE);
diff --git a/manager/actions/mutate_settings/tab1_site_settings.inc.php b/manager/actions/mutate_settings/tab1_site_settings.inc.php
index e9153d3cbf..5ade04b0f6 100644
--- a/manager/actions/mutate_settings/tab1_site_settings.inc.php
+++ b/manager/actions/mutate_settings/tab1_site_settings.inc.php
@@ -11,50 +11,50 @@
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
| + | [(site_status)] |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| htmlspecialchars($_lang['sitename_title']) ?> | +htmlspecialchars($_lang['sitename_title']) ?> [(site_name)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(emailsender)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(site_start)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(error_page)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(unauthorized_page)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(site_unavailable_page)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(site_unavailable_message)] | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(default_template)] |
db->select( @@ -121,7 +121,7 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(auto_template_logic)] |
@@ -130,7 +130,7 @@ |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(enable_filter)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(publish_default)] |
@@ -159,7 +159,7 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(cache_default)] |
@@ -167,7 +167,7 @@ |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(search_default)] |
@@ -175,7 +175,7 @@ |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(auto_menuindex)] |
@@ -200,7 +200,7 @@ |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(docid_incrmnt_method)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(enable_cache)] |
+
+ + + + |
+||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
[(cache_type)] |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(minifyphp_incache)] |
@@ -232,7 +241,7 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(server_offset_time)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(server_protocol)] |
@@ -256,13 +265,13 @@ |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(rss_url_news)] |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(track_visitors)] |
@@ -270,7 +279,7 @@ |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(top_howmany)] |
diff --git a/manager/actions/mutate_settings/tab2_furl_settings.inc.php b/manager/actions/mutate_settings/tab2_furl_settings.inc.php index 5a8ac2cf10..2269244e37 100644 --- a/manager/actions/mutate_settings/tab2_furl_settings.inc.php +++ b/manager/actions/mutate_settings/tab2_furl_settings.inc.php @@ -4,7 +4,7 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + | [(friendly_urls)] |
@@ -18,7 +18,7 @@ | |||||||||||||||||||||||
| + | [(xhtml_urls)] |
@@ -32,7 +32,7 @@ | |||||||||||||||||||||||
| + | [(friendly_url_prefix)] |
||||||||||||||||||||||||
| + | [(friendly_url_suffix)] |
||||||||||||||||||||||||
| + | [(make_folders)] |
@@ -69,7 +69,7 @@ | |||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + | [(seostrict)] |
@@ -84,7 +84,7 @@ | |||||||||||||||||||||||
| + | [(aliaslistingfolder)] |
@@ -99,7 +99,7 @@ | |||||||||||||||||||||||
| + | [(friendly_alias_urls)] |
@@ -113,7 +113,7 @@ | |||||||||||||||||||||||
| + | [(use_alias_path)] |
@@ -127,7 +127,7 @@ | |||||||||||||||||||||||
| + | [(allow_duplicate_alias)] |
@@ -141,7 +141,7 @@ | |||||||||||||||||||||||
| + | [(automatic_alias)] |
diff --git a/manager/actions/mutate_settings/tab3_user_settings.inc.php b/manager/actions/mutate_settings/tab3_user_settings.inc.php index 83e5b93135..31320489eb 100644 --- a/manager/actions/mutate_settings/tab3_user_settings.inc.php +++ b/manager/actions/mutate_settings/tab3_user_settings.inc.php @@ -4,7 +4,7 @@
| |||||||||||||||||||||||