mambax7 / instruction

class/common/traitserverstats.php

Indentation +55 added lines, -55 removed lines

@@ -16,60 +16,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats()
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper = strtoupper($moduleDirName);
-        xoops_loadLanguage('common', $moduleDirName);
-        $html = '';
-        //        $sql   = 'SELECT metavalue';
-        //        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
-        //        $sql   .= " WHERE metakey='version' LIMIT 1";
-        //        $query = $GLOBALS['xoopsDB']->query($sql);
-        //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
-        $html .= "<div style='padding: 8px;'>\n";
-        //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
-        //        $html .= "<br>\n";
-        //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
-        $html .= "<ul>\n";
-        //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
-        if (function_exists('gd_info')) {
-            if ($gdlib = true === gd_info()) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
-            }
-        }
-        //
-        //    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
-        //
-        //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
-        //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
-        //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
-        $html .= "</ul>\n";
-        $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
-        $html .= "</ul>\n";
-        $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
-        $html .= '</div>';
-        $html .= '</fieldset><br>';
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats()
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper = strtoupper($moduleDirName);
+		xoops_loadLanguage('common', $moduleDirName);
+		$html = '';
+		//        $sql   = 'SELECT metavalue';
+		//        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
+		//        $sql   .= " WHERE metakey='version' LIMIT 1";
+		//        $query = $GLOBALS['xoopsDB']->query($sql);
+		//        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
+		$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+		$html .= "<div style='padding: 8px;'>\n";
+		//        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
+		//        $html .= "<br>\n";
+		//        $html .= "<br>\n";
+		$html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+		$html .= "<ul>\n";
+		//
+		$gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
+		$html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+		if (function_exists('gd_info')) {
+			if ($gdlib = true === gd_info()) {
+				$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+			}
+		}
+		//
+		//    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
+		//
+		//    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
+		//
+		$downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
+		$html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+		//
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+		$html .= "</ul>\n";
+		$html .= "<ul>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+		$html .= "</ul>\n";
+		$html .= "<br>\n";
+		$html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+		$html .= '</div>';
+		$html .= '</fieldset><br>';
 
-        return $html;
-    }
+		return $html;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
         $html .= "<ul>\n";
         //
         $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
         if (function_exists('gd_info')) {
             if ($gdlib = true === gd_info()) {
                 $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
@@ -56,7 +56,7 @@ 
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
         $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
         //
         $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
         $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";

class/common/traitversionchecks.php

Indentation +69 added lines, -69 removed lines

@@ -16,77 +16,77 @@
  */
 trait VersionChecks
 {
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param XoopsModule $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(__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 $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(__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;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

class/common/breadcrumb.php

Indentation +39 added lines, -39 removed lines

@@ -32,48 +32,48 @@
  */
 class PedigreeBreadcrumb
 {
-    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;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

class/common/traitfilesmgmt.php

Indentation +222 added lines, -222 removed lines

@@ -16,226 +16,226 @@
  */
 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
-     */
-    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
+	 */
+	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

@@ -26,8 +26,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));
                 }
 
@@ -82,7 +82,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;
         }
 
@@ -96,12 +96,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;
                     }
                 }
@@ -130,12 +130,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;
         }
 
@@ -147,15 +147,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
     }
 
@@ -170,17 +170,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;
         }
 
@@ -189,13 +189,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
     }
 
@@ -213,17 +213,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;
         }
 
@@ -232,7 +232,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());
             }
         }

class/instruction.php

Indentation +130 added lines, -130 removed lines

@@ -8,138 +8,138 @@
 
 class InstructionInstruction 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 InstructionInstruction()
-    {
-        $this->__construct();
-    }
-
-    public function get_new_enreg()
-    {
-        $new_enreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $new_enreg;
-    }
-
-    // Получаем форму
-    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);
-        // Категория
-        $instructioncatHandler = xoops_getModuleHandler('category', 'instruction');
-        $criteria              = new CriteriaCompo();
-        $criteria->setSort('weight ASC, title');
-        $criteria->setOrder('ASC');
-        $instructioncat_arr = $instructioncatHandler->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)));
-        // Описание
-        $form->addElement(InstructionUtility::getWysiwygForm(_AM_INSTRUCTION_DESCRIPTIONC, 'description', $this->getVar('description', 'e')), true);
-        // Статус
-        $form->addElement(new XoopsFormRadioYN(_AM_INSTRUCTION_ACTIVEC, 'status', $this->getVar('status')), false);
-
-        // Теги
-        if (is_dir('../../tag') || is_dir('../tag')) {
-            $dir_tag_ok = true;
-        } else {
-            $dir_tag_ok = false;
-        }
-        // Если влючена поддержка тегов и есть модуль 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 InstructionInstruction()
+	{
+		$this->__construct();
+	}
+
+	public function get_new_enreg()
+	{
+		$new_enreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $new_enreg;
+	}
+
+	// Получаем форму
+	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);
+		// Категория
+		$instructioncatHandler = xoops_getModuleHandler('category', 'instruction');
+		$criteria              = new CriteriaCompo();
+		$criteria->setSort('weight ASC, title');
+		$criteria->setOrder('ASC');
+		$instructioncat_arr = $instructioncatHandler->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)));
+		// Описание
+		$form->addElement(InstructionUtility::getWysiwygForm(_AM_INSTRUCTION_DESCRIPTIONC, 'description', $this->getVar('description', 'e')), true);
+		// Статус
+		$form->addElement(new XoopsFormRadioYN(_AM_INSTRUCTION_ACTIVEC, 'status', $this->getVar('status')), false);
+
+		// Теги
+		if (is_dir('../../tag') || is_dir('../tag')) {
+			$dir_tag_ok = true;
+		} else {
+			$dir_tag_ok = false;
+		}
+		// Если влючена поддержка тегов и есть модуль 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;
+	}
 }
 
 class InstructionInstructionHandler extends XoopsPersistableObjectHandler
 {
-    public function __construct($db)
-    {
-        parent::__construct($db, 'instruction_instr', 'InstructionInstruction', 'instrid', 'title');
-    }
-
-    // Обновление даты обновления инструкций
-    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);
-    }
-
-    // Обновление числа страниц
-    public function updatePages($instrid = 0)
-    {
-        $inspageHandler = xoops_getModuleHandler('page', 'instruction');
-        // Находим число активных страниц
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('instrid', $instrid, '='));
-        $criteria->add(new Criteria('status ', '0', '>'));
-        // Число страниц
-        $pages = $inspageHandler->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);
-    }
+	public function __construct($db)
+	{
+		parent::__construct($db, 'instruction_instr', 'InstructionInstruction', 'instrid', 'title');
+	}
+
+	// Обновление даты обновления инструкций
+	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);
+	}
+
+	// Обновление числа страниц
+	public function updatePages($instrid = 0)
+	{
+		$inspageHandler = xoops_getModuleHandler('page', 'instruction');
+		// Находим число активных страниц
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('instrid', $instrid, '='));
+		$criteria->add(new Criteria('status ', '0', '>'));
+		// Число страниц
+		$pages = $inspageHandler->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);
+	}
 }

Spacing +3 added lines, -3 removed lines

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

class/helper.php

Indentation +29 added lines, -29 removed lines

@@ -23,37 +23,37 @@
  */
 class Instruction extends \Xmf\Module\Helper
 {
-    public $debugArray = [];
+	public $debugArray = [];
 
-    /**
-     * @internal param $debug
-     */
-    protected function __construct()
-    {
-        //        $this->debug   = $debug;
-        $this->dirname = basename(dirname(__DIR__));
-    }
+	/**
+	 * @internal param $debug
+	 */
+	protected function __construct()
+	{
+		//        $this->debug   = $debug;
+		$this->dirname = basename(dirname(__DIR__));
+	}
 
-    /**
-     * @param bool $debug
-     *
-     * @return Newbb
-     */
-    public static function getInstance($debug = false)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	/**
+	 * @param bool $debug
+	 *
+	 * @return Newbb
+	 */
+	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/page.php

Indentation +200 added lines, -200 removed lines

@@ -8,208 +8,208 @@
 
 class InstructionPage 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 InstructionPage()
-    {
-        $this->__construct();
-    }
-
-    public function get_new_enreg()
-    {
-        $new_enreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $new_enreg;
-    }
-
-    // Получаем форму
-    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);
-
-        // Родительская страница
-        $inspageHandler = 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 = $inspageHandler->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)));
-
-        // Вес
-        $form->addElement(new XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
-        // Основной текст
-        $form->addElement(InstructionUtility::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;
-    }
-
-    //
-    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 InstructionPage()
+	{
+		$this->__construct();
+	}
+
+	public function get_new_enreg()
+	{
+		$new_enreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $new_enreg;
+	}
+
+	// Получаем форму
+	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);
+
+		// Родительская страница
+		$inspageHandler = 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 = $inspageHandler->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)));
+
+		// Вес
+		$form->addElement(new XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
+		// Основной текст
+		$form->addElement(InstructionUtility::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;
+	}
+
+	//
+	public function getInstrid()
+	{
+		// Возвращаем ID инструкции
+		return $this->getVar('instrid');
+	}
 }
 
 class InstructionPageHandler extends XoopsPersistableObjectHandler
 {
-    public function __construct($db)
-    {
-        parent::__construct($db, 'instruction_page', 'InstructionPage', '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
-     */
-    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;
-        }
-    }
+	public function __construct($db)
+	{
+		parent::__construct($db, 'instruction_page', 'InstructionPage', '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
+	 */
+	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;
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,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');
@@ -128,7 +128,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/category.php

Indentation +169 added lines, -169 removed lines

@@ -11,56 +11,56 @@ 
 
 class InstructionCategory 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);
-    }
-
-    public function InstructionCategory()
-    {
-        $this->__construct();
-    }
-
-    public function get_new_enreg()
-    {
-        $new_enreg = $GLOBALS['xoopsDB']->getInsertId();
-        return $new_enreg;
-    }
-
-    // Получаем форму
-    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_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);
+	}
+
+	public function InstructionCategory()
+	{
+		$this->__construct();
+	}
+
+	public function get_new_enreg()
+	{
+		$new_enreg = $GLOBALS['xoopsDB']->getInsertId();
+		return $new_enreg;
+	}
+
+	// Получаем форму
+	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_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>');
@@ -79,127 +79,127 @@ 
         $imgtray->addElement($fileseltray);
         $form->addElement($imgtray);
         */
-        // Родительская категория
-        $instructioncatHandler = 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');
-        $instructioncat_arr = $instructioncatHandler->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)));
-        $moduleDirName = basename(__DIR__);
-        if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
-        } else {
-            $moduleHelper = Xmf\Module\Helper::getHelper('system');
-        }
-        $module = $moduleHelper->getModule();
-
-        if (InstructionUtility::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;
-    }
+		// Родительская категория
+		$instructioncatHandler = 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');
+		$instructioncat_arr = $instructioncatHandler->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)));
+		$moduleDirName = basename(__DIR__);
+		if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
+		} else {
+			$moduleHelper = Xmf\Module\Helper::getHelper('system');
+		}
+		$module = $moduleHelper->getModule();
+
+		if (InstructionUtility::checkVerXoops($module, '2.5.9')) {
+			$mytree_select = $mytree->makeSelectElement('pid', 'title', '--', $this->getVar('pid'), true, 0, '', _AM_INSTRUCTION_PCATC);
+			$form->addElement($mytree_select);
+		} else {
+			$form->addElement(new XoopsFormLabel(_AM_INSTRUCTION_PCATC, $mytree->makeSelBox('pid', 'title', '--', $this->getVar('pid'), true)));
+		}
+
+		// Вес
+		$form->addElement(new XoopsFormText(_AM_INSTRUCTION_WEIGHTC, 'weight', 5, 5, $this->getVar('weight')), true);
+		// Мета-теги ключевых слов
+		$form->addElement(new XoopsFormText(_AM_INSTRUCTION_METAKEYWORDSC, 'metakeywords', 50, 255, $this->getVar('metakeywords')), false);
+		// Мета-теги описания
+		$form->addElement(new XoopsFormText(_AM_INSTRUCTION_METADESCRIPTIONC, 'metadescription', 50, 255, $this->getVar('metadescription')), false);
+
+		// ==========================================================
+		// ==========================================================
+
+		// Права
+		$memberHandler = xoops_getHandler('member');
+		$group_list    = $memberHandler->getGroupList();
+		$gpermHandler  = xoops_getHandler('groupperm');
+		$full_list     = array_keys($group_list);
+
+		// Права на просмотр
+		$groups_ids = [];
+		// Если мы редактируем
+		if (!$this->isNew()) {
+			$groups_ids        = $gpermHandler->getGroupIds('instruction_view', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
+			$groups_ids        = array_values($groups_ids);
+			$groups_instr_view = new XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $groups_ids);
+		} else {
+			$groups_instr_view = new XoopsFormCheckBox(_AM_INSTRUCTION_PERM_VIEW, 'groups_instr_view', $full_list);
+		}
+		$groups_instr_view->addOptionArray($group_list);
+		$form->addElement($groups_instr_view);
+
+		// Права на отправку
+		$groups_ids = [];
+		if (!$this->isNew()) {
+			$groups_ids          = $gpermHandler->getGroupIds('instruction_submit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
+			$groups_ids          = array_values($groups_ids);
+			$groups_instr_submit = new XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $groups_ids);
+		} else {
+			$groups_instr_submit = new XoopsFormCheckBox(_AM_INSTRUCTION_PERM_SUBMIT, 'groups_instr_submit', $full_list);
+		}
+		$groups_instr_submit->addOptionArray($group_list);
+		$form->addElement($groups_instr_submit);
+
+		// Права на редактирование
+		$groups_ids = [];
+		if (!$this->isNew()) {
+			$groups_ids        = $gpermHandler->getGroupIds('instruction_edit', $this->getVar('cid'), $GLOBALS['xoopsModule']->getVar('mid'));
+			$groups_ids        = array_values($groups_ids);
+			$groups_instr_edit = new XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $groups_ids);
+		} else {
+			$groups_instr_edit = new XoopsFormCheckBox(_AM_INSTRUCTION_PERM_EDIT, 'groups_instr_edit', $full_list);
+		}
+		$groups_instr_edit->addOptionArray($group_list);
+		$form->addElement($groups_instr_edit);
+
+		// ==========================================================
+		// ==========================================================
+
+		// Если мы редактируем категорию
+		if (!$this->isNew()) {
+			$form->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
+			//$form->addElement( new XoopsFormHidden( 'catmodify', true));
+		}
+		//
+		$form->addElement(new XoopsFormHidden('op', 'savecat'));
+		// Кнопка
+		$button_tray = new XoopsFormElementTray('', '');
+		$submit_btn  = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+		$button_tray->addElement($submit_btn);
+		$cancel_btn = new XoopsFormButton('', 'cancel', _CANCEL, 'cancel');
+		$cancel_btn->setExtra('onclick="javascript:history.go(-1);"');
+		$button_tray->addElement($cancel_btn);
+		$form->addElement($button_tray);
+
+		return $form;
+	}
 }
 
 class InstructionCategoryHandler extends XoopsPersistableObjectHandler
 {
-    public function __construct($db)
-    {
-        parent::__construct($db, 'instruction_cat', 'InstructionCategory', 'cid', 'title');
-    }
-
-    // Обновление даты обновления категории
-    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);
-    }
+	public function __construct($db)
+	{
+		parent::__construct($db, 'instruction_cat', 'InstructionCategory', 'cid', 'title');
+	}
+
+	// Обновление даты обновления категории
+	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 +7 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
         $instructioncatHandler = 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');
@@ -128,7 +128,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);
@@ -140,7 +140,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);
@@ -152,7 +152,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);
@@ -166,7 +166,7 @@ 
         // ==========================================================
 
         // Если мы редактируем категорию
-        if (!$this->isNew()) {
+        if ( ! $this->isNew()) {
             $form->addElement(new XoopsFormHidden('cid', $this->getVar('cid')));
             //$form->addElement( new XoopsFormHidden( 'catmodify', true));
         }
@@ -196,9 +196,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);
     }

xoops_version.php

Indentation +169 added lines, -169 removed lines

@@ -10,62 +10,62 @@ 
 $xoops_url     = parse_url(XOOPS_URL);
 
 $modversion = [
-    'version'             => 1.06,
-    'module_status'       => 'Beta 3',
-    'release_date'        => '2017/05/11',
-    'name'                => _MI_INSTRUCTION_NAME,
-    'description'         => _MI_INSTRUCTION_DESC,
-    'credits'             => 'radio-hobby.org, www.shmel.org',
-    'author'              => 'andrey3761, aerograf',
-    'nickname'            => '',
-    'help'                => 'page=help',
-    'license'             => 'GNU GPL 2.0',
-    'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html/',
-    'official'            => 0,
-    'image'               => 'assets/images/slogo.png',
-    'dirname'             => $moduleDirName,
-    'modicons16'          => 'assets/images/icons/16',
-    'modicons32'          => 'assets/images/icons/32',
-    // О модуле
-    'module_website_url'  => 'radio-hobby.org',
-    'module_website_name' => 'radio-hobby.org',
+	'version'             => 1.06,
+	'module_status'       => 'Beta 3',
+	'release_date'        => '2017/05/11',
+	'name'                => _MI_INSTRUCTION_NAME,
+	'description'         => _MI_INSTRUCTION_DESC,
+	'credits'             => 'radio-hobby.org, www.shmel.org',
+	'author'              => 'andrey3761, aerograf',
+	'nickname'            => '',
+	'help'                => 'page=help',
+	'license'             => 'GNU GPL 2.0',
+	'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html/',
+	'official'            => 0,
+	'image'               => 'assets/images/slogo.png',
+	'dirname'             => $moduleDirName,
+	'modicons16'          => 'assets/images/icons/16',
+	'modicons32'          => 'assets/images/icons/32',
+	// О модуле
+	'module_website_url'  => 'radio-hobby.org',
+	'module_website_name' => 'radio-hobby.org',
 
-    'author_website_url'  => 'radio-hobby.org',
-    'author_website_name' => 'andrey3761',
-    'module_website_url'  => 'www.xoops.org',
-    'module_website_name' => 'Support site',
-    'min_php'             => '5.5',
-    'min_xoops'           => '2.5.8',
-    'min_admin'           => '1.1',
-    'min_db'              => ['mysql' => '5.5'],
-    // Файл базы данных
-    'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
-    // Таблицы
-    'tables'              => [
-        $moduleDirName . '_cat',
-        $moduleDirName . '_instr',
-        $moduleDirName . '_page'
-    ],
-    // Имеет админку
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    'system_menu'         => 1,
-    // Меню
-    'hasMain'             => 1,
-    // Search
-    'hasSearch'           => 1,
-    'search'              => [
-        'file' => 'include/search.inc.php',
-        'func' => $moduleDirName . '_search',
-    ],
+	'author_website_url'  => 'radio-hobby.org',
+	'author_website_name' => 'andrey3761',
+	'module_website_url'  => 'www.xoops.org',
+	'module_website_name' => 'Support site',
+	'min_php'             => '5.5',
+	'min_xoops'           => '2.5.8',
+	'min_admin'           => '1.1',
+	'min_db'              => ['mysql' => '5.5'],
+	// Файл базы данных
+	'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
+	// Таблицы
+	'tables'              => [
+		$moduleDirName . '_cat',
+		$moduleDirName . '_instr',
+		$moduleDirName . '_page'
+	],
+	// Имеет админку
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	'system_menu'         => 1,
+	// Меню
+	'hasMain'             => 1,
+	// Search
+	'hasSearch'           => 1,
+	'search'              => [
+		'file' => 'include/search.inc.php',
+		'func' => $moduleDirName . '_search',
+	],
 ];
 //  Help files
 $modversion['helpsection'] = [
-    ['name' => _MI_INSTRUCTION_HELP_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_INSTRUCTION_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_INSTRUCTION_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_INSTRUCTION_SUPPORT, 'link' => 'page=support'],
+	['name' => _MI_INSTRUCTION_HELP_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_INSTRUCTION_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_INSTRUCTION_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_INSTRUCTION_SUPPORT, 'link' => 'page=support'],
 ];
 
 // Comments
@@ -78,144 +78,144 @@ 
 
 // Templates
 $modversion['templates'] = [
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_index.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_cat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_editcat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_savecat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_viewcat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_instr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_editinstr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_saveinstr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_viewinstr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_editpage.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_savepage.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_perm.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_about.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_page.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_instr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_index.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_editpage.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_savepage.tpl',
-        'description' => ''
-    ],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_index.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_cat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_editcat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_savecat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_viewcat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_instr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_editinstr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_saveinstr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_viewinstr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_editpage.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_savepage.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_perm.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_about.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_page.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_instr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_index.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_editpage.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_savepage.tpl',
+		'description' => ''
+	],
 ];
 // Конфигурация
 $modversion['config'][] = [
-    'name'        => 'form_options',
-    'title'       => '_MI_INSTRUCTION_FORM_OPTIONS',
-    'description' => '_MI_INSTRUCTION_FORM_OPTIONS_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'default'     => 'dhtml',
-    'options'     => array_flip($editorHandler->getList())
+	'name'        => 'form_options',
+	'title'       => '_MI_INSTRUCTION_FORM_OPTIONS',
+	'description' => '_MI_INSTRUCTION_FORM_OPTIONS_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'default'     => 'dhtml',
+	'options'     => array_flip($editorHandler->getList())
 ];
 $modversion['config'][] = [
-    'name'        => 'perpageadmin',
-    'title'       => '_MI_INSTRUCTION_PERPAGEADMIN',
-    'description' => '_MI_INSTRUCTION_PERPAGEADMINDSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
+	'name'        => 'perpageadmin',
+	'title'       => '_MI_INSTRUCTION_PERPAGEADMIN',
+	'description' => '_MI_INSTRUCTION_PERPAGEADMINDSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
 ];
 $modversion['config'][] = [
-    'name'        => 'perpagemain',
-    'title'       => '_MI_INSTRUCTION_PERPAGEMAIN',
-    'description' => '_MI_INSTRUCTION_PERPAGEMAINDSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
+	'name'        => 'perpagemain',
+	'title'       => '_MI_INSTRUCTION_PERPAGEMAIN',
+	'description' => '_MI_INSTRUCTION_PERPAGEMAINDSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
 ];
 // Теги
 $modversion['config'][] = [
-    'name'        => 'usetag',
-    'title'       => '_MI_INSTRUCTION_USETAG',
-    'description' => '_MI_INSTRUCTION_USETAGDSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'usetag',
+	'title'       => '_MI_INSTRUCTION_USETAG',
+	'description' => '_MI_INSTRUCTION_USETAGDSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
 ];
 // Оценки
 $modversion['config'][] = [
-    'name'        => 'userat',
-    'title'       => '_MI_INSTRUCTION_USERAT',
-    'description' => '_MI_INSTRUCTION_USERATDSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'userat',
+	'title'       => '_MI_INSTRUCTION_USERAT',
+	'description' => '_MI_INSTRUCTION_USERATDSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
 ];
 
 // Блоки
 // Блок последних страниц
 $modversion['blocks'][] = [
-    'file'        => 'instr_lastpage.php',
-    'name'        => _MI_INSTR_BLOCK_LASTPAGE,
-    'description' => _MI_INSTR_BLOCK_LASTPAGE_DESC,
-    'show_func'   => 'b_instr_lastpage_show',
-    'edit_func'   => 'b_instr_lastpage_edit',
-    'options'     => '10|20',
-    'template'    => $moduleDirName . '_block_lastpage.tpl'
+	'file'        => 'instr_lastpage.php',
+	'name'        => _MI_INSTR_BLOCK_LASTPAGE,
+	'description' => _MI_INSTR_BLOCK_LASTPAGE_DESC,
+	'show_func'   => 'b_instr_lastpage_show',
+	'edit_func'   => 'b_instr_lastpage_edit',
+	'options'     => '10|20',
+	'template'    => $moduleDirName . '_block_lastpage.tpl'
 ];
 // Блок последних инструкций
 $modversion['blocks'][] = [
-    'file'        => 'instr_lastinstr.php',
-    'name'        => _MI_INSTR_BLOCK_LASTINSTR,
-    'description' => _MI_INSTR_BLOCK_LASTINSTR_DESC,
-    'show_func'   => 'b_instr_lastinstr_show',
-    'edit_func'   => 'b_instr_lastinstr_edit',
-    'options'     => '10|20',
-    'template'    => $moduleDirName . '_block_lastinstr.tpl'
+	'file'        => 'instr_lastinstr.php',
+	'name'        => _MI_INSTR_BLOCK_LASTINSTR,
+	'description' => _MI_INSTR_BLOCK_LASTINSTR_DESC,
+	'show_func'   => 'b_instr_lastinstr_show',
+	'edit_func'   => 'b_instr_lastinstr_edit',
+	'options'     => '10|20',
+	'template'    => $moduleDirName . '_block_lastinstr.tpl'
 ];
 
 // Notification