mambax7 /
instruction
@@ -13,59 +13,59 @@ discard block |
||
| 13 | 13 | function b_instr_lastinstr_show($options = []) |
| 14 | 14 | { |
| 15 | 15 | |
| 16 | - // Подключаем функции |
|
| 17 | - // $moduleDirName = dirname(__DIR__); |
|
| 18 | - $moduleDirName = basename(dirname(__DIR__)); |
|
| 19 | - // include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php'); |
|
| 20 | - include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php'); |
|
| 21 | - // |
|
| 22 | - $myts = MyTextSanitizer::getInstance(); |
|
| 23 | - // |
|
| 24 | - //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction'); |
|
| 25 | - $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 26 | - $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 16 | + // Подключаем функции |
|
| 17 | + // $moduleDirName = dirname(__DIR__); |
|
| 18 | + $moduleDirName = basename(dirname(__DIR__)); |
|
| 19 | + // include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php'); |
|
| 20 | + include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php'); |
|
| 21 | + // |
|
| 22 | + $myts = MyTextSanitizer::getInstance(); |
|
| 23 | + // |
|
| 24 | + //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction'); |
|
| 25 | + $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 26 | + $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 27 | 27 | |
| 28 | - // Добавляем стили |
|
| 29 | - //global $xoTheme; |
|
| 30 | - //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' ); |
|
| 28 | + // Добавляем стили |
|
| 29 | + //global $xoTheme; |
|
| 30 | + //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' ); |
|
| 31 | 31 | |
| 32 | - // Опции |
|
| 33 | - // Количество страниц |
|
| 34 | - $limit = $options[0]; |
|
| 35 | - // Количество символов |
|
| 36 | - $numchars = $options[1]; |
|
| 32 | + // Опции |
|
| 33 | + // Количество страниц |
|
| 34 | + $limit = $options[0]; |
|
| 35 | + // Количество символов |
|
| 36 | + $numchars = $options[1]; |
|
| 37 | 37 | |
| 38 | - // Права на просмотр |
|
| 39 | - $cat_view = Xoopsmodules\instruction\Utility::getItemIds(); |
|
| 40 | - // Массив выходных данных |
|
| 41 | - $block = []; |
|
| 38 | + // Права на просмотр |
|
| 39 | + $cat_view = Xoopsmodules\instruction\Utility::getItemIds(); |
|
| 40 | + // Массив выходных данных |
|
| 41 | + $block = []; |
|
| 42 | 42 | |
| 43 | - // Если есть категории для прасмотра |
|
| 44 | - if (is_array($cat_view) && count($cat_view) > 0) { |
|
| 43 | + // Если есть категории для прасмотра |
|
| 44 | + if (is_array($cat_view) && count($cat_view) > 0) { |
|
| 45 | 45 | |
| 46 | - // Находим последние инструкции |
|
| 47 | - $sql = "SELECT `instrid`, `cid`, `title`, `pages`, `dateupdated` FROM {$instructionHandler->table} WHERE `cid` IN (" . implode(', ', $cat_view) . ') AND `status` > 0 ORDER BY `dateupdated` DESC'; |
|
| 48 | - // Лимит запроса |
|
| 49 | - $result = $GLOBALS['xoopsDB']->query($sql, $limit); |
|
| 50 | - // Перебираем все значения |
|
| 51 | - $i = 0; |
|
| 52 | - while (list($instrid, $cid, $ititle, $pages, $dateupdated) = $GLOBALS['xoopsDB']->fetchRow($result)) { |
|
| 53 | - // ID инструкции |
|
| 54 | - $block[$i]['instrid'] = $instrid; |
|
| 55 | - // ID категории |
|
| 56 | - $block[$i]['cid'] = $cid; |
|
| 57 | - // Название инструкции |
|
| 58 | - $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle); |
|
| 59 | - // Число страниц |
|
| 60 | - $block[$i]['pages'] = $pages; |
|
| 61 | - // Дата обновления инструкции |
|
| 62 | - $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's'); |
|
| 63 | - // Инкримент |
|
| 64 | - $i++; |
|
| 65 | - } |
|
| 66 | - } |
|
| 67 | - // Возвращаем массив |
|
| 68 | - return $block; |
|
| 46 | + // Находим последние инструкции |
|
| 47 | + $sql = "SELECT `instrid`, `cid`, `title`, `pages`, `dateupdated` FROM {$instructionHandler->table} WHERE `cid` IN (" . implode(', ', $cat_view) . ') AND `status` > 0 ORDER BY `dateupdated` DESC'; |
|
| 48 | + // Лимит запроса |
|
| 49 | + $result = $GLOBALS['xoopsDB']->query($sql, $limit); |
|
| 50 | + // Перебираем все значения |
|
| 51 | + $i = 0; |
|
| 52 | + while (list($instrid, $cid, $ititle, $pages, $dateupdated) = $GLOBALS['xoopsDB']->fetchRow($result)) { |
|
| 53 | + // ID инструкции |
|
| 54 | + $block[$i]['instrid'] = $instrid; |
|
| 55 | + // ID категории |
|
| 56 | + $block[$i]['cid'] = $cid; |
|
| 57 | + // Название инструкции |
|
| 58 | + $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle); |
|
| 59 | + // Число страниц |
|
| 60 | + $block[$i]['pages'] = $pages; |
|
| 61 | + // Дата обновления инструкции |
|
| 62 | + $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's'); |
|
| 63 | + // Инкримент |
|
| 64 | + $i++; |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | + // Возвращаем массив |
|
| 68 | + return $block; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | // Редактирование последних инструкций |
@@ -75,10 +75,10 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | function b_instr_lastinstr_edit($options = []) |
| 77 | 77 | { |
| 78 | - $form = ''; |
|
| 79 | - $form .= _MB_INSTR_DISPLAYINSTRC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" ><br>' . "\n"; |
|
| 80 | - $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" ><br>' . "\n"; |
|
| 78 | + $form = ''; |
|
| 79 | + $form .= _MB_INSTR_DISPLAYINSTRC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" ><br>' . "\n"; |
|
| 80 | + $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" ><br>' . "\n"; |
|
| 81 | 81 | |
| 82 | - // Возвращаем форму |
|
| 83 | - return $form; |
|
| 82 | + // Возвращаем форму |
|
| 83 | + return $form; |
|
| 84 | 84 | } |
@@ -12,63 +12,63 @@ discard block |
||
| 12 | 12 | function b_instr_lastpage_show($options = []) |
| 13 | 13 | { |
| 14 | 14 | |
| 15 | - // Подключаем функции |
|
| 16 | - $moduleDirName = basename(dirname(__DIR__)); |
|
| 17 | - include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php'); |
|
| 18 | - // |
|
| 19 | - $myts = MyTextSanitizer::getInstance(); |
|
| 20 | - // |
|
| 21 | - //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction'); |
|
| 22 | - //mb $pageHandler = xoops_getModuleHandler('page', 'instruction'); |
|
| 15 | + // Подключаем функции |
|
| 16 | + $moduleDirName = basename(dirname(__DIR__)); |
|
| 17 | + include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php'); |
|
| 18 | + // |
|
| 19 | + $myts = MyTextSanitizer::getInstance(); |
|
| 20 | + // |
|
| 21 | + //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction'); |
|
| 22 | + //mb $pageHandler = xoops_getModuleHandler('page', 'instruction'); |
|
| 23 | 23 | |
| 24 | - $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 25 | - $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 26 | - $pageHandler = new \Xoopsmodules\instruction\PageHandler($db); |
|
| 24 | + $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 25 | + $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 26 | + $pageHandler = new \Xoopsmodules\instruction\PageHandler($db); |
|
| 27 | 27 | |
| 28 | - // Добавляем стили |
|
| 29 | - //global $xoTheme; |
|
| 30 | - //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' ); |
|
| 28 | + // Добавляем стили |
|
| 29 | + //global $xoTheme; |
|
| 30 | + //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' ); |
|
| 31 | 31 | |
| 32 | - // Опции |
|
| 33 | - // Количество страниц |
|
| 34 | - $limit = $options[0]; |
|
| 35 | - // Количество символов |
|
| 36 | - $numchars = $options[1]; |
|
| 32 | + // Опции |
|
| 33 | + // Количество страниц |
|
| 34 | + $limit = $options[0]; |
|
| 35 | + // Количество символов |
|
| 36 | + $numchars = $options[1]; |
|
| 37 | 37 | |
| 38 | - // Права на просмотр |
|
| 39 | - $cat_view = Xoopsmodules\instruction\Utility::getItemIds(); |
|
| 40 | - // Массив выходных данных |
|
| 41 | - $block = []; |
|
| 38 | + // Права на просмотр |
|
| 39 | + $cat_view = Xoopsmodules\instruction\Utility::getItemIds(); |
|
| 40 | + // Массив выходных данных |
|
| 41 | + $block = []; |
|
| 42 | 42 | |
| 43 | - // Если есть категории для прасмотра |
|
| 44 | - if (is_array($cat_view) && count($cat_view) > 0) { |
|
| 43 | + // Если есть категории для прасмотра |
|
| 44 | + if (is_array($cat_view) && count($cat_view) > 0) { |
|
| 45 | 45 | |
| 46 | - // Находим последние страницы |
|
| 47 | - $sql = "SELECT p.pageid, p.instrid, p.title, p.dateupdated, i.title, i.cid FROM {$pageHandler->table} p, {$instructionHandler->table} i WHERE p.instrid = i.instrid AND i.cid IN (" . implode(', ', $cat_view) . ') AND p.status > 0 AND i.status > 0 ORDER BY p.dateupdated DESC'; |
|
| 48 | - // Лимит запроса |
|
| 49 | - $result = $GLOBALS['xoopsDB']->query($sql, $limit); |
|
| 50 | - // Перебираем все значения |
|
| 51 | - $i = 0; |
|
| 52 | - while (list($pageid, $instrid, $ptitle, $dateupdated, $ititle, $cid) = $GLOBALS['xoopsDB']->fetchRow($result)) { |
|
| 53 | - // ID страницы |
|
| 54 | - $block[$i]['pageid'] = $pageid; |
|
| 55 | - // ID инструкции |
|
| 56 | - $block[$i]['instrid'] = $instrid; |
|
| 57 | - // Название страницы |
|
| 58 | - $block[$i]['ptitle'] = $myts->htmlSpecialChars($ptitle); |
|
| 59 | - // Название инструкции |
|
| 60 | - $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle); |
|
| 61 | - // Дата обновления страницы |
|
| 62 | - $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's'); |
|
| 63 | - // Категория инстркции |
|
| 64 | - $block[$i]['cid'] = $cid; |
|
| 65 | - // Инкримент |
|
| 66 | - $i++; |
|
| 67 | - } |
|
| 68 | - } |
|
| 46 | + // Находим последние страницы |
|
| 47 | + $sql = "SELECT p.pageid, p.instrid, p.title, p.dateupdated, i.title, i.cid FROM {$pageHandler->table} p, {$instructionHandler->table} i WHERE p.instrid = i.instrid AND i.cid IN (" . implode(', ', $cat_view) . ') AND p.status > 0 AND i.status > 0 ORDER BY p.dateupdated DESC'; |
|
| 48 | + // Лимит запроса |
|
| 49 | + $result = $GLOBALS['xoopsDB']->query($sql, $limit); |
|
| 50 | + // Перебираем все значения |
|
| 51 | + $i = 0; |
|
| 52 | + while (list($pageid, $instrid, $ptitle, $dateupdated, $ititle, $cid) = $GLOBALS['xoopsDB']->fetchRow($result)) { |
|
| 53 | + // ID страницы |
|
| 54 | + $block[$i]['pageid'] = $pageid; |
|
| 55 | + // ID инструкции |
|
| 56 | + $block[$i]['instrid'] = $instrid; |
|
| 57 | + // Название страницы |
|
| 58 | + $block[$i]['ptitle'] = $myts->htmlSpecialChars($ptitle); |
|
| 59 | + // Название инструкции |
|
| 60 | + $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle); |
|
| 61 | + // Дата обновления страницы |
|
| 62 | + $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's'); |
|
| 63 | + // Категория инстркции |
|
| 64 | + $block[$i]['cid'] = $cid; |
|
| 65 | + // Инкримент |
|
| 66 | + $i++; |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - // Возвращаем массив |
|
| 71 | - return $block; |
|
| 70 | + // Возвращаем массив |
|
| 71 | + return $block; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // Редактирование последних страниц |
@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | function b_instr_lastpage_edit($options = []) |
| 80 | 80 | { |
| 81 | - $form = ''; |
|
| 82 | - $form .= _MB_INSTR_DISPLAYPAGESC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" ><br>' . "\n"; |
|
| 83 | - $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" ><br>' . "\n"; |
|
| 81 | + $form = ''; |
|
| 82 | + $form .= _MB_INSTR_DISPLAYPAGESC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" ><br>' . "\n"; |
|
| 83 | + $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" ><br>' . "\n"; |
|
| 84 | 84 | |
| 85 | - // Возвращаем форму |
|
| 86 | - return $form; |
|
| 85 | + // Возвращаем форму |
|
| 86 | + return $form; |
|
| 87 | 87 | } |
@@ -18,97 +18,97 @@ discard block |
||
| 18 | 18 | */ |
| 19 | 19 | class Tree extends \XoopsObjectTree |
| 20 | 20 | { |
| 21 | - // public function __construct() |
|
| 22 | - // { |
|
| 23 | - // } |
|
| 24 | - |
|
| 25 | - /** |
|
| 26 | - * @param $key |
|
| 27 | - * @param $ret |
|
| 28 | - * @param $prefix_orig |
|
| 29 | - * @param $objInsinstr |
|
| 30 | - * @param string $class |
|
| 31 | - * @param string $prefix_curr |
|
| 32 | - */ |
|
| 33 | - public function _makePagesAdminOptions($key, &$ret, $prefix_orig, $objInsinstr, $class = 'odd', $prefix_curr = '') |
|
| 34 | - { |
|
| 35 | - $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 36 | - if ($key > 0) { |
|
| 37 | - |
|
| 38 | - // |
|
| 39 | - $class = ('even' === $class) ? 'odd' : 'even'; |
|
| 40 | - // ID инструкции ( Можно сделать статической ) |
|
| 41 | - $instrid = $objInsinstr->getVar('instrid'); |
|
| 42 | - |
|
| 43 | - // ID страницы |
|
| 44 | - $pageid = $this->tree[$key]['obj']->getVar('pageid'); |
|
| 45 | - // Название страницы |
|
| 46 | - $pagetitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 47 | - // Вес |
|
| 48 | - $pageweight = $this->tree[$key]['obj']->getVar('weight'); |
|
| 49 | - // Статус |
|
| 50 | - $pagestatus = $this->tree[$key]['obj']->getVar('status'); |
|
| 51 | - // Тип страницы |
|
| 52 | - $pagetype = $this->tree[$key]['obj']->getVar('type'); |
|
| 53 | - |
|
| 54 | - // Дочернии страницы |
|
| 55 | - $page_childs = $this->getAllChild($pageid); |
|
| 56 | - // Число дочерних страниц |
|
| 57 | - $num_childs = count($page_childs); |
|
| 58 | - |
|
| 59 | - // Действие - удаление |
|
| 60 | - $act_del = ($num_childs > 0) ? '<img src="../assets/images/icons/16/application_key.png" alt="' . _AM_INSTR_NODELPAGE . '" title="' . _AM_INSTR_NODELPAGE . '" >' : '<a href="instr.php?op=delpage&pageid=' |
|
| 61 | - . $pageid |
|
| 62 | - . '"><img src="'. $pathIcon16 . '/delete.png" alt="' |
|
| 63 | - . _AM_INSTRUCTION_DEL |
|
| 64 | - . '" title="' |
|
| 65 | - . _AM_INSTRUCTION_DEL |
|
| 66 | - . '"></a>'; |
|
| 67 | - // |
|
| 68 | - $page_link = '<a name="pageid_' . $pageid . '" ' . ($pagetype ? 'href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '#pagetext"' : '') . '>' . $pagetitle . '</a>'; |
|
| 69 | - |
|
| 70 | - $ret .= '<tr class="' . $class . '"> |
|
| 21 | + // public function __construct() |
|
| 22 | + // { |
|
| 23 | + // } |
|
| 24 | + |
|
| 25 | + /** |
|
| 26 | + * @param $key |
|
| 27 | + * @param $ret |
|
| 28 | + * @param $prefix_orig |
|
| 29 | + * @param $objInsinstr |
|
| 30 | + * @param string $class |
|
| 31 | + * @param string $prefix_curr |
|
| 32 | + */ |
|
| 33 | + public function _makePagesAdminOptions($key, &$ret, $prefix_orig, $objInsinstr, $class = 'odd', $prefix_curr = '') |
|
| 34 | + { |
|
| 35 | + $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 36 | + if ($key > 0) { |
|
| 37 | + |
|
| 38 | + // |
|
| 39 | + $class = ('even' === $class) ? 'odd' : 'even'; |
|
| 40 | + // ID инструкции ( Можно сделать статической ) |
|
| 41 | + $instrid = $objInsinstr->getVar('instrid'); |
|
| 42 | + |
|
| 43 | + // ID страницы |
|
| 44 | + $pageid = $this->tree[$key]['obj']->getVar('pageid'); |
|
| 45 | + // Название страницы |
|
| 46 | + $pagetitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 47 | + // Вес |
|
| 48 | + $pageweight = $this->tree[$key]['obj']->getVar('weight'); |
|
| 49 | + // Статус |
|
| 50 | + $pagestatus = $this->tree[$key]['obj']->getVar('status'); |
|
| 51 | + // Тип страницы |
|
| 52 | + $pagetype = $this->tree[$key]['obj']->getVar('type'); |
|
| 53 | + |
|
| 54 | + // Дочернии страницы |
|
| 55 | + $page_childs = $this->getAllChild($pageid); |
|
| 56 | + // Число дочерних страниц |
|
| 57 | + $num_childs = count($page_childs); |
|
| 58 | + |
|
| 59 | + // Действие - удаление |
|
| 60 | + $act_del = ($num_childs > 0) ? '<img src="../assets/images/icons/16/application_key.png" alt="' . _AM_INSTR_NODELPAGE . '" title="' . _AM_INSTR_NODELPAGE . '" >' : '<a href="instr.php?op=delpage&pageid=' |
|
| 61 | + . $pageid |
|
| 62 | + . '"><img src="'. $pathIcon16 . '/delete.png" alt="' |
|
| 63 | + . _AM_INSTRUCTION_DEL |
|
| 64 | + . '" title="' |
|
| 65 | + . _AM_INSTRUCTION_DEL |
|
| 66 | + . '"></a>'; |
|
| 67 | + // |
|
| 68 | + $page_link = '<a name="pageid_' . $pageid . '" ' . ($pagetype ? 'href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '#pagetext"' : '') . '>' . $pagetitle . '</a>'; |
|
| 69 | + |
|
| 70 | + $ret .= '<tr class="' . $class . '"> |
|
| 71 | 71 | <td>' . $prefix_curr . ' ' . $page_link . '</td> |
| 72 | 72 | <td align="center" width="50"> |
| 73 | 73 | <input type="text" name="weights[]" size="2" value="' . $pageweight . '" > |
| 74 | 74 | <input type="hidden" name="pageids[]" value="' . $pageid . '" > |
| 75 | 75 | </td> |
| 76 | 76 | <td align="center" width="180">'; |
| 77 | - // Просмотре без кэша |
|
| 78 | - $ret .= ' <a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '&nocache=1"><img src="../assets/images/icons/16/database_black.png" alt="' . _AM_INSTR_DISPLAY_NOCACHE . '" title="' . _AM_INSTR_DISPLAY_NOCACHE . '" ></a> '; |
|
| 79 | - // Добавить подстраницу |
|
| 80 | - $ret .= ' <a href="instr.php?op=editpage&instrid=' . $instrid . '&pid=' . $pageid . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDSUBPAGE . '" title="' . _AM_INSTRUCTION_ADDSUBPAGE . '" ></a> '; |
|
| 81 | - |
|
| 82 | - if ($pagestatus) { |
|
| 83 | - $ret .= ' <img src="../assets/images/icons/16/lock.png" alt="' . _AM_INSTRUCTION_LOCK . '" title="' . _AM_INSTRUCTION_LOCK . '"> '; |
|
| 84 | - } else { |
|
| 85 | - $ret .= ' <img src="../assets/images/icons/16/lock_open.png" alt="' . _AM_INSTRUCTION_UNLOCK . '" title="' . _AM_INSTRUCTION_UNLOCK . '"> '; |
|
| 86 | - } |
|
| 87 | - |
|
| 88 | - $ret .= ' <a href="instr.php?op=editpage&pageid=' . $pageid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> ' . $act_del . ' |
|
| 77 | + // Просмотре без кэша |
|
| 78 | + $ret .= ' <a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '&nocache=1"><img src="../assets/images/icons/16/database_black.png" alt="' . _AM_INSTR_DISPLAY_NOCACHE . '" title="' . _AM_INSTR_DISPLAY_NOCACHE . '" ></a> '; |
|
| 79 | + // Добавить подстраницу |
|
| 80 | + $ret .= ' <a href="instr.php?op=editpage&instrid=' . $instrid . '&pid=' . $pageid . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDSUBPAGE . '" title="' . _AM_INSTRUCTION_ADDSUBPAGE . '" ></a> '; |
|
| 81 | + |
|
| 82 | + if ($pagestatus) { |
|
| 83 | + $ret .= ' <img src="../assets/images/icons/16/lock.png" alt="' . _AM_INSTRUCTION_LOCK . '" title="' . _AM_INSTRUCTION_LOCK . '"> '; |
|
| 84 | + } else { |
|
| 85 | + $ret .= ' <img src="../assets/images/icons/16/lock_open.png" alt="' . _AM_INSTRUCTION_UNLOCK . '" title="' . _AM_INSTRUCTION_UNLOCK . '"> '; |
|
| 86 | + } |
|
| 87 | + |
|
| 88 | + $ret .= ' <a href="instr.php?op=editpage&pageid=' . $pageid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> ' . $act_del . ' |
|
| 89 | 89 | </td> |
| 90 | 90 | </tr>'; |
| 91 | 91 | |
| 92 | - // Устанавливаем префикс |
|
| 93 | - $prefix_curr .= $prefix_orig; |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 97 | - foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 98 | - $this->_makePagesAdminOptions($childkey, $ret, $prefix_orig, $objInsinstr, $class, $prefix_curr); |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - /** |
|
| 104 | - * @param $objInsinstr |
|
| 105 | - * @param string $prefix |
|
| 106 | - * @param int $key |
|
| 107 | - * @return string |
|
| 108 | - */ |
|
| 109 | - public function makePagesAdmin(&$objInsinstr, $prefix = '-', $key = 0) |
|
| 110 | - { |
|
| 111 | - $ret = '<form name="inspages" action="instr.php" method="post"> |
|
| 92 | + // Устанавливаем префикс |
|
| 93 | + $prefix_curr .= $prefix_orig; |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 97 | + foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 98 | + $this->_makePagesAdminOptions($childkey, $ret, $prefix_orig, $objInsinstr, $class, $prefix_curr); |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + /** |
|
| 104 | + * @param $objInsinstr |
|
| 105 | + * @param string $prefix |
|
| 106 | + * @param int $key |
|
| 107 | + * @return string |
|
| 108 | + */ |
|
| 109 | + public function makePagesAdmin(&$objInsinstr, $prefix = '-', $key = 0) |
|
| 110 | + { |
|
| 111 | + $ret = '<form name="inspages" action="instr.php" method="post"> |
|
| 112 | 112 | <table width="100%" cellspacing="1" class="outer"> |
| 113 | 113 | <tr> |
| 114 | 114 | <th align="center" colspan="3">' . sprintf(_AM_INSTRUCTION_LISTPAGESININSTR, $objInsinstr->getVar('title')) . '</th> |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | <td class="head" align="center" width="180">' . _AM_INSTRUCTION_ACTION . '</td> |
| 120 | 120 | </tr>'; |
| 121 | 121 | |
| 122 | - // Выводим все страницы |
|
| 123 | - $this->_makePagesAdminOptions($key, $ret, $prefix, $objInsinstr); |
|
| 122 | + // Выводим все страницы |
|
| 123 | + $this->_makePagesAdminOptions($key, $ret, $prefix, $objInsinstr); |
|
| 124 | 124 | |
| 125 | - $ret .= '<tr class="foot"> |
|
| 125 | + $ret .= '<tr class="foot"> |
|
| 126 | 126 | <td><a href="instr.php?op=editpage&instrid=' . $objInsinstr->getVar('instrid') . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDPAGE . '" title="' . _AM_INSTRUCTION_ADDPAGE . '"></a></td> |
| 127 | 127 | <td colspan="2"> |
| 128 | 128 | <input type="hidden" name="instrid" value="' . $objInsinstr->getVar('instrid') . '" > |
@@ -133,61 +133,61 @@ discard block |
||
| 133 | 133 | </table> |
| 134 | 134 | </form>'; |
| 135 | 135 | |
| 136 | - return $ret; |
|
| 137 | - } |
|
| 138 | - |
|
| 139 | - // ================================== |
|
| 140 | - // === Дерево категорий в админке === |
|
| 141 | - // ================================== |
|
| 142 | - |
|
| 143 | - /** |
|
| 144 | - * @param $key |
|
| 145 | - * @param $ret |
|
| 146 | - * @param $prefix_orig |
|
| 147 | - * @param array $cidinstrids |
|
| 148 | - * @param string $class |
|
| 149 | - * @param string $prefix_curr |
|
| 150 | - */ |
|
| 151 | - public function _makeCatsAdminOptions($key, &$ret, $prefix_orig, $cidinstrids = [], &$class = 'odd', $prefix_curr = '') |
|
| 152 | - { |
|
| 153 | - $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 154 | - if ($key > 0) { |
|
| 155 | - |
|
| 156 | - // |
|
| 157 | - $class = ('even' === $class) ? 'odd' : 'even'; |
|
| 158 | - |
|
| 159 | - // ID категории |
|
| 160 | - $catid = $this->tree[$key]['obj']->getVar('cid'); |
|
| 161 | - // Название категории |
|
| 162 | - $cattitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 163 | - // Вес |
|
| 164 | - $catweight = $this->tree[$key]['obj']->getVar('weight'); |
|
| 165 | - // Статус |
|
| 166 | - $pagestatus = $this->tree[$key]['obj']->getVar('status'); |
|
| 167 | - |
|
| 168 | - // Дочернии категории |
|
| 169 | - $cat_childs = $this->getAllChild($catid); |
|
| 170 | - // Число дочерних категорий |
|
| 171 | - $num_childs = count($cat_childs); |
|
| 172 | - // Число инструкций |
|
| 173 | - $num_instrs = isset($cidinstrids[$catid]) ? $cidinstrids[$catid] : 0; |
|
| 174 | - |
|
| 175 | - // Действие - удаление |
|
| 176 | - $act_del = (($num_instrs > 0) || ($num_childs > 0)) ? '<img src="'. $pathIcon16 . '/delete.png" alt="' . _AM_INSTR_NODELCAT . '" title="' . _AM_INSTR_NODELCAT . '" >' : '<a href="cat.php?op=delcat&cid=' |
|
| 177 | - . $catid |
|
| 178 | - . '"><img src="'. $pathIcon16 . '/delete.png" alt="' |
|
| 179 | - . _AM_INSTRUCTION_DEL |
|
| 180 | - . '" title="' |
|
| 181 | - . _AM_INSTRUCTION_DEL |
|
| 182 | - . '" ></a>'; |
|
| 183 | - // Действие - просмотр |
|
| 184 | - $act_view = ($num_instrs > 0) ? '<a href="instr.php?cid=' . $catid . '"><img src="'. $pathIcon16 . '/view.png" alt="' . _AM_INSTR_VIEWINSTR . '" title="' . _AM_INSTR_VIEWINSTR . '" ></a>' : '<img src="../assets/images/icons/16/document_protect.png" alt="' |
|
| 185 | - . _AM_INSTR_NOVIEWINSTR |
|
| 186 | - . '" title="' |
|
| 187 | - . _AM_INSTR_NOVIEWINSTR |
|
| 188 | - . '" >'; |
|
| 189 | - |
|
| 190 | - $ret .= '<tr class="' . $class . '"> |
|
| 136 | + return $ret; |
|
| 137 | + } |
|
| 138 | + |
|
| 139 | + // ================================== |
|
| 140 | + // === Дерево категорий в админке === |
|
| 141 | + // ================================== |
|
| 142 | + |
|
| 143 | + /** |
|
| 144 | + * @param $key |
|
| 145 | + * @param $ret |
|
| 146 | + * @param $prefix_orig |
|
| 147 | + * @param array $cidinstrids |
|
| 148 | + * @param string $class |
|
| 149 | + * @param string $prefix_curr |
|
| 150 | + */ |
|
| 151 | + public function _makeCatsAdminOptions($key, &$ret, $prefix_orig, $cidinstrids = [], &$class = 'odd', $prefix_curr = '') |
|
| 152 | + { |
|
| 153 | + $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 154 | + if ($key > 0) { |
|
| 155 | + |
|
| 156 | + // |
|
| 157 | + $class = ('even' === $class) ? 'odd' : 'even'; |
|
| 158 | + |
|
| 159 | + // ID категории |
|
| 160 | + $catid = $this->tree[$key]['obj']->getVar('cid'); |
|
| 161 | + // Название категории |
|
| 162 | + $cattitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 163 | + // Вес |
|
| 164 | + $catweight = $this->tree[$key]['obj']->getVar('weight'); |
|
| 165 | + // Статус |
|
| 166 | + $pagestatus = $this->tree[$key]['obj']->getVar('status'); |
|
| 167 | + |
|
| 168 | + // Дочернии категории |
|
| 169 | + $cat_childs = $this->getAllChild($catid); |
|
| 170 | + // Число дочерних категорий |
|
| 171 | + $num_childs = count($cat_childs); |
|
| 172 | + // Число инструкций |
|
| 173 | + $num_instrs = isset($cidinstrids[$catid]) ? $cidinstrids[$catid] : 0; |
|
| 174 | + |
|
| 175 | + // Действие - удаление |
|
| 176 | + $act_del = (($num_instrs > 0) || ($num_childs > 0)) ? '<img src="'. $pathIcon16 . '/delete.png" alt="' . _AM_INSTR_NODELCAT . '" title="' . _AM_INSTR_NODELCAT . '" >' : '<a href="cat.php?op=delcat&cid=' |
|
| 177 | + . $catid |
|
| 178 | + . '"><img src="'. $pathIcon16 . '/delete.png" alt="' |
|
| 179 | + . _AM_INSTRUCTION_DEL |
|
| 180 | + . '" title="' |
|
| 181 | + . _AM_INSTRUCTION_DEL |
|
| 182 | + . '" ></a>'; |
|
| 183 | + // Действие - просмотр |
|
| 184 | + $act_view = ($num_instrs > 0) ? '<a href="instr.php?cid=' . $catid . '"><img src="'. $pathIcon16 . '/view.png" alt="' . _AM_INSTR_VIEWINSTR . '" title="' . _AM_INSTR_VIEWINSTR . '" ></a>' : '<img src="../assets/images/icons/16/document_protect.png" alt="' |
|
| 185 | + . _AM_INSTR_NOVIEWINSTR |
|
| 186 | + . '" title="' |
|
| 187 | + . _AM_INSTR_NOVIEWINSTR |
|
| 188 | + . '" >'; |
|
| 189 | + |
|
| 190 | + $ret .= '<tr class="' . $class . '"> |
|
| 191 | 191 | <td>' . $prefix_curr . ' <a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/index.php?cid=' . $catid . '">' . $cattitle . '</a></td> |
| 192 | 192 | <td align="center" width="50">' . $catweight . '</td> |
| 193 | 193 | <td align="center" width="100">' . $num_instrs . '</td> |
@@ -198,26 +198,26 @@ discard block |
||
| 198 | 198 | </td> |
| 199 | 199 | </tr>'; |
| 200 | 200 | |
| 201 | - // Устанавливаем префикс |
|
| 202 | - $prefix_curr .= $prefix_orig; |
|
| 203 | - } |
|
| 204 | - |
|
| 205 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 206 | - foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 207 | - $this->_makeCatsAdminOptions($childkey, $ret, $prefix_orig, $cidinstrids, $class, $prefix_curr); |
|
| 208 | - } |
|
| 209 | - } |
|
| 210 | - } |
|
| 211 | - |
|
| 212 | - /** |
|
| 213 | - * @param string $prefix |
|
| 214 | - * @param array $cidinstrids |
|
| 215 | - * @param int $key |
|
| 216 | - * @return string |
|
| 217 | - */ |
|
| 218 | - public function makeCatsAdmin($prefix = '-', $cidinstrids = [], $key = 0) |
|
| 219 | - { |
|
| 220 | - $ret = '<table width="100%" cellspacing="1" class="outer"> |
|
| 201 | + // Устанавливаем префикс |
|
| 202 | + $prefix_curr .= $prefix_orig; |
|
| 203 | + } |
|
| 204 | + |
|
| 205 | + if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 206 | + foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 207 | + $this->_makeCatsAdminOptions($childkey, $ret, $prefix_orig, $cidinstrids, $class, $prefix_curr); |
|
| 208 | + } |
|
| 209 | + } |
|
| 210 | + } |
|
| 211 | + |
|
| 212 | + /** |
|
| 213 | + * @param string $prefix |
|
| 214 | + * @param array $cidinstrids |
|
| 215 | + * @param int $key |
|
| 216 | + * @return string |
|
| 217 | + */ |
|
| 218 | + public function makeCatsAdmin($prefix = '-', $cidinstrids = [], $key = 0) |
|
| 219 | + { |
|
| 220 | + $ret = '<table width="100%" cellspacing="1" class="outer"> |
|
| 221 | 221 | <tr> |
| 222 | 222 | <th align="center" colspan="4">' . _AM_INSTR_LISTALLCATS . '</th> |
| 223 | 223 | </tr> |
@@ -228,216 +228,216 @@ discard block |
||
| 228 | 228 | <td class="head" align="center" width="150">' . _AM_INSTRUCTION_ACTION . '</td> |
| 229 | 229 | </tr>'; |
| 230 | 230 | |
| 231 | - // Выводим все страницы |
|
| 232 | - $this->_makeCatsAdminOptions($key, $ret, $prefix, $cidinstrids); |
|
| 233 | - |
|
| 234 | - $ret .= '</table>'; |
|
| 235 | - |
|
| 236 | - return $ret; |
|
| 237 | - } |
|
| 238 | - |
|
| 239 | - // ====================================== |
|
| 240 | - // Список страниц на стороне пользователя |
|
| 241 | - // ====================================== |
|
| 242 | - |
|
| 243 | - /** |
|
| 244 | - * @param $key |
|
| 245 | - * @param $ret |
|
| 246 | - * @param int $currpageid |
|
| 247 | - * @param array $lastpageids |
|
| 248 | - * @param int $level |
|
| 249 | - */ |
|
| 250 | - public function _makePagesUserTree($key, &$ret, $currpageid = 0, &$lastpageids = [], $level = 0) |
|
| 251 | - { |
|
| 252 | - |
|
| 253 | - // Сохраняем значение предыдущей страницы |
|
| 254 | - //static $stat_prevpages; |
|
| 255 | - |
|
| 256 | - if ($key > 0) { |
|
| 257 | - |
|
| 258 | - // ID страницы |
|
| 259 | - $pageid = $this->tree[$key]['obj']->getVar('pageid'); |
|
| 260 | - // Название страницы |
|
| 261 | - $pagetitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 262 | - // Тип страницы |
|
| 263 | - $pagetype = $this->tree[$key]['obj']->getVar('type'); |
|
| 264 | - |
|
| 265 | - // Дочернии категории |
|
| 266 | - $page_childs = $this->getAllChild($pageid); |
|
| 267 | - // Число дочерних страниц |
|
| 268 | - $num_childs = count($page_childs); |
|
| 269 | - |
|
| 270 | - // Генерируем класс |
|
| 271 | - // InstrTreeNode InstrTreeIsRoot InstrTreeExpandClosed InstrTreeIsLast |
|
| 272 | - $class = []; |
|
| 273 | - // Данный класс должен быть у любого узла |
|
| 274 | - $class[] = 'InstrTreeNode'; |
|
| 275 | - // Если узел нулевого уровня, добавляем InstrTreeIsRoot |
|
| 276 | - if (0 === $level) { |
|
| 277 | - $class[] = 'InstrTreeIsRoot'; |
|
| 278 | - } |
|
| 279 | - // Тип узла InstrTreeExpandClosed|InstrTreeExpandLeaf |
|
| 280 | - // Если у узла нет потомков - InstrTreeExpandLeaf |
|
| 281 | - if (0 == $num_childs) { |
|
| 282 | - $class[] = 'InstrTreeExpandLeaf'; |
|
| 283 | - // Если у искомого элемента есть потомки - открываем список |
|
| 284 | - } elseif ($currpageid == $pageid) { |
|
| 285 | - $class[] = 'InstrTreeExpandOpen'; |
|
| 286 | - // Если искомый элемент есть в потомках текущего, то ставим класс InstrTreeExpandOpen |
|
| 287 | - } elseif (array_key_exists($currpageid, $page_childs)) { |
|
| 288 | - $class[] = 'InstrTreeExpandOpen'; |
|
| 289 | - // |
|
| 290 | - } else { |
|
| 291 | - $class[] = 'InstrTreeExpandClosed'; |
|
| 292 | - } |
|
| 293 | - |
|
| 294 | - // Данный класс нужно добавлять последнему узлу в каждом уровне |
|
| 295 | - |
|
| 296 | - if (isset($lastpageids[$level]) && ($pageid == $lastpageids[$level])) { |
|
| 297 | - $class[] = 'InstrTreeIsLast'; |
|
| 298 | - } |
|
| 299 | - |
|
| 300 | - //$class[] = 'InstrTreeIsLast'; |
|
| 301 | - |
|
| 302 | - // Test |
|
| 303 | - //$ret .= '<div id="' . $pageid . '">'; |
|
| 304 | - |
|
| 305 | - // Создаём запись |
|
| 306 | - $ret .= '<li class="' . implode(' ', $class) . '">'; |
|
| 307 | - // |
|
| 308 | - $ret .= '<div class="InstrTreeExpand"></div>'; |
|
| 309 | - // |
|
| 310 | - $ret .= '<div class="InstrTreeContent">'; |
|
| 311 | - |
|
| 312 | - // Если это лист дерева |
|
| 313 | - if (0 == $pagetype) { |
|
| 314 | - $ret .= '<span class="InstrTreeEmptyPage">' . $pagetitle . '</span>'; |
|
| 315 | - // |
|
| 316 | - } elseif ($currpageid == $pageid) { |
|
| 317 | - $ret .= $pagetitle; |
|
| 318 | - // |
|
| 319 | - } else { |
|
| 320 | - $ret .= '<a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '#pagetext">' . $pagetitle . '</a>'; |
|
| 321 | - } |
|
| 322 | - |
|
| 323 | - $ret .= '</div>'; |
|
| 324 | - |
|
| 325 | - // Если есть потомки |
|
| 326 | - if ($num_childs > 0) { |
|
| 327 | - $ret .= '<ul class="InstrTreeContainer">'; |
|
| 328 | - } |
|
| 329 | - |
|
| 330 | - // Инкримент уровня |
|
| 331 | - $level++; |
|
| 332 | - } |
|
| 333 | - |
|
| 334 | - // Рекурсия |
|
| 335 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 336 | - foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 337 | - $this->_makePagesUserTree($childkey, $ret, $currpageid, $lastpageids, $level); |
|
| 338 | - } |
|
| 339 | - } |
|
| 340 | - |
|
| 341 | - // Test |
|
| 342 | - if ($key > 0) { |
|
| 343 | - // Если есть потомки |
|
| 344 | - if ($num_childs > 0) { |
|
| 345 | - $ret .= '</ul>'; |
|
| 346 | - } |
|
| 347 | - // Конец текущей записи |
|
| 348 | - $ret .= '</li>'; |
|
| 349 | - } |
|
| 350 | - } |
|
| 351 | - |
|
| 352 | - // Находим предыдущую и следующую страницы. |
|
| 353 | - // Находим последнии страницы на каждом уровне. |
|
| 354 | - /** |
|
| 355 | - * @param $key |
|
| 356 | - * @param int $currpageid |
|
| 357 | - * @param array $prevpages |
|
| 358 | - * @param array $nextpages |
|
| 359 | - * @param array $lastpageids |
|
| 360 | - * @param int $level |
|
| 361 | - */ |
|
| 362 | - public function _makePagesUserCalc($key, $currpageid = 0, &$prevpages = [], &$nextpages = [], &$lastpageids = [], $level = 0) |
|
| 363 | - { |
|
| 364 | - |
|
| 365 | - // Сохраняем значение предыдущей страницы |
|
| 366 | - static $stat_prevpages; |
|
| 367 | - |
|
| 368 | - if ($key > 0) { |
|
| 369 | - // ID страницы |
|
| 370 | - $pageid = $this->tree[$key]['obj']->getVar('pageid'); |
|
| 371 | - // Название страницы |
|
| 372 | - $pagetitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 373 | - // Тип страницы |
|
| 374 | - $pagetype = $this->tree[$key]['obj']->getVar('type'); |
|
| 375 | - |
|
| 376 | - // Если мы передали ID текущей страницы, то находить предыдудую и следующую страницы |
|
| 377 | - // Не находить предыдущие и следующие для "Пустой страницы" |
|
| 378 | - if ($currpageid && $pagetype) { |
|
| 379 | - // Если элемент равен текущей странице |
|
| 380 | - if (null !== $stat_prevpages && ($currpageid == $pageid)) { |
|
| 381 | - // Забиваем массив предыдущей страницы |
|
| 382 | - $prevpages['pageid'] = $stat_prevpages['pageid']; |
|
| 383 | - $prevpages['title'] = $stat_prevpages['title']; |
|
| 384 | - |
|
| 385 | - // Если предыдущий равен текущей странице |
|
| 386 | - } elseif (null !== $stat_prevpages && ($currpageid == $stat_prevpages['pageid'])) { |
|
| 387 | - // Забиваем массив следующей страницы |
|
| 388 | - $nextpages['pageid'] = $pageid; |
|
| 389 | - $nextpages['title'] = $pagetitle; |
|
| 390 | - } |
|
| 391 | - // Заносим текущие данные в массив предыдущей страницы |
|
| 392 | - $stat_prevpages['pageid'] = $pageid; |
|
| 393 | - $stat_prevpages['title'] = $pagetitle; |
|
| 394 | - } |
|
| 395 | - |
|
| 396 | - // Заносим текущую страницу в массив "последних страний" |
|
| 397 | - $lastpageids[$level] = $pageid; |
|
| 398 | - |
|
| 399 | - // Инкримент уровня |
|
| 400 | - $level++; |
|
| 401 | - } |
|
| 402 | - |
|
| 403 | - // Рекурсия |
|
| 404 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 405 | - foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 406 | - $this->_makePagesUserCalc($childkey, $currpageid, $prevpages, $nextpages, $lastpageids, $level); |
|
| 407 | - } |
|
| 408 | - } |
|
| 409 | - } |
|
| 410 | - |
|
| 411 | - // |
|
| 412 | - |
|
| 413 | - /** |
|
| 414 | - * @param int $currpageid |
|
| 415 | - * @param array $prevpages |
|
| 416 | - * @param array $nextpages |
|
| 417 | - * @param int $key |
|
| 418 | - * @return string |
|
| 419 | - */ |
|
| 420 | - public function makePagesUser($currpageid = 0, &$prevpages = [], &$nextpages = [], $key = 0) |
|
| 421 | - { |
|
| 422 | - |
|
| 423 | - // Массив последней страницы на каждом уровне |
|
| 424 | - // level => pageid |
|
| 425 | - $lastpageids = []; |
|
| 426 | - |
|
| 427 | - // Расчёт |
|
| 428 | - $this->_makePagesUserCalc($key, $currpageid, $prevpages, $nextpages, $lastpageids); |
|
| 429 | - |
|
| 430 | - $ret = '<div onclick="instr_tree_toggle(arguments[0])"> |
|
| 231 | + // Выводим все страницы |
|
| 232 | + $this->_makeCatsAdminOptions($key, $ret, $prefix, $cidinstrids); |
|
| 233 | + |
|
| 234 | + $ret .= '</table>'; |
|
| 235 | + |
|
| 236 | + return $ret; |
|
| 237 | + } |
|
| 238 | + |
|
| 239 | + // ====================================== |
|
| 240 | + // Список страниц на стороне пользователя |
|
| 241 | + // ====================================== |
|
| 242 | + |
|
| 243 | + /** |
|
| 244 | + * @param $key |
|
| 245 | + * @param $ret |
|
| 246 | + * @param int $currpageid |
|
| 247 | + * @param array $lastpageids |
|
| 248 | + * @param int $level |
|
| 249 | + */ |
|
| 250 | + public function _makePagesUserTree($key, &$ret, $currpageid = 0, &$lastpageids = [], $level = 0) |
|
| 251 | + { |
|
| 252 | + |
|
| 253 | + // Сохраняем значение предыдущей страницы |
|
| 254 | + //static $stat_prevpages; |
|
| 255 | + |
|
| 256 | + if ($key > 0) { |
|
| 257 | + |
|
| 258 | + // ID страницы |
|
| 259 | + $pageid = $this->tree[$key]['obj']->getVar('pageid'); |
|
| 260 | + // Название страницы |
|
| 261 | + $pagetitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 262 | + // Тип страницы |
|
| 263 | + $pagetype = $this->tree[$key]['obj']->getVar('type'); |
|
| 264 | + |
|
| 265 | + // Дочернии категории |
|
| 266 | + $page_childs = $this->getAllChild($pageid); |
|
| 267 | + // Число дочерних страниц |
|
| 268 | + $num_childs = count($page_childs); |
|
| 269 | + |
|
| 270 | + // Генерируем класс |
|
| 271 | + // InstrTreeNode InstrTreeIsRoot InstrTreeExpandClosed InstrTreeIsLast |
|
| 272 | + $class = []; |
|
| 273 | + // Данный класс должен быть у любого узла |
|
| 274 | + $class[] = 'InstrTreeNode'; |
|
| 275 | + // Если узел нулевого уровня, добавляем InstrTreeIsRoot |
|
| 276 | + if (0 === $level) { |
|
| 277 | + $class[] = 'InstrTreeIsRoot'; |
|
| 278 | + } |
|
| 279 | + // Тип узла InstrTreeExpandClosed|InstrTreeExpandLeaf |
|
| 280 | + // Если у узла нет потомков - InstrTreeExpandLeaf |
|
| 281 | + if (0 == $num_childs) { |
|
| 282 | + $class[] = 'InstrTreeExpandLeaf'; |
|
| 283 | + // Если у искомого элемента есть потомки - открываем список |
|
| 284 | + } elseif ($currpageid == $pageid) { |
|
| 285 | + $class[] = 'InstrTreeExpandOpen'; |
|
| 286 | + // Если искомый элемент есть в потомках текущего, то ставим класс InstrTreeExpandOpen |
|
| 287 | + } elseif (array_key_exists($currpageid, $page_childs)) { |
|
| 288 | + $class[] = 'InstrTreeExpandOpen'; |
|
| 289 | + // |
|
| 290 | + } else { |
|
| 291 | + $class[] = 'InstrTreeExpandClosed'; |
|
| 292 | + } |
|
| 293 | + |
|
| 294 | + // Данный класс нужно добавлять последнему узлу в каждом уровне |
|
| 295 | + |
|
| 296 | + if (isset($lastpageids[$level]) && ($pageid == $lastpageids[$level])) { |
|
| 297 | + $class[] = 'InstrTreeIsLast'; |
|
| 298 | + } |
|
| 299 | + |
|
| 300 | + //$class[] = 'InstrTreeIsLast'; |
|
| 301 | + |
|
| 302 | + // Test |
|
| 303 | + //$ret .= '<div id="' . $pageid . '">'; |
|
| 304 | + |
|
| 305 | + // Создаём запись |
|
| 306 | + $ret .= '<li class="' . implode(' ', $class) . '">'; |
|
| 307 | + // |
|
| 308 | + $ret .= '<div class="InstrTreeExpand"></div>'; |
|
| 309 | + // |
|
| 310 | + $ret .= '<div class="InstrTreeContent">'; |
|
| 311 | + |
|
| 312 | + // Если это лист дерева |
|
| 313 | + if (0 == $pagetype) { |
|
| 314 | + $ret .= '<span class="InstrTreeEmptyPage">' . $pagetitle . '</span>'; |
|
| 315 | + // |
|
| 316 | + } elseif ($currpageid == $pageid) { |
|
| 317 | + $ret .= $pagetitle; |
|
| 318 | + // |
|
| 319 | + } else { |
|
| 320 | + $ret .= '<a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '#pagetext">' . $pagetitle . '</a>'; |
|
| 321 | + } |
|
| 322 | + |
|
| 323 | + $ret .= '</div>'; |
|
| 324 | + |
|
| 325 | + // Если есть потомки |
|
| 326 | + if ($num_childs > 0) { |
|
| 327 | + $ret .= '<ul class="InstrTreeContainer">'; |
|
| 328 | + } |
|
| 329 | + |
|
| 330 | + // Инкримент уровня |
|
| 331 | + $level++; |
|
| 332 | + } |
|
| 333 | + |
|
| 334 | + // Рекурсия |
|
| 335 | + if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 336 | + foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 337 | + $this->_makePagesUserTree($childkey, $ret, $currpageid, $lastpageids, $level); |
|
| 338 | + } |
|
| 339 | + } |
|
| 340 | + |
|
| 341 | + // Test |
|
| 342 | + if ($key > 0) { |
|
| 343 | + // Если есть потомки |
|
| 344 | + if ($num_childs > 0) { |
|
| 345 | + $ret .= '</ul>'; |
|
| 346 | + } |
|
| 347 | + // Конец текущей записи |
|
| 348 | + $ret .= '</li>'; |
|
| 349 | + } |
|
| 350 | + } |
|
| 351 | + |
|
| 352 | + // Находим предыдущую и следующую страницы. |
|
| 353 | + // Находим последнии страницы на каждом уровне. |
|
| 354 | + /** |
|
| 355 | + * @param $key |
|
| 356 | + * @param int $currpageid |
|
| 357 | + * @param array $prevpages |
|
| 358 | + * @param array $nextpages |
|
| 359 | + * @param array $lastpageids |
|
| 360 | + * @param int $level |
|
| 361 | + */ |
|
| 362 | + public function _makePagesUserCalc($key, $currpageid = 0, &$prevpages = [], &$nextpages = [], &$lastpageids = [], $level = 0) |
|
| 363 | + { |
|
| 364 | + |
|
| 365 | + // Сохраняем значение предыдущей страницы |
|
| 366 | + static $stat_prevpages; |
|
| 367 | + |
|
| 368 | + if ($key > 0) { |
|
| 369 | + // ID страницы |
|
| 370 | + $pageid = $this->tree[$key]['obj']->getVar('pageid'); |
|
| 371 | + // Название страницы |
|
| 372 | + $pagetitle = $this->tree[$key]['obj']->getVar('title'); |
|
| 373 | + // Тип страницы |
|
| 374 | + $pagetype = $this->tree[$key]['obj']->getVar('type'); |
|
| 375 | + |
|
| 376 | + // Если мы передали ID текущей страницы, то находить предыдудую и следующую страницы |
|
| 377 | + // Не находить предыдущие и следующие для "Пустой страницы" |
|
| 378 | + if ($currpageid && $pagetype) { |
|
| 379 | + // Если элемент равен текущей странице |
|
| 380 | + if (null !== $stat_prevpages && ($currpageid == $pageid)) { |
|
| 381 | + // Забиваем массив предыдущей страницы |
|
| 382 | + $prevpages['pageid'] = $stat_prevpages['pageid']; |
|
| 383 | + $prevpages['title'] = $stat_prevpages['title']; |
|
| 384 | + |
|
| 385 | + // Если предыдущий равен текущей странице |
|
| 386 | + } elseif (null !== $stat_prevpages && ($currpageid == $stat_prevpages['pageid'])) { |
|
| 387 | + // Забиваем массив следующей страницы |
|
| 388 | + $nextpages['pageid'] = $pageid; |
|
| 389 | + $nextpages['title'] = $pagetitle; |
|
| 390 | + } |
|
| 391 | + // Заносим текущие данные в массив предыдущей страницы |
|
| 392 | + $stat_prevpages['pageid'] = $pageid; |
|
| 393 | + $stat_prevpages['title'] = $pagetitle; |
|
| 394 | + } |
|
| 395 | + |
|
| 396 | + // Заносим текущую страницу в массив "последних страний" |
|
| 397 | + $lastpageids[$level] = $pageid; |
|
| 398 | + |
|
| 399 | + // Инкримент уровня |
|
| 400 | + $level++; |
|
| 401 | + } |
|
| 402 | + |
|
| 403 | + // Рекурсия |
|
| 404 | + if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 405 | + foreach ($this->tree[$key]['child'] as $childkey) { |
|
| 406 | + $this->_makePagesUserCalc($childkey, $currpageid, $prevpages, $nextpages, $lastpageids, $level); |
|
| 407 | + } |
|
| 408 | + } |
|
| 409 | + } |
|
| 410 | + |
|
| 411 | + // |
|
| 412 | + |
|
| 413 | + /** |
|
| 414 | + * @param int $currpageid |
|
| 415 | + * @param array $prevpages |
|
| 416 | + * @param array $nextpages |
|
| 417 | + * @param int $key |
|
| 418 | + * @return string |
|
| 419 | + */ |
|
| 420 | + public function makePagesUser($currpageid = 0, &$prevpages = [], &$nextpages = [], $key = 0) |
|
| 421 | + { |
|
| 422 | + |
|
| 423 | + // Массив последней страницы на каждом уровне |
|
| 424 | + // level => pageid |
|
| 425 | + $lastpageids = []; |
|
| 426 | + |
|
| 427 | + // Расчёт |
|
| 428 | + $this->_makePagesUserCalc($key, $currpageid, $prevpages, $nextpages, $lastpageids); |
|
| 429 | + |
|
| 430 | + $ret = '<div onclick="instr_tree_toggle(arguments[0])"> |
|
| 431 | 431 | <div>' . _MD_INSTRUCTION_LISTPAGES . '</div> |
| 432 | 432 | <div><ul class="InstrTreeContainer">'; |
| 433 | 433 | |
| 434 | - // Генерируем дерево |
|
| 435 | - $this->_makePagesUserTree($key, $ret, $currpageid, $lastpageids); |
|
| 434 | + // Генерируем дерево |
|
| 435 | + $this->_makePagesUserTree($key, $ret, $currpageid, $lastpageids); |
|
| 436 | 436 | |
| 437 | - $ret .= '</ul> |
|
| 437 | + $ret .= '</ul> |
|
| 438 | 438 | </div> |
| 439 | 439 | </div>'; |
| 440 | 440 | |
| 441 | - return $ret; |
|
| 442 | - } |
|
| 441 | + return $ret; |
|
| 442 | + } |
|
| 443 | 443 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public function _makePagesAdminOptions($key, &$ret, $prefix_orig, $objInsinstr, $class = 'odd', $prefix_curr = '') |
| 34 | 34 | { |
| 35 | - $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 35 | + $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 36 | 36 | if ($key > 0) { |
| 37 | 37 | |
| 38 | 38 | // |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | // Действие - удаление |
| 60 | 60 | $act_del = ($num_childs > 0) ? '<img src="../assets/images/icons/16/application_key.png" alt="' . _AM_INSTR_NODELPAGE . '" title="' . _AM_INSTR_NODELPAGE . '" >' : '<a href="instr.php?op=delpage&pageid=' |
| 61 | 61 | . $pageid |
| 62 | - . '"><img src="'. $pathIcon16 . '/delete.png" alt="' |
|
| 62 | + . '"><img src="' . $pathIcon16 . '/delete.png" alt="' |
|
| 63 | 63 | . _AM_INSTRUCTION_DEL |
| 64 | 64 | . '" title="' |
| 65 | 65 | . _AM_INSTRUCTION_DEL |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | // Просмотре без кэша |
| 78 | 78 | $ret .= ' <a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '&nocache=1"><img src="../assets/images/icons/16/database_black.png" alt="' . _AM_INSTR_DISPLAY_NOCACHE . '" title="' . _AM_INSTR_DISPLAY_NOCACHE . '" ></a> '; |
| 79 | 79 | // Добавить подстраницу |
| 80 | - $ret .= ' <a href="instr.php?op=editpage&instrid=' . $instrid . '&pid=' . $pageid . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDSUBPAGE . '" title="' . _AM_INSTRUCTION_ADDSUBPAGE . '" ></a> '; |
|
| 80 | + $ret .= ' <a href="instr.php?op=editpage&instrid=' . $instrid . '&pid=' . $pageid . '"><img src="' . $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDSUBPAGE . '" title="' . _AM_INSTRUCTION_ADDSUBPAGE . '" ></a> '; |
|
| 81 | 81 | |
| 82 | 82 | if ($pagestatus) { |
| 83 | 83 | $ret .= ' <img src="../assets/images/icons/16/lock.png" alt="' . _AM_INSTRUCTION_LOCK . '" title="' . _AM_INSTRUCTION_LOCK . '"> '; |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $ret .= ' <img src="../assets/images/icons/16/lock_open.png" alt="' . _AM_INSTRUCTION_UNLOCK . '" title="' . _AM_INSTRUCTION_UNLOCK . '"> '; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - $ret .= ' <a href="instr.php?op=editpage&pageid=' . $pageid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> ' . $act_del . ' |
|
| 88 | + $ret .= ' <a href="instr.php?op=editpage&pageid=' . $pageid . '"><img src="' . $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> ' . $act_del . ' |
|
| 89 | 89 | </td> |
| 90 | 90 | </tr>'; |
| 91 | 91 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $prefix_curr .= $prefix_orig; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 96 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 97 | 97 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 98 | 98 | $this->_makePagesAdminOptions($childkey, $ret, $prefix_orig, $objInsinstr, $class, $prefix_curr); |
| 99 | 99 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $this->_makePagesAdminOptions($key, $ret, $prefix, $objInsinstr); |
| 124 | 124 | |
| 125 | 125 | $ret .= '<tr class="foot"> |
| 126 | - <td><a href="instr.php?op=editpage&instrid=' . $objInsinstr->getVar('instrid') . '"><img src="'. $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDPAGE . '" title="' . _AM_INSTRUCTION_ADDPAGE . '"></a></td> |
|
| 126 | + <td><a href="instr.php?op=editpage&instrid=' . $objInsinstr->getVar('instrid') . '"><img src="' . $pathIcon16 . '/add.png" alt="' . _AM_INSTRUCTION_ADDPAGE . '" title="' . _AM_INSTRUCTION_ADDPAGE . '"></a></td> |
|
| 127 | 127 | <td colspan="2"> |
| 128 | 128 | <input type="hidden" name="instrid" value="' . $objInsinstr->getVar('instrid') . '" > |
| 129 | 129 | <input type="hidden" name="op" value="updpage" > |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | */ |
| 151 | 151 | public function _makeCatsAdminOptions($key, &$ret, $prefix_orig, $cidinstrids = [], &$class = 'odd', $prefix_curr = '') |
| 152 | 152 | { |
| 153 | - $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 153 | + $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16); |
|
| 154 | 154 | if ($key > 0) { |
| 155 | 155 | |
| 156 | 156 | // |
@@ -173,15 +173,15 @@ discard block |
||
| 173 | 173 | $num_instrs = isset($cidinstrids[$catid]) ? $cidinstrids[$catid] : 0; |
| 174 | 174 | |
| 175 | 175 | // Действие - удаление |
| 176 | - $act_del = (($num_instrs > 0) || ($num_childs > 0)) ? '<img src="'. $pathIcon16 . '/delete.png" alt="' . _AM_INSTR_NODELCAT . '" title="' . _AM_INSTR_NODELCAT . '" >' : '<a href="cat.php?op=delcat&cid=' |
|
| 176 | + $act_del = (($num_instrs > 0) || ($num_childs > 0)) ? '<img src="' . $pathIcon16 . '/delete.png" alt="' . _AM_INSTR_NODELCAT . '" title="' . _AM_INSTR_NODELCAT . '" >' : '<a href="cat.php?op=delcat&cid=' |
|
| 177 | 177 | . $catid |
| 178 | - . '"><img src="'. $pathIcon16 . '/delete.png" alt="' |
|
| 178 | + . '"><img src="' . $pathIcon16 . '/delete.png" alt="' |
|
| 179 | 179 | . _AM_INSTRUCTION_DEL |
| 180 | 180 | . '" title="' |
| 181 | 181 | . _AM_INSTRUCTION_DEL |
| 182 | 182 | . '" ></a>'; |
| 183 | 183 | // Действие - просмотр |
| 184 | - $act_view = ($num_instrs > 0) ? '<a href="instr.php?cid=' . $catid . '"><img src="'. $pathIcon16 . '/view.png" alt="' . _AM_INSTR_VIEWINSTR . '" title="' . _AM_INSTR_VIEWINSTR . '" ></a>' : '<img src="../assets/images/icons/16/document_protect.png" alt="' |
|
| 184 | + $act_view = ($num_instrs > 0) ? '<a href="instr.php?cid=' . $catid . '"><img src="' . $pathIcon16 . '/view.png" alt="' . _AM_INSTR_VIEWINSTR . '" title="' . _AM_INSTR_VIEWINSTR . '" ></a>' : '<img src="../assets/images/icons/16/document_protect.png" alt="' |
|
| 185 | 185 | . _AM_INSTR_NOVIEWINSTR |
| 186 | 186 | . '" title="' |
| 187 | 187 | . _AM_INSTR_NOVIEWINSTR |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | <td align="center" width="100">' . $num_instrs . '</td> |
| 194 | 194 | <td align="center" width="150"> |
| 195 | 195 | ' . $act_view . ' |
| 196 | - <a href="cat.php?op=editcat&cid=' . $catid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> |
|
| 196 | + <a href="cat.php?op=editcat&cid=' . $catid . '"><img src="' . $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a> |
|
| 197 | 197 | ' . $act_del . ' |
| 198 | 198 | </td> |
| 199 | 199 | </tr>'; |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | $prefix_curr .= $prefix_orig; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 205 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 206 | 206 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 207 | 207 | $this->_makeCatsAdminOptions($childkey, $ret, $prefix_orig, $cidinstrids, $class, $prefix_curr); |
| 208 | 208 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | // Рекурсия |
| 335 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 335 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 336 | 336 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 337 | 337 | $this->_makePagesUserTree($childkey, $ret, $currpageid, $lastpageids, $level); |
| 338 | 338 | } |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | // Рекурсия |
| 404 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 404 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 405 | 405 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 406 | 406 | $this->_makePagesUserCalc($childkey, $currpageid, $prevpages, $nextpages, $lastpageids, $level); |
| 407 | 407 | } |
@@ -7,39 +7,39 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | function instruction_tag_iteminfo(&$items) |
| 9 | 9 | { |
| 10 | - if (empty($items) || !is_array($items)) { |
|
| 11 | - return false; |
|
| 12 | - } |
|
| 10 | + if (empty($items) || !is_array($items)) { |
|
| 11 | + return false; |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - $items_id = []; |
|
| 15 | - foreach (array_keys($items) as $cat_id) { |
|
| 16 | - foreach (array_keys($items[$cat_id]) as $item_id) { |
|
| 17 | - $items_id[] = (int)$item_id; |
|
| 18 | - } |
|
| 19 | - } |
|
| 14 | + $items_id = []; |
|
| 15 | + foreach (array_keys($items) as $cat_id) { |
|
| 16 | + foreach (array_keys($items[$cat_id]) as $item_id) { |
|
| 17 | + $items_id[] = (int)$item_id; |
|
| 18 | + } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | //mb $itemHandler = xoops_getModuleHandler('instruction', 'instruction'); |
| 22 | - $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 23 | - $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 24 | - $items_obj = $itemHandler->getObjects(new \Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true); |
|
| 22 | + $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 23 | + $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 24 | + $items_obj = $itemHandler->getObjects(new \Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true); |
|
| 25 | 25 | |
| 26 | - foreach (array_keys($items) as $cat_id) { |
|
| 27 | - foreach (array_keys($items[$cat_id]) as $item_id) { |
|
| 28 | - if (isset($items_obj[$item_id])) { |
|
| 29 | - $item_obj = $items_obj[$item_id]; |
|
| 30 | - $items[$cat_id][$item_id] = [ |
|
| 31 | - 'title' => $item_obj->getVar('title'), |
|
| 32 | - 'uid' => $item_obj->getVar('uid'), |
|
| 33 | - 'link' => "instr.php?id={$item_id}", |
|
| 34 | - 'time' => $item_obj->getVar('datecreated'), |
|
| 35 | - 'tags' => '', |
|
| 36 | - 'content' => '', |
|
| 37 | - ]; |
|
| 38 | - } |
|
| 39 | - } |
|
| 40 | - } |
|
| 41 | - unset($items_obj); |
|
| 42 | - return ''; |
|
| 26 | + foreach (array_keys($items) as $cat_id) { |
|
| 27 | + foreach (array_keys($items[$cat_id]) as $item_id) { |
|
| 28 | + if (isset($items_obj[$item_id])) { |
|
| 29 | + $item_obj = $items_obj[$item_id]; |
|
| 30 | + $items[$cat_id][$item_id] = [ |
|
| 31 | + 'title' => $item_obj->getVar('title'), |
|
| 32 | + 'uid' => $item_obj->getVar('uid'), |
|
| 33 | + 'link' => "instr.php?id={$item_id}", |
|
| 34 | + 'time' => $item_obj->getVar('datecreated'), |
|
| 35 | + 'tags' => '', |
|
| 36 | + 'content' => '', |
|
| 37 | + ]; |
|
| 38 | + } |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + unset($items_obj); |
|
| 42 | + return ''; |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | // Синхронизация тегов |
@@ -48,33 +48,33 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | function instruction_tag_synchronization($mid) |
| 50 | 50 | { |
| 51 | - //mb $itemHandler = xoops_getModuleHandler('instruction', 'instruction'); |
|
| 52 | - $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 53 | - $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 54 | - $linkHandler = xoops_getModuleHandler('link', 'tag'); |
|
| 51 | + //mb $itemHandler = xoops_getModuleHandler('instruction', 'instruction'); |
|
| 52 | + $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 53 | + $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
|
| 54 | + $linkHandler = xoops_getModuleHandler('link', 'tag'); |
|
| 55 | 55 | |
| 56 | - /* clear tag-item links */ |
|
| 57 | - if (version_compare($GLOBALS['xoopsDB']->getServerVersion(), '4.1.0', 'ge')): |
|
| 58 | - $sql = " DELETE FROM {$linkHandler->table}" |
|
| 59 | - . ' WHERE ' |
|
| 60 | - . " tag_modid = {$mid}" |
|
| 61 | - . ' AND ' |
|
| 62 | - . ' ( tag_itemid NOT IN ' |
|
| 63 | - . " ( SELECT DISTINCT {$itemHandler->keyName} " |
|
| 64 | - . " FROM {$itemHandler->table} " |
|
| 65 | - . " WHERE {$itemHandler->table}.status > 0" |
|
| 66 | - . ' ) ' |
|
| 67 | - . ' )'; else: |
|
| 68 | - $sql = " DELETE {$linkHandler->table} FROM {$linkHandler->table}" |
|
| 69 | - . " LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} " |
|
| 70 | - . ' WHERE ' |
|
| 71 | - . " tag_modid = {$mid}" |
|
| 72 | - . ' AND ' |
|
| 73 | - . " ( aa.{$itemHandler->keyName} IS NULL" |
|
| 74 | - . ' OR aa.status < 1' |
|
| 75 | - . ' )'; |
|
| 76 | - endif; |
|
| 77 | - if (!$result = $linkHandler->db->queryF($sql)) { |
|
| 78 | - //xoops_error($linkHandler->db->error()); |
|
| 79 | - } |
|
| 56 | + /* clear tag-item links */ |
|
| 57 | + if (version_compare($GLOBALS['xoopsDB']->getServerVersion(), '4.1.0', 'ge')): |
|
| 58 | + $sql = " DELETE FROM {$linkHandler->table}" |
|
| 59 | + . ' WHERE ' |
|
| 60 | + . " tag_modid = {$mid}" |
|
| 61 | + . ' AND ' |
|
| 62 | + . ' ( tag_itemid NOT IN ' |
|
| 63 | + . " ( SELECT DISTINCT {$itemHandler->keyName} " |
|
| 64 | + . " FROM {$itemHandler->table} " |
|
| 65 | + . " WHERE {$itemHandler->table}.status > 0" |
|
| 66 | + . ' ) ' |
|
| 67 | + . ' )'; else: |
|
| 68 | + $sql = " DELETE {$linkHandler->table} FROM {$linkHandler->table}" |
|
| 69 | + . " LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} " |
|
| 70 | + . ' WHERE ' |
|
| 71 | + . " tag_modid = {$mid}" |
|
| 72 | + . ' AND ' |
|
| 73 | + . " ( aa.{$itemHandler->keyName} IS NULL" |
|
| 74 | + . ' OR aa.status < 1' |
|
| 75 | + . ' )'; |
|
| 76 | + endif; |
|
| 77 | + if (!$result = $linkHandler->db->queryF($sql)) { |
|
| 78 | + //xoops_error($linkHandler->db->error()); |
|
| 79 | + } |
|
| 80 | 80 | } |
@@ -7,19 +7,19 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | function instruction_tag_iteminfo(&$items) |
| 9 | 9 | { |
| 10 | - if (empty($items) || !is_array($items)) { |
|
| 10 | + if (empty($items) || ! is_array($items)) { |
|
| 11 | 11 | return false; |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | $items_id = []; |
| 15 | 15 | foreach (array_keys($items) as $cat_id) { |
| 16 | 16 | foreach (array_keys($items[$cat_id]) as $item_id) { |
| 17 | - $items_id[] = (int)$item_id; |
|
| 17 | + $items_id[] = (int) $item_id; |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | //mb $itemHandler = xoops_getModuleHandler('instruction', 'instruction'); |
| 22 | - $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 22 | + $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 23 | 23 | $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
| 24 | 24 | $items_obj = $itemHandler->getObjects(new \Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true); |
| 25 | 25 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | function instruction_tag_synchronization($mid) |
| 50 | 50 | { |
| 51 | 51 | //mb $itemHandler = xoops_getModuleHandler('instruction', 'instruction'); |
| 52 | - $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 52 | + $db = \XoopsDatabaseFactory::getDatabase(); |
|
| 53 | 53 | $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db); |
| 54 | 54 | $linkHandler = xoops_getModuleHandler('link', 'tag'); |
| 55 | 55 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | . ' OR aa.status < 1' |
| 75 | 75 | . ' )'; |
| 76 | 76 | endif; |
| 77 | - if (!$result = $linkHandler->db->queryF($sql)) { |
|
| 77 | + if ( ! $result = $linkHandler->db->queryF($sql)) { |
|
| 78 | 78 | //xoops_error($linkHandler->db->error()); |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -23,57 +23,57 @@ |
||
| 23 | 23 | $capsDirName = strtoupper($moduleDirName); |
| 24 | 24 | |
| 25 | 25 | if (!defined($capsDirName . '_DIRNAME')) { |
| 26 | - //if (!defined(constant($capsDirName . '_DIRNAME'))) { |
|
| 27 | - define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname()); |
|
| 28 | - define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME')); |
|
| 29 | - define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME')); |
|
| 30 | - define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php'); |
|
| 31 | - define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME')); |
|
| 32 | - define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png'); |
|
| 33 | - define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
| 34 | - define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
| 26 | + //if (!defined(constant($capsDirName . '_DIRNAME'))) { |
|
| 27 | + define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname()); |
|
| 28 | + define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME')); |
|
| 29 | + define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME')); |
|
| 30 | + define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php'); |
|
| 31 | + define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME')); |
|
| 32 | + define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png'); |
|
| 33 | + define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
| 34 | + define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | //Configurator |
| 38 | 38 | return (object)[ |
| 39 | - 'name' => strtoupper($moduleDirName) . ' Module Configurator', |
|
| 40 | - 'paths' => [ |
|
| 41 | - 'dirname' => $moduleDirName, |
|
| 42 | - 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin', |
|
| 43 | - // 'path' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName, |
|
| 44 | - // 'url' => XOOPS_URL . '/modules/' . $moduleDirName, |
|
| 45 | - 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName, |
|
| 46 | - 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName, |
|
| 47 | - ], |
|
| 48 | - 'uploadFolders' => [ |
|
| 49 | - constant($capsDirName . '_UPLOAD_PATH'), |
|
| 50 | - //constant($capsDirName . '_UPLOAD_PATH') . '/category', |
|
| 51 | - //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots', |
|
| 52 | - //XOOPS_UPLOAD_PATH . '/flags' |
|
| 53 | - ], |
|
| 54 | - 'blankFiles' => [ |
|
| 55 | - constant($capsDirName . '_UPLOAD_PATH'), |
|
| 56 | - //constant($capsDirName . '_UPLOAD_PATH') . '/category', |
|
| 57 | - //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots', |
|
| 58 | - //XOOPS_UPLOAD_PATH . '/flags' |
|
| 59 | - ], |
|
| 39 | + 'name' => strtoupper($moduleDirName) . ' Module Configurator', |
|
| 40 | + 'paths' => [ |
|
| 41 | + 'dirname' => $moduleDirName, |
|
| 42 | + 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin', |
|
| 43 | + // 'path' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName, |
|
| 44 | + // 'url' => XOOPS_URL . '/modules/' . $moduleDirName, |
|
| 45 | + 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName, |
|
| 46 | + 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName, |
|
| 47 | + ], |
|
| 48 | + 'uploadFolders' => [ |
|
| 49 | + constant($capsDirName . '_UPLOAD_PATH'), |
|
| 50 | + //constant($capsDirName . '_UPLOAD_PATH') . '/category', |
|
| 51 | + //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots', |
|
| 52 | + //XOOPS_UPLOAD_PATH . '/flags' |
|
| 53 | + ], |
|
| 54 | + 'blankFiles' => [ |
|
| 55 | + constant($capsDirName . '_UPLOAD_PATH'), |
|
| 56 | + //constant($capsDirName . '_UPLOAD_PATH') . '/category', |
|
| 57 | + //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots', |
|
| 58 | + //XOOPS_UPLOAD_PATH . '/flags' |
|
| 59 | + ], |
|
| 60 | 60 | |
| 61 | - 'templateFolders' => [ |
|
| 62 | - '/templates/', |
|
| 63 | - '/templates/blocks/', |
|
| 64 | - '/templates/admin/' |
|
| 61 | + 'templateFolders' => [ |
|
| 62 | + '/templates/', |
|
| 63 | + '/templates/blocks/', |
|
| 64 | + '/templates/admin/' |
|
| 65 | 65 | |
| 66 | - ], |
|
| 67 | - 'oldFiles' => [// '/sql/mysql.sql', |
|
| 68 | - ], |
|
| 69 | - 'oldFolders' => [ |
|
| 70 | - '/images', |
|
| 71 | - '/css', |
|
| 72 | - '/js', |
|
| 73 | - '/tree', |
|
| 74 | - '/images/icons/16', |
|
| 75 | - '/images/icons/32', |
|
| 76 | - ], |
|
| 77 | - 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'> |
|
| 66 | + ], |
|
| 67 | + 'oldFiles' => [// '/sql/mysql.sql', |
|
| 68 | + ], |
|
| 69 | + 'oldFolders' => [ |
|
| 70 | + '/images', |
|
| 71 | + '/css', |
|
| 72 | + '/js', |
|
| 73 | + '/tree', |
|
| 74 | + '/images/icons/16', |
|
| 75 | + '/images/icons/32', |
|
| 76 | + ], |
|
| 77 | + 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'> |
|
| 78 | 78 | <img src='" . $capsDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' ></a>', |
| 79 | 79 | ]; |
