@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $moduleDirName = basename(dirname(__DIR__)); |
| 23 | 23 | $capsDirName = strtoupper($moduleDirName); |
| 24 | 24 | |
| 25 | -if (!defined($capsDirName . '_DIRNAME')) { |
|
| 25 | +if ( ! defined($capsDirName . '_DIRNAME')) { |
|
| 26 | 26 | //if (!defined(constant($capsDirName . '_DIRNAME'))) { |
| 27 | 27 | define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname()); |
| 28 | 28 | define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME')); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | //Configurator |
| 38 | -return (object)[ |
|
| 38 | +return (object) [ |
|
| 39 | 39 | 'name' => strtoupper($moduleDirName) . ' Module Configurator', |
| 40 | 40 | 'paths' => [ |
| 41 | 41 | 'dirname' => $moduleDirName, |
@@ -52,7 +52,8 @@ discard block |
||
| 52 | 52 | . " FROM {$itemHandler->table} " |
| 53 | 53 | . " WHERE {$itemHandler->table}.status > 0" |
| 54 | 54 | . ' ) ' |
| 55 | - . ' )'; else: |
|
| 55 | + . ' )'; else {
|
|
| 56 | + : |
|
| 56 | 57 | $sql = " DELETE {$linkHandler->table} FROM {$linkHandler->table}" |
| 57 | 58 | . " LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} " |
| 58 | 59 | . ' WHERE ' |
@@ -60,7 +61,8 @@ discard block |
||
| 60 | 61 | . ' AND ' |
| 61 | 62 | . " ( aa.{$itemHandler->keyName} IS NULL" |
| 62 | 63 | . ' OR aa.status < 1' |
| 63 | - . ' )'; |
|
| 64 | + . ' )'; |
|
| 65 | + } |
|
| 64 | 66 | endif; |
| 65 | 67 | if (!$result = $linkHandler->db->queryF($sql)) { |
| 66 | 68 | //xoops_error($linkHandler->db->error()); |
@@ -7,14 +7,14 @@ 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 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | . ' OR aa.status < 1' |
| 71 | 71 | . ' )'; |
| 72 | 72 | endif; |
| 73 | - if (!$result = $linkHandler->db->queryF($sql)) { |
|
| 73 | + if ( ! $result = $linkHandler->db->queryF($sql)) { |
|
| 74 | 74 | //xoops_error($linkHandler->db->error()); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | |
| 10 | 10 | $sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0'; |
| 11 | 11 | if (0 != $userid) { |
| 12 | - $sql .= ' AND p.uid = ' . (int)$userid . ' '; |
|
| 12 | + $sql .= ' AND p.uid = ' . (int) $userid . ' '; |
|
| 13 | 13 | //return NULL; |
| 14 | 14 | } |
| 15 | 15 | |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Xoopsmodules\instruction; |
| 4 | 4 | |
| 5 | -if (!isset($moduleDirName)) { |
|
| 5 | +if ( ! isset($moduleDirName)) { |
|
| 6 | 6 | $moduleDirName = basename(dirname(__DIR__)); |
| 7 | 7 | } |
| 8 | 8 | |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | /** |
| 4 | 4 | * @see http://www.php-fig.org/psr/psr-4/examples/ |
| 5 | 5 | */ |
| 6 | -spl_autoload_register(function ($class) { |
|
| 6 | +spl_autoload_register(function($class) { |
|
| 7 | 7 | // project-specific namespace prefix |
| 8 | 8 | $prefix = 'Xoopsmodules\\instruction\\'; |
| 9 | 9 | |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | break; |
| 52 | 52 | } |
| 53 | 53 | } else { |
| 54 | - if ((int)$v > 0) { // handles versions like x.x.x.0_RC2 |
|
| 54 | + if ((int) $v > 0) { // handles versions like x.x.x.0_RC2 |
|
| 55 | 55 | $success = false; |
| 56 | 56 | break; |
| 57 | 57 | } |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | */ |
| 64 | 64 | public function render() |
| 65 | 65 | { |
| 66 | - if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) { |
|
| 66 | + if ( ! isset($GLOBALS['xoTheme']) || ! is_object($GLOBALS['xoTheme'])) { |
|
| 67 | 67 | require_once $GLOBALS['xoops']->path('class/theme.php'); |
| 68 | 68 | $GLOBALS['xoTheme'] = new xos_opal_Theme(); |
| 69 | 69 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | // $categoryHandler = xoops_getModuleHandler('category', 'instruction'); |
| 93 | 93 | $criteria = new \CriteriaCompo(); |
| 94 | 94 | // Если мы редактируем, то убрать текущую категорию из списка выбора родительской |
| 95 | - if (!$this->isNew()) { |
|
| 95 | + if ( ! $this->isNew()) { |
|
| 96 | 96 | $criteria->add(new \Criteria('cid', $this->getVar('cid'), '<>')); |
| 97 | 97 | } |
| 98 | 98 | $criteria->setSort('weight ASC, title'); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | // Права на просмотр |
| 139 | 139 | $groups_ids = []; |
| 140 | 140 | // Если мы редактируем |
| 141 | - if (!$this->isNew()) { |
|
| 141 | + if ( ! $this->isNew()) { |
|
| 142 | 142 | $groups_ids = $gpermHandler->getGroupIds('instruction_view', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid')); |
| 143 | 143 | $groups_ids = array_values($groups_ids); |
| 144 | 144 | $groups_instr_view = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $groups_ids); |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | // Права на отправку |
| 152 | 152 | $groups_ids = []; |
| 153 | - if (!$this->isNew()) { |
|
| 153 | + if ( ! $this->isNew()) { |
|
| 154 | 154 | $groups_ids = $gpermHandler->getGroupIds('instruction_submit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid')); |
| 155 | 155 | $groups_ids = array_values($groups_ids); |
| 156 | 156 | $groups_instr_submit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $groups_ids); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | // Права на редактирование |
| 164 | 164 | $groups_ids = []; |
| 165 | - if (!$this->isNew()) { |
|
| 165 | + if ( ! $this->isNew()) { |
|
| 166 | 166 | $groups_ids = $gpermHandler->getGroupIds('instruction_edit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid')); |
| 167 | 167 | $groups_ids = array_values($groups_ids); |
| 168 | 168 | $groups_instr_edit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $groups_ids); |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | // ========================================================== |
| 177 | 177 | |
| 178 | 178 | // Если мы редактируем категорию |
| 179 | - if (!$this->isNew()) { |
|
| 179 | + if ( ! $this->isNew()) { |
|
| 180 | 180 | $form->addElement(new \XoopsFormHidden('cid', $this->getVar('cid'))); |
| 181 | 181 | //$form->addElement( new \XoopsFormHidden( 'catmodify', true)); |
| 182 | 182 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | // Находим все страницы данной инструкции |
| 87 | 87 | $criteria->add(new \Criteria('instrid', $instrid_page, '=')); |
| 88 | 88 | // Если мы редактируем, то убрать текущую страницу из списка выбора родительской |
| 89 | - if (!$this->isNew()) { |
|
| 89 | + if ( ! $this->isNew()) { |
|
| 90 | 90 | $criteria->add(new \Criteria('pageid', $this->getVar('pageid'), '<>')); |
| 91 | 91 | } |
| 92 | 92 | $criteria->setSort('weight'); |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | $form->addElement($option_tray); |
| 152 | 152 | |
| 153 | 153 | // Если мы редактируем страницу |
| 154 | - if (!$this->isNew()) { |
|
| 154 | + if ( ! $this->isNew()) { |
|
| 155 | 155 | $form->addElement(new \XoopsFormHidden('pageid', $this->getVar('pageid'))); |
| 156 | 156 | } else { |
| 157 | 157 | $form->addElement(new \XoopsFormHidden('pageid', 0)); |