mambax7 / smartobject

class/Common/VersionChecks.php

Indentation +51 added lines, -51 removed lines

@@ -17,60 +17,60 @@
  */
 trait VersionChecks
 {
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @param null|string $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @param null|string $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
 
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $success     = true;
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$success     = true;
 
-        if (version_compare($currentVer, $requiredVer, '<')) {
-            $success     = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
-        }
+		if (version_compare($currentVer, $requiredVer, '<')) {
+			$success     = false;
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module)
-    {
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  =& $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module)
+	{
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  =& $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -37,13 +37,13 @@ 
         //check for minimum XOOPS version
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
-        $success     = true;
+        $success = true;
 
         if (version_compare($currentVer, $requiredVer, '<')) {
-            $success     = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $success = false;
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -63,10 +63,10 @@ 
         // check for minimum PHP version
         $success = true;
         $verNum  = PHP_VERSION;
-        $reqVer  =& $module->getInfo('min_php');
+        $reqVer  = & $module->getInfo('min_php');
         if (false !== $reqVer && '' !== $reqVer) {
             if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }

class/Common/Breadcrumb.php

Indentation +39 added lines, -39 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         require_once $GLOBALS['xoops']->path('class/template.php');
         $breadcrumbTpl = new \XoopsTpl();
         $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+        $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');
         unset($breadcrumbTpl);
 
         return $html;

class/Common/FilesManagement.php

Indentation +225 added lines, -225 removed lines

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

@@ -33,7 +33,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 (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -61,10 +61,10 @@ 
         if (!mkdir($dst) && !is_dir($dst)) {
             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);
                     }
                 }
             }
@@ -159,7 +159,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
     }
 
@@ -192,14 +192,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
     }
 
@@ -235,9 +235,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());
             }
         }
         return true;

print.php

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
  * Licence: GNU
  */
 
-require_once __DIR__ . '/header.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartloader.php';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once __DIR__.'/header.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartloader.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 
 $xoopsTpl                = new \XoopsTpl();
 $myts                    = \MyTextSanitizer::getInstance();

include/captcha/captcha.php

Indentation +244 added lines, -244 removed lines

@@ -13,253 +13,253 @@
  */
 class XoopsCaptcha
 {
-    public $active = true;
-    public $mode   = 'text';    // potential values: image, text
-    public $config = [];
-
-    public $message = []; // Logging error messages
-
-    /**
-     * XoopsCaptcha constructor.
-     */
-    public function __construct()
-    {
-        // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
-
-        $this->setMode($this->config['mode']);
-    }
-
-    /**
-     * @return XoopsCaptcha
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
-
-        return $instance;
-    }
-
-    /**
-     * @param $name
-     * @param $val
-     * @return bool
-     */
-    public function setConfig($name, $val)
-    {
-        if ('mode' === $name) {
-            $this->setMode($val);
-        } elseif (isset($this->$name)) {
-            $this->$name = $val;
-        } else {
-            $this->config[$name] = $val;
-        }
-
-        return true;
-    }
-
-    /**
-     * Set CAPTCHA mode
-     *
-     * For future possible modes, right now force to use text or image
-     *
-     * @param string $mode if no mode is set, just verify current mode
-     */
-    public function setMode($mode = null)
-    {
-        if (!empty($mode) && in_array($mode, ['text', 'image'])) {
-            $this->mode = $mode;
-
-            if ('image' !== $this->mode) {
-                return;
-            }
-        }
-
-        // Disable image mode
-        if (!extension_loaded('gd')) {
-            $this->mode = 'text';
-        } else {
-            $required_functions = [
-                'imagecreatetruecolor',
-                'imagecolorallocate',
-                'imagefilledrectangle',
-                'imagejpeg',
-                'imagedestroy',
-                'imageftbbox'
-            ];
-            foreach ($required_functions as $func) {
-                if (!function_exists($func)) {
-                    $this->mode = 'text';
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Initializing the CAPTCHA class
-     * @param string $name
-     * @param null   $skipmember
-     * @param null   $num_chars
-     * @param null   $fontsize_min
-     * @param null   $fontsize_max
-     * @param null   $background_type
-     * @param null   $background_num
-     */
-    public function init(
-        $name = 'xoopscaptcha',
-        $skipmember = null,
-        $num_chars = null,
-        $fontsize_min = null,
-        $fontsize_max = null,
-        $background_type = null,
-        $background_num = null
-    ) {
-        // Loading RUN-TIME settings
-        foreach (array_keys($this->config) as $key) {
-            if (isset(${$key}) && null !== ${$key}) {
-                $this->config[$key] = ${$key};
-            }
-        }
-        $this->config['name'] = $name;
-
-        // Skip CAPTCHA for member if set
-        if ($this->config['skipmember'] && is_object($GLOBALS['xoopsUser'])) {
-            $this->active = false;
-        }
-    }
-
-    /**
-     * Verify user submission
-     * @param  null $skipMember
-     * @return bool
-     */
-    public function verify($skipMember = null)
-    {
-        $sessionName = @$_SESSION['XoopsCaptcha_name'];
-        $skipMember  = (null === $skipMember) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
-
-        $is_valid = false;
-
-        // Skip CAPTCHA for member if set
-        if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
-            $is_valid = true;
-        // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
-            $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-
-        // Verify the code
-        } elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
-            $func     = $this->config['casesensitive'] ? 'strcmp' : 'strcasecmp';
-            $is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
-        }
-
-        if (!empty($maxAttempts)) {
-            if (!$is_valid) {
-                // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
-                // Log the error message
-                $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
-            } else {
-
-                // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
-            }
-        }
-        $this->destroyGarbage(true);
-
-        return $is_valid;
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function getCaption()
-    {
-        return defined('XOOPS_CAPTCHA_CAPTION') ? constant('XOOPS_CAPTCHA_CAPTION') : '';
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return implode('<br>', $this->message);
-    }
-
-    /**
-     * Destory historical stuff
-     * @param  bool $clearSession
-     * @return bool
-     */
-    public function destroyGarbage($clearSession = false)
-    {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
-        $captchaHandler = new $class();
-        if (method_exists($captchaHandler, 'destroyGarbage')) {
-            $captchaHandler->loadConfig($this->config);
-            $captchaHandler->destroyGarbage();
-        }
-
-        if ($clearSession) {
-            $_SESSION['XoopsCaptcha_name']        = null;
-            $_SESSION['XoopsCaptcha_skipmember']  = null;
-            $_SESSION['XoopsCaptcha_sessioncode'] = null;
-            $_SESSION['XoopsCaptcha_maxattempts'] = null;
-        }
-
-        return true;
-    }
-
-    /**
-     * @return mixed|string
-     */
-    public function render()
-    {
-        $form = '';
-
-        if (!$this->active || empty($this->config['name'])) {
-            return $form;
-        }
-
-        $_SESSION['XoopsCaptcha_name']        = $this->config['name'];
-        $_SESSION['XoopsCaptcha_skipmember']  = $this->config['skipmember'];
-        $maxAttempts                          = $this->config['maxattempt'];
-        $_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
-        /*
+	public $active = true;
+	public $mode   = 'text';    // potential values: image, text
+	public $config = [];
+
+	public $message = []; // Logging error messages
+
+	/**
+	 * XoopsCaptcha constructor.
+	 */
+	public function __construct()
+	{
+		// Loading default preferences
+		$this->config = @include __DIR__ . '/config.php';
+
+		$this->setMode($this->config['mode']);
+	}
+
+	/**
+	 * @return XoopsCaptcha
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * @param $name
+	 * @param $val
+	 * @return bool
+	 */
+	public function setConfig($name, $val)
+	{
+		if ('mode' === $name) {
+			$this->setMode($val);
+		} elseif (isset($this->$name)) {
+			$this->$name = $val;
+		} else {
+			$this->config[$name] = $val;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set CAPTCHA mode
+	 *
+	 * For future possible modes, right now force to use text or image
+	 *
+	 * @param string $mode if no mode is set, just verify current mode
+	 */
+	public function setMode($mode = null)
+	{
+		if (!empty($mode) && in_array($mode, ['text', 'image'])) {
+			$this->mode = $mode;
+
+			if ('image' !== $this->mode) {
+				return;
+			}
+		}
+
+		// Disable image mode
+		if (!extension_loaded('gd')) {
+			$this->mode = 'text';
+		} else {
+			$required_functions = [
+				'imagecreatetruecolor',
+				'imagecolorallocate',
+				'imagefilledrectangle',
+				'imagejpeg',
+				'imagedestroy',
+				'imageftbbox'
+			];
+			foreach ($required_functions as $func) {
+				if (!function_exists($func)) {
+					$this->mode = 'text';
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Initializing the CAPTCHA class
+	 * @param string $name
+	 * @param null   $skipmember
+	 * @param null   $num_chars
+	 * @param null   $fontsize_min
+	 * @param null   $fontsize_max
+	 * @param null   $background_type
+	 * @param null   $background_num
+	 */
+	public function init(
+		$name = 'xoopscaptcha',
+		$skipmember = null,
+		$num_chars = null,
+		$fontsize_min = null,
+		$fontsize_max = null,
+		$background_type = null,
+		$background_num = null
+	) {
+		// Loading RUN-TIME settings
+		foreach (array_keys($this->config) as $key) {
+			if (isset(${$key}) && null !== ${$key}) {
+				$this->config[$key] = ${$key};
+			}
+		}
+		$this->config['name'] = $name;
+
+		// Skip CAPTCHA for member if set
+		if ($this->config['skipmember'] && is_object($GLOBALS['xoopsUser'])) {
+			$this->active = false;
+		}
+	}
+
+	/**
+	 * Verify user submission
+	 * @param  null $skipMember
+	 * @return bool
+	 */
+	public function verify($skipMember = null)
+	{
+		$sessionName = @$_SESSION['XoopsCaptcha_name'];
+		$skipMember  = (null === $skipMember) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
+		$maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+
+		$is_valid = false;
+
+		// Skip CAPTCHA for member if set
+		if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
+			$is_valid = true;
+		// Kill too many attempts
+		} elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+			$this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+
+		// Verify the code
+		} elseif (!empty($_SESSION['XoopsCaptcha_sessioncode'])) {
+			$func     = $this->config['casesensitive'] ? 'strcmp' : 'strcasecmp';
+			$is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION['XoopsCaptcha_sessioncode']);
+		}
+
+		if (!empty($maxAttempts)) {
+			if (!$is_valid) {
+				// Increase the attempt records on failure
+				$_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+				// Log the error message
+				$this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
+			} else {
+
+				// reset attempt records on success
+				$_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
+			}
+		}
+		$this->destroyGarbage(true);
+
+		return $is_valid;
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function getCaption()
+	{
+		return defined('XOOPS_CAPTCHA_CAPTION') ? constant('XOOPS_CAPTCHA_CAPTION') : '';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return implode('<br>', $this->message);
+	}
+
+	/**
+	 * Destory historical stuff
+	 * @param  bool $clearSession
+	 * @return bool
+	 */
+	public function destroyGarbage($clearSession = false)
+	{
+		require_once __DIR__ . '/' . $this->mode . '.php';
+		$class          = 'XoopsCaptcha' . ucfirst($this->mode);
+		$captchaHandler = new $class();
+		if (method_exists($captchaHandler, 'destroyGarbage')) {
+			$captchaHandler->loadConfig($this->config);
+			$captchaHandler->destroyGarbage();
+		}
+
+		if ($clearSession) {
+			$_SESSION['XoopsCaptcha_name']        = null;
+			$_SESSION['XoopsCaptcha_skipmember']  = null;
+			$_SESSION['XoopsCaptcha_sessioncode'] = null;
+			$_SESSION['XoopsCaptcha_maxattempts'] = null;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return mixed|string
+	 */
+	public function render()
+	{
+		$form = '';
+
+		if (!$this->active || empty($this->config['name'])) {
+			return $form;
+		}
+
+		$_SESSION['XoopsCaptcha_name']        = $this->config['name'];
+		$_SESSION['XoopsCaptcha_skipmember']  = $this->config['skipmember'];
+		$maxAttempts                          = $this->config['maxattempt'];
+		$_SESSION['XoopsCaptcha_maxattempts'] = $maxAttempts;
+		/*
          if (!empty($maxAttempts)) {
          $_SESSION['XoopsCaptcha_maxattempts_'.$_SESSION['XoopsCaptcha_name']] = $maxAttempts;
          }
          */
 
-        // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
-            $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
-        // Load the form element
-        } else {
-            $form = $this->loadForm();
-        }
-
-        return $form;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function loadForm()
-    {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
-        $captchaHandler = new $class();
-        $captchaHandler->loadConfig($this->config);
-
-        $form = $captchaHandler->render();
-
-        return $form;
-    }
+		// Fail on too many attempts
+		if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+			$form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
+		// Load the form element
+		} else {
+			$form = $this->loadForm();
+		}
+
+		return $form;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function loadForm()
+	{
+		require_once __DIR__ . '/' . $this->mode . '.php';
+		$class          = 'XoopsCaptcha' . ucfirst($this->mode);
+		$captchaHandler = new $class();
+		$captchaHandler->loadConfig($this->config);
+
+		$form = $captchaHandler->render();
+
+		return $form;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 class XoopsCaptcha
 {
     public $active = true;
-    public $mode   = 'text';    // potential values: image, text
+    public $mode   = 'text'; // potential values: image, text
     public $config = [];
 
     public $message = []; // Logging error messages
@@ -25,7 +25,7 @@ 
     public function __construct()
     {
         // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
+        $this->config = @include __DIR__.'/config.php';
 
         $this->setMode($this->config['mode']);
     }
@@ -141,7 +141,7 @@ 
     {
         $sessionName = @$_SESSION['XoopsCaptcha_name'];
         $skipMember  = (null === $skipMember) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $maxAttempts = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
@@ -149,7 +149,7 @@ 
         if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
             $is_valid = true;
         // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
         // Verify the code
@@ -161,13 +161,13 @@ 
         if (!empty($maxAttempts)) {
             if (!$is_valid) {
                 // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
                 // Log the error message
                 $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
             } else {
 
                 // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
             }
         }
         $this->destroyGarbage(true);
@@ -198,8 +198,8 @@ 
      */
     public function destroyGarbage($clearSession = false)
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         if (method_exists($captchaHandler, 'destroyGarbage')) {
             $captchaHandler->loadConfig($this->config);
@@ -238,7 +238,7 @@ 
          */
 
         // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config['name']] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
         // Load the form element
         } else {
@@ -253,8 +253,8 @@ 
      */
     public function loadForm()
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         $captchaHandler->loadConfig($this->config);
 

include/captcha/formcaptcha.php

Indentation +52 added lines, -52 removed lines

@@ -38,60 +38,60 @@
  */
 class XoopsFormCaptcha extends \XoopsFormElement
 {
-    public $_captchaHandler;
+	public $_captchaHandler;
 
-    /**
-     * @param string  $caption        Caption of the form element, default value is defined in captcha/language/
-     * @param string  $name           Name for the input box
-     * @param boolean $skipmember     Skip CAPTCHA check for members
-     * @param int     $numchar        Number of characters in image mode, and input box size for text mode
-     * @param int     $minfontsize    Minimum font-size of characters in image mode
-     * @param int     $maxfontsize    Maximum font-size of characters in image mode
-     * @param int     $backgroundtype Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
-     * @param int     $backgroundnum  Number of background images in image mode
-     *
-     */
-    public function __construct(
-        $caption = '',
-        $name = 'xoopscaptcha',
-        $skipmember = null,
-        $numchar = null,
-        $minfontsize = null,
-        $maxfontsize = null,
-        $backgroundtype = null,
-        $backgroundnum = null
-    ) {
-        if (!class_exists('XoopsCaptcaha')) {
-            require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
-        }
+	/**
+	 * @param string  $caption        Caption of the form element, default value is defined in captcha/language/
+	 * @param string  $name           Name for the input box
+	 * @param boolean $skipmember     Skip CAPTCHA check for members
+	 * @param int     $numchar        Number of characters in image mode, and input box size for text mode
+	 * @param int     $minfontsize    Minimum font-size of characters in image mode
+	 * @param int     $maxfontsize    Maximum font-size of characters in image mode
+	 * @param int     $backgroundtype Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
+	 * @param int     $backgroundnum  Number of background images in image mode
+	 *
+	 */
+	public function __construct(
+		$caption = '',
+		$name = 'xoopscaptcha',
+		$skipmember = null,
+		$numchar = null,
+		$minfontsize = null,
+		$maxfontsize = null,
+		$backgroundtype = null,
+		$backgroundnum = null
+	) {
+		if (!class_exists('XoopsCaptcaha')) {
+			require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
+		}
 
-        $this->_captchaHandler = XoopsCaptcha::getInstance();
-        $this->_captchaHandler->init($name, $skipmember, $numchar, $minfontsize, $maxfontsize, $backgroundtype, $backgroundnum);
-        if (!$this->_captchaHandler->active) {
-            $this->setHidden();
-        } else {
-            $caption = !empty($caption) ? $caption : $this->_captchaHandler->getCaption();
-            $this->setCaption($caption);
-        }
-    }
+		$this->_captchaHandler = XoopsCaptcha::getInstance();
+		$this->_captchaHandler->init($name, $skipmember, $numchar, $minfontsize, $maxfontsize, $backgroundtype, $backgroundnum);
+		if (!$this->_captchaHandler->active) {
+			$this->setHidden();
+		} else {
+			$caption = !empty($caption) ? $caption : $this->_captchaHandler->getCaption();
+			$this->setCaption($caption);
+		}
+	}
 
-    /**
-     * @param $name
-     * @param $val
-     * @return bool
-     */
-    public function setConfig($name, $val)
-    {
-        return $this->_captchaHandler->setConfig($name, $val);
-    }
+	/**
+	 * @param $name
+	 * @param $val
+	 * @return bool
+	 */
+	public function setConfig($name, $val)
+	{
+		return $this->_captchaHandler->setConfig($name, $val);
+	}
 
-    /**
-     * @return mixed|string
-     */
-    public function render()
-    {
-        if (!$this->isHidden()) {
-            return $this->_captchaHandler->render();
-        }
-    }
+	/**
+	 * @return mixed|string
+	 */
+	public function render()
+	{
+		if (!$this->isHidden()) {
+			return $this->_captchaHandler->render();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
 
 /*
  * Usage
@@ -62,7 +62,7 @@ 
         $backgroundnum = null
     ) {
         if (!class_exists('XoopsCaptcaha')) {
-            require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
+            require_once SMARTOBJECT_ROOT_PATH.'/include/captcha/captcha.php';
         }
 
         $this->_captchaHandler = XoopsCaptcha::getInstance();

include/config.php

Indentation +54 added lines, -54 removed lines

@@ -19,62 +19,62 @@
 
 function getConfig()
 {
-    $moduleDirName      = basename(dirname(__DIR__));
-    $moduleDirNameUpper = strtoupper($moduleDirName);
-    return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
-        'paths'          => [
-            'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-        ],
-        'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
-            //XOOPS_UPLOAD_PATH . '/flags'
-        ],
-        'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
-            //XOOPS_UPLOAD_PATH . '/flags'
-        ],
+	$moduleDirName      = basename(dirname(__DIR__));
+	$moduleDirNameUpper = strtoupper($moduleDirName);
+	return (object)[
+		'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+		'paths'          => [
+			'dirname'    => $moduleDirName,
+			'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+			'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+			'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
+			'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+			'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+		],
+		'uploadFolders'  => [
+			constant($moduleDirNameUpper . '_UPLOAD_PATH'),
+			constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
+			constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
+			//XOOPS_UPLOAD_PATH . '/flags'
+		],
+		'copyBlankFiles' => [
+			constant($moduleDirNameUpper . '_UPLOAD_PATH'),
+			constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
+			constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
+			//XOOPS_UPLOAD_PATH . '/flags'
+		],
 
-        'copyTestFolders' => [
-            //        constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            //[
-            //    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
-            //    constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images',
-            //]
-        ],
+		'copyTestFolders' => [
+			//        constant($moduleDirNameUpper . '_UPLOAD_PATH'),
+			//[
+			//    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
+			//    constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images',
+			//]
+		],
 
-        'templateFolders' => [
-            '/templates/',
-            '/templates/blocks/',
-            '/templates/admin/'
+		'templateFolders' => [
+			'/templates/',
+			'/templates/blocks/',
+			'/templates/admin/'
 
-        ],
-        'oldFiles'        => [
-            '/class/request.php',
-            '/class/registry.php',
-            '/class/utilities.php',
-            '/class/util.php',
-            '/include/constants.php',
-            '/include/functions.php',
-            '/ajaxrating.txt',
-        ],
-        'oldFolders'      => [
-            '/images',
-            '/css',
-            '/js',
-            '/tcpdf',
-            '/images',
-        ],
-        'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+		],
+		'oldFiles'        => [
+			'/class/request.php',
+			'/class/registry.php',
+			'/class/utilities.php',
+			'/class/util.php',
+			'/include/constants.php',
+			'/include/functions.php',
+			'/ajaxrating.txt',
+		],
+		'oldFolders'      => [
+			'/images',
+			'/css',
+			'/js',
+			'/tcpdf',
+			'/images',
+		],
+		'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
-    ];
+	];
 }

Spacing +14 added lines, -14 removed lines

@@ -21,26 +21,26 @@ 
 {
     $moduleDirName      = basename(dirname(__DIR__));
     $moduleDirNameUpper = strtoupper($moduleDirName);
-    return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+    return (object) [
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/category',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/screenshots',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
         'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/category',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/screenshots',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
 
@@ -75,6 +75,6 @@ 
             '/images',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
     ];
 }

admin/update.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
  */
 
 use XoopsModules\Wfdownloads;
-use XoopsModules\Smartobject;
 
 require_once __DIR__ . '/admin_header.php';
 require_once SMARTCONTENT_ROOT_PATH . 'class/dbupdater.php';

Indentation +298 added lines, -298 removed lines

@@ -21,188 +21,188 @@ 
 // =========================================================================================
 function update_tables_to_300()
 {
-    $dbupdater = new Wfdownloads\Dbupdater();
+	$dbupdater = new Wfdownloads\Dbupdater();
 
-    if (!wfdownloads_TableExists('wfdownloads_meta')) {
-        // Create table wfdownloads_meta
-        $table = new Wfdownloads\DbupdaterTable('wfdownloads_meta');
-        $table->setStructure("CREATE TABLE `%s` (
+	if (!wfdownloads_TableExists('wfdownloads_meta')) {
+		// Create table wfdownloads_meta
+		$table = new Wfdownloads\DbupdaterTable('wfdownloads_meta');
+		$table->setStructure("CREATE TABLE `%s` (
                                 metakey varchar(50) NOT NULL default '',
                                 metavalue varchar(255) NOT NULL default '',
                                 PRIMARY KEY (metakey))
                                 ENGINE=MyISAM;");
 
-        $table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
-        if ($dbupdater->updateTable($table)) {
-            echo 'wfdownloads_meta table created<br>';
-        }
-    }
-
-    $download_fields = [
-        'lid'           => ['Type' => 'int(11) unsigned NOT NULL auto_increment', 'Default' => false],
-        'cid'           => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
-        'title'         => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'url'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'filename'      => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
-        'filetype'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'homepage'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'version'       => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
-        'size'          => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
-        'platform'      => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
-        'screenshot'    => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'submitter'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'publisher'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'status'        => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
-        'date'          => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'hits'          => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'rating'        => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
-        'votes'         => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'comments'      => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'license'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'mirror'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'price'         => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
-        'paypalemail'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'features'      => ['Type' => 'text NOT NULL', 'Default' => false],
-        'requirements'  => ['Type' => 'text NOT NULL', 'Default' => false],
-        'homepagetitle' => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'forumid'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'limitations'   => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
-        'dhistory'      => ['Type' => 'text NOT NULL', 'Default' => false],
-        'published'     => ['Type' => "int(11) NOT NULL default '1089662528'", 'Default' => true],
-        'expired'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'updated'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'offline'       => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
-        'description'   => ['Type' => 'text NOT NULL', 'Default' => false],
-        'ipaddress'     => ['Type' => "varchar(120) NOT NULL default '0'", 'Default' => true],
-        'notifypub'     => ['Type' => "int(1) NOT NULL default '0'", 'Default' => true],
-        'summary'       => ['Type' => 'text NOT NULL', 'Default' => false]
-    ];
-
-    $renamed_fields = [
-        'logourl' => 'screenshot'
-    ];
-
-    echo '<br><b>Checking Download table</b><br>';
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $downloadHandler = $helperWfdownloads->getHandler('Download');
-    $download_table  = new Wfdownloads\DbupdaterTable('wfdownloads_downloads');
-    $fields          = get_table_info($downloadHandler->table, $download_fields);
-    // Check for renamed fields
-    rename_fields($download_table, $renamed_fields, $fields, $download_fields);
-    update_table($download_fields, $fields, $download_table);
-    if ($dbupdater->updateTable($download_table)) {
-        echo 'Downloads table updated<br>';
-    }
-    unset($fields);
-
-    $mod_fields = [
-        'requestid'       => ['Type' => 'int(11) NOT NULL auto_increment', 'Default' => false],
-        'lid'             => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'cid'             => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
-        'title'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'url'             => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'filename'        => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
-        'filetype'        => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'homepage'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'version'         => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
-        'size'            => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
-        'platform'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
-        'screenshot'      => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'submitter'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'publisher'       => ['Type' => 'text NOT NULL', 'Default' => false],
-        'status'          => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
-        'date'            => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'hits'            => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'rating'          => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
-        'votes'           => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'comments'        => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'license'         => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'mirror'          => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'price'           => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
-        'paypalemail'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'features'        => ['Type' => 'text NOT NULL', 'Default' => false],
-        'requirements'    => ['Type' => 'text NOT NULL', 'Default' => false],
-        'homepagetitle'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'forumid'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'limitations'     => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
-        'dhistory'        => ['Type' => 'text NOT NULL', 'Default' => false],
-        'published'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'expired'         => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'updated'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'offline'         => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
-        'summary'         => ['Type' => 'text NOT NULL', 'Default' => false],
-        'description'     => ['Type' => 'text NOT NULL', 'Default' => false],
-        'modifysubmitter' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'requestdate'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
-    ];
-
-    $renamed_fields = [
-        'logourl' => 'screenshot'
-    ];
-
-    echo '<br><b>Checking Modified Downloads table</b><br>';
+		$table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
+		if ($dbupdater->updateTable($table)) {
+			echo 'wfdownloads_meta table created<br>';
+		}
+	}
+
+	$download_fields = [
+		'lid'           => ['Type' => 'int(11) unsigned NOT NULL auto_increment', 'Default' => false],
+		'cid'           => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
+		'title'         => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'url'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'filename'      => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
+		'filetype'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'homepage'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'version'       => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
+		'size'          => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
+		'platform'      => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
+		'screenshot'    => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'submitter'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'publisher'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'status'        => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
+		'date'          => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'hits'          => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'rating'        => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
+		'votes'         => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'comments'      => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'license'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'mirror'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'price'         => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
+		'paypalemail'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'features'      => ['Type' => 'text NOT NULL', 'Default' => false],
+		'requirements'  => ['Type' => 'text NOT NULL', 'Default' => false],
+		'homepagetitle' => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'forumid'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'limitations'   => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
+		'dhistory'      => ['Type' => 'text NOT NULL', 'Default' => false],
+		'published'     => ['Type' => "int(11) NOT NULL default '1089662528'", 'Default' => true],
+		'expired'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'updated'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'offline'       => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
+		'description'   => ['Type' => 'text NOT NULL', 'Default' => false],
+		'ipaddress'     => ['Type' => "varchar(120) NOT NULL default '0'", 'Default' => true],
+		'notifypub'     => ['Type' => "int(1) NOT NULL default '0'", 'Default' => true],
+		'summary'       => ['Type' => 'text NOT NULL', 'Default' => false]
+	];
+
+	$renamed_fields = [
+		'logourl' => 'screenshot'
+	];
+
+	echo '<br><b>Checking Download table</b><br>';
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$downloadHandler = $helperWfdownloads->getHandler('Download');
+	$download_table  = new Wfdownloads\DbupdaterTable('wfdownloads_downloads');
+	$fields          = get_table_info($downloadHandler->table, $download_fields);
+	// Check for renamed fields
+	rename_fields($download_table, $renamed_fields, $fields, $download_fields);
+	update_table($download_fields, $fields, $download_table);
+	if ($dbupdater->updateTable($download_table)) {
+		echo 'Downloads table updated<br>';
+	}
+	unset($fields);
+
+	$mod_fields = [
+		'requestid'       => ['Type' => 'int(11) NOT NULL auto_increment', 'Default' => false],
+		'lid'             => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'cid'             => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
+		'title'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'url'             => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'filename'        => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
+		'filetype'        => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'homepage'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'version'         => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
+		'size'            => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
+		'platform'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
+		'screenshot'      => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'submitter'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'publisher'       => ['Type' => 'text NOT NULL', 'Default' => false],
+		'status'          => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
+		'date'            => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'hits'            => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'rating'          => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
+		'votes'           => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'comments'        => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'license'         => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'mirror'          => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'price'           => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
+		'paypalemail'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'features'        => ['Type' => 'text NOT NULL', 'Default' => false],
+		'requirements'    => ['Type' => 'text NOT NULL', 'Default' => false],
+		'homepagetitle'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'forumid'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'limitations'     => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
+		'dhistory'        => ['Type' => 'text NOT NULL', 'Default' => false],
+		'published'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'expired'         => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'updated'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'offline'         => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
+		'summary'         => ['Type' => 'text NOT NULL', 'Default' => false],
+		'description'     => ['Type' => 'text NOT NULL', 'Default' => false],
+		'modifysubmitter' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'requestdate'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
+	];
+
+	$renamed_fields = [
+		'logourl' => 'screenshot'
+	];
+
+	echo '<br><b>Checking Modified Downloads table</b><br>';
 //    $moduleHandler = xoops_getModuleHandler('modification', 'wfdownloads');
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $moduleHandler = $helperWfdownloads->getHandler('Modification');
-    $mod_table     = new Wfdownloads\DbupdaterTable('wfdownloads_mod');
-    $fields        = get_table_info($moduleHandler->table, $mod_fields);
-    rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
-    update_table($mod_fields, $fields, $mod_table);
-    if ($dbupdater->updateTable($mod_table)) {
-        echo 'Modified Downloads table updated <br>';
-    }
-    unset($fields);
-
-    $cat_fields = [
-        'cid'          => ['Type' => 'int(5) unsigned NOT NULL auto_increment', 'Default' => false],
-        'pid'          => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
-        'title'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
-        'imgurl'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'description'  => ['Type' => 'text NULL', 'Default' => true],
-        'total'        => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'summary'      => ['Type' => 'text NOT NULL', 'Default' => false],
-        'spotlighttop' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'spotlighthis' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'dohtml'       => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'dosmiley'     => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'doxcode'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'doimage'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'dobr'         => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'weight'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
-    ];
-    echo '<br><b>Checking Category table</b><br>';
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$moduleHandler = $helperWfdownloads->getHandler('Modification');
+	$mod_table     = new Wfdownloads\DbupdaterTable('wfdownloads_mod');
+	$fields        = get_table_info($moduleHandler->table, $mod_fields);
+	rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
+	update_table($mod_fields, $fields, $mod_table);
+	if ($dbupdater->updateTable($mod_table)) {
+		echo 'Modified Downloads table updated <br>';
+	}
+	unset($fields);
+
+	$cat_fields = [
+		'cid'          => ['Type' => 'int(5) unsigned NOT NULL auto_increment', 'Default' => false],
+		'pid'          => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
+		'title'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
+		'imgurl'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'description'  => ['Type' => 'text NULL', 'Default' => true],
+		'total'        => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'summary'      => ['Type' => 'text NOT NULL', 'Default' => false],
+		'spotlighttop' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'spotlighthis' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'dohtml'       => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'dosmiley'     => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'doxcode'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'doimage'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'dobr'         => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'weight'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
+	];
+	echo '<br><b>Checking Category table</b><br>';
 //    $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $catHandler = $helperWfdownloads->getHandler('Report');
-
-    $cat_table  = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
-    $fields     = get_table_info($catHandler->table, $cat_fields);
-    update_table($cat_fields, $fields, $cat_table);
-    if ($dbupdater->updateTable($cat_table)) {
-        echo 'Category table updated<br>';
-    }
-    unset($fields);
-
-    $broken_fields = [
-        'reportid'     => ['Type' => 'int(5) NOT NULL auto_increment', 'Default' => false],
-        'lid'          => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'sender'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'ip'           => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
-        'date'         => ['Type' => "varchar(11) NOT NULL default '0'", 'Default' => true],
-        'confirmed'    => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true],
-        'acknowledged' => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true]
-    ];
-    echo '<br><b>Checking Broken Report table</b><br>';
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $brokenHandler = $helperWfdownloads->getHandler('Report');
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$catHandler = $helperWfdownloads->getHandler('Report');
+
+	$cat_table  = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
+	$fields     = get_table_info($catHandler->table, $cat_fields);
+	update_table($cat_fields, $fields, $cat_table);
+	if ($dbupdater->updateTable($cat_table)) {
+		echo 'Category table updated<br>';
+	}
+	unset($fields);
+
+	$broken_fields = [
+		'reportid'     => ['Type' => 'int(5) NOT NULL auto_increment', 'Default' => false],
+		'lid'          => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'sender'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'ip'           => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
+		'date'         => ['Type' => "varchar(11) NOT NULL default '0'", 'Default' => true],
+		'confirmed'    => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true],
+		'acknowledged' => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true]
+	];
+	echo '<br><b>Checking Broken Report table</b><br>';
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$brokenHandler = $helperWfdownloads->getHandler('Report');
 //    $brokenHandler = xoops_getModuleHandler('report', 'wfdownloads');
-    $broken_table  = new Wfdownloads\DbupdaterTable('wfdownloads_broken');
-    $fields        = get_table_info($brokenHandler->table, $broken_fields);
-    update_table($broken_fields, $fields, $broken_table);
-    if ($dbupdater->updateTable($broken_table)) {
-        echo 'Broken Reports table updated<br>';
-    }
-    unset($fields);
+	$broken_table  = new Wfdownloads\DbupdaterTable('wfdownloads_broken');
+	$fields        = get_table_info($brokenHandler->table, $broken_fields);
+	update_table($broken_fields, $fields, $broken_table);
+	if ($dbupdater->updateTable($broken_table)) {
+		echo 'Broken Reports table updated<br>';
+	}
+	unset($fields);
 }
 
 // =========================================================================================
@@ -215,49 +215,49 @@ 
  */
 function invert_nohtm_dohtml_values()
 {
-    $ret = [];
-    global $xoopsDB;
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $catHandler = $helperWfdownloads->getHandler('Category');
-    $result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
-    while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
-        $fields[$existing_field['field']] = $existing_field['type'];
-    }
-    if (in_array('nohtml', array_keys($fields))) {
-        $dbupdater = new Wfdownloads\Dbupdater();
-        //Invert column values
-        // alter options in wfdownloads_cat
-        $table = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
-        $table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
-
-        //inverting values no=1 <=> do=0
-        // have to store teporarly as value = 2 to
-        // avoid putting everithing to same value
-        // if you change 1 to 0, then 0 to one,
-        // every value will be 1, follow me?
-        $table->addUpdatedWhere('dohtml', 2, '=1');
-        $table->addUpdatedWhere('dohtml', 1, '=0');
-        $table->addUpdatedWhere('dohtml', 0, '=2');
-
-        $table->addUpdatedWhere('dosmiley', 2, '=1');
-        $table->addUpdatedWhere('dosmiley', 1, '=0');
-        $table->addUpdatedWhere('dosmiley', 0, '=2');
-
-        $table->addUpdatedWhere('doxcode', 2, '=1');
-        $table->addUpdatedWhere('doxcode', 1, '=0');
-        $table->addUpdatedWhere('doxcode', 0, '=2');
-
-        $table->addUpdatedWhere('doimage', 2, '=1');
-        $table->addUpdatedWhere('doimage', 1, '=0');
-        $table->addUpdatedWhere('doimage', 0, '=2');
-        $ret = $dbupdater->updateTable($table);
-    }
-
-    return $ret;
+	$ret = [];
+	global $xoopsDB;
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$catHandler = $helperWfdownloads->getHandler('Category');
+	$result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+	while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
+		$fields[$existing_field['field']] = $existing_field['type'];
+	}
+	if (in_array('nohtml', array_keys($fields))) {
+		$dbupdater = new Wfdownloads\Dbupdater();
+		//Invert column values
+		// alter options in wfdownloads_cat
+		$table = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
+		$table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
+
+		//inverting values no=1 <=> do=0
+		// have to store teporarly as value = 2 to
+		// avoid putting everithing to same value
+		// if you change 1 to 0, then 0 to one,
+		// every value will be 1, follow me?
+		$table->addUpdatedWhere('dohtml', 2, '=1');
+		$table->addUpdatedWhere('dohtml', 1, '=0');
+		$table->addUpdatedWhere('dohtml', 0, '=2');
+
+		$table->addUpdatedWhere('dosmiley', 2, '=1');
+		$table->addUpdatedWhere('dosmiley', 1, '=0');
+		$table->addUpdatedWhere('dosmiley', 0, '=2');
+
+		$table->addUpdatedWhere('doxcode', 2, '=1');
+		$table->addUpdatedWhere('doxcode', 1, '=0');
+		$table->addUpdatedWhere('doxcode', 0, '=2');
+
+		$table->addUpdatedWhere('doimage', 2, '=1');
+		$table->addUpdatedWhere('doimage', 1, '=0');
+		$table->addUpdatedWhere('doimage', 0, '=2');
+		$ret = $dbupdater->updateTable($table);
+	}
+
+	return $ret;
 }
 
 /**
@@ -270,22 +270,22 @@ 
  */
 function update_table($new_fields, $existing_fields, &$table)
 {
-    foreach ($new_fields as $field => $fieldinfo) {
-        $type = $fieldinfo['Type'];
-        if (!in_array($field, array_keys($existing_fields))) {
-            //Add field as it is missing
-            $table->addNewField($field, $type);
-        //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
-            //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
-        } elseif ($existing_fields[$field] != $type) {
-            $table->addAlteredField($field, $field . ' ' . $type);
-        // check $fields[$field]['type'] for things like "int(10) unsigned"
-            //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
-            //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
-        } else {
-            //echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br>";
-        }
-    }
+	foreach ($new_fields as $field => $fieldinfo) {
+		$type = $fieldinfo['Type'];
+		if (!in_array($field, array_keys($existing_fields))) {
+			//Add field as it is missing
+			$table->addNewField($field, $type);
+		//$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
+			//echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
+		} elseif ($existing_fields[$field] != $type) {
+			$table->addAlteredField($field, $field . ' ' . $type);
+		// check $fields[$field]['type'] for things like "int(10) unsigned"
+			//$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
+			//echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
+		} else {
+			//echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br>";
+		}
+	}
 }
 
 /**
@@ -298,22 +298,22 @@ 
  */
 function get_table_info($table, $default_fields)
 {
-    global $xoopsDB;
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
-    while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
-        $fields[$existing_field['Field']] = $existing_field['Type'];
-        if ('YES' !== $existing_field['Null']) {
-            $fields[$existing_field['Field']] .= ' NOT NULL';
-        }
-        if ($existing_field['Extra']) {
-            $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
-        }
-        if ($default_fields[$existing_field['Field']]['Default']) {
-            $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
-        }
-    }
-
-    return $fields;
+	global $xoopsDB;
+	$result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
+	while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
+		$fields[$existing_field['Field']] = $existing_field['Type'];
+		if ('YES' !== $existing_field['Null']) {
+			$fields[$existing_field['Field']] .= ' NOT NULL';
+		}
+		if ($existing_field['Extra']) {
+			$fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+		}
+		if ($default_fields[$existing_field['Field']]['Default']) {
+			$fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+		}
+	}
+
+	return $fields;
 }
 
 /**
@@ -327,60 +327,60 @@ 
  */
 function rename_fields(&$table, $renamed_fields, &$fields, $new_fields)
 {
-    foreach (array_keys($fields) as $field) {
-        if (in_array($field, array_keys($renamed_fields))) {
-            $new_field_name = $renamed_fields[$field];
-            $new_field_type = $new_fields[$new_field_name]['Type'];
-            $table->addAltered($field, $new_field_name . ' ' . $new_field_type);
-            //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
-            //echo $field." Renamed to ".$new_field_name."<br>";
-            $fields[$new_field_name] = $new_field_type;
-        }
-    }
-    //return $fields;
+	foreach (array_keys($fields) as $field) {
+		if (in_array($field, array_keys($renamed_fields))) {
+			$new_field_name = $renamed_fields[$field];
+			$new_field_type = $new_fields[$new_field_name]['Type'];
+			$table->addAltered($field, $new_field_name . ' ' . $new_field_type);
+			//$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
+			//echo $field." Renamed to ".$new_field_name."<br>";
+			$fields[$new_field_name] = $new_field_type;
+		}
+	}
+	//return $fields;
 }
 
 $op = \Xmf\Request::getInt('op', 0, 'REQUEST');
 switch ($op) {
-    case 1:
-        // Make sure that nohtml is properly changed to dohtml
-        invert_nohtm_dohtml_values();
-        // Ensure that the proper tables are present
-        update_tables_to_300();
-        // Import data from MyDownloads
-        import_mydownloads_to_wfdownloads();
-        break;
-
-    case 2:
-        // Update WF-Downloads
-        $log = invert_nohtm_dohtml_values();
-        update_tables_to_300();
-        break;
-
-    default:
-        //ask what to do
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        $form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
-
-        //Is MyDownloads installed?
-        /** @var XoopsModuleHandler $moduleHandler */
-        $moduleHandler     = xoops_getHandler('module');
-        $mydownloadsModule = $moduleHandler->getByDirname('mydownloads');
-        if (is_object($mydownloadsModule)) {
-            $mydownloadsButton = new \XoopsFormButton('Import data from MyDownloads', 'myd_button', 'Import', 'submit');
-            $mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"1\"'");
-            $form->addElement($mydownloadsButton);
-        }
-
-        if (!wfdownloads_TableExists('wfdownloads_meta')) {
-            $updateButton = new \XoopsFormButton('Update WF-Downloads', 'upd_button', 'Update', 'submit');
-            $updateButton->setExtra("onclick='document.forms.form.op.value=\"2\"'");
-            $form->addElement($updateButton);
-        }
-
-        $form->addElement(new \XoopsFormHidden('op', 0));
-        $form->display();
-        break;
+	case 1:
+		// Make sure that nohtml is properly changed to dohtml
+		invert_nohtm_dohtml_values();
+		// Ensure that the proper tables are present
+		update_tables_to_300();
+		// Import data from MyDownloads
+		import_mydownloads_to_wfdownloads();
+		break;
+
+	case 2:
+		// Update WF-Downloads
+		$log = invert_nohtm_dohtml_values();
+		update_tables_to_300();
+		break;
+
+	default:
+		//ask what to do
+		include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+		$form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
+
+		//Is MyDownloads installed?
+		/** @var XoopsModuleHandler $moduleHandler */
+		$moduleHandler     = xoops_getHandler('module');
+		$mydownloadsModule = $moduleHandler->getByDirname('mydownloads');
+		if (is_object($mydownloadsModule)) {
+			$mydownloadsButton = new \XoopsFormButton('Import data from MyDownloads', 'myd_button', 'Import', 'submit');
+			$mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"1\"'");
+			$form->addElement($mydownloadsButton);
+		}
+
+		if (!wfdownloads_TableExists('wfdownloads_meta')) {
+			$updateButton = new \XoopsFormButton('Update WF-Downloads', 'upd_button', 'Update', 'submit');
+			$updateButton->setExtra("onclick='document.forms.form.op.value=\"2\"'");
+			$form->addElement($updateButton);
+		}
+
+		$form->addElement(new \XoopsFormHidden('op', 0));
+		$form->display();
+		break;
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();

Spacing +10 added lines, -10 removed lines

@@ -10,8 +10,8 @@ 
 use XoopsModules\Wfdownloads;
 use XoopsModules\Smartobject;
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTCONTENT_ROOT_PATH . 'class/dbupdater.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTCONTENT_ROOT_PATH.'class/dbupdater.php';
 
 smartcontent_xoops_cp_header();
 
@@ -219,7 +219,7 @@ 
     global $xoopsDB;
     $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
     $catHandler = $helperWfdownloads->getHandler('Category');
-    $result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+    $result     = $xoopsDB->query('SHOW COLUMNS FROM '.$catHandler->table);
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
         $fields[$existing_field['field']] = $existing_field['type'];
     }
@@ -278,7 +278,7 @@ 
         //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
             //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
         } elseif ($existing_fields[$field] != $type) {
-            $table->addAlteredField($field, $field . ' ' . $type);
+            $table->addAlteredField($field, $field.' '.$type);
         // check $fields[$field]['type'] for things like "int(10) unsigned"
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
             //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
@@ -299,17 +299,17 @@ 
 function get_table_info($table, $default_fields)
 {
     global $xoopsDB;
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
+    $result = $xoopsDB->query('SHOW COLUMNS FROM '.$table);
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
         $fields[$existing_field['Field']] = $existing_field['Type'];
         if ('YES' !== $existing_field['Null']) {
             $fields[$existing_field['Field']] .= ' NOT NULL';
         }
         if ($existing_field['Extra']) {
-            $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+            $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
         }
         if ($default_fields[$existing_field['Field']]['Default']) {
-            $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+            $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
         }
     }
 
@@ -331,7 +331,7 @@ 
         if (in_array($field, array_keys($renamed_fields))) {
             $new_field_name = $renamed_fields[$field];
             $new_field_type = $new_fields[$new_field_name]['Type'];
-            $table->addAltered($field, $new_field_name . ' ' . $new_field_type);
+            $table->addAltered($field, $new_field_name.' '.$new_field_type);
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
             //echo $field." Renamed to ".$new_field_name."<br>";
             $fields[$new_field_name] = $new_field_type;
@@ -359,7 +359,7 @@ 
 
     default:
         //ask what to do
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
 
         //Is MyDownloads installed?
@@ -384,4 +384,4 @@ 
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

class/DbTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
     }
 
     /**
-     * @param $field
+     * @param string $field
      * @return bool
      */
     public function fieldExists($field)

Indentation +499 added lines, -500 removed lines

@@ -25,7 +25,6 @@ 
  * Contains the classes for updating database tables
  *
  * @license GNU
-
  */
 /**
  * SmartDbTable class
@@ -38,7 +37,7 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
@@ -46,7 +45,7 @@ 
 global $xoopsConfig;
 $common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+	$common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
 }
 include $common_file;
 
@@ -55,501 +54,501 @@ 
  */
 class DbTable
 {
-    /**
-     * @var string $_name name of the table
-     */
-    public $_name;
-    /**
-     * @var string $_structure structure of the table
-     */
-    public $_structure;
-
-    /**
-     * @var array $_data containing valued of each records to be added
-     */
-    public $_data;
-
-    /**
-     * @var array $_alteredFields containing fields to be altered
-     */
-    public $_alteredFields;
-
-    /**
-     * @var array $_newFields containing new fields to be added
-     */
-    public $_newFields;
-
-    /**
-     * @var array $_droppedFields containing fields to be dropped
-     */
-    public $_droppedFields;
-
-    /**
-     * @var array $_flagForDrop flag table to drop it
-     */
-    public $_flagForDrop = false;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */
-    public $_updatedFields;
-
-    /**
-     * @var array $_updatedFields containing fields which values will be updated
-     */ //felix
-    public $_updatedWhere;
-
-    public $_existingFieldsArray = false;
-
-    /**
-     * Constructor
-     *
-     * @param string $name name of the table
-     *
-     */
-    public function __construct($name)
-    {
-        $this->_name = $name;
-        $this->_data = [];
-    }
-
-    /**
-     * Return the table name, prefixed with site table prefix
-     *
-     * @return string table name
-     *
-     */
-    public function name()
-    {
-        global $xoopsDB;
-
-        return $xoopsDB->prefix($this->_name);
-    }
-
-    /**
-     * Checks if the table already exists in the database
-     *
-     * @return bool TRUE if it exists, FALSE if not
-     *
-     */
-    public function exists()
-    {
-        return Smartobject\Utility::isTable($this->_name);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExistingFieldsArray()
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
-        while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
-            $fields[$existing_field['Field']] = $existing_field['Type'];
-            if ('YES' !== $existing_field['Null']) {
-                $fields[$existing_field['Field']] .= ' NOT NULL';
-            }
-            if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
-            }
-            if (!(null === $existing_field['Default'])
-                && ($existing_field['Default']
-                    || '' === $existing_field['Default']
-                    || 0 == $existing_field['Default'])) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * @param $field
-     * @return bool
-     */
-    public function fieldExists($field)
-    {
-        $existingFields = $this->getExistingFieldsArray();
-
-        return isset($existingFields[$field]);
-    }
-
-    /**
-     * Set the table structure
-     *
-     * Example:
-     *
-     *      $table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
-     *                `date` int(11) NOT NULL default '0',
-     *                `status` int(1) NOT NULL default '-1',
-     *                `itemid` int(11) NOT NULL default '0',
-     *                `uid` int(11) NOT NULL default '0',
-     *                `price` float NOT NULL default '0',
-     *                `currency` varchar(100) NOT NULL default '',
-     *                PRIMARY KEY  (`transactionid`)");
-     *
-     * @param string $structure table structure
-     *
-     */
-    public function setStructure($structure)
-    {
-        $this->_structure = $structure;
-    }
-
-    /**
-     * Return the table structure
-     *
-     * @return string table structure
-     *
-     */
-    public function getStructure()
-    {
-        return sprintf($this->_structure, $this->name());
-    }
-
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $data values of a record
-     *
-     */
-    public function setData($data)
-    {
-        $this->_data[] = $data;
-    }
-
-    /**
-     * Get the data array
-     *
-     * @return array containing the records values to be added
-     *
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Use to insert data in a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function addData()
-    {
-        global $xoopsDB;
-        foreach ($this->getData() as $data) {
-            $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
-            $ret   = $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Add a field to be added
-     *
-     * @param string $name       name of the field
-     * @param string $properties properties of the field
-     * @param bool   $newname
-     * @param bool   $showerror
-     */
-    public function addAlteredField($name, $properties, $newname = false, $showerror = true)
-    {
-        $field['name']          = $name;
-        $field['properties']    = $properties;
-        $field['showerror']     = $showerror;
-        $field['newname']       = $newname;
-        $this->_alteredFields[] = $field;
-    }
-    /**
-     * Invert values 0 to 1 and 1 to 0
-     *
-     * @param string $name name of the field
-     * @param        $newValue
-     * @param        $oldValue
-     * @internal param string $old old propertie
-     * @internal param string $new new propertie
-     */ //felix
-    public function addUpdatedWhere($name, $newValue, $oldValue)
-    {
-        $field['name']         = $name;
-        $field['value']        = $newValue;
-        $field['where']        = $oldValue;
-        $this->_updatedWhere[] = $field;
-    }
-
-    /**
-     * Add new field of a record to be added
-     *
-     * @param string $name       name of the field
-     * @param string $properties properties of the field
-     *
-     */
-    public function addNewField($name, $properties)
-    {
-        $field['name']       = $name;
-        $field['properties'] = $properties;
-        $this->_newFields[]  = $field;
-    }
-
-    /**
-     * Get fields that need to be altered
-     *
-     * @return array fields that need to be altered
-     *
-     */
-    public function getAlteredFields()
-    {
-        return $this->_alteredFields;
-    }
-
-    /**
-     * Add field for which the value will be updated
-     *
-     * @param string $name  name of the field
-     * @param string $value value to be set
-     *
-     */
-    public function addUpdatedField($name, $value)
-    {
-        $field['name']          = $name;
-        $field['value']         = $value;
-        $this->_updatedFields[] = $field;
-    }
-
-    /**
-     * Get new fields to be added
-     *
-     * @return array fields to be added
-     *
-     */
-    public function getNewFields()
-    {
-        return $this->_newFields;
-    }
-
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */
-    public function getUpdatedFields()
-    {
-        return $this->_updatedFields;
-    }
-    /**
-     * Get fields which values need to be updated
-     *
-     * @return array fields which values need to be updated
-     *
-     */ //felix
-    public function getUpdatedWhere()
-    {
-        return $this->_updatedWhere;
-    }
-
-    /**
-     * Add values of a record to be added
-     *
-     * @param string $name name of the field
-     *
-     */
-    public function addDroppedField($name)
-    {
-        $this->_droppedFields[] = $name;
-    }
-
-    /**
-     * Get fields that need to be dropped
-     *
-     * @return array fields that need to be dropped
-     *
-     */
-    public function getDroppedFields()
-    {
-        return $this->_droppedFields;
-    }
-
-    /**
-     * Set the flag to drop the table
-     *
-     */
-    public function setFlagForDrop()
-    {
-        $this->_flagForDrop = true;
-    }
-
-    /**
-     * Use to create a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function createTable()
-    {
-        global $xoopsDB;
-        $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
-        //xoops_debug($query);
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to drop a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function dropTable()
-    {
-        global $xoopsDB;
-        $query = sprintf('DROP TABLE %s', $this->name());
-        $ret   = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-
-            return false;
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to alter a table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function alterTable()
-    {
-        global $xoopsDB;
-        $ret = true;
-
-        foreach ($this->getAlteredFields() as $alteredField) {
-            if (!$alteredField['newname']) {
-                $alteredField['newname'] = $alteredField['name'];
-            }
-
-            $query = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s', $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
-            $ret   = $ret && $xoopsDB->query($query);
-            if ($alteredField['showerror']) {
-                if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-                } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to add new fileds in the table
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function addNewFields()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getNewFields() as $newField) {
-            $query = sprintf('ALTER TABLE `%s` ADD `%s` %s', $this->name(), $newField['name'], $newField['properties']);
-            //echo $query;
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function updateFieldsValues()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedFields() as $updatedField) {
-            $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
-            $ret   = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-    /**
-     * Use to update fields values
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */ //felix
-    public function updateWhereValues()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getUpdatedWhere() as $updatedWhere) {
-            $query = sprintf('UPDATE %s SET %s = %s WHERE %s  %s', $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
-            //echo $query."<br>";
-            $ret = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Use to drop fields
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function dropFields()
-    {
-        global $xoopsDB;
-        $ret = true;
-        foreach ($this->getDroppedFields() as $droppedField) {
-            $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
-            $ret   = $ret && $xoopsDB->query($query);
-            if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
-            } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
-            }
-        }
-
-        return $ret;
-    }
+	/**
+	 * @var string $_name name of the table
+	 */
+	public $_name;
+	/**
+	 * @var string $_structure structure of the table
+	 */
+	public $_structure;
+
+	/**
+	 * @var array $_data containing valued of each records to be added
+	 */
+	public $_data;
+
+	/**
+	 * @var array $_alteredFields containing fields to be altered
+	 */
+	public $_alteredFields;
+
+	/**
+	 * @var array $_newFields containing new fields to be added
+	 */
+	public $_newFields;
+
+	/**
+	 * @var array $_droppedFields containing fields to be dropped
+	 */
+	public $_droppedFields;
+
+	/**
+	 * @var array $_flagForDrop flag table to drop it
+	 */
+	public $_flagForDrop = false;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */
+	public $_updatedFields;
+
+	/**
+	 * @var array $_updatedFields containing fields which values will be updated
+	 */ //felix
+	public $_updatedWhere;
+
+	public $_existingFieldsArray = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $name name of the table
+	 *
+	 */
+	public function __construct($name)
+	{
+		$this->_name = $name;
+		$this->_data = [];
+	}
+
+	/**
+	 * Return the table name, prefixed with site table prefix
+	 *
+	 * @return string table name
+	 *
+	 */
+	public function name()
+	{
+		global $xoopsDB;
+
+		return $xoopsDB->prefix($this->_name);
+	}
+
+	/**
+	 * Checks if the table already exists in the database
+	 *
+	 * @return bool TRUE if it exists, FALSE if not
+	 *
+	 */
+	public function exists()
+	{
+		return Smartobject\Utility::isTable($this->_name);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getExistingFieldsArray()
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+		while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
+			$fields[$existing_field['Field']] = $existing_field['Type'];
+			if ('YES' !== $existing_field['Null']) {
+				$fields[$existing_field['Field']] .= ' NOT NULL';
+			}
+			if ($existing_field['Extra']) {
+				$fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+			}
+			if (!(null === $existing_field['Default'])
+				&& ($existing_field['Default']
+					|| '' === $existing_field['Default']
+					|| 0 == $existing_field['Default'])) {
+				$fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * @param $field
+	 * @return bool
+	 */
+	public function fieldExists($field)
+	{
+		$existingFields = $this->getExistingFieldsArray();
+
+		return isset($existingFields[$field]);
+	}
+
+	/**
+	 * Set the table structure
+	 *
+	 * Example:
+	 *
+	 *      $table->setStructure("`transactionid` int(11) NOT NULL auto_increment,
+	 *                `date` int(11) NOT NULL default '0',
+	 *                `status` int(1) NOT NULL default '-1',
+	 *                `itemid` int(11) NOT NULL default '0',
+	 *                `uid` int(11) NOT NULL default '0',
+	 *                `price` float NOT NULL default '0',
+	 *                `currency` varchar(100) NOT NULL default '',
+	 *                PRIMARY KEY  (`transactionid`)");
+	 *
+	 * @param string $structure table structure
+	 *
+	 */
+	public function setStructure($structure)
+	{
+		$this->_structure = $structure;
+	}
+
+	/**
+	 * Return the table structure
+	 *
+	 * @return string table structure
+	 *
+	 */
+	public function getStructure()
+	{
+		return sprintf($this->_structure, $this->name());
+	}
+
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $data values of a record
+	 *
+	 */
+	public function setData($data)
+	{
+		$this->_data[] = $data;
+	}
+
+	/**
+	 * Get the data array
+	 *
+	 * @return array containing the records values to be added
+	 *
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * Use to insert data in a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function addData()
+	{
+		global $xoopsDB;
+		foreach ($this->getData() as $data) {
+			$query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
+			$ret   = $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Add a field to be added
+	 *
+	 * @param string $name       name of the field
+	 * @param string $properties properties of the field
+	 * @param bool   $newname
+	 * @param bool   $showerror
+	 */
+	public function addAlteredField($name, $properties, $newname = false, $showerror = true)
+	{
+		$field['name']          = $name;
+		$field['properties']    = $properties;
+		$field['showerror']     = $showerror;
+		$field['newname']       = $newname;
+		$this->_alteredFields[] = $field;
+	}
+	/**
+	 * Invert values 0 to 1 and 1 to 0
+	 *
+	 * @param string $name name of the field
+	 * @param        $newValue
+	 * @param        $oldValue
+	 * @internal param string $old old propertie
+	 * @internal param string $new new propertie
+	 */ //felix
+	public function addUpdatedWhere($name, $newValue, $oldValue)
+	{
+		$field['name']         = $name;
+		$field['value']        = $newValue;
+		$field['where']        = $oldValue;
+		$this->_updatedWhere[] = $field;
+	}
+
+	/**
+	 * Add new field of a record to be added
+	 *
+	 * @param string $name       name of the field
+	 * @param string $properties properties of the field
+	 *
+	 */
+	public function addNewField($name, $properties)
+	{
+		$field['name']       = $name;
+		$field['properties'] = $properties;
+		$this->_newFields[]  = $field;
+	}
+
+	/**
+	 * Get fields that need to be altered
+	 *
+	 * @return array fields that need to be altered
+	 *
+	 */
+	public function getAlteredFields()
+	{
+		return $this->_alteredFields;
+	}
+
+	/**
+	 * Add field for which the value will be updated
+	 *
+	 * @param string $name  name of the field
+	 * @param string $value value to be set
+	 *
+	 */
+	public function addUpdatedField($name, $value)
+	{
+		$field['name']          = $name;
+		$field['value']         = $value;
+		$this->_updatedFields[] = $field;
+	}
+
+	/**
+	 * Get new fields to be added
+	 *
+	 * @return array fields to be added
+	 *
+	 */
+	public function getNewFields()
+	{
+		return $this->_newFields;
+	}
+
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */
+	public function getUpdatedFields()
+	{
+		return $this->_updatedFields;
+	}
+	/**
+	 * Get fields which values need to be updated
+	 *
+	 * @return array fields which values need to be updated
+	 *
+	 */ //felix
+	public function getUpdatedWhere()
+	{
+		return $this->_updatedWhere;
+	}
+
+	/**
+	 * Add values of a record to be added
+	 *
+	 * @param string $name name of the field
+	 *
+	 */
+	public function addDroppedField($name)
+	{
+		$this->_droppedFields[] = $name;
+	}
+
+	/**
+	 * Get fields that need to be dropped
+	 *
+	 * @return array fields that need to be dropped
+	 *
+	 */
+	public function getDroppedFields()
+	{
+		return $this->_droppedFields;
+	}
+
+	/**
+	 * Set the flag to drop the table
+	 *
+	 */
+	public function setFlagForDrop()
+	{
+		$this->_flagForDrop = true;
+	}
+
+	/**
+	 * Use to create a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function createTable()
+	{
+		global $xoopsDB;
+		$query = $this->getStructure();
+		$query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+		//xoops_debug($query);
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to drop a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function dropTable()
+	{
+		global $xoopsDB;
+		$query = sprintf('DROP TABLE %s', $this->name());
+		$ret   = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+
+			return false;
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to alter a table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function alterTable()
+	{
+		global $xoopsDB;
+		$ret = true;
+
+		foreach ($this->getAlteredFields() as $alteredField) {
+			if (!$alteredField['newname']) {
+				$alteredField['newname'] = $alteredField['name'];
+			}
+
+			$query = sprintf('ALTER TABLE `%s` CHANGE `%s` `%s` %s', $this->name(), $alteredField['name'], $alteredField['newname'], $alteredField['properties']);
+			$ret   = $ret && $xoopsDB->query($query);
+			if ($alteredField['showerror']) {
+				if (!$ret) {
+					echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+				} else {
+					echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to add new fileds in the table
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function addNewFields()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getNewFields() as $newField) {
+			$query = sprintf('ALTER TABLE `%s` ADD `%s` %s', $this->name(), $newField['name'], $newField['properties']);
+			//echo $query;
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function updateFieldsValues()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedFields() as $updatedField) {
+			$query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
+			$ret   = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+	/**
+	 * Use to update fields values
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */ //felix
+	public function updateWhereValues()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getUpdatedWhere() as $updatedWhere) {
+			$query = sprintf('UPDATE %s SET %s = %s WHERE %s  %s', $this->name(), $updatedWhere['name'], $updatedWhere['value'], $updatedWhere['name'], $updatedWhere['where']);
+			//echo $query."<br>";
+			$ret = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Use to drop fields
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function dropFields()
+	{
+		global $xoopsDB;
+		$ret = true;
+		foreach ($this->getDroppedFields() as $droppedField) {
+			$query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
+			$ret   = $ret && $xoopsDB->query($query);
+			if (!$ret) {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+			} else {
+				echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+			}
+		}
+
+		return $ret;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -38,15 +38,15 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+    $common_file = SMARTOBJECT_ROOT_PATH.'language/english/smartdbupdater.php';
 }
 include $common_file;
 
@@ -143,20 +143,20 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->query('SHOW COLUMNS FROM '.$this->name());
         while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ('YES' !== $existing_field['Null']) {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
             if (!(null === $existing_field['Default'])
                 && ($existing_field['Default']
                     || '' === $existing_field['Default']
                     || 0 == $existing_field['Default'])) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+                $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
             }
         }
 
@@ -242,9 +242,9 @@ 
             $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
             $ret   = $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -396,13 +396,13 @@ 
     {
         global $xoopsDB;
         $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+        $query = 'CREATE TABLE `'.$this->name().'` ('.$query.") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
         //xoops_debug($query);
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -420,11 +420,11 @@ 
         $query = sprintf('DROP TABLE %s', $this->name());
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -450,9 +450,9 @@ 
             $ret   = $ret && $xoopsDB->query($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).' ('.$xoopsDB->error().')<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -475,9 +475,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -498,9 +498,9 @@ 
             $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -521,9 +521,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -544,9 +544,9 @@ 
             $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }