mambax7 / instruction

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);
             }

include/plugin.tag.php

Spacing +5 added lines, -5 removed lines

@@ -7,19 +7,19 @@ 
  */
 function instruction_tag_iteminfo(&$items)
 {
-    if (empty($items) || !is_array($items)) {
+    if (empty($items) || ! is_array($items)) {
         return false;
     }
 
     $items_id = [];
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {
-            $items_id[] = (int)$item_id;
+            $items_id[] = (int) $item_id;
         }
     }
 
 //mb    $itemHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $db                 = \XoopsDatabaseFactory::getDatabase();
+    $db = \XoopsDatabaseFactory::getDatabase();
     $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
     $items_obj   = $itemHandler->getObjects(new \Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true);
 
@@ -49,7 +49,7 @@ 
 function instruction_tag_synchronization($mid)
 {
     //mb    $itemHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $db                 = \XoopsDatabaseFactory::getDatabase();
+    $db = \XoopsDatabaseFactory::getDatabase();
     $itemHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
     $linkHandler = xoops_getModuleHandler('link', 'tag');
 
@@ -74,7 +74,7 @@ 
                . '            OR aa.status < 1'
                . '        )';
     endif;
-    if (!$result = $linkHandler->db->queryF($sql)) {
+    if ( ! $result = $linkHandler->db->queryF($sql)) {
         //xoops_error($linkHandler->db->error());
     }
 }