mambax7 / instruction

admin/index.php

Indentation +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 
 $configurator = include __DIR__ . '/../include/config.php';
 foreach (array_keys($configurator->uploadFolders) as $i) {
-    $utility::createFolder($configurator->uploadFolders[$i]);
-    $adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');
+	$utility::createFolder($configurator->uploadFolders[$i]);
+	$adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');
 }
 
 //$instructionHandler = xoops_getModuleHandler('instruction', 'instruction');

admin/menu.php

Indentation +31 added lines, -31 removed lines

@@ -3,7 +3,7 @@ 
 use Xoopsmodules\instruction;
 
 if (!isset($moduleDirName)) {
-    $moduleDirName = basename(dirname(__DIR__));
+	$moduleDirName = basename(dirname(__DIR__));
 }
 
 /** @var Xmf\Module\Helper $moduleHelper */
@@ -17,34 +17,34 @@ 
 
 // Административное меню
 $adminmenu = [
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_HOME,
-        'link'  => 'admin/index.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_HOME_DESC,
-        'icon'  => $pathIcon32 . '/home.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_CAT,
-        'link'  => 'admin/cat.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_CAT_DESC,
-        'icon'  => $pathIcon32 . '/category.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_INSTR,
-        'link'  => 'admin/instr.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_INSTR_DESC,
-        'icon'  => $pathModIcon32 . '/nav_book.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_PERM,
-        'link'  => 'admin/perm.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_PERM_DESC,
-        'icon'  => $pathIcon32 . '/permissions.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_ABOUT,
-        'link'  => 'admin/about.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_ABOUT_DESC,
-        'icon'  => $pathIcon32 . '/about.png'
-    ]
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_HOME,
+		'link'  => 'admin/index.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_HOME_DESC,
+		'icon'  => $pathIcon32 . '/home.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_CAT,
+		'link'  => 'admin/cat.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_CAT_DESC,
+		'icon'  => $pathIcon32 . '/category.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_INSTR,
+		'link'  => 'admin/instr.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_INSTR_DESC,
+		'icon'  => $pathModIcon32 . '/nav_book.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_PERM,
+		'link'  => 'admin/perm.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_PERM_DESC,
+		'icon'  => $pathIcon32 . '/permissions.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_ABOUT,
+		'link'  => 'admin/about.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_ABOUT_DESC,
+		'icon'  => $pathIcon32 . '/about.png'
+	]
 ];

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 use Xoopsmodules\instruction;
 
-if (!isset($moduleDirName)) {
+if ( ! isset($moduleDirName)) {
     $moduleDirName = basename(dirname(__DIR__));
 }
 

preloads/core.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
  */
 class InstructionCorePreload extends XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args)
-    {
-        include __DIR__ . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args)
+	{
+		include __DIR__ . '/autoloader.php';
+	}
 }

preloads/autoloader.php

Indentation +19 added lines, -19 removed lines

@@ -4,29 +4,29 @@
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(function ($class) {
-    // project-specific namespace prefix
-    $prefix = 'Xoopsmodules\\instruction\\';
+	// project-specific namespace prefix
+	$prefix = 'Xoopsmodules\\instruction\\';
 
-    // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/../class/';
+	// base directory for the namespace prefix
+	$base_dir = __DIR__ . '/../class/';
 
-    // does the class use the namespace prefix?
-    $len = strlen($prefix);
+	// does the class use the namespace prefix?
+	$len = strlen($prefix);
 
-    if (0 !== strncmp($prefix, $class, $len)) {
-        return;
-    }
+	if (0 !== strncmp($prefix, $class, $len)) {
+		return;
+	}
 
-    // get the relative class name
-    $relative_class = substr($class, $len);
+	// get the relative class name
+	$relative_class = substr($class, $len);
 
-    // replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
 
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require $file;
-    }
+	// if the file exists, require it
+	if (file_exists($file)) {
+		require $file;
+	}
 });

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 /**
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     // project-specific namespace prefix
     $prefix = 'Xoopsmodules\\instruction\\';
 

class/common/VersionChecks.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles versions like x.x.x.0_RC2
                     $success = false;
                     break;
                 }

Indentation +69 added lines, -69 removed lines

@@ -17,77 +17,77 @@
  */
 trait VersionChecks
 {
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule|null $module
-     *
-     * @param null|string       $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        $currArray  = explode('.', $currentVer);
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $reqArray = explode('.', $requiredVer);
-        $success  = true;
-        foreach ($reqArray as $k => $v) {
-            if (isset($currArray[$k])) {
-                if ($currArray[$k] > $v) {
-                    break;
-                } elseif ($currArray[$k] == $v) {
-                    continue;
-                } else {
-                    $success = false;
-                    break;
-                }
-            } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
-                    $success = false;
-                    break;
-                }
-            }
-        }
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule|null $module
+	 *
+	 * @param null|string       $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		$currArray  = explode('.', $currentVer);
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$reqArray = explode('.', $requiredVer);
+		$success  = true;
+		foreach ($reqArray as $k => $v) {
+			if (isset($currArray[$k])) {
+				if ($currArray[$k] > $v) {
+					break;
+				} elseif ($currArray[$k] == $v) {
+					continue;
+				} else {
+					$success = false;
+					break;
+				}
+			} else {
+				if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+					$success = false;
+					break;
+				}
+			}
+		}
 
-        if (false === $success) {
-            $module->setErrors(sprintf(_AM_INSTRUCTION_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
-        }
+		if (false === $success) {
+			$module->setErrors(sprintf(_AM_INSTRUCTION_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module)
-    {
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(_AM_INSTRUCTION_ERROR_BAD_PHP, $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module)
+	{
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(_AM_INSTRUCTION_ERROR_BAD_PHP, $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

class/common/Breadcrumb.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      */
     public function render()
     {
-        if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
+        if ( ! isset($GLOBALS['xoTheme']) || ! is_object($GLOBALS['xoTheme'])) {
             require_once $GLOBALS['xoops']->path('class/theme.php');
             $GLOBALS['xoTheme'] = new xos_opal_Theme();
         }

Indentation +39 added lines, -39 removed lines

@@ -33,48 +33,48 @@
  */
 class Breadcrumb
 {
-    public $dirname;
-    private $bread = [];
+	public $dirname;
+	private $bread = [];
 
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->dirname = basename(dirname(dirname(__DIR__)));
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->dirname = basename(dirname(dirname(__DIR__)));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = '')
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = '')
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title
+		];
+	}
 
-    /**
-     * Render BreadCrumb
-     *
-     */
-    public function render()
-    {
-        if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
-            require_once $GLOBALS['xoops']->path('class/theme.php');
-            $GLOBALS['xoTheme'] = new xos_opal_Theme();
-        }
+	/**
+	 * Render BreadCrumb
+	 *
+	 */
+	public function render()
+	{
+		if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
+			require_once $GLOBALS['xoops']->path('class/theme.php');
+			$GLOBALS['xoTheme'] = new xos_opal_Theme();
+		}
 
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        $breadcrumbTpl = new \XoopsTpl();
-        $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
-        unset($breadcrumbTpl);
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		$breadcrumbTpl = new \XoopsTpl();
+		$breadcrumbTpl->assign('breadcrumb', $this->bread);
+		$html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+		unset($breadcrumbTpl);
 
-        return $html;
-    }
+		return $html;
+	}
 }

class/Helper.php

Indentation +30 added lines, -30 removed lines

@@ -24,38 +24,38 @@
  */
 class Helper extends \Xmf\Module\Helper
 {
-    public $debug;
+	public $debug;
 
-    /**
-     * @internal param $debug
-     * @param bool $debug
-     */
-    protected function __construct($debug = false)
-    {
-        $this->debug   = $debug;
-        $this->dirname = basename(dirname(__DIR__));
-    }
+	/**
+	 * @internal param $debug
+	 * @param bool $debug
+	 */
+	protected function __construct($debug = false)
+	{
+		$this->debug   = $debug;
+		$this->dirname = basename(dirname(__DIR__));
+	}
 
-    /**
-     * @param bool $debug
-     *
-     * @return \Xoopsmodules\instruction\Helper
-     */
-    public static function getInstance($debug = false)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	/**
+	 * @param bool $debug
+	 *
+	 * @return \Xoopsmodules\instruction\Helper
+	 */
+	public static function getInstance($debug = false)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($debug);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @return string
-     */
-    public function getDirname()
-    {
-        return $this->dirname;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDirname()
+	{
+		return $this->dirname;
+	}
 }

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,107 +88,107 @@ 
         $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;
+	}
 }