XoopsModules25x / myiframe

blocks/myiframe_iframe.php

Indentation +50 added lines, -50 removed lines

@@ -14,36 +14,36 @@ 
  */
 function b_myiframe_iframe_show($options)
 {
-    $block         = [];
-    $tblalign      = [
-        'top',
-        'middle',
-        'bottom',
-        'left',
-        'rigth',
-    ];
-    $tblscrolling  = [
-        'yes',
-        'no',
-        'auto',
-    ];
-    $iframeHandler = $helper->getHandler('MyiframeBase');
-    $frame         = null;
-    $frame         = $iframeHandler->get($options[0]);
+	$block         = [];
+	$tblalign      = [
+		'top',
+		'middle',
+		'bottom',
+		'left',
+		'rigth',
+	];
+	$tblscrolling  = [
+		'yes',
+		'no',
+		'auto',
+	];
+	$iframeHandler = $helper->getHandler('MyiframeBase');
+	$frame         = null;
+	$frame         = $iframeHandler->get($options[0]);
 
-    if (is_object($frame)) {
-        $block['longdesc']     = $frame->getVar('frame_description');
-        $block['width']        = $frame->getVar('frame_width');
-        $block['height']       = $frame->getVar('frame_height');
-        $block['align']        = $tblalign[$frame->getVar('frame_align') - 1];
-        $block['frameborder']  = $frame->getVar('frame_frameborder');
-        $block['marginwidth']  = $frame->getVar('frame_marginwidth');
-        $block['marginheight'] = $frame->getVar('frame_marginheight');
-        $block['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling') - 1];
-        $block['url']          = $frame->getVar('frame_url');
-    }
+	if (is_object($frame)) {
+		$block['longdesc']     = $frame->getVar('frame_description');
+		$block['width']        = $frame->getVar('frame_width');
+		$block['height']       = $frame->getVar('frame_height');
+		$block['align']        = $tblalign[$frame->getVar('frame_align') - 1];
+		$block['frameborder']  = $frame->getVar('frame_frameborder');
+		$block['marginwidth']  = $frame->getVar('frame_marginwidth');
+		$block['marginheight'] = $frame->getVar('frame_marginheight');
+		$block['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling') - 1];
+		$block['url']          = $frame->getVar('frame_url');
+	}
 
-    return $block;
+	return $block;
 }
 
 /**
@@ -52,25 +52,25 @@ 
  */
 function b_myiframe_iframe_edit($options)
 {
-    /** @var \MyiframeBaseHandler $iframeHandler */
-    $iframeHandler = $helper->getHandler('MyiframeBase');
-    $frarray       = [];
-    $critere       = new \Criteria('1', '1', '=');
-    $critere->setSort('frame_description');
-    $frarray = $iframeHandler->getObjects($critere);
+	/** @var \MyiframeBaseHandler $iframeHandler */
+	$iframeHandler = $helper->getHandler('MyiframeBase');
+	$frarray       = [];
+	$critere       = new \Criteria('1', '1', '=');
+	$critere->setSort('frame_description');
+	$frarray = $iframeHandler->getObjects($critere);
 
-    $form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
-    /** @var Myiframe $oneframe */
-    foreach ($frarray as $oneframe) {
-        $form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
-        if ($options[0] == $oneframe->getVar('frame_frameid')) {
-            $form .= " selected='selected'";
-        }
-        $form .= '>' . $oneframe->getVar('frame_description') . '</option>';
-    }
-    $form .= "</select>\n";
+	$form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
+	/** @var Myiframe $oneframe */
+	foreach ($frarray as $oneframe) {
+		$form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
+		if ($options[0] == $oneframe->getVar('frame_frameid')) {
+			$form .= " selected='selected'";
+		}
+		$form .= '>' . $oneframe->getVar('frame_description') . '</option>';
+	}
+	$form .= "</select>\n";
 
-    return $form;
+	return $form;
 }
 
 /**
@@ -78,10 +78,10 @@ 
  */
 function b_myiframe_iframe_onthefly($options): void
 {
-    $options = explode('|', $options);
-    $block   = b_myiframe_iframe_show($options);
+	$options = explode('|', $options);
+	$block   = b_myiframe_iframe_show($options);
 
-    $tpl = new \XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:myiframe_block_show.tpl');
+	$tpl = new \XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:myiframe_block_show.tpl');
 }

index.php

Indentation +64 added lines, -64 removed lines

@@ -16,81 +16,81 @@
 
 $suplparam = '';
 if (isset($_GET)) {
-    foreach ($_GET as $k => $v) {
-        if ('IFRAMEID' !== \mb_strtoupper(trim($k))) {
-            $suplparam .= $k . '=' . $v . '&';
-        }
-    }
+	foreach ($_GET as $k => $v) {
+		if ('IFRAMEID' !== \mb_strtoupper(trim($k))) {
+			$suplparam .= $k . '=' . $v . '&';
+		}
+	}
 }
 
 if (mb_strlen(xoops_trim($suplparam)) > 0) {
-    $suplparam = mb_substr($suplparam, 0, -1);
+	$suplparam = mb_substr($suplparam, 0, -1);
 }
 
 /** @var \MyiframeBaseHandler $iframeHandler */
 $iframeHandler = $helper->getHandler('MyiframeBase');
 
 if (Request::hasVar('iframeid', 'GET')) {
-    $tblalign     = [
-        'top',
-        'middle',
-        'bottom',
-        'left',
-        'rigth',
-    ];
-    $tblscrolling = [
-        'yes',
-        'no',
-        'auto',
-    ];
-    $frameid      = Request::getInt('iframeid', 0, 'GET');
+	$tblalign     = [
+		'top',
+		'middle',
+		'bottom',
+		'left',
+		'rigth',
+	];
+	$tblscrolling = [
+		'yes',
+		'no',
+		'auto',
+	];
+	$frameid      = Request::getInt('iframeid', 0, 'GET');
 
-    $frame = $iframeHandler->get($frameid);
+	$frame = $iframeHandler->get($frameid);
 
-    if (is_object($frame)) {
-        $iframeHandler->updatehits($frameid);
-        $xoopsTpl->assign('frameok', true);
-        $xoopsTpl->assign('longdesc', $frame->getVar('frame_description'));
-        $xoopsTpl->assign('width', $frame->getVar('frame_width'));
-        $xoopsTpl->assign('height', $frame->getVar('frame_height'));
-        $xoopsTpl->assign('align', $tblalign[$frame->getVar('frame_align') - 1]);
-        $xoopsTpl->assign('frameborder', $frame->getVar('frame_frameborder'));
-        $xoopsTpl->assign('marginwidth', $frame->getVar('frame_marginwidth'));
-        $xoopsTpl->assign('marginheight', $frame->getVar('frame_marginheight'));
-        $xoopsTpl->assign('scrolling', $tblscrolling[$frame->getVar('frame_scrolling') - 1]);
-        if ('' !== xoops_trim($suplparam)) {
-            $xoopsTpl->assign('url', $frame->getVar('frame_url') . '?' . $suplparam);
-        } else {
-            $xoopsTpl->assign('url', $frame->getVar('frame_url'));
-        }
-        $title = $frame->getVar('frame_description');
-        myiframe_set_metas($title, $title);
-    } else {
-        $xoopsTpl->assign('frameok', false);
-        $xoopsTpl->assign('frame_error', _MYIFRAME_FRAME_ERROR);
-    }
+	if (is_object($frame)) {
+		$iframeHandler->updatehits($frameid);
+		$xoopsTpl->assign('frameok', true);
+		$xoopsTpl->assign('longdesc', $frame->getVar('frame_description'));
+		$xoopsTpl->assign('width', $frame->getVar('frame_width'));
+		$xoopsTpl->assign('height', $frame->getVar('frame_height'));
+		$xoopsTpl->assign('align', $tblalign[$frame->getVar('frame_align') - 1]);
+		$xoopsTpl->assign('frameborder', $frame->getVar('frame_frameborder'));
+		$xoopsTpl->assign('marginwidth', $frame->getVar('frame_marginwidth'));
+		$xoopsTpl->assign('marginheight', $frame->getVar('frame_marginheight'));
+		$xoopsTpl->assign('scrolling', $tblscrolling[$frame->getVar('frame_scrolling') - 1]);
+		if ('' !== xoops_trim($suplparam)) {
+			$xoopsTpl->assign('url', $frame->getVar('frame_url') . '?' . $suplparam);
+		} else {
+			$xoopsTpl->assign('url', $frame->getVar('frame_url'));
+		}
+		$title = $frame->getVar('frame_description');
+		myiframe_set_metas($title, $title);
+	} else {
+		$xoopsTpl->assign('frameok', false);
+		$xoopsTpl->assign('frame_error', _MYIFRAME_FRAME_ERROR);
+	}
 } else {
-    if (myiframe_getmoduleoption('showlist')) {
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php';
-        $frarray = [];
-        $critere = new \Criteria('1', '1', '=');
-        $critere->setSort('frame_description');
-        $frarray = $iframeHandler->getObjects($critere);
-        if (count($frarray) > 0) {
-            foreach ($frarray as $frame) {
-                /** @var Myiframe $frame */
-                if ('' === xoops_trim($frame->getVar('frame_description'))) {
-                    $liendesc = $frame->getVar('frame_url');
-                } else {
-                    $liendesc = "<a href='" . $baseurl . '?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
-                }
-                $iframe['list'] = $liendesc;
-                $xoopsTpl->append('iframes', $iframe);
-            }
-        }
-    } else {
-        $xoopsTpl->assign('frameok', false);
-        $xoopsTpl->assign('frame_error', _MYIFRAME_FRAME_ERROR);
-    }
+	if (myiframe_getmoduleoption('showlist')) {
+		$baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php';
+		$frarray = [];
+		$critere = new \Criteria('1', '1', '=');
+		$critere->setSort('frame_description');
+		$frarray = $iframeHandler->getObjects($critere);
+		if (count($frarray) > 0) {
+			foreach ($frarray as $frame) {
+				/** @var Myiframe $frame */
+				if ('' === xoops_trim($frame->getVar('frame_description'))) {
+					$liendesc = $frame->getVar('frame_url');
+				} else {
+					$liendesc = "<a href='" . $baseurl . '?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+				}
+				$iframe['list'] = $liendesc;
+				$xoopsTpl->append('iframes', $iframe);
+			}
+		}
+	} else {
+		$xoopsTpl->assign('frameok', false);
+		$xoopsTpl->assign('frame_error', _MYIFRAME_FRAME_ERROR);
+	}
 }
 require_once XOOPS_ROOT_PATH . '/footer.php';

class/Utility.php

Indentation +1 added lines, -1 removed lines

@@ -30,5 +30,5 @@
  */
 class Utility extends Common\SysUtility
 {
-    //--------------- Custom module methods -----------------------------
+	//--------------- Custom module methods -----------------------------
 }

class/Constants.php

Indentation +21 added lines, -21 removed lines

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

class/Helper.php

Indentation +49 added lines, -49 removed lines

@@ -23,60 +23,60 @@
  */
 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);
+	}
 
-    /**
-     * @return \XoopsModules\Myiframe\Helper
-     */
-    public static function getInstance(bool $debug = false): self
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($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;
+	}
 }

class/Common/Breadcrumb.php

Indentation +27 added lines, -27 removed lines

@@ -25,39 +25,39 @@ 
  */
 class Breadcrumb
 {
-    public  $dirname;
-    private $bread = [];
+	public  $dirname;
+	private $bread = [];
 
-    public function __construct()
-    {
-        $this->dirname = \basename(\dirname(__DIR__, 2));
-    }
+	public function __construct()
+	{
+		$this->dirname = \basename(\dirname(__DIR__, 2));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = ''): void
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title,
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = ''): void
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title,
+		];
+	}
 
-    /**
-     * Render BreadCrumb
-     */
-    public function render(): void
-    {
-        /*
+	/**
+	 * Render BreadCrumb
+	 */
+	public function render(): void
+	{
+		/*
         TODO if you want to use the render code below,
         1) create ./templates/chess_common_breadcrumb.tpl)
         2) add declaration to  xoops_version.php
         */
-        /*
+		/*
         if (!isset($GLOBALS['xoTheme']) || !\is_object($GLOBALS['xoTheme'])) {
             require $GLOBALS['xoops']->path('class/theme.php');
 
@@ -76,5 +76,5 @@ 
 
         return $html;
         */
-    }
+	}
 }

class/Common/VersionChecks.php

Indentation +113 added lines, -113 removed lines

@@ -19,127 +19,127 @@
  */
 trait VersionChecks
 {
-    /**
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @param null|string  $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        \xoops_loadLanguage('admin', $moduleDirName);
-        \xoops_loadLanguage('common', $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(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		\xoops_loadLanguage('admin', $moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
 
-        //check for minimum XOOPS version
-        $currentVer = mb_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 = mb_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|bool|null $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module = null)
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        \xoops_loadLanguage('admin', $moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
+	/**
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule|bool|null $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module = null)
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		\xoops_loadLanguage('admin', $moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
 
-        // check for minimum PHP version
-        $success = true;
+		// check for minimum PHP version
+		$success = true;
 
-        $verNum = \PHP_VERSION;
-        $reqVer = &$module->getInfo('min_php');
+		$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;
-            }
-        }
+		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;
+	}
 
-    /**
-     * compares current module version with the latest GitHub release
-     * @static
-     *
-     * @return string|array info about the latest module version, if newer
-     */
-    public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
-        //        $repository         = 'XoopsModules25x/publisher'; //for testing only
-        $ret             = null;
-        $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
-        if ('github' === $source) {
-            if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
-                \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
-                \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
-                \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
-                \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
-                $curlReturn = \curl_exec($curlHandle);
-                if (false === $curlReturn) {
-                    \trigger_error(\curl_error($curlHandle));
-                } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
-                } else {
-                    $file              = json_decode($curlReturn, false);
-                    $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
-                    $latestVersion     = $file[0]->tag_name;
-                    $prerelease        = $file[0]->prerelease;
-                    if ('master' !== $latestVersionLink) {
-                        $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
-                    }
-                    //"PHP-standardized" version
-                    $latestVersion = \mb_strtolower($latestVersion);
-                    if (false !== mb_strpos($latestVersion, 'final')) {
-                        $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
-                        $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
-                    }
-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
-                    //"PHP-standardized" version
-                    $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));
-                    //                    $moduleVersion = '1.0'; //for testing only
-                    //                    $moduleDirName = 'publisher'; //for testing only
-                    if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) {
-                        $ret   = [];
-                        $ret[] = $update;
-                        $ret[] = $latestVersionLink;
-                    }
-                }
-                \curl_close($curlHandle);
-            }
-        }
+	/**
+	 * compares current module version with the latest GitHub release
+	 * @static
+	 *
+	 * @return string|array info about the latest module version, if newer
+	 */
+	public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		$update             = '';
+		$repository         = 'XoopsModules25x/' . $moduleDirName;
+		//        $repository         = 'XoopsModules25x/publisher'; //for testing only
+		$ret             = null;
+		$infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
+		if ('github' === $source) {
+			if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
+				\curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
+				\curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
+				\curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
+				\curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
+				$curlReturn = \curl_exec($curlHandle);
+				if (false === $curlReturn) {
+					\trigger_error(\curl_error($curlHandle));
+				} elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
+					\trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+				} else {
+					$file              = json_decode($curlReturn, false);
+					$latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
+					$latestVersion     = $file[0]->tag_name;
+					$prerelease        = $file[0]->prerelease;
+					if ('master' !== $latestVersionLink) {
+						$update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
+					}
+					//"PHP-standardized" version
+					$latestVersion = \mb_strtolower($latestVersion);
+					if (false !== mb_strpos($latestVersion, 'final')) {
+						$latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
+						$latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
+					}
+					$moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
+					//"PHP-standardized" version
+					$moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));
+					//                    $moduleVersion = '1.0'; //for testing only
+					//                    $moduleDirName = 'publisher'; //for testing only
+					if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) {
+						$ret   = [];
+						$ret[] = $update;
+						$ret[] = $latestVersionLink;
+					}
+				}
+				\curl_close($curlHandle);
+			}
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

class/Common/TestdataButtons.php

Indentation +60 added lines, -60 removed lines

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

class/Common/ServerStats.php

Indentation +53 added lines, -53 removed lines

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