XoopsModules25x / myiframe

class/MyiframeBaseHandler.php

Indentation +212 added lines, -212 removed lines

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

class/Constants.php

Indentation +21 added lines, -21 removed lines

@@ -27,28 +27,28 @@
  */
 final class Constants
 {
-    /**#@+
+	/**#@+
      * Constant definition
      */
 
-    public const DISALLOW = 0;
-
-    /**
-     * no delay XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_NONE = 0;
-    /**
-     * short XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_SHORT = 1;
-    /**
-     * medium XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_MEDIUM = 3;
-    /**
-     * long XOOPS redirect delay (in seconds)
-     */
-    public const REDIRECT_DELAY_LONG = 7;
-
-    /**#@-*/
+	public const DISALLOW = 0;
+
+	/**
+	 * no delay XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_NONE = 0;
+	/**
+	 * short XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_SHORT = 1;
+	/**
+	 * medium XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_MEDIUM = 3;
+	/**
+	 * long XOOPS redirect delay (in seconds)
+	 */
+	public const REDIRECT_DELAY_LONG = 7;
+
+	/**#@-*/
 }

class/Common/FilesManagement.php

Indentation +222 added lines, -222 removed lines

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

class/Common/TestdataButtons.php

Indentation +61 added lines, -61 removed lines

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

class/Helper.php

Indentation +51 added lines, -51 removed lines

@@ -23,62 +23,62 @@
  */
 class Helper extends \Xmf\Module\Helper
 {
-    public $debug;
+	public $debug;
 
-    /**
-     * @param bool $debug
-     */
-    public function __construct($debug = false)
-    {
-        $this->debug   = $debug;
-        $moduleDirName = \basename(\dirname(__DIR__));
-        parent::__construct($moduleDirName);
-    }
+	/**
+	 * @param bool $debug
+	 */
+	public function __construct($debug = false)
+	{
+		$this->debug   = $debug;
+		$moduleDirName = \basename(\dirname(__DIR__));
+		parent::__construct($moduleDirName);
+	}
 
-    /**
-     * @param bool $debug
-     *
-     * @return \XoopsModules\Myiframe\Helper
-     */
-    public static function getInstance(bool $debug = false): self
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	/**
+	 * @param bool $debug
+	 *
+	 * @return \XoopsModules\Myiframe\Helper
+	 */
+	public static function getInstance(bool $debug = false): self
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($debug);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @return string
-     */
-    public function getDirname()
-    {
-        return $this->dirname;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDirname()
+	{
+		return $this->dirname;
+	}
 
-    /**
-     * Get an Object Handler
-     *
-     * @param string $name name of handler to load
-     *
-     * @return bool|\XoopsObjectHandler|\XoopsPersistableObjectHandler
-     */
-    public function getHandler($name)
-    {
-        $ret = false;
+	/**
+	 * Get an Object Handler
+	 *
+	 * @param string $name name of handler to load
+	 *
+	 * @return bool|\XoopsObjectHandler|\XoopsPersistableObjectHandler
+	 */
+	public function getHandler($name)
+	{
+		$ret = false;
 
-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
-        if (!\class_exists($class)) {
-            throw new \RuntimeException("Class '$class' not found");
-        }
-        /** @var \XoopsMySQLDatabase $db */
-        $db     = \XoopsDatabaseFactory::getDatabaseConnection();
-        $helper = self::getInstance();
-        $ret    = new $class($db, $helper);
-        $this->addLog("Getting handler '{$name}'");
+		$class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
+		if (!\class_exists($class)) {
+			throw new \RuntimeException("Class '$class' not found");
+		}
+		/** @var \XoopsMySQLDatabase $db */
+		$db     = \XoopsDatabaseFactory::getDatabaseConnection();
+		$helper = self::getInstance();
+		$ret    = new $class($db, $helper);
+		$this->addLog("Getting handler '{$name}'");
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

xoops_version.php

Indentation +81 added lines, -81 removed lines

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