mambax7 / instruction

class/common/VersionChecks.php

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_WFL_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
-        }
+		if (false === $success) {
+			$module->setErrors(sprintf(_AM_WFL_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_WFL_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_WFL_ERROR_BAD_PHP, $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

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

class/InstructionHandler.php

Indentation +42 added lines, -42 removed lines

@@ -14,51 +14,51 @@
  */
 class InstructionHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param null|mixed $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'instruction_instr', Instruction::class, 'instrid', 'title');
-    }
+	/**
+	 * @param null|mixed $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'instruction_instr', Instruction::class, 'instrid', 'title');
+	}
 
-    // Обновление даты обновления инструкций
+	// Обновление даты обновления инструкций
 
-    /**
-     * @param int  $instrid
-     * @param bool|int $time
-     * @return mixed
-     */
-    public function updateDateupdated($instrid = 0, $time = null)
-    {
-        // Если не передали время
-        $time = null === $time ? time() : (int)$time;
-        //
-        $sql = sprintf('UPDATE `%s` SET `dateupdated` = %u WHERE `instrid` = %u', $this->table, $time, (int)$instrid);
-        //
-        return $this->db->query($sql);
-    }
+	/**
+	 * @param int  $instrid
+	 * @param bool|int $time
+	 * @return mixed
+	 */
+	public function updateDateupdated($instrid = 0, $time = null)
+	{
+		// Если не передали время
+		$time = null === $time ? time() : (int)$time;
+		//
+		$sql = sprintf('UPDATE `%s` SET `dateupdated` = %u WHERE `instrid` = %u', $this->table, $time, (int)$instrid);
+		//
+		return $this->db->query($sql);
+	}
 
-    // Обновление числа страниц
+	// Обновление числа страниц
 
-    /**
-     * @param int $instrid
-     * @return mixed
-     */
-    public function updatePages($instrid = 0)
-    {
-        //        $pageHandler = xoops_getModuleHandler('page', 'instruction');
-        // Находим число активных страниц
-        $criteria = new \CriteriaCompo();
-        $criteria->add(new \Criteria('instrid', $instrid, '='));
-        $criteria->add(new \Criteria('status ', '0', '>'));
-        // Число страниц
-        $pages = $pageHandler->getCount($criteria);
-        unset($criteria);
+	/**
+	 * @param int $instrid
+	 * @return mixed
+	 */
+	public function updatePages($instrid = 0)
+	{
+		//        $pageHandler = xoops_getModuleHandler('page', 'instruction');
+		// Находим число активных страниц
+		$criteria = new \CriteriaCompo();
+		$criteria->add(new \Criteria('instrid', $instrid, '='));
+		$criteria->add(new \Criteria('status ', '0', '>'));
+		// Число страниц
+		$pages = $pageHandler->getCount($criteria);
+		unset($criteria);
 
-        // Сохраняем это число
-        $sql = sprintf('UPDATE `%s` SET `pages` = %u, `dateupdated` = %u WHERE `instrid` = %u', $this->table, $pages, time(), $instrid);
-        //
-        return $this->db->query($sql);
-    }
+		// Сохраняем это число
+		$sql = sprintf('UPDATE `%s` SET `pages` = %u, `dateupdated` = %u WHERE `instrid` = %u', $this->table, $pages, time(), $instrid);
+		//
+		return $this->db->query($sql);
+	}
 }

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/config.php

Indentation +46 added lines, -46 removed lines

@@ -23,57 +23,57 @@
 $capsDirName   = strtoupper($moduleDirName);
 
 if (!defined($capsDirName . '_DIRNAME')) {
-    //if (!defined(constant($capsDirName . '_DIRNAME'))) {
-    define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
-    define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
-    define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
-    define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
-    define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
-    define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
-    define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	//if (!defined(constant($capsDirName . '_DIRNAME'))) {
+	define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
+	define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
+	define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
+	define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
+	define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
+	define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
+	define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
 }
 
 //Configurator
 return (object)[
-    'name'          => strtoupper($moduleDirName) . ' Module Configurator',
-    'paths'         => [
-        'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        //        'path'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        //        'url'        => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-    ],
-    'uploadFolders' => [
-        constant($capsDirName . '_UPLOAD_PATH'),
-        //constant($capsDirName . '_UPLOAD_PATH') . '/category',
-        //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
-    'blankFiles'    => [
-        constant($capsDirName . '_UPLOAD_PATH'),
-        //constant($capsDirName . '_UPLOAD_PATH') . '/category',
-        //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
+	'name'          => strtoupper($moduleDirName) . ' Module Configurator',
+	'paths'         => [
+		'dirname'    => $moduleDirName,
+		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+		//        'path'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+		//        'url'        => XOOPS_URL . '/modules/' . $moduleDirName,
+		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+	],
+	'uploadFolders' => [
+		constant($capsDirName . '_UPLOAD_PATH'),
+		//constant($capsDirName . '_UPLOAD_PATH') . '/category',
+		//constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
+	'blankFiles'    => [
+		constant($capsDirName . '_UPLOAD_PATH'),
+		//constant($capsDirName . '_UPLOAD_PATH') . '/category',
+		//constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
 
-    'templateFolders' => [
-        '/templates/',
-        '/templates/blocks/',
-        '/templates/admin/'
+	'templateFolders' => [
+		'/templates/',
+		'/templates/blocks/',
+		'/templates/admin/'
 
-    ],
-    'oldFiles'        => [//        '/sql/mysql.sql',
-    ],
-    'oldFolders'      => [
-        '/images',
-        '/css',
-        '/js',
-        '/tree',
-        '/images/icons/16',
-        '/images/icons/32',
-    ],
-    'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+	],
+	'oldFiles'        => [//        '/sql/mysql.sql',
+	],
+	'oldFolders'      => [
+		'/images',
+		'/css',
+		'/js',
+		'/tree',
+		'/images/icons/16',
+		'/images/icons/32',
+	],
+	'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . $capsDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' /></a>',
 ];

class/Instruction.php

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/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__));