@@ -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, |
@@ -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 | |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | // } |
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | - * @param $key |
|
| 27 | - * @param $ret |
|
| 28 | - * @param $prefix_orig |
|
| 26 | + * @param integer $key |
|
| 27 | + * @param string $ret |
|
| 28 | + * @param string $prefix_orig |
|
| 29 | 29 | * @param $objInsinstr |
| 30 | 30 | * @param string $class |
| 31 | 31 | * @param string $prefix_curr |
@@ -140,9 +140,9 @@ discard block |
||
| 140 | 140 | // ================================== |
| 141 | 141 | |
| 142 | 142 | /** |
| 143 | - * @param $key |
|
| 144 | - * @param $ret |
|
| 145 | - * @param $prefix_orig |
|
| 143 | + * @param integer $key |
|
| 144 | + * @param string $ret |
|
| 145 | + * @param string $prefix_orig |
|
| 146 | 146 | * @param array $cidinstrids |
| 147 | 147 | * @param string $class |
| 148 | 148 | * @param string $prefix_curr |
@@ -239,8 +239,8 @@ discard block |
||
| 239 | 239 | // ====================================== |
| 240 | 240 | |
| 241 | 241 | /** |
| 242 | - * @param $key |
|
| 243 | - * @param $ret |
|
| 242 | + * @param integer $key |
|
| 243 | + * @param string $ret |
|
| 244 | 244 | * @param int $currpageid |
| 245 | 245 | * @param array $lastpageids |
| 246 | 246 | * @param int $level |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | // Находим предыдущую и следующую страницы. |
| 351 | 351 | // Находим последнии страницы на каждом уровне. |
| 352 | 352 | /** |
| 353 | - * @param $key |
|
| 353 | + * @param integer $key |
|
| 354 | 354 | * @param int $currpageid |
| 355 | 355 | * @param array $prevpages |
| 356 | 356 | * @param array $nextpages |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $prefix_curr .= $prefix_orig; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 81 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 82 | 82 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 83 | 83 | $this->_makePagesAdminOptions($childkey, $ret, $prefix_orig, $objInsinstr, $class, $prefix_curr); |
| 84 | 84 | } |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | $prefix_curr .= $prefix_orig; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 175 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 176 | 176 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 177 | 177 | $this->_makeCatsAdminOptions($childkey, $ret, $prefix_orig, $cidinstrids, $class, $prefix_curr); |
| 178 | 178 | } |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | // Рекурсия |
| 292 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 292 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 293 | 293 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 294 | 294 | $this->_makePagesUserTree($childkey, $ret, $currpageid, $lastpageids, $level); |
| 295 | 295 | } |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | // Рекурсия |
| 353 | - if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) { |
|
| 353 | + if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) { |
|
| 354 | 354 | foreach ($this->tree[$key]['child'] as $childkey) { |
| 355 | 355 | $this->_makePagesUserCalc($childkey, $currpageid, $prevpages, $nextpages, $lastpageids, $level); |
| 356 | 356 | } |
@@ -46,8 +46,8 @@ |
||
| 46 | 46 | // Редактор |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * @param $caption |
|
| 50 | - * @param $name |
|
| 49 | + * @param string $caption |
|
| 50 | + * @param string $name |
|
| 51 | 51 | * @param string $value |
| 52 | 52 | * @return bool|\XoopsFormEditor |
| 53 | 53 | */ |
@@ -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 | } |