XoopsModules25x / myiframe

class/Common/TestdataButtons.php

Indentation +60 added lines, -60 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 use Xmf\{
-    Module\Admin,
-    Request,
-    Yaml
+	Module\Admin,
+	Request,
+	Yaml
 };
 use XoopsModules\Myiframe\{
-    Helper
+	Helper
 };
 
 /** @var Helper $helper */
@@ -40,64 +40,64 @@ 
  */
 class TestdataButtons
 {
-    /** Button status constants */
-    private const SHOW_BUTTONS = 1;
-    private const HIDE_BUTTONS = 0;
+	/** Button status constants */
+	private const SHOW_BUTTONS = 1;
+	private const HIDE_BUTTONS = 0;
 
-    /**
-     * Load the test button configuration
-     *
-     * @param \Xmf\Module\Admin $adminObject
-     *
-     * @return void
-     */
-    public static function loadButtonConfig(Admin $adminObject): void
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        $helper              = Helper::getInstance();
-        $yamlFile            = $helper->path('/config/admin.yml');
-        $config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
-        $displaySampleButton = $config['displaySampleButton'];
+	/**
+	 * Load the test button configuration
+	 *
+	 * @param \Xmf\Module\Admin $adminObject
+	 *
+	 * @return void
+	 */
+	public static function loadButtonConfig(Admin $adminObject): void
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		$helper              = Helper::getInstance();
+		$yamlFile            = $helper->path('/config/admin.yml');
+		$config             = Yaml::readWrapped($yamlFile); // work with phpmyadmin YAML dumps
+		$displaySampleButton = $config['displaySampleButton'];
 
-        if (self::SHOW_BUTTONS == $displaySampleButton) {
-            \xoops_loadLanguage('admin/modulesadmin', 'system');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
-            //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
-        } else {
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
-            // $displaySampleButton = $config['displaySampleButton'];
-        }
-    }
+		if (self::SHOW_BUTTONS == $displaySampleButton) {
+			\xoops_loadLanguage('admin/modulesadmin', 'system');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
+			//    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+		} else {
+			$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+			// $displaySampleButton = $config['displaySampleButton'];
+		}
+	}
 
-    /**
-     * Hide the test buttons
-     *
-     * @return void
-     */
-    public static function hideButtons(): void
-    {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
-        $app                        = [];
-        $app['displaySampleButton'] = 0;
-        Yaml::save($app, $yamlFile);
-        \redirect_header('index.php', 0, '');
-    }
+	/**
+	 * Hide the test buttons
+	 *
+	 * @return void
+	 */
+	public static function hideButtons(): void
+	{
+		$yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+		$app                        = [];
+		$app['displaySampleButton'] = 0;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 
-    /**
-     * Show the test buttons
-     *
-     * @return void
-     */
-    public static function showButtons(): void
-    {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
-        $app                        = [];
-        $app['displaySampleButton'] = 1;
-        Yaml::save($app, $yamlFile);
-        \redirect_header('index.php', 0, '');
-    }
+	/**
+	 * Show the test buttons
+	 *
+	 * @return void
+	 */
+	public static function showButtons(): void
+	{
+		$yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+		$app                        = [];
+		$app['displaySampleButton'] = 1;
+		Yaml::save($app, $yamlFile);
+		\redirect_header('index.php', 0, '');
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -62,13 +62,13 @@ 
 
         if (self::SHOW_BUTTONS == $displaySampleButton) {
             \xoops_loadLanguage('admin/modulesadmin', 'system');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA'), $helper->url('testdata/index.php?op=load'), 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), $helper->url('testdata/index.php?op=save'), 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA'), $helper->url('testdata/index.php?op=clear'), 'alert');
             //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), $helper->url( 'testdata/index.php?op=exportschema'), 'add');
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
         } else {
-            $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+            $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
             // $displaySampleButton = $config['displaySampleButton'];
         }
     }
@@ -80,7 +80,7 @@ 
      */
     public static function hideButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = 0;
         Yaml::save($app, $yamlFile);
@@ -94,7 +94,7 @@ 
      */
     public static function showButtons(): void
     {
-        $yamlFile                   = \dirname(__DIR__, 2) . '/config/admin.yml';
+        $yamlFile                   = \dirname(__DIR__, 2).'/config/admin.yml';
         $app                        = [];
         $app['displaySampleButton'] = 1;
         Yaml::save($app, $yamlFile);

class/Common/ServerStats.php

Indentation +53 added lines, -53 removed lines

@@ -19,60 +19,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats()
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_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";
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats()
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_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 (true === ($gdlib = 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;
+		$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 (true === ($gdlib = 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>';
+		$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 +12 added lines, -12 removed lines

@@ -36,19 +36,19 @@ 
         //        $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 .= "<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 .= '<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;
+        $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 (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -58,18 +58,18 @@ 
         //    $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;
+        $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 .= '<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 .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= \constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';
 

class/Common/FilesManagement.php

Indentation +221 added lines, -221 removed lines

@@ -19,225 +19,225 @@
  */
 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
-     */
-    public static function createFolder($folder): void
-    {
-        try {
-            if (!\is_dir($folder)) {
-                if (!\is_dir($folder) && !\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 (\Throwable $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    /**
-     * @param $file
-     * @param $folder
-     */
-    public static function copyFile(string $file, string $folder): bool
-    {
-        return \copy($file, $folder);
-    }
-
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst): void
-    {
-        $dir = \opendir($src);
-        //        @mkdir($dst);
-        if (!@\mkdir($dst) && !\is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
-        }
-        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
-     *
-     * @return bool true on success
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     */
-    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;
-                    }
-                } elseif (!($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) && !\is_dir($dest)) {
-            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
-     *
-     * @return bool true on success
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     */
-    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) && !\is_dir($dest)) {
-            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
+	 */
+	public static function createFolder($folder): void
+	{
+		try {
+			if (!\is_dir($folder)) {
+				if (!\is_dir($folder) && !\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 (\Throwable $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	/**
+	 * @param $file
+	 * @param $folder
+	 */
+	public static function copyFile(string $file, string $folder): bool
+	{
+		return \copy($file, $folder);
+	}
+
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst): void
+	{
+		$dir = \opendir($src);
+		//        @mkdir($dst);
+		if (!@\mkdir($dst) && !\is_dir($dst)) {
+			throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+		}
+		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
+	 *
+	 * @return bool true on success
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 */
+	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;
+					}
+				} elseif (!($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) && !\is_dir($dest)) {
+			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
+	 *
+	 * @return bool true on success
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 */
+	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) && !\is_dir($dest)) {
+			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 +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
                     throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));
                 }
 
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Throwable $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -57,14 +57,14 @@ 
         $dir = \opendir($src);
         //        @mkdir($dst);
         if (!@\mkdir($dst) && !\is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+            throw new \RuntimeException('The directory '.$dst.' could not be created.');
         }
         while (false !== ($file = \readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (\is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (\is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
+                    \copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -154,7 +154,7 @@ 
                 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
     }
@@ -188,14 +188,14 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                \rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                \rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                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
     }
@@ -232,9 +232,9 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                \copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                \copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             }
         }
 

class/Common/Configurator.php

Indentation +34 added lines, -34 removed lines

@@ -24,41 +24,41 @@
  */
 class Configurator
 {
-    public $name;
-    public $paths           = [];
-    public $uploadFolders   = [];
-    public $copyBlankFiles  = [];
-    public $copyTestFolders = [];
-    public $templateFolders = [];
-    public $oldFiles        = [];
-    public $oldFolders      = [];
-    public $renameTables    = [];
-    public $renameColumns   = [];
-    public $moduleStats     = [];
-    public $modCopyright;
-    public $icons;
+	public $name;
+	public $paths           = [];
+	public $uploadFolders   = [];
+	public $copyBlankFiles  = [];
+	public $copyTestFolders = [];
+	public $templateFolders = [];
+	public $oldFiles        = [];
+	public $oldFolders      = [];
+	public $renameTables    = [];
+	public $renameColumns   = [];
+	public $moduleStats     = [];
+	public $modCopyright;
+	public $icons;
 
-    /**
-     * Configurator constructor.
-     */
-    public function __construct()
-    {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+	/**
+	 * Configurator constructor.
+	 */
+	public function __construct()
+	{
+		$config = require \dirname(__DIR__, 2) . '/config/config.php';
 
-        $this->name            = $config->name;
-        $this->paths           = $config->paths;
-        $this->uploadFolders   = $config->uploadFolders;
-        $this->copyBlankFiles  = $config->copyBlankFiles;
-        $this->copyTestFolders = $config->copyTestFolders;
-        $this->templateFolders = $config->templateFolders;
-        $this->oldFiles        = $config->oldFiles;
-        $this->oldFolders      = $config->oldFolders;
-        $this->renameTables    = $config->renameTables;
-        $this->renameColumns   = $config->renameColumns;
-        $this->moduleStats     = $config->moduleStats;
-        $this->modCopyright    = $config->modCopyright;
+		$this->name            = $config->name;
+		$this->paths           = $config->paths;
+		$this->uploadFolders   = $config->uploadFolders;
+		$this->copyBlankFiles  = $config->copyBlankFiles;
+		$this->copyTestFolders = $config->copyTestFolders;
+		$this->templateFolders = $config->templateFolders;
+		$this->oldFiles        = $config->oldFiles;
+		$this->oldFolders      = $config->oldFolders;
+		$this->renameTables    = $config->renameTables;
+		$this->renameColumns   = $config->renameColumns;
+		$this->moduleStats     = $config->moduleStats;
+		$this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
-    }
+		$this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
+		$this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function __construct()
     {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+        $config = require \dirname(__DIR__, 2).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;
@@ -58,7 +58,7 @@ 
         $this->moduleStats     = $config->moduleStats;
         $this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+        $this->icons = require \dirname(__DIR__, 2).'/config/icons.php';
+        $this->paths = require \dirname(__DIR__, 2).'/config/paths.php';
     }
 }

class/Common/Blocksadmin.php

Indentation +556 added lines, -556 removed lines

@@ -26,72 +26,72 @@ 
  */
 class Blocksadmin
 {
-    /**
-     * @var \XoopsMySQLDatabase|null
-     */
-    public $db;
-    /**
-     * @var \Xmf\Module\Helper
-     */
-    public $helper;
-    /**
-     * @var string
-     */
-    public $moduleDirName;
-    /**
-     * @var string
-     */
-    public $moduleDirNameUpper;
-
-    /**
-     * Blocksadmin constructor.
-     */
-    public function __construct(?\XoopsDatabase $db, \Xmf\Module\Helper $helper)
-    {
-        if (null === $db) {
-            $db = \XoopsDatabaseFactory::getDatabaseConnection();
-        }
-        $this->db                 = $db;
-        $this->helper             = $helper;
-        $this->moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $this->moduleDirNameUpper = \mb_strtoupper($this->moduleDirName);
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-        \xoops_loadLanguage('common', $this->moduleDirName);
-        \xoops_loadLanguage('blocksadmin', $this->moduleDirName);
-    }
-
-    /**
-     * @return void
-     */
-    public function listBlocks(): void
-    {
-        global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        //        xoops_loadLanguage('admin', 'system');
-        //        xoops_loadLanguage('admin/blocksadmin', 'system');
-        //        xoops_loadLanguage('admin/groups', 'system');
-        //        xoops_loadLanguage('common', $moduleDirName);
-        //        xoops_loadLanguage('blocks', $moduleDirName);
-
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = \xoops_getHandler('module');
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = \xoops_getHandler('member');
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = \xoops_getHandler('groupperm');
-        $groups           = $memberHandler->getGroups();
-        $criteria         = new \CriteriaCompo(new \Criteria('hasmain', '1'));
-        $criteria->add(new \Criteria('isactive', '1'));
-        $moduleList     = $moduleHandler->getList($criteria);
-        $moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
-        $moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
-        \ksort($moduleList);
-        echo "<h4 style='text-align:left;'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
-        echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
-        echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-        echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
+	/**
+	 * @var \XoopsMySQLDatabase|null
+	 */
+	public $db;
+	/**
+	 * @var \Xmf\Module\Helper
+	 */
+	public $helper;
+	/**
+	 * @var string
+	 */
+	public $moduleDirName;
+	/**
+	 * @var string
+	 */
+	public $moduleDirNameUpper;
+
+	/**
+	 * Blocksadmin constructor.
+	 */
+	public function __construct(?\XoopsDatabase $db, \Xmf\Module\Helper $helper)
+	{
+		if (null === $db) {
+			$db = \XoopsDatabaseFactory::getDatabaseConnection();
+		}
+		$this->db                 = $db;
+		$this->helper             = $helper;
+		$this->moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$this->moduleDirNameUpper = \mb_strtoupper($this->moduleDirName);
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+		\xoops_loadLanguage('common', $this->moduleDirName);
+		\xoops_loadLanguage('blocksadmin', $this->moduleDirName);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function listBlocks(): void
+	{
+		global $xoopsModule, $pathIcon16;
+		require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+		//        xoops_loadLanguage('admin', 'system');
+		//        xoops_loadLanguage('admin/blocksadmin', 'system');
+		//        xoops_loadLanguage('admin/groups', 'system');
+		//        xoops_loadLanguage('common', $moduleDirName);
+		//        xoops_loadLanguage('blocks', $moduleDirName);
+
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = \xoops_getHandler('module');
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = \xoops_getHandler('member');
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = \xoops_getHandler('groupperm');
+		$groups           = $memberHandler->getGroups();
+		$criteria         = new \CriteriaCompo(new \Criteria('hasmain', '1'));
+		$criteria->add(new \Criteria('isactive', '1'));
+		$moduleList     = $moduleHandler->getList($criteria);
+		$moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
+		$moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
+		\ksort($moduleList);
+		echo "<h4 style='text-align:left;'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
+		echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
+		echo $GLOBALS['xoopsSecurity']->getTokenHTML();
+		echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>" . \_AM_SYSTEM_BLOCKS_TITLE . "</th><th align='center' nowrap='nowrap'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'SIDE') . '<br>' . _LEFT . '-' . _CENTER . '-' . _RIGHT . "</th>
         <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT') . "</th>
         <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE') . "</th><th align='center'>" . \_AM_SYSTEM_BLOCKS_VISIBLEIN . "</th>
@@ -99,82 +99,82 @@ 
         <th align='center'>" . \_AM_SYSTEM_BLOCKS_BCACHETIME . "</th>
         <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'ACTION') . '</th>
         </tr>';
-        $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
-        $blockCount = \count($blockArray);
-        $class      = 'even';
-        $cachetimes = [
-            0       => _NOCACHE,
-            30      => \sprintf(_SECONDS, 30),
-            60      => _MINUTE,
-            300     => \sprintf(_MINUTES, 5),
-            1800    => \sprintf(_MINUTES, 30),
-            3600    => _HOUR,
-            18000   => \sprintf(_HOURS, 5),
-            86400   => _DAY,
-            259200  => \sprintf(_DAYS, 3),
-            604800  => _WEEK,
-            2592000 => _MONTH,
-        ];
-        foreach ($blockArray as $i) {
-            $groupsPermissions = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql               = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
-            $result            = $this->db->query($sql);
-            $modules           = [];
-            if (!$result instanceof \mysqli_result) {
-                \trigger_error("Query Failed! SQL: $sql Error: " . $this->db->error(), \E_USER_ERROR);
-            }
-            while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
-            }
-
-            $cachetimeOptions = '';
-            foreach ($cachetimes as $cachetime => $cachetimeName) {
-                if ($i->getVar('bcachetime') == $cachetime) {
-                    $cachetimeOptions .= "<option value='$cachetime' selected='selected'>$cachetimeName</option>\n";
-                } else {
-                    $cachetimeOptions .= "<option value='$cachetime'>$cachetimeName</option>\n";
-                }
-            }
-
-            $ssel7 = '';
-            $ssel6 = $ssel7;
-            $ssel5 = $ssel6;
-            $ssel4 = $ssel5;
-            $ssel3 = $ssel4;
-            $ssel2 = $ssel3;
-            $ssel1 = $ssel2;
-            $ssel0 = $ssel1;
-            $sel1  = $ssel0;
-            $sel0  = $sel1;
-            if (1 === $i->getVar('visible')) {
-                $sel1 = ' checked';
-            } else {
-                $sel0 = ' checked';
-            }
-            if (\XOOPS_SIDEBLOCK_LEFT === $i->getVar('side')) {
-                $ssel0 = ' checked';
-            } elseif (\XOOPS_SIDEBLOCK_RIGHT === $i->getVar('side')) {
-                $ssel1 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_LEFT === $i->getVar('side')) {
-                $ssel2 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_RIGHT === $i->getVar('side')) {
-                $ssel4 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_CENTER === $i->getVar('side')) {
-                $ssel3 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOMLEFT === $i->getVar('side')) {
-                $ssel5 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOMRIGHT === $i->getVar('side')) {
-                $ssel6 = ' checked';
-            } elseif (\XOOPS_CENTERBLOCK_BOTTOM === $i->getVar('side')) {
-                $ssel7 = ' checked';
-            }
-            if ('' === $i->getVar('title')) {
-                $title = '&nbsp;';
-            } else {
-                $title = $i->getVar('title');
-            }
-            $name = $i->getVar('name');
-            echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar('bid') . "]' value='" . $title . "'></td>
+		$blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
+		$blockCount = \count($blockArray);
+		$class      = 'even';
+		$cachetimes = [
+			0       => _NOCACHE,
+			30      => \sprintf(_SECONDS, 30),
+			60      => _MINUTE,
+			300     => \sprintf(_MINUTES, 5),
+			1800    => \sprintf(_MINUTES, 30),
+			3600    => _HOUR,
+			18000   => \sprintf(_HOURS, 5),
+			86400   => _DAY,
+			259200  => \sprintf(_DAYS, 3),
+			604800  => _WEEK,
+			2592000 => _MONTH,
+		];
+		foreach ($blockArray as $i) {
+			$groupsPermissions = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
+			$sql               = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+			$result            = $this->db->query($sql);
+			$modules           = [];
+			if (!$result instanceof \mysqli_result) {
+				\trigger_error("Query Failed! SQL: $sql Error: " . $this->db->error(), \E_USER_ERROR);
+			}
+			while (false !== ($row = $this->db->fetchArray($result))) {
+				$modules[] = (int)$row['module_id'];
+			}
+
+			$cachetimeOptions = '';
+			foreach ($cachetimes as $cachetime => $cachetimeName) {
+				if ($i->getVar('bcachetime') == $cachetime) {
+					$cachetimeOptions .= "<option value='$cachetime' selected='selected'>$cachetimeName</option>\n";
+				} else {
+					$cachetimeOptions .= "<option value='$cachetime'>$cachetimeName</option>\n";
+				}
+			}
+
+			$ssel7 = '';
+			$ssel6 = $ssel7;
+			$ssel5 = $ssel6;
+			$ssel4 = $ssel5;
+			$ssel3 = $ssel4;
+			$ssel2 = $ssel3;
+			$ssel1 = $ssel2;
+			$ssel0 = $ssel1;
+			$sel1  = $ssel0;
+			$sel0  = $sel1;
+			if (1 === $i->getVar('visible')) {
+				$sel1 = ' checked';
+			} else {
+				$sel0 = ' checked';
+			}
+			if (\XOOPS_SIDEBLOCK_LEFT === $i->getVar('side')) {
+				$ssel0 = ' checked';
+			} elseif (\XOOPS_SIDEBLOCK_RIGHT === $i->getVar('side')) {
+				$ssel1 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_LEFT === $i->getVar('side')) {
+				$ssel2 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_RIGHT === $i->getVar('side')) {
+				$ssel4 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_CENTER === $i->getVar('side')) {
+				$ssel3 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_BOTTOMLEFT === $i->getVar('side')) {
+				$ssel5 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_BOTTOMRIGHT === $i->getVar('side')) {
+				$ssel6 = ' checked';
+			} elseif (\XOOPS_CENTERBLOCK_BOTTOM === $i->getVar('side')) {
+				$ssel7 = ' checked';
+			}
+			if ('' === $i->getVar('title')) {
+				$title = '&nbsp;';
+			} else {
+				$title = $i->getVar('title');
+			}
+			$name = $i->getVar('name');
+			echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar('bid') . "]' value='" . $title . "'></td>
             <td class='$class' align='center' nowrap='nowrap'><div align='center' >
                     <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_LEFT . "'$ssel2>
                     <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_CENTER . "'$ssel3>
@@ -193,39 +193,39 @@ 
                 <td class='$class' align='center'><input type='text' name='weight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "' size='5' maxlength='5'></td>
                 <td class='$class' align='center' nowrap><input type='radio' name='visible[" . $i->getVar('bid') . "]' value='1'$sel1>" . _YES . "&nbsp;<input type='radio' name='visible[" . $i->getVar('bid') . "]' value='0'$sel0>" . _NO . '</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
-            foreach ($moduleList as $k => $v) {
-                echo "<option value='$k'" . (\in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
-            }
-            echo '</select></td>';
+			echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+			foreach ($moduleList as $k => $v) {
+				echo "<option value='$k'" . (\in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
+			}
+			echo '</select></td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
-            foreach ($groups as $grp) {
-                echo "<option value='" . $grp->getVar('groupid') . "' " . (\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
-            }
-            echo '</select></td>';
+			echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+			foreach ($groups as $grp) {
+				echo "<option value='" . $grp->getVar('groupid') . "' " . (\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
+			}
+			echo '</select></td>';
 
-            // Cache lifetime
-            echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
+			// Cache lifetime
+			echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
                                     </td>';
 
-            // Actions
+			// Actions
 
-            echo "<td class='$class' align='center'>
+			echo "<td class='$class' align='center'>
                 <a href='blocksadmin.php?op=edit&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/edit.png' . " alt='" . _EDIT . "' title='" . _EDIT . "'></a> 
                 <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/editcopy.png' . " alt='" . _CLONE . "' title='" . _CLONE . "'></a>";
-            //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
-            //                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
-            //                     </a>";
-            //            }
-
-            //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
-            if (!\in_array($i->getVar('block_type'), ['M', 'S'])) {
-                echo "&nbsp;
+			//            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
+			//                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
+			//                     </a>";
+			//            }
+
+			//            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
+			if (!\in_array($i->getVar('block_type'), ['M', 'S'])) {
+				echo "&nbsp;
                 <a href='blocksadmin.php?op=delete&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
                      </a>";
-            }
-            echo "
+			}
+			echo "
             <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
             <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
             <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
@@ -235,394 +235,394 @@ 
             <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
             </td></tr>
             ";
-            $class = ('even' === $class) ? 'odd' : 'even';
-        }
-        echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' name='submit' value='" . _SUBMIT . "'></td></tr></table></form><br><br>";
-    }
-
-    public function deleteBlock(int $bid): void
-    {
-        //        \xoops_cp_header();
-
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-
-        $myblock = new \XoopsBlock($bid);
-
-        $sql = \sprintf('DELETE FROM %s WHERE bid = %u', $this->db->prefix('newblocks'), $bid);
-        $this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
-        $sql = \sprintf('DELETE FROM %s WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
-        $this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
-
-        $this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
-    }
-
-    public function cloneBlock(int $bid): void
-    {
-        //require __DIR__ . '/admin_header.php';
-        //        \xoops_cp_header();
-
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-
-        $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
-        $result  = $this->db->query($sql);
-        $modules = [];
-        if ($result instanceof \mysqli_result) {
-            while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
-            }
-        }
-        $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
-        $block    = [
-            'title'      => $myblock->getVar('title') . ' Clone',
-            'form_title' => \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
-            'name'       => $myblock->getVar('name'),
-            'side'       => $myblock->getVar('side'),
-            'weight'     => $myblock->getVar('weight'),
-            'visible'    => $myblock->getVar('visible'),
-            'content'    => $myblock->getVar('content', 'N'),
-            'modules'    => $modules,
-            'is_custom'  => $isCustom,
-            'ctype'      => $myblock->getVar('c_type'),
-            'bcachetime' => $myblock->getVar('bcachetime'),
-            'op'         => 'clone_ok',
-            'bid'        => $myblock->getVar('bid'),
-            'edit_form'  => $myblock->getOptions(),
-            'template'   => $myblock->getVar('template'),
-            'options'    => $myblock->getVar('options'),
-        ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
-        //        $form = new Blockform();
-        //        $form->render();
-
-        echo $this->render($block);
-        //        xoops_cp_footer();
-        //        require_once __DIR__ . '/admin_footer.php';
-        //        exit();
-    }
-
-    public function isBlockCloned(int $bid, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
-    {
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-
-        $block = new \XoopsBlock($bid);
-        $clone = $block->xoopsClone();
-        if (empty($bmodule)) {
-            //            \xoops_cp_header();
-            \xoops_error(\sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
-            \xoops_cp_footer();
-            exit();
-        }
-        $clone->setVar('side', $bside);
-        $clone->setVar('weight', $bweight);
-        $clone->setVar('visible', $bvisible);
-        //$clone->setVar('content', $_POST['bcontent']);
-        $clone->setVar('title', Request::getString('btitle', '', 'POST'));
-        $clone->setVar('bcachetime', $bcachetime);
-        if (\is_array($options) && (\count($options) > 0)) {
-            $options = \implode('|', $options);
-            $clone->setVar('options', $options);
-        }
-        $clone->setVar('bid', 0);
-        if (\in_array($block->getVar('block_type'), ['C', 'E'])) {
-            $clone->setVar('block_type', 'E');
-        } else {
-            $clone->setVar('block_type', 'D');
-        }
-        //        $newid = $clone->store(); //see https://github.com/XOOPS/XoopsCore25/issues/1105
-        if ($clone->store()) {
-            $newid = $clone->id();  //get the id of the cloned block
-        }
-        if (!$newid) {
-            //            \xoops_cp_header();
-            $clone->getHtmlErrors();
-            \xoops_cp_footer();
-            exit();
-        }
-        if ('' !== $clone->getVar('template')) {
-            /** @var \XoopsTplfileHandler $tplfileHandler */
-            $tplfileHandler = \xoops_getHandler('tplfile');
-            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string)$bid);
-            if (\count($btemplate) > 0) {
-                $tplclone = $btemplate[0]->xoopsClone();
-                $tplclone->setVar('tpl_id', 0);
-                $tplclone->setVar('tpl_refid', $newid);
-                $tplfileHandler->insert($tplclone);
-            }
-        }
-
-        foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
-            $this->db->query($sql);
-        }
-        //$groups = &$GLOBALS['xoopsUser']->getGroups();
-        foreach ($groups as $iValue) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
-            $this->db->query($sql);
-        }
-        $this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
-    }
-
-    public function setOrder(string $bid, string $title, string $weight, string $visible, string $side, string $bcachetime, ?array $bmodule = null): void
-    {
-        $myblock = new \XoopsBlock($bid);
-        $myblock->setVar('title', $title);
-        $myblock->setVar('weight', $weight);
-        $myblock->setVar('visible', $visible);
-        $myblock->setVar('side', $side);
-        $myblock->setVar('bcachetime', $bcachetime);
-        $myblock->store();
-        //        /** @var \XoopsBlockHandler $blockHandler */
-        //        $blockHandler = \xoops_getHandler('block');
-        //        return $blockHandler->insert($myblock);
-    }
-
-    public function editBlock(int $bid): void
-    {
-        //        require_once \dirname(__DIR__,2) . '/admin/admin_header.php';
-        //        \xoops_cp_header();
-        \xoops_loadLanguage('admin', 'system');
-        \xoops_loadLanguage('admin/blocksadmin', 'system');
-        \xoops_loadLanguage('admin/groups', 'system');
-        //        mpu_adm_menu();
-        $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
-        $result  = $this->db->query($sql);
-        $modules = [];
-        if ($result instanceof \mysqli_result) {
-            while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
-            }
-        }
-        $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
-        $block    = [
-            'title'      => $myblock->getVar('title'),
-            'form_title' => \_AM_SYSTEM_BLOCKS_EDITBLOCK,
-            //        'name'       => $myblock->getVar('name'),
-            'side'       => $myblock->getVar('side'),
-            'weight'     => $myblock->getVar('weight'),
-            'visible'    => $myblock->getVar('visible'),
-            'content'    => $myblock->getVar('content', 'N'),
-            'modules'    => $modules,
-            'is_custom'  => $isCustom,
-            'ctype'      => $myblock->getVar('c_type'),
-            'bcachetime' => $myblock->getVar('bcachetime'),
-            'op'         => 'edit_ok',
-            'bid'        => $myblock->getVar('bid'),
-            'edit_form'  => $myblock->getOptions(),
-            'template'   => $myblock->getVar('template'),
-            'options'    => $myblock->getVar('options'),
-        ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
-
-        echo $this->render($block);
-    }
-
-    public function updateBlock(int $bid, string $btitle, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
-    {
-        $myblock = new \XoopsBlock($bid);
-        $myblock->setVar('title', $btitle);
-        $myblock->setVar('weight', $bweight);
-        $myblock->setVar('visible', $bvisible);
-        $myblock->setVar('side', $bside);
-        $myblock->setVar('bcachetime', $bcachetime);
-        //update block options
-        if (isset($options)) {
-            $optionsCount = \count($options);
-            if ($optionsCount > 0) {
-                //Convert array values to comma-separated
-                foreach ($options as $i => $iValue) {
-                    if (\is_array($iValue)) {
-                        $options[$i] = \implode(',', $iValue);
-                    }
-                }
-                $options = \implode('|', $options);
-                $myblock->setVar('options', $options);
-            }
-        }
-        $myblock->store();
-        //        /** @var \XoopsBlockHandler $blockHandler */
-        //        $blockHandler = \xoops_getHandler('block');
-        //        $blockHandler->insert($myblock);
-
-        if (!empty($bmodule) && \count($bmodule) > 0) {
-            $sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
-            $this->db->query($sql);
-            if (\in_array(0, $bmodule)) {
-                $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, 0);
-                $this->db->query($sql);
-            } else {
-                foreach ($bmodule as $bmid) {
-                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int)$bmid);
-                    $this->db->query($sql);
-                }
-            }
-        }
-        $sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid);
-        $this->db->query($sql);
-        if (!empty($groups)) {
-            foreach ($groups as $grp) {
-                $sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid);
-                $this->db->query($sql);
-            }
-        }
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
-    }
-
-    public function orderBlock(
-        array $bid, array $oldtitle, array $oldside, array $oldweight, array $oldvisible, array $oldgroups, array $oldbcachetime, array $oldbmodule, array $title, array $weight, array $visible, array $side, array $bcachetime, array $groups, array $bmodule
-    ): void {
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            \redirect_header($_SERVER['SCRIPT_NAME'], 3, \implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        foreach (\array_keys($bid) as $i) {
-            if ($oldtitle[$i] !== $title[$i]
-                || $oldweight[$i] !== $weight[$i]
-                || $oldvisible[$i] !== $visible[$i]
-                || $oldside[$i] !== $side[$i]
-                || $oldbcachetime[$i] !== $bcachetime[$i]
-                || $oldbmodule[$i] !== $bmodule[$i]) {
-                $this->setOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bcachetime[$i], $bmodule[$i]);
-            }
-            if (!empty($bmodule[$i]) && \count($bmodule[$i]) > 0) {
-                $sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid[$i]);
-                $this->db->query($sql);
-                if (\in_array(0, $bmodule[$i], true)) {
-                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], 0);
-                    $this->db->query($sql);
-                } else {
-                    foreach ($bmodule[$i] as $bmid) {
-                        $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int)$bmid);
-                        $this->db->query($sql);
-                    }
-                }
-            }
-            $sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid[$i]);
-            $this->db->query($sql);
-            if (!empty($groups[$i])) {
-                foreach ($groups[$i] as $grp) {
-                    $sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid[$i]);
-                    $this->db->query($sql);
-                }
-            }
-        }
-
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
-    }
-
-    public function render(?array $block = null)
-    {
-        \xoops_load('XoopsFormLoader');
-        \xoops_loadLanguage('common', $this->moduleDirNameUpper);
-
-        $form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
-        if (isset($block['name'])) {
-            $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_NAME, $block['name']));
-        }
-        $sideSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
-        $sideSelect->addOptionArray([
-                                        0 => \_AM_SYSTEM_BLOCKS_SBLEFT,
-                                        1 => \_AM_SYSTEM_BLOCKS_SBRIGHT,
-                                        3 => \_AM_SYSTEM_BLOCKS_CBLEFT,
-                                        4 => \_AM_SYSTEM_BLOCKS_CBRIGHT,
-                                        5 => \_AM_SYSTEM_BLOCKS_CBCENTER,
-                                        7 => \_AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
-                                        8 => \_AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
-                                        9 => \_AM_SYSTEM_BLOCKS_CBBOTTOM,
-                                    ]);
-        $form->addElement($sideSelect);
-        $form->addElement(new \XoopsFormText(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-        $form->addElement(new \XoopsFormRadioYN(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-        $modSelect = new \XoopsFormSelect(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = \xoops_getHandler('module');
-        $criteria      = new \CriteriaCompo(new \Criteria('hasmain', '1'));
-        $criteria->add(new \Criteria('isactive', '1'));
-        $moduleList     = $moduleHandler->getList($criteria);
-        $moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
-        $moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
-        \ksort($moduleList);
-        $modSelect->addOptionArray($moduleList);
-        $form->addElement($modSelect);
-        $form->addElement(new \XoopsFormText(\_AM_SYSTEM_BLOCKS_TITLE, 'btitle', 50, 255, $block['title']), false);
-        if ($block['is_custom']) {
-            $textarea = new \XoopsFormDhtmlTextArea(\_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-            $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . \_AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . \sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
-            $form->addElement($textarea, true);
-            $ctypeSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
-            $ctypeSelect->addOptionArray([
-                                             'H' => \_AM_SYSTEM_BLOCKS_HTML,
-                                             'P' => \_AM_SYSTEM_BLOCKS_PHP,
-                                             'S' => \_AM_SYSTEM_BLOCKS_AFWSMILE,
-                                             'T' => \_AM_SYSTEM_BLOCKS_AFNOSMILE,
-                                         ]);
-            $form->addElement($ctypeSelect);
-        } else {
-            if ('' !== $block['template']) {
-                /** @var \XoopsTplfileHandler $tplfileHandler */
-                $tplfileHandler = \xoops_getHandler('tplfile');
-                $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
-                if (\count($btemplate) > 0) {
-                    $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
-                } else {
-                    $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
-                    if (\count($btemplate2) > 0) {
-                        $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
-                    }
-                }
-            }
-            if (false !== $block['edit_form']) {
-                $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_OPTIONS, $block['edit_form']));
-            }
-        }
-        $cache_select = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
-        $cache_select->addOptionArray([
-                                          0       => _NOCACHE,
-                                          30      => \sprintf(_SECONDS, 30),
-                                          60      => _MINUTE,
-                                          300     => \sprintf(_MINUTES, 5),
-                                          1800    => \sprintf(_MINUTES, 30),
-                                          3600    => _HOUR,
-                                          18000   => \sprintf(_HOURS, 5),
-                                          86400   => _DAY,
-                                          259200  => \sprintf(_DAYS, 3),
-                                          604800  => _WEEK,
-                                          2592000 => _MONTH,
-                                      ]);
-        $form->addElement($cache_select);
-
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = \xoops_getHandler('groupperm');
-        $groups           = $grouppermHandler->getGroupIds('block_read', $block['bid']);
-
-        $form->addElement(new \XoopsFormSelectGroup(\_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
-
-        if (isset($block['bid'])) {
-            $form->addElement(new \XoopsFormHidden('bid', $block['bid']));
-        }
-        $form->addElement(new \XoopsFormHidden('op', $block['op']));
-        $form->addElement(new \XoopsFormHidden('fct', 'blocksadmin'));
-        $buttonTray = new \XoopsFormElementTray('', '&nbsp;');
-        if ($block['is_custom']) {
-            $buttonTray->addElement(new \XoopsFormButton('', 'previewblock', _PREVIEW, 'submit'));
-        }
-
-        //Submit buttons
-        $buttonTray   = new \XoopsFormElementTray('', '');
-        $submitButton = new \XoopsFormButton('', 'submitblock', _SUBMIT, 'submit');
-        $buttonTray->addElement($submitButton);
-
-        $cancelButton = new \XoopsFormButton('', '', _CANCEL, 'button');
-        $cancelButton->setExtra('onclick="history.go(-1)"');
-        $buttonTray->addElement($cancelButton);
-
-        $form->addElement($buttonTray);
-        $form->display();
-    }
+			$class = ('even' === $class) ? 'odd' : 'even';
+		}
+		echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' name='submit' value='" . _SUBMIT . "'></td></tr></table></form><br><br>";
+	}
+
+	public function deleteBlock(int $bid): void
+	{
+		//        \xoops_cp_header();
+
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+
+		$myblock = new \XoopsBlock($bid);
+
+		$sql = \sprintf('DELETE FROM %s WHERE bid = %u', $this->db->prefix('newblocks'), $bid);
+		$this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
+		$sql = \sprintf('DELETE FROM %s WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
+		$this->db->queryF($sql) or \trigger_error($GLOBALS['xoopsDB']->error());
+
+		$this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
+	}
+
+	public function cloneBlock(int $bid): void
+	{
+		//require __DIR__ . '/admin_header.php';
+		//        \xoops_cp_header();
+
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+
+		$myblock = new \XoopsBlock($bid);
+		$sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+		$result  = $this->db->query($sql);
+		$modules = [];
+		if ($result instanceof \mysqli_result) {
+			while (false !== ($row = $this->db->fetchArray($result))) {
+				$modules[] = (int)$row['module_id'];
+			}
+		}
+		$isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
+		$block    = [
+			'title'      => $myblock->getVar('title') . ' Clone',
+			'form_title' => \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+			'name'       => $myblock->getVar('name'),
+			'side'       => $myblock->getVar('side'),
+			'weight'     => $myblock->getVar('weight'),
+			'visible'    => $myblock->getVar('visible'),
+			'content'    => $myblock->getVar('content', 'N'),
+			'modules'    => $modules,
+			'is_custom'  => $isCustom,
+			'ctype'      => $myblock->getVar('c_type'),
+			'bcachetime' => $myblock->getVar('bcachetime'),
+			'op'         => 'clone_ok',
+			'bid'        => $myblock->getVar('bid'),
+			'edit_form'  => $myblock->getOptions(),
+			'template'   => $myblock->getVar('template'),
+			'options'    => $myblock->getVar('options'),
+		];
+		echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
+		//        $form = new Blockform();
+		//        $form->render();
+
+		echo $this->render($block);
+		//        xoops_cp_footer();
+		//        require_once __DIR__ . '/admin_footer.php';
+		//        exit();
+	}
+
+	public function isBlockCloned(int $bid, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
+	{
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+
+		$block = new \XoopsBlock($bid);
+		$clone = $block->xoopsClone();
+		if (empty($bmodule)) {
+			//            \xoops_cp_header();
+			\xoops_error(\sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+			\xoops_cp_footer();
+			exit();
+		}
+		$clone->setVar('side', $bside);
+		$clone->setVar('weight', $bweight);
+		$clone->setVar('visible', $bvisible);
+		//$clone->setVar('content', $_POST['bcontent']);
+		$clone->setVar('title', Request::getString('btitle', '', 'POST'));
+		$clone->setVar('bcachetime', $bcachetime);
+		if (\is_array($options) && (\count($options) > 0)) {
+			$options = \implode('|', $options);
+			$clone->setVar('options', $options);
+		}
+		$clone->setVar('bid', 0);
+		if (\in_array($block->getVar('block_type'), ['C', 'E'])) {
+			$clone->setVar('block_type', 'E');
+		} else {
+			$clone->setVar('block_type', 'D');
+		}
+		//        $newid = $clone->store(); //see https://github.com/XOOPS/XoopsCore25/issues/1105
+		if ($clone->store()) {
+			$newid = $clone->id();  //get the id of the cloned block
+		}
+		if (!$newid) {
+			//            \xoops_cp_header();
+			$clone->getHtmlErrors();
+			\xoops_cp_footer();
+			exit();
+		}
+		if ('' !== $clone->getVar('template')) {
+			/** @var \XoopsTplfileHandler $tplfileHandler */
+			$tplfileHandler = \xoops_getHandler('tplfile');
+			$btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string)$bid);
+			if (\count($btemplate) > 0) {
+				$tplclone = $btemplate[0]->xoopsClone();
+				$tplclone->setVar('tpl_id', 0);
+				$tplclone->setVar('tpl_refid', $newid);
+				$tplfileHandler->insert($tplclone);
+			}
+		}
+
+		foreach ($bmodule as $bmid) {
+			$sql = 'INSERT INTO ' . $this->db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+			$this->db->query($sql);
+		}
+		//$groups = &$GLOBALS['xoopsUser']->getGroups();
+		foreach ($groups as $iValue) {
+			$sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
+			$this->db->query($sql);
+		}
+		$this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
+	}
+
+	public function setOrder(string $bid, string $title, string $weight, string $visible, string $side, string $bcachetime, ?array $bmodule = null): void
+	{
+		$myblock = new \XoopsBlock($bid);
+		$myblock->setVar('title', $title);
+		$myblock->setVar('weight', $weight);
+		$myblock->setVar('visible', $visible);
+		$myblock->setVar('side', $side);
+		$myblock->setVar('bcachetime', $bcachetime);
+		$myblock->store();
+		//        /** @var \XoopsBlockHandler $blockHandler */
+		//        $blockHandler = \xoops_getHandler('block');
+		//        return $blockHandler->insert($myblock);
+	}
+
+	public function editBlock(int $bid): void
+	{
+		//        require_once \dirname(__DIR__,2) . '/admin/admin_header.php';
+		//        \xoops_cp_header();
+		\xoops_loadLanguage('admin', 'system');
+		\xoops_loadLanguage('admin/blocksadmin', 'system');
+		\xoops_loadLanguage('admin/groups', 'system');
+		//        mpu_adm_menu();
+		$myblock = new \XoopsBlock($bid);
+		$sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+		$result  = $this->db->query($sql);
+		$modules = [];
+		if ($result instanceof \mysqli_result) {
+			while (false !== ($row = $this->db->fetchArray($result))) {
+				$modules[] = (int)$row['module_id'];
+			}
+		}
+		$isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
+		$block    = [
+			'title'      => $myblock->getVar('title'),
+			'form_title' => \_AM_SYSTEM_BLOCKS_EDITBLOCK,
+			//        'name'       => $myblock->getVar('name'),
+			'side'       => $myblock->getVar('side'),
+			'weight'     => $myblock->getVar('weight'),
+			'visible'    => $myblock->getVar('visible'),
+			'content'    => $myblock->getVar('content', 'N'),
+			'modules'    => $modules,
+			'is_custom'  => $isCustom,
+			'ctype'      => $myblock->getVar('c_type'),
+			'bcachetime' => $myblock->getVar('bcachetime'),
+			'op'         => 'edit_ok',
+			'bid'        => $myblock->getVar('bid'),
+			'edit_form'  => $myblock->getOptions(),
+			'template'   => $myblock->getVar('template'),
+			'options'    => $myblock->getVar('options'),
+		];
+		echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
+
+		echo $this->render($block);
+	}
+
+	public function updateBlock(int $bid, string $btitle, string $bside, string $bweight, string $bvisible, string $bcachetime, ?array $bmodule, ?array $options, ?array $groups): void
+	{
+		$myblock = new \XoopsBlock($bid);
+		$myblock->setVar('title', $btitle);
+		$myblock->setVar('weight', $bweight);
+		$myblock->setVar('visible', $bvisible);
+		$myblock->setVar('side', $bside);
+		$myblock->setVar('bcachetime', $bcachetime);
+		//update block options
+		if (isset($options)) {
+			$optionsCount = \count($options);
+			if ($optionsCount > 0) {
+				//Convert array values to comma-separated
+				foreach ($options as $i => $iValue) {
+					if (\is_array($iValue)) {
+						$options[$i] = \implode(',', $iValue);
+					}
+				}
+				$options = \implode('|', $options);
+				$myblock->setVar('options', $options);
+			}
+		}
+		$myblock->store();
+		//        /** @var \XoopsBlockHandler $blockHandler */
+		//        $blockHandler = \xoops_getHandler('block');
+		//        $blockHandler->insert($myblock);
+
+		if (!empty($bmodule) && \count($bmodule) > 0) {
+			$sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid);
+			$this->db->query($sql);
+			if (\in_array(0, $bmodule)) {
+				$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, 0);
+				$this->db->query($sql);
+			} else {
+				foreach ($bmodule as $bmid) {
+					$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int)$bmid);
+					$this->db->query($sql);
+				}
+			}
+		}
+		$sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid);
+		$this->db->query($sql);
+		if (!empty($groups)) {
+			foreach ($groups as $grp) {
+				$sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid);
+				$this->db->query($sql);
+			}
+		}
+		$this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+	}
+
+	public function orderBlock(
+		array $bid, array $oldtitle, array $oldside, array $oldweight, array $oldvisible, array $oldgroups, array $oldbcachetime, array $oldbmodule, array $title, array $weight, array $visible, array $side, array $bcachetime, array $groups, array $bmodule
+	): void {
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			\redirect_header($_SERVER['SCRIPT_NAME'], 3, \implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		foreach (\array_keys($bid) as $i) {
+			if ($oldtitle[$i] !== $title[$i]
+				|| $oldweight[$i] !== $weight[$i]
+				|| $oldvisible[$i] !== $visible[$i]
+				|| $oldside[$i] !== $side[$i]
+				|| $oldbcachetime[$i] !== $bcachetime[$i]
+				|| $oldbmodule[$i] !== $bmodule[$i]) {
+				$this->setOrder($bid[$i], $title[$i], $weight[$i], $visible[$i], $side[$i], $bcachetime[$i], $bmodule[$i]);
+			}
+			if (!empty($bmodule[$i]) && \count($bmodule[$i]) > 0) {
+				$sql = \sprintf('DELETE FROM `%s` WHERE block_id = %u', $this->db->prefix('block_module_link'), $bid[$i]);
+				$this->db->query($sql);
+				if (\in_array(0, $bmodule[$i], true)) {
+					$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], 0);
+					$this->db->query($sql);
+				} else {
+					foreach ($bmodule[$i] as $bmid) {
+						$sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int)$bmid);
+						$this->db->query($sql);
+					}
+				}
+			}
+			$sql = \sprintf('DELETE FROM `%s` WHERE gperm_itemid = %u', $this->db->prefix('group_permission'), $bid[$i]);
+			$this->db->query($sql);
+			if (!empty($groups[$i])) {
+				foreach ($groups[$i] as $grp) {
+					$sql = \sprintf("INSERT INTO `%s` (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (%u, %u, 1, 'block_read')", $this->db->prefix('group_permission'), $grp, $bid[$i]);
+					$this->db->query($sql);
+				}
+			}
+		}
+
+		$this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+	}
+
+	public function render(?array $block = null)
+	{
+		\xoops_load('XoopsFormLoader');
+		\xoops_loadLanguage('common', $this->moduleDirNameUpper);
+
+		$form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
+		if (isset($block['name'])) {
+			$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_NAME, $block['name']));
+		}
+		$sideSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
+		$sideSelect->addOptionArray([
+										0 => \_AM_SYSTEM_BLOCKS_SBLEFT,
+										1 => \_AM_SYSTEM_BLOCKS_SBRIGHT,
+										3 => \_AM_SYSTEM_BLOCKS_CBLEFT,
+										4 => \_AM_SYSTEM_BLOCKS_CBRIGHT,
+										5 => \_AM_SYSTEM_BLOCKS_CBCENTER,
+										7 => \_AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
+										8 => \_AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
+										9 => \_AM_SYSTEM_BLOCKS_CBBOTTOM,
+									]);
+		$form->addElement($sideSelect);
+		$form->addElement(new \XoopsFormText(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+		$form->addElement(new \XoopsFormRadioYN(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
+		$modSelect = new \XoopsFormSelect(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = \xoops_getHandler('module');
+		$criteria      = new \CriteriaCompo(new \Criteria('hasmain', '1'));
+		$criteria->add(new \Criteria('isactive', '1'));
+		$moduleList     = $moduleHandler->getList($criteria);
+		$moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
+		$moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
+		\ksort($moduleList);
+		$modSelect->addOptionArray($moduleList);
+		$form->addElement($modSelect);
+		$form->addElement(new \XoopsFormText(\_AM_SYSTEM_BLOCKS_TITLE, 'btitle', 50, 255, $block['title']), false);
+		if ($block['is_custom']) {
+			$textarea = new \XoopsFormDhtmlTextArea(\_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
+			$textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . \_AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . \sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+			$form->addElement($textarea, true);
+			$ctypeSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
+			$ctypeSelect->addOptionArray([
+											 'H' => \_AM_SYSTEM_BLOCKS_HTML,
+											 'P' => \_AM_SYSTEM_BLOCKS_PHP,
+											 'S' => \_AM_SYSTEM_BLOCKS_AFWSMILE,
+											 'T' => \_AM_SYSTEM_BLOCKS_AFNOSMILE,
+										 ]);
+			$form->addElement($ctypeSelect);
+		} else {
+			if ('' !== $block['template']) {
+				/** @var \XoopsTplfileHandler $tplfileHandler */
+				$tplfileHandler = \xoops_getHandler('tplfile');
+				$btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
+				if (\count($btemplate) > 0) {
+					$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+				} else {
+					$btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
+					if (\count($btemplate2) > 0) {
+						$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+					}
+				}
+			}
+			if (false !== $block['edit_form']) {
+				$form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_OPTIONS, $block['edit_form']));
+			}
+		}
+		$cache_select = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
+		$cache_select->addOptionArray([
+										  0       => _NOCACHE,
+										  30      => \sprintf(_SECONDS, 30),
+										  60      => _MINUTE,
+										  300     => \sprintf(_MINUTES, 5),
+										  1800    => \sprintf(_MINUTES, 30),
+										  3600    => _HOUR,
+										  18000   => \sprintf(_HOURS, 5),
+										  86400   => _DAY,
+										  259200  => \sprintf(_DAYS, 3),
+										  604800  => _WEEK,
+										  2592000 => _MONTH,
+									  ]);
+		$form->addElement($cache_select);
+
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = \xoops_getHandler('groupperm');
+		$groups           = $grouppermHandler->getGroupIds('block_read', $block['bid']);
+
+		$form->addElement(new \XoopsFormSelectGroup(\_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
+
+		if (isset($block['bid'])) {
+			$form->addElement(new \XoopsFormHidden('bid', $block['bid']));
+		}
+		$form->addElement(new \XoopsFormHidden('op', $block['op']));
+		$form->addElement(new \XoopsFormHidden('fct', 'blocksadmin'));
+		$buttonTray = new \XoopsFormElementTray('', '&nbsp;');
+		if ($block['is_custom']) {
+			$buttonTray->addElement(new \XoopsFormButton('', 'previewblock', _PREVIEW, 'submit'));
+		}
+
+		//Submit buttons
+		$buttonTray   = new \XoopsFormElementTray('', '');
+		$submitButton = new \XoopsFormButton('', 'submitblock', _SUBMIT, 'submit');
+		$buttonTray->addElement($submitButton);
+
+		$cancelButton = new \XoopsFormButton('', '', _CANCEL, 'button');
+		$cancelButton->setExtra('onclick="history.go(-1)"');
+		$buttonTray->addElement($cancelButton);
+
+		$form->addElement($buttonTray);
+		$form->display();
+	}
 }

Spacing +61 added lines, -61 removed lines

@@ -68,7 +68,7 @@ 
     public function listBlocks(): void
     {
         global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
         //        xoops_loadLanguage('admin', 'system');
         //        xoops_loadLanguage('admin/blocksadmin', 'system');
         //        xoops_loadLanguage('admin/groups', 'system');
@@ -88,16 +88,16 @@ 
         $moduleList[-1] = \_AM_SYSTEM_BLOCKS_TOPPAGE;
         $moduleList[0]  = \_AM_SYSTEM_BLOCKS_ALLPAGES;
         \ksort($moduleList);
-        echo "<h4 style='text-align:left;'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
-        echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
+        echo "<h4 style='text-align:left;'>".\constant('CO_'.$this->moduleDirNameUpper.'_'.'BADMIN').'</h4>';
+        echo "<form action='".$_SERVER['SCRIPT_NAME']."' name='blockadmin' method='post'>";
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
-        <tr valign='middle'><th align='center'>" . \_AM_SYSTEM_BLOCKS_TITLE . "</th><th align='center' nowrap='nowrap'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'SIDE') . '<br>' . _LEFT . '-' . _CENTER . '-' . _RIGHT . "</th>
-        <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT') . "</th>
-        <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE') . "</th><th align='center'>" . \_AM_SYSTEM_BLOCKS_VISIBLEIN . "</th>
-        <th align='center'>" . \_AM_SYSTEM_ADGS . "</th>
-        <th align='center'>" . \_AM_SYSTEM_BLOCKS_BCACHETIME . "</th>
-        <th align='center'>" . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'ACTION') . '</th>
+        <tr valign='middle'><th align='center'>" . \_AM_SYSTEM_BLOCKS_TITLE."</th><th align='center' nowrap='nowrap'>".\constant('CO_'.$this->moduleDirNameUpper.'_'.'SIDE').'<br>'._LEFT.'-'._CENTER.'-'._RIGHT."</th>
+        <th align='center'>" . \constant('CO_'.$this->moduleDirNameUpper.'_'.'WEIGHT')."</th>
+        <th align='center'>" . \constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLE')."</th><th align='center'>".\_AM_SYSTEM_BLOCKS_VISIBLEIN."</th>
+        <th align='center'>" . \_AM_SYSTEM_ADGS."</th>
+        <th align='center'>" . \_AM_SYSTEM_BLOCKS_BCACHETIME."</th>
+        <th align='center'>" . \constant('CO_'.$this->moduleDirNameUpper.'_'.'ACTION').'</th>
         </tr>';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
         $blockCount = \count($blockArray);
@@ -117,14 +117,14 @@ 
         ];
         foreach ($blockArray as $i) {
             $groupsPermissions = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql               = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+            $sql               = 'SELECT module_id FROM '.$this->db->prefix('block_module_link').' WHERE block_id='.$i->getVar('bid');
             $result            = $this->db->query($sql);
             $modules           = [];
             if (!$result instanceof \mysqli_result) {
-                \trigger_error("Query Failed! SQL: $sql Error: " . $this->db->error(), \E_USER_ERROR);
+                \trigger_error("Query Failed! SQL: $sql Error: ".$this->db->error(), \E_USER_ERROR);
             }
             while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
 
             $cachetimeOptions = '';
@@ -174,46 +174,46 @@ 
                 $title = $i->getVar('title');
             }
             $name = $i->getVar('name');
-            echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[" . $i->getVar('bid') . "]' value='" . $title . "'></td>
+            echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title[".$i->getVar('bid')."]' value='".$title."'></td>
             <td class='$class' align='center' nowrap='nowrap'><div align='center' >
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_LEFT . "'$ssel2>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_CENTER . "'$ssel3>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_RIGHT . "'$ssel4>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_LEFT."'$ssel2>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_CENTER."'$ssel3>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_RIGHT."'$ssel4>
                     </div>
                     <div>
-                        <span style='float:right;'><input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_SIDEBLOCK_RIGHT . "'$ssel1></span>
-                    <div align='left'><input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_SIDEBLOCK_LEFT . "'$ssel0></div>
+                        <span style='float:right;'><input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_SIDEBLOCK_RIGHT."'$ssel1></span>
+                    <div align='left'><input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_SIDEBLOCK_LEFT."'$ssel0></div>
                     </div>
                     <div align='center'>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_BOTTOMLEFT . "'$ssel5>
-                        <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_BOTTOM . "'$ssel7>
-                    <input type='radio' name='side[" . $i->getVar('bid') . "]' value='" . \XOOPS_CENTERBLOCK_BOTTOMRIGHT . "'$ssel6>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_BOTTOMLEFT."'$ssel5>
+                        <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_BOTTOM."'$ssel7>
+                    <input type='radio' name='side[".$i->getVar('bid')."]' value='".\XOOPS_CENTERBLOCK_BOTTOMRIGHT."'$ssel6>
                     </div>
                 </td>
-                <td class='$class' align='center'><input type='text' name='weight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "' size='5' maxlength='5'></td>
-                <td class='$class' align='center' nowrap><input type='radio' name='visible[" . $i->getVar('bid') . "]' value='1'$sel1>" . _YES . "&nbsp;<input type='radio' name='visible[" . $i->getVar('bid') . "]' value='0'$sel0>" . _NO . '</td>';
+                <td class='$class' align='center'><input type='text' name='weight[".$i->getVar('bid')."]' value='".$i->getVar('weight')."' size='5' maxlength='5'></td>
+                <td class='$class' align='center' nowrap><input type='radio' name='visible[".$i->getVar('bid')."]' value='1'$sel1>"._YES."&nbsp;<input type='radio' name='visible[".$i->getVar('bid')."]' value='0'$sel0>"._NO.'</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='bmodule[".$i->getVar('bid')."][]' id='bmodule[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($moduleList as $k => $v) {
-                echo "<option value='$k'" . (\in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
+                echo "<option value='$k'".(\in_array($k, $modules) ? " selected='selected'" : '').">$v</option>";
             }
             echo '</select></td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='groups[".$i->getVar('bid')."][]' id='groups[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($groups as $grp) {
-                echo "<option value='" . $grp->getVar('groupid') . "' " . (\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
+                echo "<option value='".$grp->getVar('groupid')."' ".(\in_array($grp->getVar('groupid'), $groupsPermissions) ? " selected='selected'" : '').'>'.$grp->getVar('name').'</option>';
             }
             echo '</select></td>';
 
             // Cache lifetime
-            echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
+            echo '<td class="'.$class.'" align="center"> <select name="bcachetime['.$i->getVar('bid').']" size="1">'.$cachetimeOptions.'</select>
                                     </td>';
 
             // Actions
 
             echo "<td class='$class' align='center'>
-                <a href='blocksadmin.php?op=edit&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/edit.png' . " alt='" . _EDIT . "' title='" . _EDIT . "'></a> 
-                <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/editcopy.png' . " alt='" . _CLONE . "' title='" . _CLONE . "'></a>";
+                <a href='blocksadmin.php?op=edit&amp;bid=".$i->getVar('bid')."'><img src=".$pathIcon16.'/edit.png'." alt='"._EDIT."' title='"._EDIT."'></a> 
+                <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid')."'><img src=".$pathIcon16.'/editcopy.png'." alt='"._CLONE."' title='"._CLONE."'></a>";
             //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
             //                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
             //                     </a>";
@@ -222,22 +222,22 @@ 
             //            if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
             if (!\in_array($i->getVar('block_type'), ['M', 'S'])) {
                 echo "&nbsp;
-                <a href='blocksadmin.php?op=delete&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
+                <a href='blocksadmin.php?op=delete&amp;bid=" . $i->getVar('bid')."'><img src=".$pathIcon16.'/delete.png'." alt='"._DELETE."' title='"._DELETE."'>
                      </a>";
             }
             echo "
-            <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
-            <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
-            <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
-            <input type='hidden' name='oldvisible[" . $i->getVar('bid') . "]' value='" . $i->getVar('visible') . "'>
-            <input type='hidden' name='oldgroups[" . $i->getVar('groups') . "]' value='" . $i->getVar('groups') . "'>
-            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid') . "]' value='" . $i->getVar('bcachetime') . "'>
-            <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
+            <input type='hidden' name='oldtitle[" . $i->getVar('bid')."]' value='".$i->getVar('title')."'>
+            <input type='hidden' name='oldside[" . $i->getVar('bid')."]' value='".$i->getVar('side')."'>
+            <input type='hidden' name='oldweight[" . $i->getVar('bid')."]' value='".$i->getVar('weight')."'>
+            <input type='hidden' name='oldvisible[" . $i->getVar('bid')."]' value='".$i->getVar('visible')."'>
+            <input type='hidden' name='oldgroups[" . $i->getVar('groups')."]' value='".$i->getVar('groups')."'>
+            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid')."]' value='".$i->getVar('bcachetime')."'>
+            <input type='hidden' name='bid[" . $i->getVar('bid')."]' value='".$i->getVar('bid')."'>
             </td></tr>
             ";
             $class = ('even' === $class) ? 'odd' : 'even';
         }
-        echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' name='submit' value='" . _SUBMIT . "'></td></tr></table></form><br><br>";
+        echo "<tr><td class='foot' align='center' colspan='8'> <input type='hidden' name='op' value='order'>".$GLOBALS['xoopsSecurity']->getTokenHTML()."<input type='submit' name='submit' value='"._SUBMIT."'></td></tr></table></form><br><br>";
     }
 
     public function deleteBlock(int $bid): void
@@ -268,18 +268,18 @@ 
         \xoops_loadLanguage('admin/groups', 'system');
 
         $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+        $sql     = 'SELECT module_id FROM '.$this->db->prefix('block_module_link').' WHERE block_id='.$bid;
         $result  = $this->db->query($sql);
         $modules = [];
         if ($result instanceof \mysqli_result) {
             while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
         }
         $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
         $block    = [
-            'title'      => $myblock->getVar('title') . ' Clone',
-            'form_title' => \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+            'title'      => $myblock->getVar('title').' Clone',
+            'form_title' => \constant('CO_'.$this->moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK'),
             'name'       => $myblock->getVar('name'),
             'side'       => $myblock->getVar('side'),
             'weight'     => $myblock->getVar('weight'),
@@ -295,7 +295,7 @@ 
             'template'   => $myblock->getVar('template'),
             'options'    => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
+        echo '<a href="blocksadmin.php">'.\constant('CO_'.$this->moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.\_AM_SYSTEM_BLOCKS_CLONEBLOCK.'<br><br>';
         //        $form = new Blockform();
         //        $form->render();
 
@@ -337,7 +337,7 @@ 
         }
         //        $newid = $clone->store(); //see https://github.com/XOOPS/XoopsCore25/issues/1105
         if ($clone->store()) {
-            $newid = $clone->id();  //get the id of the cloned block
+            $newid = $clone->id(); //get the id of the cloned block
         }
         if (!$newid) {
             //            \xoops_cp_header();
@@ -348,7 +348,7 @@ 
         if ('' !== $clone->getVar('template')) {
             /** @var \XoopsTplfileHandler $tplfileHandler */
             $tplfileHandler = \xoops_getHandler('tplfile');
-            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string)$bid);
+            $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', (string) $bid);
             if (\count($btemplate) > 0) {
                 $tplclone = $btemplate[0]->xoopsClone();
                 $tplclone->setVar('tpl_id', 0);
@@ -358,12 +358,12 @@ 
         }
 
         foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+            $sql = 'INSERT INTO '.$this->db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
             $this->db->query($sql);
         }
         //$groups = &$GLOBALS['xoopsUser']->getGroups();
         foreach ($groups as $iValue) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
+            $sql = 'INSERT INTO '.$this->db->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ('.$iValue.', '.$newid.", 1, 'block_read')";
             $this->db->query($sql);
         }
         $this->helper->redirect('admin/blocksadmin.php?op=list', 1, _AM_DBUPDATED);
@@ -392,12 +392,12 @@ 
         \xoops_loadLanguage('admin/groups', 'system');
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
-        $sql     = 'SELECT module_id FROM ' . $this->db->prefix('block_module_link') . ' WHERE block_id=' . $bid;
+        $sql     = 'SELECT module_id FROM '.$this->db->prefix('block_module_link').' WHERE block_id='.$bid;
         $result  = $this->db->query($sql);
         $modules = [];
         if ($result instanceof \mysqli_result) {
             while (false !== ($row = $this->db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
         }
         $isCustom = \in_array($myblock->getVar('block_type'), ['C', 'E']);
@@ -419,7 +419,7 @@ 
             'template'   => $myblock->getVar('template'),
             'options'    => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . \constant('CO_' . $this->moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . \_AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
+        echo '<a href="blocksadmin.php">'.\constant('CO_'.$this->moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.\_AM_SYSTEM_BLOCKS_EDITBLOCK.'<br><br>';
 
         echo $this->render($block);
     }
@@ -459,7 +459,7 @@ 
                 $this->db->query($sql);
             } else {
                 foreach ($bmodule as $bmid) {
-                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int)$bmid);
+                    $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid, (int) $bmid);
                     $this->db->query($sql);
                 }
             }
@@ -472,7 +472,7 @@ 
                 $this->db->query($sql);
             }
         }
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_'.$this->moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     public function orderBlock(
@@ -498,7 +498,7 @@ 
                     $this->db->query($sql);
                 } else {
                     foreach ($bmodule[$i] as $bmid) {
-                        $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int)$bmid);
+                        $sql = \sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $this->db->prefix('block_module_link'), $bid[$i], (int) $bmid);
                         $this->db->query($sql);
                     }
                 }
@@ -513,7 +513,7 @@ 
             }
         }
 
-        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_' . $this->moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        $this->helper->redirect('admin/blocksadmin.php', 1, \constant('CO_'.$this->moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     public function render(?array $block = null)
@@ -537,9 +537,9 @@ 
                                         9 => \_AM_SYSTEM_BLOCKS_CBBOTTOM,
                                     ]);
         $form->addElement($sideSelect);
-        $form->addElement(new \XoopsFormText(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-        $form->addElement(new \XoopsFormRadioYN(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-        $modSelect = new \XoopsFormSelect(\constant('CO_' . $this->moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+        $form->addElement(new \XoopsFormText(\constant('CO_'.$this->moduleDirNameUpper.'_'.'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+        $form->addElement(new \XoopsFormRadioYN(\constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLE'), 'bvisible', $block['visible']));
+        $modSelect = new \XoopsFormSelect(\constant('CO_'.$this->moduleDirNameUpper.'_'.'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
         /** @var \XoopsModuleHandler $moduleHandler */
         $moduleHandler = \xoops_getHandler('module');
         $criteria      = new \CriteriaCompo(new \Criteria('hasmain', '1'));
@@ -553,7 +553,7 @@ 
         $form->addElement(new \XoopsFormText(\_AM_SYSTEM_BLOCKS_TITLE, 'btitle', 50, 255, $block['title']), false);
         if ($block['is_custom']) {
             $textarea = new \XoopsFormDhtmlTextArea(\_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-            $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . \_AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . \sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+            $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'.\_AM_SYSTEM_BLOCKS_USEFULTAGS.'</span><br><span style="font-size:x-small;font-weight:normal;">'.\sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
             $form->addElement($textarea, true);
             $ctypeSelect = new \XoopsFormSelect(\_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
             $ctypeSelect->addOptionArray([
@@ -569,11 +569,11 @@ 
                 $tplfileHandler = \xoops_getHandler('tplfile');
                 $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
                 if (\count($btemplate) > 0) {
-                    $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                    $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'.\_AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
                 } else {
                     $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
                     if (\count($btemplate2) > 0) {
-                        $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . \_AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                        $form->addElement(new \XoopsFormLabel(\_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" target="_blank">'.\_AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
                     }
                 }
             }

class/Common/SysUtility.php

Indentation +212 added lines, -212 removed lines

@@ -30,216 +30,216 @@
  */
 class SysUtility
 {
-    use VersionChecks;
-
-    //checkVerXoops, checkVerPhp Traits
-
-    use ServerStats;
-
-    // getServerStats Trait
-
-    use FilesManagement;
-
-    // Files Management Trait
-
-    /**
-     * truncateHtml can truncate a string up to a number of characters while preserving whole words and HTML tags
-     * www.gsdesign.ro/blog/cut-html-string-without-breaking-the-tags
-     * www.cakephp.org
-     *
-     * @param string $text         String to truncate.
-     * @param int    $length       Length of returned string, including ellipsis.
-     * @param string $ending       Ending to be appended to the trimmed string.
-     * @param bool   $exact        If false, $text will not be cut mid-word
-     * @param bool   $considerHtml If true, HTML tags would be handled correctly
-     *
-     * @return string Trimmed string.
-     */
-    public static function truncateHtml($text, $length = 100, $ending = '...', $exact = false, $considerHtml = true)
-    {
-        if ($considerHtml) {
-            // if the plain text is shorter than the maximum length, return the whole text
-            if (mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
-                return $text;
-            }
-            // splits all html-tags to scanable lines
-            \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
-            $total_length = mb_strlen($ending);
-            $open_tags    = [];
-            $truncate     = '';
-            foreach ($lines as $line_matchings) {
-                // if there is any html-tag in this line, handle it and add it (uncounted) to the output
-                if (!empty($line_matchings[1])) {
-                    // if it's an "empty element" with or without xhtml-conform closing slash
-                    if (\preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
-                        // do nothing
-                        // if tag is a closing tag
-                    } elseif (\preg_match('/^<\s*\/(\S+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
-                        // delete tag from $open_tags list
-                        $pos = \array_search($tag_matchings[1], $open_tags, true);
-                        if (false !== $pos) {
-                            unset($open_tags[$pos]);
-                        }
-                        // if tag is an opening tag
-                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
-                        // add tag to the beginning of $open_tags list
-                        \array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
-                    }
-                    // add html-tag to $truncate'd text
-                    $truncate .= $line_matchings[1];
-                }
-                // calculate the length of the plain text part of the line; handle entities as one character
-                $content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
-                if ($total_length + $content_length > $length) {
-                    // the number of characters which are left
-                    $left            = $length - $total_length;
-                    $entities_length = 0;
-                    // search for html entities
-                    if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
-                        // calculate the real length of all entities in the legal range
-                        foreach ($entities[0] as $entity) {
-                            if ($left >= $entity[1] + 1 - $entities_length) {
-                                $left--;
-                                $entities_length += mb_strlen($entity[0]);
-                            } else {
-                                // no more characters left
-                                break;
-                            }
-                        }
-                    }
-                    $truncate .= mb_substr($line_matchings[2], 0, $left + $entities_length);
-                    // maximum lenght is reached, so get off the loop
-                    break;
-                }
-                $truncate     .= $line_matchings[2];
-                $total_length += $content_length;
-
-                // if the maximum length is reached, get off the loop
-                if ($total_length >= $length) {
-                    break;
-                }
-            }
-        } else {
-            if (mb_strlen($text) <= $length) {
-                return $text;
-            }
-            $truncate = mb_substr($text, 0, $length - mb_strlen($ending));
-        }
-        // if the words shouldn't be cut in the middle...
-        if (!$exact) {
-            // ...search the last occurance of a space...
-            $spacepos = mb_strrpos($truncate, ' ');
-            if (isset($spacepos)) {
-                // ...and cut the text in this position
-                $truncate = mb_substr($truncate, 0, $spacepos);
-            }
-        }
-        // add the defined ending to the text
-        $truncate .= $ending;
-        if ($considerHtml) {
-            // close all unclosed html-tags
-            foreach ($open_tags as $tag) {
-                $truncate .= '</' . $tag . '>';
-            }
-        }
-
-        return $truncate;
-    }
-
-    /**
-     * @param \Xmf\Module\Helper $helper
-     * @param array|null         $options
-     * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor
-     */
-    public static function getEditor($helper = null, $options = null)
-    {
-        /** @var Helper $helper */
-        if (null === $options) {
-            $options           = [];
-            $options['name']   = 'Editor';
-            $options['value']  = 'Editor';
-            $options['rows']   = 10;
-            $options['cols']   = '100%';
-            $options['width']  = '100%';
-            $options['height'] = '400px';
-        }
-
-        if (null === $helper) {
-            $helper = Helper::getInstance();
-        }
-
-        $isAdmin = $helper->isUserAdmin();
-
-        if (\class_exists('XoopsFormEditor')) {
-            if ($isAdmin) {
-                $descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorAdmin'), $options, $nohtml = false, $onfailure = 'textarea');
-            } else {
-                $descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorUser'), $options, $nohtml = false, $onfailure = 'textarea');
-            }
-        } else {
-            $descEditor = new \XoopsFormDhtmlTextArea(\ucfirst($options['name']), $options['name'], $options['value'], '100%', '100%');
-        }
-
-        //        $form->addElement($descEditor);
-
-        return $descEditor;
-    }
-
-    /**
-     * @param $fieldname
-     * @param $table
-     */
-    public static function fieldExists(string $fieldname, string $table): bool
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->queryF("SHOW COLUMNS FROM   $table LIKE '$fieldname'");
-
-        return ($xoopsDB->getRowsNum($result) > 0);
-    }
-
-    /**
-     * @param array|string $tableName
-     * @param int          $id_field
-     * @param int          $id
-     *
-     * @return mixed
-     */
-    public static function cloneRecord($tableName, $id_field, $id)
-    {
-        $new_id = false;
-        $table  = $GLOBALS['xoopsDB']->prefix($tableName);
-        // copy content of the record you wish to clone
-        $sql    = "SELECT * FROM $table WHERE $idField='" . $id . "' ";
-        $result = $GLOBALS['xoopsDB']->query($sql);
-        if ($result instanceof \mysqli_result) {
-            $tempTable = $GLOBALS['xoopsDB']->fetchArray($result, \MYSQLI_ASSOC);
-        }
-        if (!$tempTable) {
-            \trigger_error($GLOBALS['xoopsDB']->error());
-        }
-        // set the auto-incremented id's value to blank.
-        unset($tempTable[$id_field]);
-        // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", \array_values($tempTable)) . "')";
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-        if (!$result) {
-            \trigger_error($GLOBALS['xoopsDB']->error());
-        }
-        // Return the new id
-        $new_id = $GLOBALS['xoopsDB']->getInsertId();
-
-        return $new_id;
-    }
-
-    /**
-     * @param string $tablename
-     *
-     * @return bool
-     */
-    public static function tableExists($tablename)
-    {
-        $result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
-
-        return $GLOBALS['xoopsDB']->getRowsNum($result) > 0;
-    }
+	use VersionChecks;
+
+	//checkVerXoops, checkVerPhp Traits
+
+	use ServerStats;
+
+	// getServerStats Trait
+
+	use FilesManagement;
+
+	// Files Management Trait
+
+	/**
+	 * truncateHtml can truncate a string up to a number of characters while preserving whole words and HTML tags
+	 * www.gsdesign.ro/blog/cut-html-string-without-breaking-the-tags
+	 * www.cakephp.org
+	 *
+	 * @param string $text         String to truncate.
+	 * @param int    $length       Length of returned string, including ellipsis.
+	 * @param string $ending       Ending to be appended to the trimmed string.
+	 * @param bool   $exact        If false, $text will not be cut mid-word
+	 * @param bool   $considerHtml If true, HTML tags would be handled correctly
+	 *
+	 * @return string Trimmed string.
+	 */
+	public static function truncateHtml($text, $length = 100, $ending = '...', $exact = false, $considerHtml = true)
+	{
+		if ($considerHtml) {
+			// if the plain text is shorter than the maximum length, return the whole text
+			if (mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+				return $text;
+			}
+			// splits all html-tags to scanable lines
+			\preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+			$total_length = mb_strlen($ending);
+			$open_tags    = [];
+			$truncate     = '';
+			foreach ($lines as $line_matchings) {
+				// if there is any html-tag in this line, handle it and add it (uncounted) to the output
+				if (!empty($line_matchings[1])) {
+					// if it's an "empty element" with or without xhtml-conform closing slash
+					if (\preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
+						// do nothing
+						// if tag is a closing tag
+					} elseif (\preg_match('/^<\s*\/(\S+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
+						// delete tag from $open_tags list
+						$pos = \array_search($tag_matchings[1], $open_tags, true);
+						if (false !== $pos) {
+							unset($open_tags[$pos]);
+						}
+						// if tag is an opening tag
+					} elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+						// add tag to the beginning of $open_tags list
+						\array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
+					}
+					// add html-tag to $truncate'd text
+					$truncate .= $line_matchings[1];
+				}
+				// calculate the length of the plain text part of the line; handle entities as one character
+				$content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
+				if ($total_length + $content_length > $length) {
+					// the number of characters which are left
+					$left            = $length - $total_length;
+					$entities_length = 0;
+					// search for html entities
+					if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
+						// calculate the real length of all entities in the legal range
+						foreach ($entities[0] as $entity) {
+							if ($left >= $entity[1] + 1 - $entities_length) {
+								$left--;
+								$entities_length += mb_strlen($entity[0]);
+							} else {
+								// no more characters left
+								break;
+							}
+						}
+					}
+					$truncate .= mb_substr($line_matchings[2], 0, $left + $entities_length);
+					// maximum lenght is reached, so get off the loop
+					break;
+				}
+				$truncate     .= $line_matchings[2];
+				$total_length += $content_length;
+
+				// if the maximum length is reached, get off the loop
+				if ($total_length >= $length) {
+					break;
+				}
+			}
+		} else {
+			if (mb_strlen($text) <= $length) {
+				return $text;
+			}
+			$truncate = mb_substr($text, 0, $length - mb_strlen($ending));
+		}
+		// if the words shouldn't be cut in the middle...
+		if (!$exact) {
+			// ...search the last occurance of a space...
+			$spacepos = mb_strrpos($truncate, ' ');
+			if (isset($spacepos)) {
+				// ...and cut the text in this position
+				$truncate = mb_substr($truncate, 0, $spacepos);
+			}
+		}
+		// add the defined ending to the text
+		$truncate .= $ending;
+		if ($considerHtml) {
+			// close all unclosed html-tags
+			foreach ($open_tags as $tag) {
+				$truncate .= '</' . $tag . '>';
+			}
+		}
+
+		return $truncate;
+	}
+
+	/**
+	 * @param \Xmf\Module\Helper $helper
+	 * @param array|null         $options
+	 * @return \XoopsFormDhtmlTextArea|\XoopsFormEditor
+	 */
+	public static function getEditor($helper = null, $options = null)
+	{
+		/** @var Helper $helper */
+		if (null === $options) {
+			$options           = [];
+			$options['name']   = 'Editor';
+			$options['value']  = 'Editor';
+			$options['rows']   = 10;
+			$options['cols']   = '100%';
+			$options['width']  = '100%';
+			$options['height'] = '400px';
+		}
+
+		if (null === $helper) {
+			$helper = Helper::getInstance();
+		}
+
+		$isAdmin = $helper->isUserAdmin();
+
+		if (\class_exists('XoopsFormEditor')) {
+			if ($isAdmin) {
+				$descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorAdmin'), $options, $nohtml = false, $onfailure = 'textarea');
+			} else {
+				$descEditor = new \XoopsFormEditor(\ucfirst($options['name']), $helper->getConfig('editorUser'), $options, $nohtml = false, $onfailure = 'textarea');
+			}
+		} else {
+			$descEditor = new \XoopsFormDhtmlTextArea(\ucfirst($options['name']), $options['name'], $options['value'], '100%', '100%');
+		}
+
+		//        $form->addElement($descEditor);
+
+		return $descEditor;
+	}
+
+	/**
+	 * @param $fieldname
+	 * @param $table
+	 */
+	public static function fieldExists(string $fieldname, string $table): bool
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->queryF("SHOW COLUMNS FROM   $table LIKE '$fieldname'");
+
+		return ($xoopsDB->getRowsNum($result) > 0);
+	}
+
+	/**
+	 * @param array|string $tableName
+	 * @param int          $id_field
+	 * @param int          $id
+	 *
+	 * @return mixed
+	 */
+	public static function cloneRecord($tableName, $id_field, $id)
+	{
+		$new_id = false;
+		$table  = $GLOBALS['xoopsDB']->prefix($tableName);
+		// copy content of the record you wish to clone
+		$sql    = "SELECT * FROM $table WHERE $idField='" . $id . "' ";
+		$result = $GLOBALS['xoopsDB']->query($sql);
+		if ($result instanceof \mysqli_result) {
+			$tempTable = $GLOBALS['xoopsDB']->fetchArray($result, \MYSQLI_ASSOC);
+		}
+		if (!$tempTable) {
+			\trigger_error($GLOBALS['xoopsDB']->error());
+		}
+		// set the auto-incremented id's value to blank.
+		unset($tempTable[$id_field]);
+		// insert cloned copy of the original  record
+		$sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", \array_values($tempTable)) . "')";
+		$result = $GLOBALS['xoopsDB']->queryF($sql);
+		if (!$result) {
+			\trigger_error($GLOBALS['xoopsDB']->error());
+		}
+		// Return the new id
+		$new_id = $GLOBALS['xoopsDB']->getInsertId();
+
+		return $new_id;
+	}
+
+	/**
+	 * @param string $tablename
+	 *
+	 * @return bool
+	 */
+	public static function tableExists($tablename)
+	{
+		$result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
+
+		return $GLOBALS['xoopsDB']->getRowsNum($result) > 0;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -59,11 +59,11 @@ 
     {
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
-            if (mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+            if (mb_strlen(\preg_replace('/<.*?'.'>/', '', $text)) <= $length) {
                 return $text;
             }
             // splits all html-tags to scanable lines
-            \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+            \preg_match_all('/(<.+?'.'>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
             $total_length = mb_strlen($ending);
             $open_tags    = [];
             $truncate     = '';
@@ -81,7 +81,7 @@ 
                             unset($open_tags[$pos]);
                         }
                         // if tag is an opening tag
-                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?'.'>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $open_tags list
                         \array_unshift($open_tags, \mb_strtolower($tag_matchings[1]));
                     }
@@ -90,15 +90,15 @@ 
                 }
                 // calculate the length of the plain text part of the line; handle entities as one character
                 $content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
-                if ($total_length + $content_length > $length) {
+                if ($total_length+$content_length > $length) {
                     // the number of characters which are left
-                    $left            = $length - $total_length;
+                    $left            = $length-$total_length;
                     $entities_length = 0;
                     // search for html entities
                     if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
                         // calculate the real length of all entities in the legal range
                         foreach ($entities[0] as $entity) {
-                            if ($left >= $entity[1] + 1 - $entities_length) {
+                            if ($left >= $entity[1]+1-$entities_length) {
                                 $left--;
                                 $entities_length += mb_strlen($entity[0]);
                             } else {
@@ -107,7 +107,7 @@ 
                             }
                         }
                     }
-                    $truncate .= mb_substr($line_matchings[2], 0, $left + $entities_length);
+                    $truncate .= mb_substr($line_matchings[2], 0, $left+$entities_length);
                     // maximum lenght is reached, so get off the loop
                     break;
                 }
@@ -123,7 +123,7 @@ 
             if (mb_strlen($text) <= $length) {
                 return $text;
             }
-            $truncate = mb_substr($text, 0, $length - mb_strlen($ending));
+            $truncate = mb_substr($text, 0, $length-mb_strlen($ending));
         }
         // if the words shouldn't be cut in the middle...
         if (!$exact) {
@@ -139,7 +139,7 @@ 
         if ($considerHtml) {
             // close all unclosed html-tags
             foreach ($open_tags as $tag) {
-                $truncate .= '</' . $tag . '>';
+                $truncate .= '</'.$tag.'>';
             }
         }
 
@@ -209,7 +209,7 @@ 
         $new_id = false;
         $table  = $GLOBALS['xoopsDB']->prefix($tableName);
         // copy content of the record you wish to clone
-        $sql    = "SELECT * FROM $table WHERE $idField='" . $id . "' ";
+        $sql    = "SELECT * FROM $table WHERE $idField='".$id."' ";
         $result = $GLOBALS['xoopsDB']->query($sql);
         if ($result instanceof \mysqli_result) {
             $tempTable = $GLOBALS['xoopsDB']->fetchArray($result, \MYSQLI_ASSOC);
@@ -220,7 +220,7 @@ 
         // set the auto-incremented id's value to blank.
         unset($tempTable[$id_field]);
         // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", \array_values($tempTable)) . "')";
+        $sql    = "INSERT INTO $table (".\implode(', ', \array_keys($tempTable)).") VALUES ('".\implode("', '", \array_values($tempTable))."')";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
             \trigger_error($GLOBALS['xoopsDB']->error());

class/MyiframeBaseHandler.php

Indentation +210 added lines, -210 removed lines

@@ -15,214 +15,214 @@
  */
 class MyiframeBaseHandler extends \XoopsObjectHandler
 {
-    /**
-     * @param bool $isNew
-     * @return myiframe
-     */
-    public function create($isNew = true)
-    {
-        $object = new MyiframeBase();
-        if ($isNew) {
-            $object->setNew();
-        }
-
-        return $object;
-    }
-
-    /**
-     * @param int $id
-     * @return myiframe|null
-     */
-    public function get($id)
-    {
-        $ret = null;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
-        if (!$result = $this->db->query($sql)) {
-            return $ret;
-        }
-        $numrows = $this->db->getRowsNum($result);
-        if (1 == $numrows) {
-            $object = new MyiframeBase();
-            $object->assignVars($this->db->fetchArray($result));
-
-            return $object;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param bool $force
-     * @return bool
-     */
-    public function insert(\XoopsObject $object, $force = false)
-    {
-        if (!$object instanceof MyiframeBase) {
-            return false;
-        }
-        if (!$object->isDirty()) {
-            return true;
-        }
-        if (!$object->cleanVars()) {
-            foreach ($object->getErrors() as $oneerror) {
-                \trigger_error($oneerror);
-            }
-
-            return false;
-        }
-        foreach ($object->cleanVars as $k => $v) {
-            ${$k} = $v;
-        }
-
-        if ($object->isNew()) {
-            $format = 'INSERT INTO %s (frame_created, frame_uid, frame_description, frame_width, frame_height, frame_align, frame_frameborder, frame_marginwidth, frame_marginheight, frame_scrolling, frame_hits, frame_url) VALUES (%u, %u, %s, %s, %s, %d, %d, %d, %d, %d, %u, %s)';
-            $sql    = \sprintf(
-                $format,
-                $this->db->prefix('myiframe'),
-                $frame_created,
-                $frame_uid,
-                $this->db->quoteString($frame_description),
-                $this->db->quoteString($frame_width),
-                $this->db->quoteString($frame_height),
-                $frame_align,
-                $frame_frameborder,
-                $frame_marginwidth,
-                $frame_marginheight,
-                $frame_scrolling,
-                $frame_hits,
-                $this->db->quoteString($frame_url)
-            );
-            $force  = true;
-        } else {
-            $format = 'UPDATE %s SET frame_description=%s, frame_width=%s, frame_height=%s, frame_align="%d", frame_frameborder="%d", frame_marginwidth="%d", frame_marginheight="%d", frame_scrolling="%d", frame_hits="%u", frame_url=%s WHERE frame_frameid=%u';
-            $sql    = \sprintf(
-                $format,
-                $this->db->prefix('myiframe'),
-                $this->db->quoteString($frame_description),
-                $this->db->quoteString($frame_width),
-                $this->db->quoteString($frame_height),
-                $frame_align,
-                $frame_frameborder,
-                $frame_marginwidth,
-                $frame_marginheight,
-                $frame_scrolling,
-                $frame_hits,
-                $this->db->quoteString($frame_url),
-                $frame_frameid
-            );
-        }
-        if (false !== $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-        if (empty($frame_frameid)) {
-            $frame_frameid = $this->db->getInsertId();
-        }
-        $object->assignVar('frame_frameid', $frame_frameid);
-
-        return $frame_frameid;
-    }
-
-    /**
-     * @param bool $force
-     * @return bool
-     */
-    public function delete(\XoopsObject $object, $force = false)
-    {
-        if (!$object instanceof \MyiframeBase) {
-            return false;
-        }
-        $sql = \sprintf('DELETE FROM %s WHERE frame_frameid = "%u"', $this->db->prefix('myiframe'), $object->getVar('frame_frameid'));
-        if (false !== $force) {
-            $result = $this->db->queryF($sql);
-        } else {
-            $result = $this->db->query($sql);
-        }
-        if (!$result) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param \XoopsModules\Myiframe\Criteria $criteria
-     * @param bool                            $id_as_key
-     * @return array
-     */
-    public function &getObjects(\Criteria $criteria = null, $id_as_key = false)
-    {
-        $ret   = [];
-        $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        if ($result instanceof \mysqli_result) {
-            while (false !== ($myrow = $this->db->fetchArray($result))) {
-                if (!$id_as_key) {
-                    $ret[] = new MyiframeBase($myrow);
-                } else {
-                    $ret[$myrow['frame_frameid']] = new MyiframeBase($myrow);
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param \XoopsModules\Myiframe\CriteriaCompo $criteria
-     * @return int
-     */
-    public function getCount(\CriteriaCompo $criteria = null)
-    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        [$count] = $this->db->fetchRow($result);
-
-        return $count;
-    }
-
-    /**
-     * @param \XoopsModules\Myiframe\CriteriaCompo $criteria
-     * @return bool
-     */
-    public function deleteAll(\CriteriaCompo $criteria = null)
-    {
-        $sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param $frame_id
-     */
-    public function updatehits($frame_id): void
-    {
-        $sql = \sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid="%u"', $this->db->prefix('myiframe'), (int)$frame_id);
-        $this->db->queryF($sql);
-    }
+	/**
+	 * @param bool $isNew
+	 * @return myiframe
+	 */
+	public function create($isNew = true)
+	{
+		$object = new MyiframeBase();
+		if ($isNew) {
+			$object->setNew();
+		}
+
+		return $object;
+	}
+
+	/**
+	 * @param int $id
+	 * @return myiframe|null
+	 */
+	public function get($id)
+	{
+		$ret = null;
+		$sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
+		if (!$result = $this->db->query($sql)) {
+			return $ret;
+		}
+		$numrows = $this->db->getRowsNum($result);
+		if (1 == $numrows) {
+			$object = new MyiframeBase();
+			$object->assignVars($this->db->fetchArray($result));
+
+			return $object;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param bool $force
+	 * @return bool
+	 */
+	public function insert(\XoopsObject $object, $force = false)
+	{
+		if (!$object instanceof MyiframeBase) {
+			return false;
+		}
+		if (!$object->isDirty()) {
+			return true;
+		}
+		if (!$object->cleanVars()) {
+			foreach ($object->getErrors() as $oneerror) {
+				\trigger_error($oneerror);
+			}
+
+			return false;
+		}
+		foreach ($object->cleanVars as $k => $v) {
+			${$k} = $v;
+		}
+
+		if ($object->isNew()) {
+			$format = 'INSERT INTO %s (frame_created, frame_uid, frame_description, frame_width, frame_height, frame_align, frame_frameborder, frame_marginwidth, frame_marginheight, frame_scrolling, frame_hits, frame_url) VALUES (%u, %u, %s, %s, %s, %d, %d, %d, %d, %d, %u, %s)';
+			$sql    = \sprintf(
+				$format,
+				$this->db->prefix('myiframe'),
+				$frame_created,
+				$frame_uid,
+				$this->db->quoteString($frame_description),
+				$this->db->quoteString($frame_width),
+				$this->db->quoteString($frame_height),
+				$frame_align,
+				$frame_frameborder,
+				$frame_marginwidth,
+				$frame_marginheight,
+				$frame_scrolling,
+				$frame_hits,
+				$this->db->quoteString($frame_url)
+			);
+			$force  = true;
+		} else {
+			$format = 'UPDATE %s SET frame_description=%s, frame_width=%s, frame_height=%s, frame_align="%d", frame_frameborder="%d", frame_marginwidth="%d", frame_marginheight="%d", frame_scrolling="%d", frame_hits="%u", frame_url=%s WHERE frame_frameid=%u';
+			$sql    = \sprintf(
+				$format,
+				$this->db->prefix('myiframe'),
+				$this->db->quoteString($frame_description),
+				$this->db->quoteString($frame_width),
+				$this->db->quoteString($frame_height),
+				$frame_align,
+				$frame_frameborder,
+				$frame_marginwidth,
+				$frame_marginheight,
+				$frame_scrolling,
+				$frame_hits,
+				$this->db->quoteString($frame_url),
+				$frame_frameid
+			);
+		}
+		if (false !== $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+		if (empty($frame_frameid)) {
+			$frame_frameid = $this->db->getInsertId();
+		}
+		$object->assignVar('frame_frameid', $frame_frameid);
+
+		return $frame_frameid;
+	}
+
+	/**
+	 * @param bool $force
+	 * @return bool
+	 */
+	public function delete(\XoopsObject $object, $force = false)
+	{
+		if (!$object instanceof \MyiframeBase) {
+			return false;
+		}
+		$sql = \sprintf('DELETE FROM %s WHERE frame_frameid = "%u"', $this->db->prefix('myiframe'), $object->getVar('frame_frameid'));
+		if (false !== $force) {
+			$result = $this->db->queryF($sql);
+		} else {
+			$result = $this->db->query($sql);
+		}
+		if (!$result) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param \XoopsModules\Myiframe\Criteria $criteria
+	 * @param bool                            $id_as_key
+	 * @return array
+	 */
+	public function &getObjects(\Criteria $criteria = null, $id_as_key = false)
+	{
+		$ret   = [];
+		$limit = $start = 0;
+		$sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ('' !== $criteria->getSort()) {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		if ($result instanceof \mysqli_result) {
+			while (false !== ($myrow = $this->db->fetchArray($result))) {
+				if (!$id_as_key) {
+					$ret[] = new MyiframeBase($myrow);
+				} else {
+					$ret[$myrow['frame_frameid']] = new MyiframeBase($myrow);
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param \XoopsModules\Myiframe\CriteriaCompo $criteria
+	 * @return int
+	 */
+	public function getCount(\CriteriaCompo $criteria = null)
+	{
+		$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		[$count] = $this->db->fetchRow($result);
+
+		return $count;
+	}
+
+	/**
+	 * @param \XoopsModules\Myiframe\CriteriaCompo $criteria
+	 * @return bool
+	 */
+	public function deleteAll(\CriteriaCompo $criteria = null)
+	{
+		$sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $frame_id
+	 */
+	public function updatehits($frame_id): void
+	{
+		$sql = \sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid="%u"', $this->db->prefix('myiframe'), (int)$frame_id);
+		$this->db->queryF($sql);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
  * Copyright (c) Hervé Thouzard of Instant Zero (https://www.instant-zero.com)
  * ****************************************************************************
  */
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 /**
  * Class MyiframeBaseHandler
@@ -36,7 +36,7 @@ 
     public function get($id)
     {
         $ret = null;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
+        $sql = 'SELECT * FROM '.$this->db->prefix('myiframe').'  WHERE frame_frameid='.(int) $id;
         if (!$result = $this->db->query($sql)) {
             return $ret;
         }
@@ -158,11 +158,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('myiframe');
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -187,9 +187,9 @@ 
      */
     public function getCount(\CriteriaCompo $criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('myiframe');
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -206,9 +206,9 @@ 
      */
     public function deleteAll(\CriteriaCompo $criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
+        $sql = 'DELETE FROM '.$this->db->prefix('myiframe');
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             return false;
@@ -222,7 +222,7 @@ 
      */
     public function updatehits($frame_id): void
     {
-        $sql = \sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid="%u"', $this->db->prefix('myiframe'), (int)$frame_id);
+        $sql = \sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid="%u"', $this->db->prefix('myiframe'), (int) $frame_id);
         $this->db->queryF($sql);
     }
 }

class/MyiframeBase.php

Indentation +44 added lines, -44 removed lines

@@ -15,50 +15,50 @@
  */
 class MyiframeBase extends \XoopsObject
 {
-    //    /** @var \XoopsMySQLDatabase */
-    public $db;
+	//    /** @var \XoopsMySQLDatabase */
+	public $db;
 
-    /**
-     * myiframe constructor.
-     * @param null $id
-     */
-    public function __construct($id = null)
-    {
-        $this->db = \XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar('frame_frameid', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_created', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_uid', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_description', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('frame_width', \XOBJ_DTYPE_TXTBOX, null, false, 15);
-        $this->initVar('frame_height', \XOBJ_DTYPE_TXTBOX, null, false, 15);
-        $this->initVar('frame_align', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_frameborder', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_marginwidth', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_marginheight', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_scrolling', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_hits', \XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_url', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        if (!empty($id)) {
-            if (\is_array($id)) {
-                $this->assignVars($id);
-            } else {
-                $this->load((int)$id);
-            }
-        } else {
-            $this->setNew();
-        }
-    }
+	/**
+	 * myiframe constructor.
+	 * @param null $id
+	 */
+	public function __construct($id = null)
+	{
+		$this->db = \XoopsDatabaseFactory::getDatabaseConnection();
+		$this->initVar('frame_frameid', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_created', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_uid', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_description', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('frame_width', \XOBJ_DTYPE_TXTBOX, null, false, 15);
+		$this->initVar('frame_height', \XOBJ_DTYPE_TXTBOX, null, false, 15);
+		$this->initVar('frame_align', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_frameborder', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_marginwidth', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_marginheight', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_scrolling', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_hits', \XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_url', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		if (!empty($id)) {
+			if (\is_array($id)) {
+				$this->assignVars($id);
+			} else {
+				$this->load((int)$id);
+			}
+		} else {
+			$this->setNew();
+		}
+	}
 
-    /**
-     * @param $id
-     */
-    public function load($id): void
-    {
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
-        $myrow = $this->db->fetchArray($this->db->query($sql));
-        $this->assignVars($myrow);
-        if (!$myrow) {
-            $this->setNew();
-        }
-    }
+	/**
+	 * @param $id
+	 */
+	public function load($id): void
+	{
+		$sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
+		$myrow = $this->db->fetchArray($this->db->query($sql));
+		$this->assignVars($myrow);
+		if (!$myrow) {
+			$this->setNew();
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * Copyright (c) Hervé Thouzard of Instant Zero (https://www.instant-zero.com)
  * ****************************************************************************
  */
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 /**
  * Class Myiframe
@@ -42,7 +42,7 @@ 
             if (\is_array($id)) {
                 $this->assignVars($id);
             } else {
-                $this->load((int)$id);
+                $this->load((int) $id);
             }
         } else {
             $this->setNew();
@@ -54,7 +54,7 @@ 
      */
     public function load($id): void
     {
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
+        $sql   = 'SELECT * FROM '.$this->db->prefix('myiframe').' WHERE frame_frameid='.(int) $id;
         $myrow = $this->db->fetchArray($this->db->query($sql));
         $this->assignVars($myrow);
         if (!$myrow) {

xoops_version.php

Indentation +81 added lines, -81 removed lines

@@ -14,113 +14,113 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 $modversion = [
-    'version'             => '1.67.0',
-    'module_status'       => 'Beta 1',
-    'release_date'        => '2022/01/26',
-    'name'                => _MI_MYIFRAME_NAME,
-    'description'         => _MI_MYIFRAME_DESC,
-    'credits'             => '',
-    'author'              => 'Instant Zero - https://xoops.instant-zero.com',
-    'help'                => 'page=help',
-    'license'             => 'GPL see LICENSE',
-    'official'            => 0,
-    'image'               => 'assets/images/logoModule.png',
-    'dirname'             => basename(__DIR__),
-    'min_php'             => '7.3',
-    'min_db'              => ['mysql' => '5.5'],
-    'min_xoops'           => '2.5.10+',
-    'min_admin'           => '1.2',
-    'module_website_url'  => 'www.xoops.org',
-    'module_website_name' => 'XOOPS',
-    'module_release'      => '05/07/2017',
-    'system_menu'         => 1,
-    //sql tables
-    'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
-    'tables'              => [
-        'myiframe',
-    ],
-    // Admin
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    // Menu
-    'hasMain'             => 1,
+	'version'             => '1.67.0',
+	'module_status'       => 'Beta 1',
+	'release_date'        => '2022/01/26',
+	'name'                => _MI_MYIFRAME_NAME,
+	'description'         => _MI_MYIFRAME_DESC,
+	'credits'             => '',
+	'author'              => 'Instant Zero - https://xoops.instant-zero.com',
+	'help'                => 'page=help',
+	'license'             => 'GPL see LICENSE',
+	'official'            => 0,
+	'image'               => 'assets/images/logoModule.png',
+	'dirname'             => basename(__DIR__),
+	'min_php'             => '7.3',
+	'min_db'              => ['mysql' => '5.5'],
+	'min_xoops'           => '2.5.10+',
+	'min_admin'           => '1.2',
+	'module_website_url'  => 'www.xoops.org',
+	'module_website_name' => 'XOOPS',
+	'module_release'      => '05/07/2017',
+	'system_menu'         => 1,
+	//sql tables
+	'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
+	'tables'              => [
+		'myiframe',
+	],
+	// Admin
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	// Menu
+	'hasMain'             => 1,
 ];
 // ------------------- Help files ------------------- //
 $modversion['helpsection'] = [
-    ['name' => _MI_MYIFRAME_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_MYIFRAME_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_MYIFRAME_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_MYIFRAME_SUPPORT, 'link' => 'page=support'],
+	['name' => _MI_MYIFRAME_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_MYIFRAME_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_MYIFRAME_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_MYIFRAME_SUPPORT, 'link' => 'page=support'],
 ];
 // ------------------- Templates ------------------- //
 $modversion['templates'] = [
-    ['file' => 'myiframe.tpl', 'description' => 'Default template'],
+	['file' => 'myiframe.tpl', 'description' => 'Default template'],
 ];
 
 //Blocks
 $modversion['blocks'][] = [
-    'file'        => 'myiframe_iframe.php',
-    'name'        => _MI_MYIFRAME_BNAME1,
-    'description' => 'Shows an iframe in a block',
-    'show_func'   => 'b_myiframe_iframe_show',
-    'edit_func'   => 'b_myiframe_iframe_edit',
-    'options'     => '0',
-    'template'    => 'myiframe_block_show.tpl',
+	'file'        => 'myiframe_iframe.php',
+	'name'        => _MI_MYIFRAME_BNAME1,
+	'description' => 'Shows an iframe in a block',
+	'show_func'   => 'b_myiframe_iframe_show',
+	'edit_func'   => 'b_myiframe_iframe_edit',
+	'options'     => '0',
+	'template'    => 'myiframe_block_show.tpl',
 ];
 global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
-    $i = 0;
-    require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
-    $myts = \MyTextSanitizer::getInstance();
-    if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' ORDER BY frame_description';
-        $result = $GLOBALS['xoopsDB']->query($sql);
-        while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            if ('' !== xoops_trim($myrow['frame_description'])) {
-                $modversion['sub'][$i]['name'] = htmlspecialchars($myrow['frame_description']);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
-                $i++;
-            }
-        }
-    }
+	$i = 0;
+	require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+	$myts = \MyTextSanitizer::getInstance();
+	if (myiframe_getmoduleoption('showinmenu')) {
+		$sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' ORDER BY frame_description';
+		$result = $GLOBALS['xoopsDB']->query($sql);
+		while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			if ('' !== xoops_trim($myrow['frame_description'])) {
+				$modversion['sub'][$i]['name'] = htmlspecialchars($myrow['frame_description']);
+				$modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+				$i++;
+			}
+		}
+	}
 }
 // Options
 $modversion['config'][] = [
-    'name'        => 'showinmenu',
-    'title'       => '_MI_MYIFRAME_OPT0',
-    'description' => '_MI_MYIFRAME_OPT0_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0,
+	'name'        => 'showinmenu',
+	'title'       => '_MI_MYIFRAME_OPT0',
+	'description' => '_MI_MYIFRAME_OPT0_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0,
 ];
 $modversion['config'][] = [
-    'name'        => 'showlist',
-    'title'       => '_MI_MYIFRAME_OPT1',
-    'description' => '_MI_MYIFRAME_OPT1_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'showlist',
+	'title'       => '_MI_MYIFRAME_OPT1',
+	'description' => '_MI_MYIFRAME_OPT1_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 
 // Make Sample button visible?
 $modversion['config'][] = [
-    'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'displaySampleButton',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 // Maintained by
 $modversion['config'][] = [
-    'name'        => 'maintainedby',
-    'title'       => '\_MI_MYMODULE_MAINTAINEDBY',
-    'description' => '\_MI_MYMODULE_MAINTAINEDBY_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => 'https://xoops.org/modules/newbb',
+	'name'        => 'maintainedby',
+	'title'       => '\_MI_MYMODULE_MAINTAINEDBY',
+	'description' => '\_MI_MYMODULE_MAINTAINEDBY_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => 'https://xoops.org/modules/newbb',
 ];
 
 // Search

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined.');
 
-require_once __DIR__ . '/preloads/autoloader.php';
+require_once __DIR__.'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(__DIR__);
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -72,15 +72,15 @@ 
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
     $i = 0;
-    require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
     $myts = \MyTextSanitizer::getInstance();
     if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' ORDER BY frame_description';
+        $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('myiframe').' ORDER BY frame_description';
         $result = $GLOBALS['xoopsDB']->query($sql);
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
             if ('' !== xoops_trim($myrow['frame_description'])) {
                 $modversion['sub'][$i]['name'] = htmlspecialchars($myrow['frame_description']);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+                $modversion['sub'][$i]['url']  = 'index.php?iframeid='.(int) $myrow['frame_frameid'];
                 $i++;
             }
         }
@@ -107,8 +107,8 @@ 
 // Make Sample button visible?
 $modversion['config'][] = [
     'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,