mambax7 / instruction

class/common/FilesManagement.php

Indentation +224 added lines, -224 removed lines

@@ -17,228 +17,228 @@
  */
 trait FilesManagement
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     *
-     * @return void
-     * @throws \RuntimeException
-     */
-    public static function createFolder($folder)
-    {
-        try {
-            if (!file_exists($folder)) {
-                if (!mkdir($folder) && !is_dir($folder)) {
-                    throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-                }
-
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-            }
-        }
-        catch (\Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    public static function copyFile($file, $folder)
-    {
-        return copy($file, $folder);
-    }
-
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst)
-    {
-        $dir = opendir($src);
-        @mkdir($dst);
-        while (false !== ($file = readdir($dir))) {
-            if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        closedir($dir);
-    }
-
-    /**
-     *
-     * Remove files and (sub)directories
-     *
-     * @param string $src source directory to delete
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @return bool true on success
-     */
-    public static function deleteDirectory($src)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        $success = true;
-        // remove old files
-        $dirInfo = new \SplFileInfo($src);
-        // validate is a directory
-        if ($dirInfo->isDir()) {
-            $fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
-            foreach ($fileList as $k => $v) {
-                $fileInfo = new \SplFileInfo("{$src}/{$v}");
-                if ($fileInfo->isDir()) {
-                    // recursively handle subdirectories
-                    if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
-                        break;
-                    }
-                } else {
-                    // delete the file
-                    if (!($success = unlink($fileInfo->getRealPath()))) {
-                        break;
-                    }
-                }
-            }
-            // now delete this (sub)directory if all the files are gone
-            if ($success) {
-                $success = rmdir($dirInfo->getRealPath());
-            }
-        } else {
-            // input is not a valid directory
-            $success = false;
-        }
-        return $success;
-    }
-
-    /**
-     *
-     * Recursively remove directory
-     *
-     * @todo currently won't remove directories with hidden files, should it?
-     *
-     * @param string $src directory to remove (delete)
-     *
-     * @return bool true on success
-     */
-    public static function rrmdir($src)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        $success = true;
-
-        // Open the source directory to read in files
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                $filename = $fObj->getPathname();
-                $fObj     = null; // clear this iterator object to close the file
-                if (!unlink($filename)) {
-                    return false; // couldn't delete the file
-                }
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rrmdir($fObj->getPathname());
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-        return rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively move files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @return bool true on success
-     */
-    public static function rmove($src, $dest)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest, 0755)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-                //                rmdir($fObj->getPath()); // now delete the directory
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-        return rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively copy directories and files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @return bool true on success
-     */
-    public static function rcopy($src, $dest)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest, 0755)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            }
-        }
-        return true;
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 *
+	 * @return void
+	 * @throws \RuntimeException
+	 */
+	public static function createFolder($folder)
+	{
+		try {
+			if (!file_exists($folder)) {
+				if (!mkdir($folder) && !is_dir($folder)) {
+					throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+				}
+
+				file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+			}
+		}
+		catch (\Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	/**
+	 * @param $file
+	 * @param $folder
+	 * @return bool
+	 */
+	public static function copyFile($file, $folder)
+	{
+		return copy($file, $folder);
+	}
+
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst)
+	{
+		$dir = opendir($src);
+		@mkdir($dst);
+		while (false !== ($file = readdir($dir))) {
+			if (('.' !== $file) && ('..' !== $file)) {
+				if (is_dir($src . '/' . $file)) {
+					self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+				} else {
+					copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
+
+	/**
+	 *
+	 * Remove files and (sub)directories
+	 *
+	 * @param string $src source directory to delete
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @return bool true on success
+	 */
+	public static function deleteDirectory($src)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		$success = true;
+		// remove old files
+		$dirInfo = new \SplFileInfo($src);
+		// validate is a directory
+		if ($dirInfo->isDir()) {
+			$fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
+			foreach ($fileList as $k => $v) {
+				$fileInfo = new \SplFileInfo("{$src}/{$v}");
+				if ($fileInfo->isDir()) {
+					// recursively handle subdirectories
+					if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
+						break;
+					}
+				} else {
+					// delete the file
+					if (!($success = unlink($fileInfo->getRealPath()))) {
+						break;
+					}
+				}
+			}
+			// now delete this (sub)directory if all the files are gone
+			if ($success) {
+				$success = rmdir($dirInfo->getRealPath());
+			}
+		} else {
+			// input is not a valid directory
+			$success = false;
+		}
+		return $success;
+	}
+
+	/**
+	 *
+	 * Recursively remove directory
+	 *
+	 * @todo currently won't remove directories with hidden files, should it?
+	 *
+	 * @param string $src directory to remove (delete)
+	 *
+	 * @return bool true on success
+	 */
+	public static function rrmdir($src)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		$success = true;
+
+		// Open the source directory to read in files
+		$iterator = new \DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				$filename = $fObj->getPathname();
+				$fObj     = null; // clear this iterator object to close the file
+				if (!unlink($filename)) {
+					return false; // couldn't delete the file
+				}
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rrmdir($fObj->getPathname());
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+		return rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively move files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @return bool true on success
+	 */
+	public static function rmove($src, $dest)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!is_dir($dest) && !mkdir($dest, 0755)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new \DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+				//                rmdir($fObj->getPath()); // now delete the directory
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+		return rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively copy directories and files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @return bool true on success
+	 */
+	public static function rcopy($src, $dest)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!is_dir($dest) && !mkdir($dest, 0755)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new \DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			}
+		}
+		return true;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -28,8 +28,8 @@ 
     public static function createFolder($folder)
     {
         try {
-            if (!file_exists($folder)) {
-                if (!mkdir($folder) && !is_dir($folder)) {
+            if ( ! file_exists($folder)) {
+                if ( ! mkdir($folder) && ! is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 }
 
@@ -85,7 +85,7 @@ 
     public static function deleteDirectory($src)
     {
         // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+        if ( ! ($GLOBALS['xoopsUser'] instanceof XoopsUser) || ! $GLOBALS['xoopsUser']->isAdmin()) {
             return false;
         }
 
@@ -99,12 +99,12 @@ 
                 $fileInfo = new \SplFileInfo("{$src}/{$v}");
                 if ($fileInfo->isDir()) {
                     // recursively handle subdirectories
-                    if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
+                    if ( ! $success = self::deleteDirectory($fileInfo->getRealPath())) {
                         break;
                     }
                 } else {
                     // delete the file
-                    if (!($success = unlink($fileInfo->getRealPath()))) {
+                    if ( ! ($success = unlink($fileInfo->getRealPath()))) {
                         break;
                     }
                 }
@@ -133,12 +133,12 @@ 
     public static function rrmdir($src)
     {
         // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+        if ( ! ($GLOBALS['xoopsUser'] instanceof XoopsUser) || ! $GLOBALS['xoopsUser']->isAdmin()) {
             return false;
         }
 
         // If source is not a directory stop processing
-        if (!is_dir($src)) {
+        if ( ! is_dir($src)) {
             return false;
         }
 
@@ -150,15 +150,15 @@ 
             if ($fObj->isFile()) {
                 $filename = $fObj->getPathname();
                 $fObj     = null; // clear this iterator object to close the file
-                if (!unlink($filename)) {
+                if ( ! unlink($filename)) {
                     return false; // couldn't delete the file
                 }
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
+            } elseif ( ! $fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
                 self::rrmdir($fObj->getPathname());
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -173,17 +173,17 @@ 
     public static function rmove($src, $dest)
     {
         // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+        if ( ! ($GLOBALS['xoopsUser'] instanceof XoopsUser) || ! $GLOBALS['xoopsUser']->isAdmin()) {
             return false;
         }
 
         // If source is not a directory stop processing
-        if (!is_dir($src)) {
+        if ( ! is_dir($src)) {
             return false;
         }
 
         // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest, 0755)) {
+        if ( ! is_dir($dest) && ! mkdir($dest, 0755)) {
             return false;
         }
 
@@ -192,13 +192,13 @@ 
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
                 rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
+            } elseif ( ! $fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
                 self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
                 //                rmdir($fObj->getPath()); // now delete the directory
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -216,17 +216,17 @@ 
     public static function rcopy($src, $dest)
     {
         // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+        if ( ! ($GLOBALS['xoopsUser'] instanceof XoopsUser) || ! $GLOBALS['xoopsUser']->isAdmin()) {
             return false;
         }
 
         // If source is not a directory stop processing
-        if (!is_dir($src)) {
+        if ( ! is_dir($src)) {
             return false;
         }
 
         // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest, 0755)) {
+        if ( ! is_dir($dest) && ! mkdir($dest, 0755)) {
             return false;
         }
 
@@ -235,7 +235,7 @@ 
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
                 copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
+            } elseif ( ! $fObj->isDot() && $fObj->isDir()) {
                 self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
             }
         }

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
 
                 file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
             }
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
         }
     }

class/common/Breadcrumb.php

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(__DIR__));
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->dirname = basename(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 Pedigree 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 Pedigree 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

Indentation +159 added lines, -159 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 get_new_enreg()
-    {
-        $new_enreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $new_enreg;
-    }
-
-    // Получаем форму
-
-    /**
-     * @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 get_new_enreg()
+	{
+		$new_enreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $new_enreg;
+	}
+
+	// Получаем форму
+
+	/**
+	 * @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,110 +88,110 @@ 
         $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');
-
-        $db              = \XoopsDatabaseFactory::getDatabase();
-        $categoryHandler = new CategoryHandler($db);
-
-        $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');
+
+		$db              = \XoopsDatabaseFactory::getDatabase();
+		$categoryHandler = new CategoryHandler($db);
+
+		$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;
+	}
 }
 

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

class/Page.php

Indentation +173 added lines, -173 removed lines

@@ -12,177 +12,177 @@
  */
 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);
-    }
-
-    public function Page()
-    {
-        $this->__construct();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function get_new_enreg()
-    {
-        $new_enreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $new_enreg;
-    }
-
-    // Получаем форму
-
-    /**
-     * @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');
-        $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);
+	}
+
+	public function Page()
+	{
+		$this->__construct();
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function get_new_enreg()
+	{
+		$new_enreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $new_enreg;
+	}
+
+	// Получаем форму
+
+	/**
+	 * @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');
+		$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');
+	}
 }

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

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

Indentation +115 added lines, -115 removed lines

@@ -12,120 +12,120 @@
  */
 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);
-    }
-
-    public function Instruction()
-    {
-        $this->__construct();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function get_new_enreg()
-    {
-        $new_enreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $new_enreg;
-    }
-
-    // Получаем форму
-
-    /**
-     * @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);
+	}
+
+	public function Instruction()
+	{
+		$this->__construct();
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function get_new_enreg()
+	{
+		$new_enreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $new_enreg;
+	}
+
+	// Получаем форму
+
+	/**
+	 * @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;
+	}
 }
 

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

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