From 470ea6bb4c9f5b28314658531252b7ced28ea16f Mon Sep 17 00:00:00 2001 From: "M@dD3n" Date: Wed, 21 Aug 2019 19:04:33 +0300 Subject: [PATCH] Fixes --- admin/lang/ru/sysblocks.txt | 2 +- admin/sysblocks.php | 83 ++--- admin/templates/request/form.tpl | 2 +- admin/templates/sysblocks/form.tpl | 2 +- admin/templates/sysblocks/form_visual.tpl | 0 admin/templates/sysblocks/list.tpl | 30 +- admin/templates/sysblocks/multi.tpl | 0 admin/templates/sysblocks/nav.tpl | 0 class/class.docs.php | 70 ++-- class/class.sysblocks.php | 392 +++++++++++++++------- 10 files changed, 363 insertions(+), 218 deletions(-) mode change 100755 => 100644 admin/lang/ru/sysblocks.txt mode change 100755 => 100644 admin/templates/sysblocks/form.tpl mode change 100755 => 100644 admin/templates/sysblocks/form_visual.tpl mode change 100755 => 100644 admin/templates/sysblocks/list.tpl mode change 100755 => 100644 admin/templates/sysblocks/multi.tpl mode change 100755 => 100644 admin/templates/sysblocks/nav.tpl mode change 100755 => 100644 class/class.sysblocks.php diff --git a/admin/lang/ru/sysblocks.txt b/admin/lang/ru/sysblocks.txt old mode 100755 new mode 100644 index d5e451e..c38fc72 --- a/admin/lang/ru/sysblocks.txt +++ b/admin/lang/ru/sysblocks.txt @@ -76,4 +76,4 @@ SYSBLOCK_ER_SYN = "Неверный алиас!
Алиас не долже SYSBLOCK_ER_EXISTS = "Неверный алиас!
Данный алиас уже привязан к другоому системному блоку" // v 3.25 -SYSBLOCK_EVAL = "Выполнять PHP перед выозвращением результата" \ No newline at end of file +SYSBLOCK_EVAL = "Выполнять PHP перед возвращением результата" \ No newline at end of file diff --git a/admin/sysblocks.php b/admin/sysblocks.php index b4cc8d3..d29716b 100644 --- a/admin/sysblocks.php +++ b/admin/sysblocks.php @@ -20,109 +20,74 @@ global $AVE_DB, $AVE_Template; require(BASE_DIR . '/class/class.sysblocks.php'); - $AVE_SysBlock = new AVE_SysBlock; + + new Sysblocks; $AVE_Template->config_load(BASE_DIR . '/admin/lang/' . $_SESSION['admin_language'] . '/sysblocks.txt', 'sysblocks'); switch ($_REQUEST['action']) { + // Список системных блоков case '': if (check_permission_acp('sysblocks_view')) { - $AVE_SysBlock->sys_blockList(); + Sysblocks::startPage(); + } + break; + + // Список групп системных блоков + case 'groups': + if (check_permission_acp('sysblocks_view')) + { + Sysblocks::listGroups(); } break; + // Создать новый системный блок case 'new': if (check_permission_acp('sysblocks_edit')) { - $AVE_SysBlock->sys_blockNew(); + Sysblocks::newBlock(); } break; + // Редактировать системный блок case 'edit': if (check_permission_acp('sysblocks_edit')) { - $AVE_SysBlock->sys_blockEdit(isset($_REQUEST['id']) ? $_REQUEST['id'] : null); + Sysblocks::editBlock(); } break; + // Сохранить системный блок case 'save': if (check_permission_acp('sysblocks_edit')) { - $AVE_SysBlock->sys_blockSave(isset($_REQUEST['id']) ? $_REQUEST['id'] : null); + Sysblocks::saveBlock(); } break; + // Удалить системный блок case 'del': if (check_permission_acp('sysblocks_edit')) { - $AVE_SysBlock->sys_blockDelete($_REQUEST['id']); + Sysblocks::delBlock(); } break; + // Проверка алиаса case 'alias': if (check_permission_acp('sysblocks_edit')) { - echo $AVE_SysBlock->sys_blockValidate($_REQUEST['alias'], (int)$_REQUEST['id']); + echo Sysblocks::aliasValidate($_REQUEST['alias'], (int)$_REQUEST['id']); } exit; + // Копирование системного блока case 'multi': if (check_permission_acp('sysblocks_edit')) { - $_REQUEST['sub'] = (!isset($_REQUEST['sub'])) ? '' : $_REQUEST['sub']; - $errors = array(); - switch ($_REQUEST['sub']) - { - case 'save': - $ok = true; - $row = $AVE_DB->Query(" - SELECT sysblock_name - FROM " . PREFIX . "_sysblocks - WHERE sysblock_name = '" . $_REQUEST['sysblock_name'] . "' - ")->FetchRow(); - - if (@$row->sysblock_name != '') - { - array_push($errors, $AVE_Template->get_config_vars('SYSBLOCK_EXIST')); - $AVE_Template->assign('errors', $errors); - $ok = false; - } - - if ($_REQUEST['sysblock_name'] == '') - { - array_push($errors, $AVE_Template->get_config_vars('SYSBLOCK_COPY_TIP')); - $AVE_Template->assign('errors', $errors); - $ok = false; - } - - if ($ok) - { - $row = $AVE_DB->Query(" - SELECT sysblock_text - FROM " . PREFIX . "_sysblocks - WHERE id = '" . (int)$_REQUEST['id'] . "' - ")->FetchRow(); - - $AVE_DB->Query(" - INSERT - INTO " . PREFIX . "_sysblocks - SET - Id = '', - sysblock_name = '" . $_REQUEST['sysblock_name'] . "', - sysblock_text = '" . addslashes($row->sysblock_text) . "', - sysblock_author_id = '" . $_SESSION['user_id'] . "', - sysblock_created = '" . time() . "' - "); - - reportLog($_SESSION['user_name'] . ' - создал копию системного блока (' . (int)$_REQUEST['id'] . ')', 2, 2); - - header('Location:index.php?do=sysblocks'.'&cp=' . SESSION); - } - $AVE_Template->assign('content', $AVE_Template->fetch('sysblocks/multi.tpl')); - break; - } + // } } ?> \ No newline at end of file diff --git a/admin/templates/request/form.tpl b/admin/templates/request/form.tpl index 6c719ff..9645866 100644 --- a/admin/templates/request/form.tpl +++ b/admin/templates/request/form.tpl @@ -142,7 +142,7 @@ function changeRub(select) {ldelim}
  - +
diff --git a/admin/templates/sysblocks/form.tpl b/admin/templates/sysblocks/form.tpl old mode 100755 new mode 100644 index c991080..f12ca7f --- a/admin/templates/sysblocks/form.tpl +++ b/admin/templates/sysblocks/form.tpl @@ -249,7 +249,7 @@ {if $smarty.request.action != 'new'}