mambax7 / instruction

admin/instr.php

Spacing +19 added lines, -19 removed lines

@@ -60,7 +60,7 @@ 
             // Получаем объект категории
             $objInscat = $categoryHandler->get($cid);
             // Если нет такой категории
-            if (!is_object($objInscat)) {
+            if ( ! is_object($objInscat)) {
                 redirect_header('cat.php', 3, _AM_INSTRUCTION_ERR_CATNOTSELECT);
             }
         }
@@ -166,7 +166,7 @@ 
     case 'saveinstr':
 
         // Проверка
-        if (!$GLOBALS['xoopsSecurity']->check()) {
+        if ( ! $GLOBALS['xoopsSecurity']->check()) {
             redirect_header('instr.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         // Если мы редактируем
@@ -197,18 +197,18 @@ 
         $objInsinstr->setVar('metadescription', Request::getString('metadescription', ''));
 
         // Проверка категорий
-        if (!$cid) {
-            $err         = true;
+        if ( ! $cid) {
+            $err = true;
             $message_err .= _AM_INSTRUCTION_ERR_CAT . '<br>';
         }
         // Проверка названия
-        if (!$instr_title) {
-            $err         = true;
+        if ( ! $instr_title) {
+            $err = true;
             $message_err .= _AM_INSTR_ERR_TITLE . '<br>';
         }
         // Проверка основного текста
-        if (!$instr_description) {
-            $err         = true;
+        if ( ! $instr_description) {
+            $err = true;
             $message_err .= _AM_INSTR_ERR_DESCRIPTION . '<br>';
         }
 
@@ -313,7 +313,7 @@ 
         if ($ok) {
 
             // Проверка
-            if (!$GLOBALS['xoopsSecurity']->check()) {
+            if ( ! $GLOBALS['xoopsSecurity']->check()) {
                 redirect_header('instr.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             // Находим все страницы, пренадлежащие этой инструкции
@@ -400,7 +400,7 @@ 
         $message_err = '';
 
         // Проверка сессии
-        if (!$GLOBALS['xoopsSecurity']->check()) {
+        if ( ! $GLOBALS['xoopsSecurity']->check()) {
             $err         = true;
             $err_txt     = implode(', ', $GLOBALS['xoopsSecurity']->getErrors());
             $message_err .= $err_txt . '<br>';
@@ -458,28 +458,28 @@ 
         $objInspage->setVar('dobr', $dobr);
 
         //
-        if (!$pageid && !$instrid) {
-            $err         = true;
+        if ( ! $pageid && ! $instrid) {
+            $err = true;
             $message_err .= _AM_INSTRUCTION_ERR_INSTR . '<br>';
         }
         // Проверка веса
         if (0 == $weight) {
-            $err         = true;
+            $err = true;
             $message_err .= _AM_INSTRUCTION_ERR_WEIGHT . '<br>';
         }
         // Проверка родительской страницы
         if ($pageid && ($pageid == $pid)) {
-            $err         = true;
+            $err = true;
             $message_err .= _AM_INSTRUCTION_ERR_PPAGE . '<br>';
         }
         // Проверка названия
-        if (!$page_title) {
-            $err         = true;
+        if ( ! $page_title) {
+            $err = true;
             $message_err .= _AM_INSTR_ERR_TITLE . '<br>';
         }
         // Проверка основного текста
-        if (!$page_hometext) {
-            $err         = true;
+        if ( ! $page_hometext) {
+            $err = true;
             $message_err .= _AM_INSTR_ERR_HOMETEXT . '<br>';
         }
 
@@ -547,7 +547,7 @@ 
         if ($ok) {
 
             // Проверка
-            if (!$GLOBALS['xoopsSecurity']->check()) {
+            if ( ! $GLOBALS['xoopsSecurity']->check()) {
                 redirect_header('instr.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             // ID инструкции

instr.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 
 // Права на просмотр инструкции
 $categories = Xoopsmodules\instruction\Utility::getItemIds();
-if (!in_array($objInsinstr->getVar('cid'), $categories)) {
+if ( ! in_array($objInsinstr->getVar('cid'), $categories)) {
     redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
     exit();
 }
@@ -62,7 +62,7 @@ 
                            . $moduleDirName
                            . '/admin/instr.php?op=editinstr&instrid='
                            . $instrid
-                           . '"><img style="width:16px;" src="'. $pathIcon16 . '/edit.png" alt='
+                           . '"><img style="width:16px;" src="' . $pathIcon16 . '/edit.png" alt='
                            . _EDIT
                            . ' title='
                            . _EDIT
@@ -72,7 +72,7 @@ 
                            . $moduleDirName
                            . '/admin/instr.php?op=delinstr&instrid='
                            . $instrid
-                           . '"><img style="width:16px;" src="'. $pathIcon16 . '/delete.png" alt='
+                           . '"><img style="width:16px;" src="' . $pathIcon16 . '/delete.png" alt='
                            . _DELETE
                            . ' title='
                            . _DELETE

class/Tree.php

Spacing +14 added lines, -14 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function _makePagesAdminOptions($key, &$ret, $prefix_orig, $objInsinstr, $class = 'odd', $prefix_curr = '')
     {
-        $pathIcon16    = \Xmf\Module\Admin::iconUrl('', 16);
+        $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
         if ($key > 0) {
 
             //
@@ -59,7 +59,7 @@ 
             // Действие - удаление
             $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='
                                                                                                                                                                       . $pageid
-                                                                                                                                                                      . '"><img src="'. $pathIcon16 . '/delete.png" alt="'
+                                                                                                                                                                      . '"><img src="' . $pathIcon16 . '/delete.png" alt="'
                                                                                                                                                                       . _AM_INSTRUCTION_DEL
                                                                                                                                                                       . '" title="'
                                                                                                                                                                       . _AM_INSTRUCTION_DEL
@@ -77,7 +77,7 @@ 
             // Просмотре без кэша
             $ret .= ' <a href="' . XOOPS_URL . '/modules/' . INST_DIRNAME . '/page.php?id=' . $pageid . '&amp;nocache=1"><img src="../assets/images/icons/16/database_black.png" alt="' . _AM_INSTR_DISPLAY_NOCACHE . '" title="' . _AM_INSTR_DISPLAY_NOCACHE . '" /></a> ';
             // Добавить подстраницу
-            $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> ';
+            $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> ';
 
             if ($pagestatus) {
                 $ret .= ' <img src="../assets/images/icons/16/lock.png" alt="' . _AM_INSTRUCTION_LOCK . '" title="' . _AM_INSTRUCTION_LOCK . '"> ';
@@ -85,7 +85,7 @@ 
                 $ret .= ' <img src="../assets/images/icons/16/lock_open.png" alt="' . _AM_INSTRUCTION_UNLOCK . '" title="' . _AM_INSTRUCTION_UNLOCK . '"> ';
             }
 
-            $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 . '
+            $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 . '
       </td>
     </tr>';
 
@@ -93,7 +93,7 @@ 
             $prefix_curr .= $prefix_orig;
         }
 
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
             foreach ($this->tree[$key]['child'] as $childkey) {
                 $this->_makePagesAdminOptions($childkey, $ret, $prefix_orig, $objInsinstr, $class, $prefix_curr);
             }
@@ -123,7 +123,7 @@ 
         $this->_makePagesAdminOptions($key, $ret, $prefix, $objInsinstr);
 
         $ret .= '<tr class="foot">
-      <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>
+      <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>
       <td colspan="2">
         <input type="hidden" name="instrid" value="' . $objInsinstr->getVar('instrid') . '" />
         <input type="hidden" name="op" value="updpage" />
@@ -150,7 +150,7 @@ 
      */
     public function _makeCatsAdminOptions($key, &$ret, $prefix_orig, $cidinstrids = [], &$class = 'odd', $prefix_curr = '')
     {
-        $pathIcon16    = \Xmf\Module\Admin::iconUrl('', 16);
+        $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
         if ($key > 0) {
 
             //
@@ -173,15 +173,15 @@ 
             $num_instrs = isset($cidinstrids[$catid]) ? $cidinstrids[$catid] : 0;
 
             // Действие - удаление
-            $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='
+            $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='
                                                                                                                                                                                            . $catid
-                                                                                                                                                                                           . '"><img src="'. $pathIcon16 . '/delete.png" alt="'
+                                                                                                                                                                                           . '"><img src="' . $pathIcon16 . '/delete.png" alt="'
                                                                                                                                                                                            . _AM_INSTRUCTION_DEL
                                                                                                                                                                                            . '" title="'
                                                                                                                                                                                            . _AM_INSTRUCTION_DEL
                                                                                                                                                                                            . '" /></a>';
             // Действие - просмотр
-            $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="'
+            $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="'
                                                                                                                                                                                                              . _AM_INSTR_NOVIEWINSTR
                                                                                                                                                                                                              . '" title="'
                                                                                                                                                                                                              . _AM_INSTR_NOVIEWINSTR
@@ -193,7 +193,7 @@ 
       <td align="center" width="100">' . $num_instrs . '</td>
       <td align="center" width="150">
         ' . $act_view . '
-        <a href="cat.php?op=editcat&cid=' . $catid . '"><img src="'. $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a>
+        <a href="cat.php?op=editcat&cid=' . $catid . '"><img src="' . $pathIcon16 . '/edit.png" alt="' . _AM_INSTRUCTION_EDIT . '" title="' . _AM_INSTRUCTION_EDIT . '"></a>
         ' . $act_del . '
       </td>
     </tr>';
@@ -202,7 +202,7 @@ 
             $prefix_curr .= $prefix_orig;
         }
 
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
             foreach ($this->tree[$key]['child'] as $childkey) {
                 $this->_makeCatsAdminOptions($childkey, $ret, $prefix_orig, $cidinstrids, $class, $prefix_curr);
             }
@@ -332,7 +332,7 @@ 
         }
 
         // Рекурсия
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
             foreach ($this->tree[$key]['child'] as $childkey) {
                 $this->_makePagesUserTree($childkey, $ret, $currpageid, $lastpageids, $level);
             }
@@ -401,7 +401,7 @@ 
         }
 
         // Рекурсия
-        if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
+        if (isset($this->tree[$key]['child']) && ! empty($this->tree[$key]['child'])) {
             foreach ($this->tree[$key]['child'] as $childkey) {
                 $this->_makePagesUserCalc($childkey, $currpageid, $prevpages, $nextpages, $lastpageids, $level);
             }

page.php

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
 
 // Права на просмотр инструкции
 $categories = Xoopsmodules\instruction\Utility::getItemIds();
-if (!in_array($objInsinstr->getVar('cid'), $categories)) {
+if ( ! in_array($objInsinstr->getVar('cid'), $categories)) {
     redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
     exit();
 }
@@ -95,7 +95,7 @@ 
                           . $moduleDirName
                           . '/admin/instr.php?op=editpage&pageid='
                           . $pages['pageid']
-                          . '"><img style="width:16px;" src="'. $pathIcon16 . '/edit.png" alt='
+                          . '"><img style="width:16px;" src="' . $pathIcon16 . '/edit.png" alt='
                           . _EDIT
                           . ' title='
                           . _EDIT
@@ -105,7 +105,7 @@ 
                           . $moduleDirName
                           . '/admin/instr.php?op=delpage&pageid='
                           . $pages['pageid']
-                          . '"><img style="width:16px;" src="'. $pathIcon16 . '/delete.png" alt='
+                          . '"><img style="width:16px;" src="' . $pathIcon16 . '/delete.png" alt='
                           . _DELETE
                           . ' title='
                           . _DELETE
@@ -114,7 +114,7 @@ 
     $pages['adminlink'] = '&nbsp;';
     // Если можно редактировать
     if ($gpermHandler->checkRight($moduleDirName . '_edit', $objInsinstr->getVar('cid'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
-        $pages['adminlink'] .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/submit.php?op=editpage&pageid=' . $pages['pageid'] . '"><img style="width:16px;" src="'. $pathIcon16 . '/edit.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
+        $pages['adminlink'] .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/submit.php?op=editpage&pageid=' . $pages['pageid'] . '"><img style="width:16px;" src="' . $pathIcon16 . '/edit.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
     }
 
     $pages['adminlink'] .= '&nbsp;';