mambax7 / instruction

class/PageHandler.php

Indentation +54 added lines, -54 removed lines

@@ -12,60 +12,60 @@
  */
 class PageHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param null|mixed $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'instruction_page', Page::class, 'pageid', 'title');
-    }
+	/**
+	 * @param null|mixed $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'instruction_page', Page::class, 'pageid', 'title');
+	}
 
-    /**
-     * Generate function for update user post
-     *
-     * @ Update user post count after send approve content
-     * @ Update user post count after change status content
-     * @ Update user post count after delete content
-     * @param $uid
-     * @param $status
-     * @param $action
-     */
-    public function updateposts($uid, $status, $action)
-    {
-        //
-        switch ($action) {
-            // Добавление страницы
-            case 'add':
-                if ($uid && $status) {
-                    $user          = new \XoopsUser($uid);
-                    $memberHandler = xoops_getHandler('member');
-                    // Добавялем +1 к комментам
-                    $memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') + 1);
-                }
-                break;
-            // Удаление страницы
-            case 'delete':
-                if ($uid && $status) {
-                    $user          = new \XoopsUser($uid);
-                    $memberHandler = xoops_getHandler('member');
-                    // Декримент комментов
-                    //$user->setVar( 'posts', $user->getVar( 'posts' ) - 1 );
-                    // Сохраняем
-                    $memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') - 1);
-                }
-                break;
+	/**
+	 * Generate function for update user post
+	 *
+	 * @ Update user post count after send approve content
+	 * @ Update user post count after change status content
+	 * @ Update user post count after delete content
+	 * @param $uid
+	 * @param $status
+	 * @param $action
+	 */
+	public function updateposts($uid, $status, $action)
+	{
+		//
+		switch ($action) {
+			// Добавление страницы
+			case 'add':
+				if ($uid && $status) {
+					$user          = new \XoopsUser($uid);
+					$memberHandler = xoops_getHandler('member');
+					// Добавялем +1 к комментам
+					$memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') + 1);
+				}
+				break;
+			// Удаление страницы
+			case 'delete':
+				if ($uid && $status) {
+					$user          = new \XoopsUser($uid);
+					$memberHandler = xoops_getHandler('member');
+					// Декримент комментов
+					//$user->setVar( 'posts', $user->getVar( 'posts' ) - 1 );
+					// Сохраняем
+					$memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') - 1);
+				}
+				break;
 
-            case 'status':
-                if ($uid) {
-                    $user          = new \XoopsUser($uid);
-                    $memberHandler = xoops_getHandler('member');
-                    if ($status) {
-                        $memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') - 1);
-                    } else {
-                        $memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') + 1);
-                    }
-                }
-                break;
-        }
-    }
+			case 'status':
+				if ($uid) {
+					$user          = new \XoopsUser($uid);
+					$memberHandler = xoops_getHandler('member');
+					if ($status) {
+						$memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') - 1);
+					} else {
+						$memberHandler->updateUserByField($user, 'posts', $user->getVar('posts') + 1);
+					}
+				}
+				break;
+		}
+	}
 }

class/Category.php

Spacing +5 added lines, -5 removed lines

@@ -92,7 +92,7 @@ 
         //        $categoryHandler = xoops_getModuleHandler('category', 'instruction');
         $criteria = new \CriteriaCompo();
         // Если мы редактируем, то убрать текущую категорию из списка выбора родительской
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $criteria->add(new \Criteria('cid', $this->getVar('cid'), '<>'));
         }
         $criteria->setSort('weight ASC, title');
@@ -138,7 +138,7 @@ 
         // Права на просмотр
         $groups_ids = [];
         // Если мы редактируем
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $groups_ids        = $gpermHandler->getGroupIds('instruction_view', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
             $groups_ids        = array_values($groups_ids);
             $groups_instr_view = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $groups_ids);
@@ -150,7 +150,7 @@ 
 
         // Права на отправку
         $groups_ids = [];
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $groups_ids          = $gpermHandler->getGroupIds('instruction_submit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
             $groups_ids          = array_values($groups_ids);
             $groups_instr_submit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $groups_ids);
@@ -162,7 +162,7 @@ 
 
         // Права на редактирование
         $groups_ids = [];
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $groups_ids        = $gpermHandler->getGroupIds('instruction_edit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
             $groups_ids        = array_values($groups_ids);
             $groups_instr_edit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $groups_ids);
@@ -176,7 +176,7 @@ 
         // ==========================================================
 
         // Если мы редактируем категорию
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $form->addElement(new \XoopsFormHidden('cid', $this->getVar('cid')));
             //$form->addElement( new \XoopsFormHidden( 'catmodify', true));
         }

Indentation +157 added lines, -157 removed lines

@@ -16,60 +16,60 @@ 
  */
 class Category extends \XoopsObject
 {
-    // constructor
-    public function __construct()
-    {
-        //		$this->XoopsObject();
-        $this->initVar('cid', XOBJ_DTYPE_INT, null, false, 5);
-        $this->initVar('pid', XOBJ_DTYPE_INT, 0, false, 5);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, '', false);
-        $this->initVar('imgurl', XOBJ_DTYPE_TXTBOX, '', false);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('weight', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('datecreated', XOBJ_DTYPE_INT, 0, false, 10);
-        $this->initVar('dateupdated', XOBJ_DTYPE_INT, 0, false, 10);
-        $this->initVar('metakeywords', XOBJ_DTYPE_TXTBOX, '', false);
-        $this->initVar('metadescription', XOBJ_DTYPE_TXTBOX, '', false);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getNewInstertId()
-    {
-        $newEnreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $newEnreg;
-    }
-
-    // Получаем форму
-
-    /**
-     * @param bool|null|string $action
-     * @return \XoopsThemeForm
-     */
-    public function getForm($action = false)
-    {
-        //global $xoopsDB, $xoopsModule, $xoopsModuleConfig;
-        require_once __DIR__ . '/../include/common.php';
-        // Если нет $action
-        if (false === $action) {
-            $action = xoops_getenv('REQUEST_URI');
-        }
-        // Подключаем формы
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-
-        // Название формы
-        $title = $this->isNew() ? sprintf(_AM_INSTRUCTION_FORMADDCAT) : sprintf(_AM_INSTRUCTION_FORMEDITCAT);
-
-        // Форма
-        $form = new \XoopsThemeForm($title, 'formcat', $action, 'post', true);
-        //$form->setExtra('enctype="multipart/form-data"');
-        // Название категории
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_TITLEC, 'title', 50, 255, $this->getVar('title')), true);
-        // Редактор
-        $form->addElement(new \XoopsFormTextArea(_AM_INSTRUCTION_DSCC, 'description', $this->getVar('description', 'e')), true);
-        //image
-        /*
+	// constructor
+	public function __construct()
+	{
+		//		$this->XoopsObject();
+		$this->initVar('cid', XOBJ_DTYPE_INT, null, false, 5);
+		$this->initVar('pid', XOBJ_DTYPE_INT, 0, false, 5);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, '', false);
+		$this->initVar('imgurl', XOBJ_DTYPE_TXTBOX, '', false);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('weight', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('datecreated', XOBJ_DTYPE_INT, 0, false, 10);
+		$this->initVar('dateupdated', XOBJ_DTYPE_INT, 0, false, 10);
+		$this->initVar('metakeywords', XOBJ_DTYPE_TXTBOX, '', false);
+		$this->initVar('metadescription', XOBJ_DTYPE_TXTBOX, '', false);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getNewInstertId()
+	{
+		$newEnreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $newEnreg;
+	}
+
+	// Получаем форму
+
+	/**
+	 * @param bool|null|string $action
+	 * @return \XoopsThemeForm
+	 */
+	public function getForm($action = false)
+	{
+		//global $xoopsDB, $xoopsModule, $xoopsModuleConfig;
+		require_once __DIR__ . '/../include/common.php';
+		// Если нет $action
+		if (false === $action) {
+			$action = xoops_getenv('REQUEST_URI');
+		}
+		// Подключаем формы
+		include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+
+		// Название формы
+		$title = $this->isNew() ? sprintf(_AM_INSTRUCTION_FORMADDCAT) : sprintf(_AM_INSTRUCTION_FORMEDITCAT);
+
+		// Форма
+		$form = new \XoopsThemeForm($title, 'formcat', $action, 'post', true);
+		//$form->setExtra('enctype="multipart/form-data"');
+		// Название категории
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_TITLEC, 'title', 50, 255, $this->getVar('title')), true);
+		// Редактор
+		$form->addElement(new \XoopsFormTextArea(_AM_INSTRUCTION_DSCC, 'description', $this->getVar('description', 'e')), true);
+		//image
+		/*
         $downloadscat_img = $this->getVar('imgurl') ? $this->getVar('imgurl') : 'blank.gif';
         $uploadirectory='/uploads/tdmdownloads/images/cats';
         $imgtray = new \XoopsFormElementTray(_AM_TDMDOWNLOADS_FORMIMG,'<br>');
@@ -88,108 +88,108 @@ 
         $imgtray->addElement($fileseltray);
         $form->addElement($imgtray);
         */
-        // Родительская категория
-        //        $categoryHandler = xoops_getModuleHandler('category', 'instruction');
-        $criteria = new \CriteriaCompo();
-        // Если мы редактируем, то убрать текущую категорию из списка выбора родительской
-        if (!$this->isNew()) {
-            $criteria->add(new \Criteria('cid', $this->getVar('cid'), '<>'));
-        }
-        $criteria->setSort('weight ASC, title');
-        $criteria->setOrder('ASC');
-
-        $categoryHandler = new CategoryHandler;
-        $instructioncat_arr = $categoryHandler->getall($criteria);
-        unset($criteria);
-        // Подключаем трей
-        include_once $GLOBALS['xoops']->path('class/tree.php');
-        $mytree = new \XoopsObjectTree($instructioncat_arr, 'cid', 'pid');
-
-        // $form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_PCATC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
-
-        $helper = Helper::getInstance();
-        $module = $helper->getModule();
-
-        if (Utility::checkVerXoops($module, '2.5.9')) {
-            $mytree_select = $mytree->makeSelectElement('pid', 'title', '--', $this->getVar('pid'), true, 0, '', _AM_INSTRUCTION_PCATC);
-            $form->addElement($mytree_select);
-        } else {
-            $form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_PCATC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
-        }
-
-        // Вес
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
-        // Мета-теги ключевых слов
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'metakeywords', 50, 255, $this->getVar('metakeywords')), false);
-        // Мета-теги описания
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'metadescription', 50, 255, $this->getVar('metadescription')), false);
-
-        // ==========================================================
-        // ==========================================================
-
-        // Права
-        $memberHandler = xoops_getHandler('member');
-        $group_list    = $memberHandler->getGroupList();
-        $gpermHandler  = xoops_getHandler('groupperm');
-        $full_list     = array_keys($group_list);
-
-        // Права на просмотр
-        $groups_ids = [];
-        // Если мы редактируем
-        if (!$this->isNew()) {
-            $groups_ids        = $gpermHandler->getGroupIds('instruction_view', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
-            $groups_ids        = array_values($groups_ids);
-            $groups_instr_view = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $groups_ids);
-        } else {
-            $groups_instr_view = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $full_list);
-        }
-        $groups_instr_view->addOptionArray($group_list);
-        $form->addElement($groups_instr_view);
-
-        // Права на отправку
-        $groups_ids = [];
-        if (!$this->isNew()) {
-            $groups_ids          = $gpermHandler->getGroupIds('instruction_submit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
-            $groups_ids          = array_values($groups_ids);
-            $groups_instr_submit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $groups_ids);
-        } else {
-            $groups_instr_submit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $full_list);
-        }
-        $groups_instr_submit->addOptionArray($group_list);
-        $form->addElement($groups_instr_submit);
-
-        // Права на редактирование
-        $groups_ids = [];
-        if (!$this->isNew()) {
-            $groups_ids        = $gpermHandler->getGroupIds('instruction_edit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
-            $groups_ids        = array_values($groups_ids);
-            $groups_instr_edit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $groups_ids);
-        } else {
-            $groups_instr_edit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $full_list);
-        }
-        $groups_instr_edit->addOptionArray($group_list);
-        $form->addElement($groups_instr_edit);
-
-        // ==========================================================
-        // ==========================================================
-
-        // Если мы редактируем категорию
-        if (!$this->isNew()) {
-            $form->addElement(new \XoopsFormHidden('cid', $this->getVar('cid')));
-            //$form->addElement( new \XoopsFormHidden( 'catmodify', true));
-        }
-        //
-        $form->addElement(new \XoopsFormHidden('op', 'savecat'));
-        // Кнопка
-        $button_tray = new \XoopsFormElementTray('', '');
-        $submit_btn  = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-        $button_tray->addElement($submit_btn);
-        $cancel_btn = new \XoopsFormButton('', 'cancel', _CANCEL, 'cancel');
-        $cancel_btn->setExtra('onclick="javascript:history.go(-1);"');
-        $button_tray->addElement($cancel_btn);
-        $form->addElement($button_tray);
-
-        return $form;
-    }
+		// Родительская категория
+		//        $categoryHandler = xoops_getModuleHandler('category', 'instruction');
+		$criteria = new \CriteriaCompo();
+		// Если мы редактируем, то убрать текущую категорию из списка выбора родительской
+		if (!$this->isNew()) {
+			$criteria->add(new \Criteria('cid', $this->getVar('cid'), '<>'));
+		}
+		$criteria->setSort('weight ASC, title');
+		$criteria->setOrder('ASC');
+
+		$categoryHandler = new CategoryHandler;
+		$instructioncat_arr = $categoryHandler->getall($criteria);
+		unset($criteria);
+		// Подключаем трей
+		include_once $GLOBALS['xoops']->path('class/tree.php');
+		$mytree = new \XoopsObjectTree($instructioncat_arr, 'cid', 'pid');
+
+		// $form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_PCATC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
+
+		$helper = Helper::getInstance();
+		$module = $helper->getModule();
+
+		if (Utility::checkVerXoops($module, '2.5.9')) {
+			$mytree_select = $mytree->makeSelectElement('pid', 'title', '--', $this->getVar('pid'), true, 0, '', _AM_INSTRUCTION_PCATC);
+			$form->addElement($mytree_select);
+		} else {
+			$form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_PCATC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
+		}
+
+		// Вес
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
+		// Мета-теги ключевых слов
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'metakeywords', 50, 255, $this->getVar('metakeywords')), false);
+		// Мета-теги описания
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'metadescription', 50, 255, $this->getVar('metadescription')), false);
+
+		// ==========================================================
+		// ==========================================================
+
+		// Права
+		$memberHandler = xoops_getHandler('member');
+		$group_list    = $memberHandler->getGroupList();
+		$gpermHandler  = xoops_getHandler('groupperm');
+		$full_list     = array_keys($group_list);
+
+		// Права на просмотр
+		$groups_ids = [];
+		// Если мы редактируем
+		if (!$this->isNew()) {
+			$groups_ids        = $gpermHandler->getGroupIds('instruction_view', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
+			$groups_ids        = array_values($groups_ids);
+			$groups_instr_view = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $groups_ids);
+		} else {
+			$groups_instr_view = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $full_list);
+		}
+		$groups_instr_view->addOptionArray($group_list);
+		$form->addElement($groups_instr_view);
+
+		// Права на отправку
+		$groups_ids = [];
+		if (!$this->isNew()) {
+			$groups_ids          = $gpermHandler->getGroupIds('instruction_submit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
+			$groups_ids          = array_values($groups_ids);
+			$groups_instr_submit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $groups_ids);
+		} else {
+			$groups_instr_submit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $full_list);
+		}
+		$groups_instr_submit->addOptionArray($group_list);
+		$form->addElement($groups_instr_submit);
+
+		// Права на редактирование
+		$groups_ids = [];
+		if (!$this->isNew()) {
+			$groups_ids        = $gpermHandler->getGroupIds('instruction_edit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
+			$groups_ids        = array_values($groups_ids);
+			$groups_instr_edit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $groups_ids);
+		} else {
+			$groups_instr_edit = new \XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $full_list);
+		}
+		$groups_instr_edit->addOptionArray($group_list);
+		$form->addElement($groups_instr_edit);
+
+		// ==========================================================
+		// ==========================================================
+
+		// Если мы редактируем категорию
+		if (!$this->isNew()) {
+			$form->addElement(new \XoopsFormHidden('cid', $this->getVar('cid')));
+			//$form->addElement( new \XoopsFormHidden( 'catmodify', true));
+		}
+		//
+		$form->addElement(new \XoopsFormHidden('op', 'savecat'));
+		// Кнопка
+		$button_tray = new \XoopsFormElementTray('', '');
+		$submit_btn  = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+		$button_tray->addElement($submit_btn);
+		$cancel_btn = new \XoopsFormButton('', 'cancel', _CANCEL, 'cancel');
+		$cancel_btn->setExtra('onclick="javascript:history.go(-1);"');
+		$button_tray->addElement($cancel_btn);
+		$form->addElement($button_tray);
+
+		return $form;
+	}
 }
 

class/Page.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
         // Находим все страницы данной инструкции
         $criteria->add(new \Criteria('instrid', $instrid_page, '='));
         // Если мы редактируем, то убрать текущую страницу из списка выбора родительской
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $criteria->add(new \Criteria('pageid', $this->getVar('pageid'), '<>'));
         }
         $criteria->setSort('weight');
@@ -151,7 +151,7 @@ 
         $form->addElement($option_tray);
 
         // Если мы редактируем страницу
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $form->addElement(new \XoopsFormHidden('pageid', $this->getVar('pageid')));
         } else {
             $form->addElement(new \XoopsFormHidden('pageid', 0));

Indentation +170 added lines, -170 removed lines

@@ -12,174 +12,174 @@
  */
 class Page extends \XoopsObject
 {
-    // constructor
-    public function __construct()
-    {
-        //	$this->XoopsObject();
-        $this->initVar('pageid', XOBJ_DTYPE_INT, null, false, 11);
-        $this->initVar('pid', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('instrid', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar('status', XOBJ_DTYPE_INT, 1, false, 1);
-        $this->initVar('type', XOBJ_DTYPE_INT, 1, false, 1);
-        $this->initVar('hometext', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('footnote', XOBJ_DTYPE_TXTAREA, '', false);
-        $this->initVar('weight', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('keywords', XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar('description', XOBJ_DTYPE_TXTBOX, '', false, 255);
-        $this->initVar('comments', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('datecreated', XOBJ_DTYPE_INT, 0, false, 10);
-        $this->initVar('dateupdated', XOBJ_DTYPE_INT, 0, false, 10);
-        $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false, 1);
-        $this->initVar('dosmiley', XOBJ_DTYPE_INT, 0, false, 1);
-        $this->initVar('doxcode', XOBJ_DTYPE_INT, 1, false, 1);
-        $this->initVar('dobr', XOBJ_DTYPE_INT, 0, false, 1);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getNewInstertId()
-    {
-        $newEnreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $newEnreg;
-    }
-
-    // Получаем форму
-
-    /**
-     * @param bool|null|string $action
-     * @param int  $instrid
-     * @return \XoopsThemeForm
-     */
-    public function getForm($action = false, $instrid = 0)
-    {
-        // Если нет $action
-        if (false === $action) {
-            $action = xoops_getenv('REQUEST_URI');
-        }
-
-        // Подключаем формы
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        // Подключаем типы страниц
-        $pagetypes = include $GLOBALS['xoops']->path('modules/instruction/include/pagetypes.inc.php');
-
-        // Название формы
-        $title = $this->isNew() ? sprintf(_AM_INSTRUCTION_FORMADDPAGE) : sprintf(_AM_INSTRUCTION_FORMEDITPAGE);
-
-        // Форма
-        $form = new \XoopsThemeForm($title, 'instr_form_page', $action, 'post', true);
-        // Название
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_TITLEC, 'title', 50, 255, $this->getVar('title')), true);
-
-        // Родительская страница
-        //        $pageHandler = xoops_getModuleHandler('page', 'instruction');
-        $pageHandler = new PageHandler;
-
-        $criteria = new \CriteriaCompo();
-        // ID инструкции в которой данная страница
-        $instrid_page = $this->isNew() ? $instrid : $this->getVar('instrid');
-        // Находим все страницы данной инструкции
-        $criteria->add(new \Criteria('instrid', $instrid_page, '='));
-        // Если мы редактируем, то убрать текущую страницу из списка выбора родительской
-        if (!$this->isNew()) {
-            $criteria->add(new \Criteria('pageid', $this->getVar('pageid'), '<>'));
-        }
-        $criteria->setSort('weight');
-        $criteria->setOrder('ASC');
-        $inspage_arr = $pageHandler->getall($criteria);
-        unset($criteria);
-        // Подключаем трей
-        include_once $GLOBALS['xoops']->path('class/tree.php');
-        $mytree = new \XoopsObjectTree($inspage_arr, 'pageid', 'pid');
-
-        // $form->addElement(new XoopsFormLabel(_AM_INSTRUCTION_PPAGEC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
-        $helper = Helper::getInstance();
-        $module = $helper->getModule();
-
-        if (Utility::checkVerXoops($module, '2.5.9')) {
-            $mytree_select = $mytree->makeSelectElement('pid', 'title', '--', $this->getVar('pid'), true, 0, '', _AM_INSTRUCTION_PPAGEC);
-            $form->addElement($mytree_select);
-        } else {
-            $form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_PPAGEC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
-        }
-
-        // Вес
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
-        // Основной текст
-        $form->addElement(Utility::getWysiwygForm(_AM_INSTRUCTION_HOMETEXTC, 'hometext', $this->getVar('hometext', 'e')), true);
-        // Сноска
-        $form_footnote = new \XoopsFormTextArea(_AM_INSTRUCTION_FOOTNOTEC, 'footnote', $this->getVar('footnote', 'e'));
-        $form_footnote->setDescription(_AM_INSTRUCTION_FOOTNOTE_DSC);
-        $form->addElement($form_footnote, false);
-        unset($form_footnote);
-        // Статус
-        $form->addElement(new \XoopsFormRadioYN(_AM_INSTRUCTION_ACTIVEC, 'status', $this->getVar('status')), false);
-        // Тип страницы
-        $form_type = new \XoopsFormSelect(_AM_INSTR_PAGETYPEC, 'type', $this->getVar('type'));
-        $form_type->setDescription(_AM_INSTR_PAGETYPEC_DESC);
-        $form_type->addOptionArray($pagetypes);
-        $form->addElement($form_type, false);
-        // Мета-теги ключевых слов
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'keywords', 50, 255, $this->getVar('keywords')), false);
-        // Мета-теги описания
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'description', 50, 255, $this->getVar('description')), false);
-
-        // Настройки
-        $option_tray = new \XoopsFormElementTray(_OPTIONS, '<br>');
-        // HTML
-        $html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $this->getVar('dohtml'));
-        $html_checkbox->addOption(1, _AM_INSTR_DOHTML);
-        $option_tray->addElement($html_checkbox);
-        // Смайлы
-        $smiley_checkbox = new \XoopsFormCheckBox('', 'dosmiley', $this->getVar('dosmiley'));
-        $smiley_checkbox->addOption(1, _AM_INSTR_DOSMILEY);
-        $option_tray->addElement($smiley_checkbox);
-        // ББ коды
-        $xcode_checkbox = new \XoopsFormCheckBox('', 'doxcode', $this->getVar('doxcode'));
-        $xcode_checkbox->addOption(1, _AM_INSTR_DOXCODE);
-        $option_tray->addElement($xcode_checkbox);
-        //
-        $br_checkbox = new \XoopsFormCheckBox('', 'dobr', $this->getVar('dobr'));
-        $br_checkbox->addOption(1, _AM_INSTR_DOAUTOWRAP);
-        $option_tray->addElement($br_checkbox);
-        //
-        $form->addElement($option_tray);
-
-        // Если мы редактируем страницу
-        if (!$this->isNew()) {
-            $form->addElement(new \XoopsFormHidden('pageid', $this->getVar('pageid')));
-        } else {
-            $form->addElement(new \XoopsFormHidden('pageid', 0));
-        }
-        // ID инструкции
-        if ($instrid) {
-            $form->addElement(new \XoopsFormHidden('instrid', $instrid));
-        } else {
-            $form->addElement(new \XoopsFormHidden('instrid', 0));
-        }
-        //
-        $form->addElement(new \XoopsFormHidden('op', 'savepage'));
-        // Кнопка
-        $button_tray = new \XoopsFormElementTray('', '');
-        $button_tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $save_btn = new \XoopsFormButton('', 'cancel', _AM_INSTR_SAVEFORM);
-        $save_btn->setExtra('onclick="instrSavePage();"');
-        $button_tray->addElement($save_btn);
-        $form->addElement($button_tray);
-
-        return $form;
-    }
-
-    //
-
-    /**
-     * @return mixed
-     */
-    public function getInstrid()
-    {
-        // Возвращаем ID инструкции
-        return $this->getVar('instrid');
-    }
+	// constructor
+	public function __construct()
+	{
+		//	$this->XoopsObject();
+		$this->initVar('pageid', XOBJ_DTYPE_INT, null, false, 11);
+		$this->initVar('pid', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('instrid', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, '', false, 255);
+		$this->initVar('status', XOBJ_DTYPE_INT, 1, false, 1);
+		$this->initVar('type', XOBJ_DTYPE_INT, 1, false, 1);
+		$this->initVar('hometext', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('footnote', XOBJ_DTYPE_TXTAREA, '', false);
+		$this->initVar('weight', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('keywords', XOBJ_DTYPE_TXTBOX, '', false, 255);
+		$this->initVar('description', XOBJ_DTYPE_TXTBOX, '', false, 255);
+		$this->initVar('comments', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('datecreated', XOBJ_DTYPE_INT, 0, false, 10);
+		$this->initVar('dateupdated', XOBJ_DTYPE_INT, 0, false, 10);
+		$this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false, 1);
+		$this->initVar('dosmiley', XOBJ_DTYPE_INT, 0, false, 1);
+		$this->initVar('doxcode', XOBJ_DTYPE_INT, 1, false, 1);
+		$this->initVar('dobr', XOBJ_DTYPE_INT, 0, false, 1);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getNewInstertId()
+	{
+		$newEnreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $newEnreg;
+	}
+
+	// Получаем форму
+
+	/**
+	 * @param bool|null|string $action
+	 * @param int  $instrid
+	 * @return \XoopsThemeForm
+	 */
+	public function getForm($action = false, $instrid = 0)
+	{
+		// Если нет $action
+		if (false === $action) {
+			$action = xoops_getenv('REQUEST_URI');
+		}
+
+		// Подключаем формы
+		include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+		// Подключаем типы страниц
+		$pagetypes = include $GLOBALS['xoops']->path('modules/instruction/include/pagetypes.inc.php');
+
+		// Название формы
+		$title = $this->isNew() ? sprintf(_AM_INSTRUCTION_FORMADDPAGE) : sprintf(_AM_INSTRUCTION_FORMEDITPAGE);
+
+		// Форма
+		$form = new \XoopsThemeForm($title, 'instr_form_page', $action, 'post', true);
+		// Название
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_TITLEC, 'title', 50, 255, $this->getVar('title')), true);
+
+		// Родительская страница
+		//        $pageHandler = xoops_getModuleHandler('page', 'instruction');
+		$pageHandler = new PageHandler;
+
+		$criteria = new \CriteriaCompo();
+		// ID инструкции в которой данная страница
+		$instrid_page = $this->isNew() ? $instrid : $this->getVar('instrid');
+		// Находим все страницы данной инструкции
+		$criteria->add(new \Criteria('instrid', $instrid_page, '='));
+		// Если мы редактируем, то убрать текущую страницу из списка выбора родительской
+		if (!$this->isNew()) {
+			$criteria->add(new \Criteria('pageid', $this->getVar('pageid'), '<>'));
+		}
+		$criteria->setSort('weight');
+		$criteria->setOrder('ASC');
+		$inspage_arr = $pageHandler->getall($criteria);
+		unset($criteria);
+		// Подключаем трей
+		include_once $GLOBALS['xoops']->path('class/tree.php');
+		$mytree = new \XoopsObjectTree($inspage_arr, 'pageid', 'pid');
+
+		// $form->addElement(new XoopsFormLabel(_AM_INSTRUCTION_PPAGEC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
+		$helper = Helper::getInstance();
+		$module = $helper->getModule();
+
+		if (Utility::checkVerXoops($module, '2.5.9')) {
+			$mytree_select = $mytree->makeSelectElement('pid', 'title', '--', $this->getVar('pid'), true, 0, '', _AM_INSTRUCTION_PPAGEC);
+			$form->addElement($mytree_select);
+		} else {
+			$form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_PPAGEC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
+		}
+
+		// Вес
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
+		// Основной текст
+		$form->addElement(Utility::getWysiwygForm(_AM_INSTRUCTION_HOMETEXTC, 'hometext', $this->getVar('hometext', 'e')), true);
+		// Сноска
+		$form_footnote = new \XoopsFormTextArea(_AM_INSTRUCTION_FOOTNOTEC, 'footnote', $this->getVar('footnote', 'e'));
+		$form_footnote->setDescription(_AM_INSTRUCTION_FOOTNOTE_DSC);
+		$form->addElement($form_footnote, false);
+		unset($form_footnote);
+		// Статус
+		$form->addElement(new \XoopsFormRadioYN(_AM_INSTRUCTION_ACTIVEC, 'status', $this->getVar('status')), false);
+		// Тип страницы
+		$form_type = new \XoopsFormSelect(_AM_INSTR_PAGETYPEC, 'type', $this->getVar('type'));
+		$form_type->setDescription(_AM_INSTR_PAGETYPEC_DESC);
+		$form_type->addOptionArray($pagetypes);
+		$form->addElement($form_type, false);
+		// Мета-теги ключевых слов
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'keywords', 50, 255, $this->getVar('keywords')), false);
+		// Мета-теги описания
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'description', 50, 255, $this->getVar('description')), false);
+
+		// Настройки
+		$option_tray = new \XoopsFormElementTray(_OPTIONS, '<br>');
+		// HTML
+		$html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $this->getVar('dohtml'));
+		$html_checkbox->addOption(1, _AM_INSTR_DOHTML);
+		$option_tray->addElement($html_checkbox);
+		// Смайлы
+		$smiley_checkbox = new \XoopsFormCheckBox('', 'dosmiley', $this->getVar('dosmiley'));
+		$smiley_checkbox->addOption(1, _AM_INSTR_DOSMILEY);
+		$option_tray->addElement($smiley_checkbox);
+		// ББ коды
+		$xcode_checkbox = new \XoopsFormCheckBox('', 'doxcode', $this->getVar('doxcode'));
+		$xcode_checkbox->addOption(1, _AM_INSTR_DOXCODE);
+		$option_tray->addElement($xcode_checkbox);
+		//
+		$br_checkbox = new \XoopsFormCheckBox('', 'dobr', $this->getVar('dobr'));
+		$br_checkbox->addOption(1, _AM_INSTR_DOAUTOWRAP);
+		$option_tray->addElement($br_checkbox);
+		//
+		$form->addElement($option_tray);
+
+		// Если мы редактируем страницу
+		if (!$this->isNew()) {
+			$form->addElement(new \XoopsFormHidden('pageid', $this->getVar('pageid')));
+		} else {
+			$form->addElement(new \XoopsFormHidden('pageid', 0));
+		}
+		// ID инструкции
+		if ($instrid) {
+			$form->addElement(new \XoopsFormHidden('instrid', $instrid));
+		} else {
+			$form->addElement(new \XoopsFormHidden('instrid', 0));
+		}
+		//
+		$form->addElement(new \XoopsFormHidden('op', 'savepage'));
+		// Кнопка
+		$button_tray = new \XoopsFormElementTray('', '');
+		$button_tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$save_btn = new \XoopsFormButton('', 'cancel', _AM_INSTR_SAVEFORM);
+		$save_btn->setExtra('onclick="instrSavePage();"');
+		$button_tray->addElement($save_btn);
+		$form->addElement($button_tray);
+
+		return $form;
+	}
+
+	//
+
+	/**
+	 * @return mixed
+	 */
+	public function getInstrid()
+	{
+		// Возвращаем ID инструкции
+		return $this->getVar('instrid');
+	}
 }

class/CategoryHandler.php

Indentation +22 added lines, -22 removed lines

@@ -16,28 +16,28 @@
  */
 class CategoryHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param null|mixed $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'instruction_cat', Category::class, 'cid', 'title');
-    }
+	/**
+	 * @param null|mixed $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'instruction_cat', Category::class, 'cid', 'title');
+	}
 
-    // Обновление даты обновления категории
+	// Обновление даты обновления категории
 
-    /**
-     * @param int  $cid
-     * @param null|int $time
-     * @return mixed
-     */
-    public function updateDateupdated($cid = 0, $time = null)
-    {
-        // Если не передали время
-        $time = null === $time ? time() : (int)$time;
-        //
-        $sql = sprintf('UPDATE `%s` SET `dateupdated` = %u WHERE `cid` = %u', $this->table, $time, (int)$cid);
-        //
-        return $this->db->query($sql);
-    }
+	/**
+	 * @param int  $cid
+	 * @param null|int $time
+	 * @return mixed
+	 */
+	public function updateDateupdated($cid = 0, $time = null)
+	{
+		// Если не передали время
+		$time = null === $time ? time() : (int)$time;
+		//
+		$sql = sprintf('UPDATE `%s` SET `dateupdated` = %u WHERE `cid` = %u', $this->table, $time, (int)$cid);
+		//
+		return $this->db->query($sql);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -34,9 +34,9 @@
     public function updateDateupdated($cid = 0, $time = null)
     {
         // Если не передали время
-        $time = null === $time ? time() : (int)$time;
+        $time = null === $time ? time() : (int) $time;
         //
-        $sql = sprintf('UPDATE `%s` SET `dateupdated` = %u WHERE `cid` = %u', $this->table, $time, (int)$cid);
+        $sql = sprintf('UPDATE `%s` SET `dateupdated` = %u WHERE `cid` = %u', $this->table, $time, (int) $cid);
         //
         return $this->db->query($sql);
     }

class/Instruction.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
         $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'metadescription', 50, 255, $this->getVar('metadescription')), false);
 
         // Если мы редактируем категорию
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $form->addElement(new \XoopsFormHidden('instrid', $this->getVar('instrid')));
         }
         //

Indentation +110 added lines, -110 removed lines

@@ -12,115 +12,115 @@
  */
 class Instruction extends \XoopsObject
 {
-    // constructor
-    public function __construct()
-    {
-        //		$this->XoopsObject();
-        $this->initVar('instrid', XOBJ_DTYPE_INT, null, false, 11);
-        $this->initVar('cid', XOBJ_DTYPE_INT, 0, false, 5);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, '', false);
-        $this->initVar('status', XOBJ_DTYPE_INT, 0, false, 1);
-        $this->initVar('pages', XOBJ_DTYPE_INT, 0, false, 11);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('datecreated', XOBJ_DTYPE_INT, 0, false, 10);
-        $this->initVar('dateupdated', XOBJ_DTYPE_INT, 0, false, 10);
-        $this->initVar('metakeywords', XOBJ_DTYPE_TXTBOX, '', false);
-        $this->initVar('metadescription', XOBJ_DTYPE_TXTBOX, '', false);
-
-        // Нет в таблице
-        $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
-        $this->initVar('dobr', XOBJ_DTYPE_INT, 0, false);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getNewInstertId()
-    {
-        $newEnreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $newEnreg;
-    }
-
-    // Получаем форму
-
-    /**
-     * @param bool|null|string $action
-     * @return \XoopsThemeForm
-     */
-    public function getForm($action = false)
-    {
-        global $xoopsDB, $xoopsModule, $xoopsModuleConfig;
-        // Если нет $action
-        if (false === $action) {
-            $action = xoops_getenv('REQUEST_URI');
-        }
-        // Подключаем формы
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-
-        // Название формы
-        $title = $this->isNew() ? sprintf(_AM_INSTRUCTION_FORMADDINSTR) : sprintf(_AM_INSTRUCTION_FORMEDITINSTR);
-
-        // Форма
-        $form = new \XoopsThemeForm($title, 'forminstr', $action, 'post', true);
-        //$form->setExtra('enctype="multipart/form-data"');
-        // Название инструкции
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_TITLEC, 'title', 50, 255, $this->getVar('title')), true);
-        // Категория
-        $categoryHandler = new CategoryHandler;
-        $criteria        = new \CriteriaCompo();
-        $criteria->setSort('weight ASC, title');
-        $criteria->setOrder('ASC');
-        $instructioncat_arr = $categoryHandler->getall($criteria);
-        unset($criteria);
-        // Подключаем трей
-        include_once $GLOBALS['xoops']->path('class/tree.php');
-        $mytree = new \XoopsObjectTree($instructioncat_arr, 'cid', 'pid');
-
-        // $form->addElement(new XoopsFormLabel(_AM_INSTRUCTION_CATC, $mytree->makeSelBox('cid', 'title', '--', $this->getVar('cid'), true)));
-        $helper = Helper::getInstance();
-        $module = $helper->getModule();
-
-        if (Utility::checkVerXoops($module, '2.5.9')) {
-            $mytree_select = $mytree->makeSelectElement('cid', 'title', '--', $this->getVar('cid'), true, 0, '', _AM_INSTRUCTION_CATC);
-            $form->addElement($mytree_select);
-        } else {
-            $form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_CATC, $mytree->makeSelBox('cid', 'title', '--', $this->getVar('cid'), true)));
-        }
-
-        // Описание
-        $form->addElement(Utility::getWysiwygForm(_AM_INSTRUCTION_DESCRIPTIONC, 'description', $this->getVar('description', 'e')), true);
-        // Статус
-        $form->addElement(new \XoopsFormRadioYN(_AM_INSTRUCTION_ACTIVEC, 'status', $this->getVar('status')), false);
-
-        // Теги
-        $dir_tag_ok = false;
-        if (is_dir('../../tag') || is_dir('../tag')) {
-            $dir_tag_ok = true;
-        }
-        // Если влючена поддержка тегов и есть модуль tag
-        if (xoops_getModuleOption('usetag', 'instruction') && $dir_tag_ok) {
-            $itemIdForTag = $this->isNew() ? 0 : $this->getVar('instrid');
-            // Подключаем форму тегов
-            include_once $GLOBALS['xoops']->path('modules/tag/include/formtag.php');
-            // Добавляем элемент в форму
-            $form->addElement(new \XoopsFormTag('tag', 60, 255, $itemIdForTag, 0));
-        }
-
-        // Мета-теги ключевых слов
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'metakeywords', 50, 255, $this->getVar('metakeywords')), false);
-        // Мета-теги описания
-        $form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'metadescription', 50, 255, $this->getVar('metadescription')), false);
-
-        // Если мы редактируем категорию
-        if (!$this->isNew()) {
-            $form->addElement(new \XoopsFormHidden('instrid', $this->getVar('instrid')));
-        }
-        //
-        $form->addElement(new \XoopsFormHidden('op', 'saveinstr'));
-        // Кнопка
-        $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        return $form;
-    }
+	// constructor
+	public function __construct()
+	{
+		//		$this->XoopsObject();
+		$this->initVar('instrid', XOBJ_DTYPE_INT, null, false, 11);
+		$this->initVar('cid', XOBJ_DTYPE_INT, 0, false, 5);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('title', XOBJ_DTYPE_TXTBOX, '', false);
+		$this->initVar('status', XOBJ_DTYPE_INT, 0, false, 1);
+		$this->initVar('pages', XOBJ_DTYPE_INT, 0, false, 11);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, null, false);
+		$this->initVar('datecreated', XOBJ_DTYPE_INT, 0, false, 10);
+		$this->initVar('dateupdated', XOBJ_DTYPE_INT, 0, false, 10);
+		$this->initVar('metakeywords', XOBJ_DTYPE_TXTBOX, '', false);
+		$this->initVar('metadescription', XOBJ_DTYPE_TXTBOX, '', false);
+
+		// Нет в таблице
+		$this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false);
+		$this->initVar('dobr', XOBJ_DTYPE_INT, 0, false);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getNewInstertId()
+	{
+		$newEnreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $newEnreg;
+	}
+
+	// Получаем форму
+
+	/**
+	 * @param bool|null|string $action
+	 * @return \XoopsThemeForm
+	 */
+	public function getForm($action = false)
+	{
+		global $xoopsDB, $xoopsModule, $xoopsModuleConfig;
+		// Если нет $action
+		if (false === $action) {
+			$action = xoops_getenv('REQUEST_URI');
+		}
+		// Подключаем формы
+		include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+
+		// Название формы
+		$title = $this->isNew() ? sprintf(_AM_INSTRUCTION_FORMADDINSTR) : sprintf(_AM_INSTRUCTION_FORMEDITINSTR);
+
+		// Форма
+		$form = new \XoopsThemeForm($title, 'forminstr', $action, 'post', true);
+		//$form->setExtra('enctype="multipart/form-data"');
+		// Название инструкции
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_TITLEC, 'title', 50, 255, $this->getVar('title')), true);
+		// Категория
+		$categoryHandler = new CategoryHandler;
+		$criteria        = new \CriteriaCompo();
+		$criteria->setSort('weight ASC, title');
+		$criteria->setOrder('ASC');
+		$instructioncat_arr = $categoryHandler->getall($criteria);
+		unset($criteria);
+		// Подключаем трей
+		include_once $GLOBALS['xoops']->path('class/tree.php');
+		$mytree = new \XoopsObjectTree($instructioncat_arr, 'cid', 'pid');
+
+		// $form->addElement(new XoopsFormLabel(_AM_INSTRUCTION_CATC, $mytree->makeSelBox('cid', 'title', '--', $this->getVar('cid'), true)));
+		$helper = Helper::getInstance();
+		$module = $helper->getModule();
+
+		if (Utility::checkVerXoops($module, '2.5.9')) {
+			$mytree_select = $mytree->makeSelectElement('cid', 'title', '--', $this->getVar('cid'), true, 0, '', _AM_INSTRUCTION_CATC);
+			$form->addElement($mytree_select);
+		} else {
+			$form->addElement(new \XoopsFormLabel(_AM_INSTRUCTION_CATC, $mytree->makeSelBox('cid', 'title', '--', $this->getVar('cid'), true)));
+		}
+
+		// Описание
+		$form->addElement(Utility::getWysiwygForm(_AM_INSTRUCTION_DESCRIPTIONC, 'description', $this->getVar('description', 'e')), true);
+		// Статус
+		$form->addElement(new \XoopsFormRadioYN(_AM_INSTRUCTION_ACTIVEC, 'status', $this->getVar('status')), false);
+
+		// Теги
+		$dir_tag_ok = false;
+		if (is_dir('../../tag') || is_dir('../tag')) {
+			$dir_tag_ok = true;
+		}
+		// Если влючена поддержка тегов и есть модуль tag
+		if (xoops_getModuleOption('usetag', 'instruction') && $dir_tag_ok) {
+			$itemIdForTag = $this->isNew() ? 0 : $this->getVar('instrid');
+			// Подключаем форму тегов
+			include_once $GLOBALS['xoops']->path('modules/tag/include/formtag.php');
+			// Добавляем элемент в форму
+			$form->addElement(new \XoopsFormTag('tag', 60, 255, $itemIdForTag, 0));
+		}
+
+		// Мета-теги ключевых слов
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'metakeywords', 50, 255, $this->getVar('metakeywords')), false);
+		// Мета-теги описания
+		$form->addElement(new \XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'metadescription', 50, 255, $this->getVar('metadescription')), false);
+
+		// Если мы редактируем категорию
+		if (!$this->isNew()) {
+			$form->addElement(new \XoopsFormHidden('instrid', $this->getVar('instrid')));
+		}
+		//
+		$form->addElement(new \XoopsFormHidden('op', 'saveinstr'));
+		// Кнопка
+		$form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		return $form;
+	}
 }
 

include/plugin.tag.php

Spacing +3 added lines, -3 removed lines

@@ -7,14 +7,14 @@ 
  */
 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;
         }
     }
 
@@ -70,7 +70,7 @@ 
                . '            OR aa.status < 1'
                . '        )';
     endif;
-    if (!$result = $linkHandler->db->queryF($sql)) {
+    if ( ! $result = $linkHandler->db->queryF($sql)) {
         //xoops_error($linkHandler->db->error());
     }
 }

Braces +4 added lines, -2 removed lines

@@ -60,7 +60,8 @@ 
                . "                WHERE {$itemHandler->table}.status > 0"
                . '            ) '
                . '        )';
-    else:
+    else {

+    	:
         $sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
                . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
                . '    WHERE '
@@ -68,7 +69,8 @@ 
                . '        AND '
                . "        ( aa.{$itemHandler->keyName} IS NULL"
                . '            OR aa.status < 1'
-               . '        )';
+               . '        )';

+    }

     endif;
     if (!$result = $linkHandler->db->queryF($sql)) {
         //xoops_error($linkHandler->db->error());

Indentation +55 added lines, -55 removed lines

@@ -7,37 +7,37 @@ 
  */
 function instruction_tag_iteminfo(&$items)
 {
-    if (empty($items) || !is_array($items)) {
-        return false;
-    }
+	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 = [];
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			$items_id[] = (int)$item_id;
+		}
+	}
 
-    $itemHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $items_obj   = $itemHandler->getObjects(new \Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true);
+	$itemHandler = xoops_getModuleHandler('instruction', 'instruction');
+	$items_obj   = $itemHandler->getObjects(new \Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true);
 
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            if (isset($items_obj[$item_id])) {
-                $item_obj                 = $items_obj[$item_id];
-                $items[$cat_id][$item_id] = [
-                    'title'   => $item_obj->getVar('title'),
-                    'uid'     => $item_obj->getVar('uid'),
-                    'link'    => "instr.php?id={$item_id}",
-                    'time'    => $item_obj->getVar('datecreated'),
-                    'tags'    => '',
-                    'content' => '',
-                ];
-            }
-        }
-    }
-    unset($items_obj);
-    return '';
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			if (isset($items_obj[$item_id])) {
+				$item_obj                 = $items_obj[$item_id];
+				$items[$cat_id][$item_id] = [
+					'title'   => $item_obj->getVar('title'),
+					'uid'     => $item_obj->getVar('uid'),
+					'link'    => "instr.php?id={$item_id}",
+					'time'    => $item_obj->getVar('datecreated'),
+					'tags'    => '',
+					'content' => '',
+				];
+			}
+		}
+	}
+	unset($items_obj);
+	return '';
 }
 
 // Синхронизация тегов
@@ -46,32 +46,32 @@ 
  */
 function instruction_tag_synchronization($mid)
 {
-    $itemHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $linkHandler = xoops_getModuleHandler('link', 'tag');
+	$itemHandler = xoops_getModuleHandler('instruction', 'instruction');
+	$linkHandler = xoops_getModuleHandler('link', 'tag');
 
-    /* clear tag-item links */
-    if (version_compare($GLOBALS['xoopsDB']->getServerVersion(), '4.1.0', 'ge')):
-        $sql = "    DELETE FROM {$linkHandler->table}"
-               . '    WHERE '
-               . "        tag_modid = {$mid}"
-               . '        AND '
-               . '        ( tag_itemid NOT IN '
-               . "            ( SELECT DISTINCT {$itemHandler->keyName} "
-               . "                FROM {$itemHandler->table} "
-               . "                WHERE {$itemHandler->table}.status > 0"
-               . '            ) '
-               . '        )';
-    else:
-        $sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
-               . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
-               . '    WHERE '
-               . "        tag_modid = {$mid}"
-               . '        AND '
-               . "        ( aa.{$itemHandler->keyName} IS NULL"
-               . '            OR aa.status < 1'
-               . '        )';
-    endif;
-    if (!$result = $linkHandler->db->queryF($sql)) {
-        //xoops_error($linkHandler->db->error());
-    }
+	/* clear tag-item links */
+	if (version_compare($GLOBALS['xoopsDB']->getServerVersion(), '4.1.0', 'ge')):
+		$sql = "    DELETE FROM {$linkHandler->table}"
+			   . '    WHERE '
+			   . "        tag_modid = {$mid}"
+			   . '        AND '
+			   . '        ( tag_itemid NOT IN '
+			   . "            ( SELECT DISTINCT {$itemHandler->keyName} "
+			   . "                FROM {$itemHandler->table} "
+			   . "                WHERE {$itemHandler->table}.status > 0"
+			   . '            ) '
+			   . '        )';
+	else:
+		$sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
+			   . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
+			   . '    WHERE '
+			   . "        tag_modid = {$mid}"
+			   . '        AND '
+			   . "        ( aa.{$itemHandler->keyName} IS NULL"
+			   . '            OR aa.status < 1'
+			   . '        )';
+	endif;
+	if (!$result = $linkHandler->db->queryF($sql)) {
+		//xoops_error($linkHandler->db->error());
+	}
 }

include/comment_functions.php

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@ 
  */
 function instruction_com_update($pageid, $total_num)
 {
-    $db  = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql = 'UPDATE ' . $db->prefix('instruction_page') . ' SET comments = ' . $total_num . ' WHERE pageid  = ' . $pageid;
-    $db->query($sql);
+	$db  = XoopsDatabaseFactory::getDatabaseConnection();
+	$sql = 'UPDATE ' . $db->prefix('instruction_page') . ' SET comments = ' . $total_num . ' WHERE pageid  = ' . $pageid;
+	$db->query($sql);
 }
 
 /**
@@ -19,5 +19,5 @@ 
  */
 function instruction_com_approve(&$comment)
 {
-    // notification mail here
+	// notification mail here
 }

include/common.php

Indentation +2 added lines, -2 removed lines

@@ -70,8 +70,8 @@
 $debug = false;
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new \XoopsTpl();
 }
 
 $moduleDirName = basename(dirname(__DIR__));

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 
 $debug = false;
 
-if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
+if ( ! isset($GLOBALS['xoopsTpl']) || ! ($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
     require_once $GLOBALS['xoops']->path('class/template.php');
     $xoopsTpl = new \XoopsTpl();
 }

page.php

Indentation +43 added lines, -43 removed lines

@@ -29,8 +29,8 @@ 
 $criteria->add(new \Criteria('pageid ', $pageid));
 $criteria->add(new \Criteria('status ', '0', '>'));
 if (0 == $pageHandler->getCount($criteria)) {
-    redirect_header('index.php', 3, _MD_INSTRUCTION_PAGENOTEXIST);
-    exit();
+	redirect_header('index.php', 3, _MD_INSTRUCTION_PAGENOTEXIST);
+	exit();
 }
 //
 unset($criteria);
@@ -42,8 +42,8 @@ 
 
 // Если админ и ссылка на отключение кэша
 if (($GLOBALS['xoopsUser'] instanceof \XoopsUser) && $GLOBALS['xoopsUser']->isAdmin() && $nocache) {
-    // Отключаем кэш
-    $GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
+	// Отключаем кэш
+	$GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
 }
 
 // Задание тайтла
@@ -60,8 +60,8 @@ 
 // Права на просмотр инструкции
 $categories = Xoopsmodules\instruction\Utility::getItemIds();
 if (!in_array($objInsinstr->getVar('cid'), $categories)) {
-    redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
-    exit();
+	redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
+	exit();
 }
 
 // Массив данных о странице
@@ -78,9 +78,9 @@ 
 $footnote = $objInspage->getVar('footnote');
 // Если есть сноски
 if ($footnote) {
-    $pages['footnotes'] = explode('|', $objInspage->getVar('footnote'));
+	$pages['footnotes'] = explode('|', $objInspage->getVar('footnote'));
 } else {
-    $pages['footnotes'] = false;
+	$pages['footnotes'] = false;
 }
 // Мета-теги ключевых слов
 $pages['keywords'] = $objInspage->getVar('keywords');
@@ -89,39 +89,39 @@ 
 //
 // Если админ, рисуем админлинк
 if (($GLOBALS['xoopsUser'] instanceof \XoopsUser) && $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid())) {
-    $pages['adminlink'] = '&nbsp;<a href="'
-                          . XOOPS_URL
-                          . '/modules/'
-                          . $moduleDirName
-                          . '/admin/instr.php?op=editpage&pageid='
-                          . $pages['pageid']
-                          . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt='
-                          . _EDIT
-                          . ' title='
-                          . _EDIT
-                          . '></a>&nbsp;<a href="'
-                          . XOOPS_URL
-                          . '/modules/'
-                          . $moduleDirName
-                          . '/admin/instr.php?op=delpage&pageid='
-                          . $pages['pageid']
-                          . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
-                          . _DELETE
-                          . ' title='
-                          . _DELETE
-                          . '></a>&nbsp;';
+	$pages['adminlink'] = '&nbsp;<a href="'
+						  . XOOPS_URL
+						  . '/modules/'
+						  . $moduleDirName
+						  . '/admin/instr.php?op=editpage&pageid='
+						  . $pages['pageid']
+						  . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt='
+						  . _EDIT
+						  . ' title='
+						  . _EDIT
+						  . '></a>&nbsp;<a href="'
+						  . XOOPS_URL
+						  . '/modules/'
+						  . $moduleDirName
+						  . '/admin/instr.php?op=delpage&pageid='
+						  . $pages['pageid']
+						  . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
+						  . _DELETE
+						  . ' title='
+						  . _DELETE
+						  . '></a>&nbsp;';
 } else {
-    $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="./assets/icons/edit_mini.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
-    }
-
-    $pages['adminlink'] .= '&nbsp;';
-    // Если нет админлика
-    if ('[&nbsp;&nbsp;]' === $pages['adminlink']) {
-        $pages['adminlink'] = '';
-    }
+	$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="./assets/icons/edit_mini.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
+	}
+
+	$pages['adminlink'] .= '&nbsp;';
+	// Если нет админлика
+	if ('[&nbsp;&nbsp;]' === $pages['adminlink']) {
+		$pages['adminlink'] = '';
+	}
 }
 // Выводим в шаблон
 $GLOBALS['xoopsTpl']->assign('insPage', $pages);
@@ -140,7 +140,7 @@ 
 $nav_parent_id = array_reverse($nav_parent_id);
 $navigation    = '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/">' . $GLOBALS['xoopsModule']->name() . '</a>&nbsp;:&nbsp;';
 foreach (array_keys($nav_parent_id) as $i) {
-    $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $nav_parent_id[$i]->getVar('cid') . '">' . $nav_parent_id[$i]->getVar('title') . '</a>&nbsp;:&nbsp;';
+	$navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $nav_parent_id[$i]->getVar('cid') . '">' . $nav_parent_id[$i]->getVar('title') . '</a>&nbsp;:&nbsp;';
 }
 $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $objInscat->getVar('cid') . '">' . $objInscat->getVar('title') . '</a>&nbsp;:&nbsp;';
 $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/instr.php?id=' . $pages['instrid'] . '">' . $objInsinstr->getVar('title') . '</a>';
@@ -172,9 +172,9 @@ 
 
 // Рейтинг
 if (xoops_getModuleOption('userat', 'instruction')) {
-    $xoopsTpl->assign('insUserat', true);
+	$xoopsTpl->assign('insUserat', true);
 } else {
-    $xoopsTpl->assign('insUserat', false);
+	$xoopsTpl->assign('insUserat', false);
 }
 
 // Мета теги

Spacing +1 added lines, -1 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();
 }