XoopsModules25x / myiframe

class/myiframe.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     }
 
     /**
-     * @param $id
+     * @param integer $id
      */
     public function load($id)
     {

Indentation +213 added lines, -213 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if (!defined('XOOPS_ROOT_PATH')) {
-    die('XOOPS root path not defined');
+	die('XOOPS root path not defined');
 }
 
 include_once XOOPS_ROOT_PATH . '/kernel/object.php';
@@ -17,51 +17,51 @@ 
  */
 class Myiframe extends XoopsObject
 {
-    public $db;
+	public $db;
 
-    /**
-     * myiframe constructor.
-     * @param null $id
-     */
-    public function __construct($id = null)
-    {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
-        $this->initVar('frame_frameid', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_created', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_uid', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_description', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('frame_width', XOBJ_DTYPE_TXTBOX, null, false, 15);
-        $this->initVar('frame_height', XOBJ_DTYPE_TXTBOX, null, false, 15);
-        $this->initVar('frame_align', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_frameborder', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_marginwidth', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_marginheight', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_scrolling', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_hits', XOBJ_DTYPE_INT, null, false, 10);
-        $this->initVar('frame_url', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        if (!empty($id)) {
-            if (is_array($id)) {
-                $this->assignVars($id);
-            } else {
-                $this->load((int)$id);
-            }
-        } else {
-            $this->setNew();
-        }
-    }
+	/**
+	 * myiframe constructor.
+	 * @param null $id
+	 */
+	public function __construct($id = null)
+	{
+		$this->db = XoopsDatabaseFactory::getDatabaseConnection();
+		$this->initVar('frame_frameid', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_created', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_uid', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_description', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('frame_width', XOBJ_DTYPE_TXTBOX, null, false, 15);
+		$this->initVar('frame_height', XOBJ_DTYPE_TXTBOX, null, false, 15);
+		$this->initVar('frame_align', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_frameborder', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_marginwidth', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_marginheight', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_scrolling', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_hits', XOBJ_DTYPE_INT, null, false, 10);
+		$this->initVar('frame_url', XOBJ_DTYPE_TXTBOX, null, false, 255);
+		if (!empty($id)) {
+			if (is_array($id)) {
+				$this->assignVars($id);
+			} else {
+				$this->load((int)$id);
+			}
+		} else {
+			$this->setNew();
+		}
+	}
 
-    /**
-     * @param $id
-     */
-    public function load($id)
-    {
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
-        $myrow = $this->db->fetchArray($this->db->query($sql));
-        $this->assignVars($myrow);
-        if (!$myrow) {
-            $this->setNew();
-        }
-    }
+	/**
+	 * @param $id
+	 */
+	public function load($id)
+	{
+		$sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
+		$myrow = $this->db->fetchArray($this->db->query($sql));
+		$this->assignVars($myrow);
+		if (!$myrow) {
+			$this->setNew();
+		}
+	}
 }
 
 /**
@@ -69,188 +69,188 @@ 
  */
 class MyiframeMyiframeHandler extends XoopsObjectHandler
 {
-    /**
-     * @param bool $isNew
-     * @return myiframe
-     */
-    public function create($isNew = true)
-    {
-        $object = new Myiframe();
-        if ($isNew) {
-            $object->setNew();
-        }
+	/**
+	 * @param bool $isNew
+	 * @return myiframe
+	 */
+	public function create($isNew = true)
+	{
+		$object = new Myiframe();
+		if ($isNew) {
+			$object->setNew();
+		}
 
-        return $object;
-    }
+		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 ($numrows == 1) {
-            $object = new Myiframe();
-            $object->assignVars($this->db->fetchArray($result));
-            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 ($numrows == 1) {
+			$object = new Myiframe();
+			$object->assignVars($this->db->fetchArray($result));
+			return $object;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param XoopsObject $object
-     * @param bool        $force
-     * @return bool
-     */
-    public function insert(XoopsObject $object, $force = false)
-    {
-        if (get_class($object) !== 'myiframe') {
-            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;
-        }
+	/**
+	 * @param XoopsObject $object
+	 * @param bool        $force
+	 * @return bool
+	 */
+	public function insert(XoopsObject $object, $force = false)
+	{
+		if (get_class($object) !== 'myiframe') {
+			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);
+		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;
-    }
+		return $frame_frameid;
+	}
 
-    /**
-     * @param XoopsObject $object
-     * @param bool        $force
-     * @return bool
-     */
-    public function delete(XoopsObject $object, $force = false)
-    {
-        if (get_class($object) !== 'myiframe') {
-            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;
-        }
+	/**
+	 * @param XoopsObject $object
+	 * @param bool        $force
+	 * @return bool
+	 */
+	public function delete(XoopsObject $object, $force = false)
+	{
+		if (get_class($object) !== 'myiframe') {
+			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;
-    }
+		return true;
+	}
 
-    /**
-     * @param null $criteria
-     * @param bool $id_as_key
-     * @return array
-     */
-    public function &getObjects($criteria = null, $id_as_key = false)
-    {
-        $ret   = array();
-        $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ($criteria->getSort() !== '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-            $limit = $criteria->getLimit();
-            $start = $criteria->getStart();
-        }
-        $result = $this->db->query($sql, $limit, $start);
-        if (!$result) {
-            return $ret;
-        }
-        while ($myrow = $this->db->fetchArray($result)) {
-            if (!$id_as_key) {
-                $ret[] = new Myiframe($myrow);
-            } else {
-                $ret[$myrow['frame_frameid']] = new Myiframe($myrow);
-            }
-        }
+	/**
+	 * @param null $criteria
+	 * @param bool $id_as_key
+	 * @return array
+	 */
+	public function &getObjects($criteria = null, $id_as_key = false)
+	{
+		$ret   = array();
+		$limit = $start = 0;
+		$sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ($criteria->getSort() !== '') {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
+		}
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+		while ($myrow = $this->db->fetchArray($result)) {
+			if (!$id_as_key) {
+				$ret[] = new Myiframe($myrow);
+			} else {
+				$ret[$myrow['frame_frameid']] = new Myiframe($myrow);
+			}
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param null $criteria
-     * @return int
-     */
-    public function getCount($criteria = null)
-    {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        list($count) = $this->db->fetchRow($result);
+	/**
+	 * @param null $criteria
+	 * @return int
+	 */
+	public function getCount($criteria = null)
+	{
+		$sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		list($count) = $this->db->fetchRow($result);
 
-        return $count;
-    }
+		return $count;
+	}
 
-    /**
-     * @param null $criteria
-     * @return bool
-     */
-    public function deleteAll($criteria = null)
-    {
-        $sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
-        if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            return false;
-        }
+	/**
+	 * @param null $criteria
+	 * @return bool
+	 */
+	public function deleteAll($criteria = null)
+	{
+		$sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
+		if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @param $frame_id
-     */
-    public function updatehits($frame_id)
-    {
-        $sql = sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid=%u', $this->db->prefix('myiframe'), (int)$frame_id);
-        $this->db->queryF($sql);
-    }
+	/**
+	 * @param $frame_id
+	 */
+	public function updatehits($frame_id)
+	{
+		$sql = sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid=%u', $this->db->prefix('myiframe'), (int)$frame_id);
+		$this->db->queryF($sql);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
     die('XOOPS root path not defined');
 }
 
-include_once XOOPS_ROOT_PATH . '/kernel/object.php';
+include_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 /**
  * Class Myiframe
@@ -43,7 +43,7 @@ 
             if (is_array($id)) {
                 $this->assignVars($id);
             } else {
-                $this->load((int)$id);
+                $this->load((int) $id);
             }
         } else {
             $this->setNew();
@@ -55,7 +55,7 @@ 
      */
     public function load($id)
     {
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
+        $sql   = 'SELECT * FROM '.$this->db->prefix('myiframe').' WHERE frame_frameid='.(int) $id;
         $myrow = $this->db->fetchArray($this->db->query($sql));
         $this->assignVars($myrow);
         if (!$myrow) {
@@ -90,7 +90,7 @@ 
     public function &get($id)
     {
         $ret = null;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('myiframe') . '  WHERE frame_frameid=' . (int)$id;
+        $sql = 'SELECT * FROM '.$this->db->prefix('myiframe').'  WHERE frame_frameid='.(int) $id;
         if (!$result = $this->db->query($sql)) {
             return $ret;
         }
@@ -185,11 +185,11 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('myiframe');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() !== '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -215,9 +215,9 @@ 
      */
     public function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('myiframe');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('myiframe');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -234,9 +234,9 @@ 
      */
     public function deleteAll($criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('myiframe');
+        $sql = 'DELETE FROM '.$this->db->prefix('myiframe');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             return false;
@@ -250,7 +250,7 @@ 
      */
     public function updatehits($frame_id)
     {
-        $sql = sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid=%u', $this->db->prefix('myiframe'), (int)$frame_id);
+        $sql = sprintf('UPDATE %s SET frame_hits = frame_hits+1 WHERE frame_frameid=%u', $this->db->prefix('myiframe'), (int) $frame_id);
         $this->db->queryF($sql);
     }
 }

include/functions.php

Indentation +44 added lines, -44 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if (!defined('XOOPS_ROOT_PATH')) {
-    die('XOOPS root path not defined');
+	die('XOOPS root path not defined');
 }
 
 /**
@@ -24,30 +24,30 @@ 
  */
 function myiframe_getmoduleoption($option, $repmodule = 'myiframe')
 {
-    global $xoopsModuleConfig, $xoopsModule;
-    static $tbloptions = array();
-    if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
-        return $tbloptions[$option];
-    }
+	global $xoopsModuleConfig, $xoopsModule;
+	static $tbloptions = array();
+	if (is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
+		return $tbloptions[$option];
+	}
 
-    $retval = false;
-    if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
-        if (isset($xoopsModuleConfig[$option])) {
-            $retval = $xoopsModuleConfig[$option];
-        }
-    } else {
-        $moduleHandler = xoops_getHandler('module');
-        $module        = $moduleHandler->getByDirname($repmodule);
-        $configHandler = xoops_getHandler('config');
-        if ($module) {
-            $moduleConfig = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
-            if (isset($moduleConfig[$option])) {
-                $retval = $moduleConfig[$option];
-            }
-        }
-    }
-    $tbloptions[$option] = $retval;
-    return $retval;
+	$retval = false;
+	if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
+		if (isset($xoopsModuleConfig[$option])) {
+			$retval = $xoopsModuleConfig[$option];
+		}
+	} else {
+		$moduleHandler = xoops_getHandler('module');
+		$module        = $moduleHandler->getByDirname($repmodule);
+		$configHandler = xoops_getHandler('config');
+		if ($module) {
+			$moduleConfig = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
+			if (isset($moduleConfig[$option])) {
+				$retval = $moduleConfig[$option];
+			}
+		}
+	}
+	$tbloptions[$option] = $retval;
+	return $retval;
 }
 
 /**
@@ -62,9 +62,9 @@ 
  */
 function myiframe_FieldExists($fieldname, $table)
 {
-    global $xoopsDB;
-    $result = $xoopsDB->queryF("SHOW COLUMNS FROM	$table LIKE '$fieldname'");
-    return ($xoopsDB->getRowsNum($result) > 0);
+	global $xoopsDB;
+	$result = $xoopsDB->queryF("SHOW COLUMNS FROM	$table LIKE '$fieldname'");
+	return ($xoopsDB->getRowsNum($result) > 0);
 }
 
 /**
@@ -82,21 +82,21 @@ 
  */
 function myiframe_set_metas($page_title = '', $meta_description = '', $meta_keywords = '')
 {
-    global $xoTheme, $xoTheme, $xoopsTpl;
-    $xoopsTpl->assign('xoops_pagetitle', $page_title);
-    if (isset($xoTheme) && is_object($xoTheme)) {
-        if (!empty($meta_keywords)) {
-            $xoTheme->addMeta('meta', 'keywords', $meta_keywords);
-        }
-        if (!empty($meta_description)) {
-            $xoTheme->addMeta('meta', 'description', $meta_description);
-        }
-    } elseif (isset($xoopsTpl) && is_object($xoopsTpl)) {    // Compatibility for old Xoops versions
-        if (!empty($meta_keywords)) {
-            $xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
-        }
-        if (!empty($meta_description)) {
-            $xoopsTpl->assign('xoops_meta_description', $meta_description);
-        }
-    }
+	global $xoTheme, $xoTheme, $xoopsTpl;
+	$xoopsTpl->assign('xoops_pagetitle', $page_title);
+	if (isset($xoTheme) && is_object($xoTheme)) {
+		if (!empty($meta_keywords)) {
+			$xoTheme->addMeta('meta', 'keywords', $meta_keywords);
+		}
+		if (!empty($meta_description)) {
+			$xoTheme->addMeta('meta', 'description', $meta_description);
+		}
+	} elseif (isset($xoopsTpl) && is_object($xoopsTpl)) {    // Compatibility for old Xoops versions
+		if (!empty($meta_keywords)) {
+			$xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
+		}
+		if (!empty($meta_description)) {
+			$xoopsTpl->assign('xoops_meta_description', $meta_description);
+		}
+	}
 }

xoops_version.php

Indentation +69 added lines, -69 removed lines

@@ -9,97 +9,97 @@
 use Xmf\Request;
 
 if (!defined('XOOPS_ROOT_PATH')) {
-    die('XOOPS root path not defined');
+	die('XOOPS root path not defined');
 }
 
 $modversion = array(
-    'version'             => 1.66,
-    'module_status'       => 'Beta 1',
-    'release_date'        => '2017/08/04',
-    'name'                => _MI_MYIFRAME_NAME,
-    'description'         => _MI_MYIFRAME_DESC,
-    'credits'             => '',
-    'author'              => 'Instant Zero - http://xoops.instant-zero.com',
-    'help'                => '',
-    'license'             => 'GPL see LICENSE',
-    'official'            => 0,
-    'image'               => 'assets/images/myiframe.png',
-    'dirname'             => 'myiframe',
-    'min_php'             => '5.5',
-    'min_db'              => array('mysql' => '5.5'),
-    'min_xoops'           => '2.5.8+',
-    'min_admin'           => '1.2',
-    'module_website_url'  => 'www.xoops.org',
-    'module_website_name' => 'XOOPS',
-    'module_release'      => '05/07/2017',
-    'system_menu'         => 1,
-    //sql tables
-    'sqlfile'             => array('mysql' => 'sql/mysql.sql'),
-    'tables'              => array(
-        'myiframe'
-    ),
-    // Admin
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    // Menu
-    'hasMain'             => 1
+	'version'             => 1.66,
+	'module_status'       => 'Beta 1',
+	'release_date'        => '2017/08/04',
+	'name'                => _MI_MYIFRAME_NAME,
+	'description'         => _MI_MYIFRAME_DESC,
+	'credits'             => '',
+	'author'              => 'Instant Zero - http://xoops.instant-zero.com',
+	'help'                => '',
+	'license'             => 'GPL see LICENSE',
+	'official'            => 0,
+	'image'               => 'assets/images/myiframe.png',
+	'dirname'             => 'myiframe',
+	'min_php'             => '5.5',
+	'min_db'              => array('mysql' => '5.5'),
+	'min_xoops'           => '2.5.8+',
+	'min_admin'           => '1.2',
+	'module_website_url'  => 'www.xoops.org',
+	'module_website_name' => 'XOOPS',
+	'module_release'      => '05/07/2017',
+	'system_menu'         => 1,
+	//sql tables
+	'sqlfile'             => array('mysql' => 'sql/mysql.sql'),
+	'tables'              => array(
+		'myiframe'
+	),
+	// Admin
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	// Menu
+	'hasMain'             => 1
 );
 
 // Templates
 $modversion['templates'] = array(
-    array(
-        'file'        => 'myiframe.tpl',
-        'description' => 'Default template'
-    ),
+	array(
+		'file'        => 'myiframe.tpl',
+		'description' => 'Default template'
+	),
 );
 
 //Blocks
 $modversion['blocks'][] = array(
-    'file'        => 'myiframe_iframe.php',
-    'name'        => _MI_MYIFAME_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_MYIFAME_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 $xoopsDB, $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
-    $i = 0;
-    include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
-    $myts = MyTextSanitizer::getInstance();
-    if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
-        $result = $xoopsDB->query($sql);
-        while ($myrow = $xoopsDB->fetchArray($result)) {
-            if (xoops_trim($myrow['frame_description']) !== '') {
-                $modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
-                $i++;
-            }
-        }
-    }
+	$i = 0;
+	include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+	$myts = MyTextSanitizer::getInstance();
+	if (myiframe_getmoduleoption('showinmenu')) {
+		$sql    = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
+		$result = $xoopsDB->query($sql);
+		while ($myrow = $xoopsDB->fetchArray($result)) {
+			if (xoops_trim($myrow['frame_description']) !== '') {
+				$modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
+				$modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+				$i++;
+			}
+		}
+	}
 }
 
 // Options
 $modversion['config'][] = [
-    'name'        => 'showinmenu',
-    'title'       => '_MI_MYIFRAME_OPT0',
-    'description' => '_MI_MYIFRAME_OPT0_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0,
+	'name'        => 'showinmenu',
+	'title'       => '_MI_MYIFRAME_OPT0',
+	'description' => '_MI_MYIFRAME_OPT0_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0,
 ];
 $modversion['config'][] = [
-    'name'        => 'showlist',
-    'title'       => '_MI_MYIFRAME_OPT1',
-    'description' => '_MI_MYIFRAME_OPT1_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'showlist',
+	'title'       => '_MI_MYIFRAME_OPT1',
+	'description' => '_MI_MYIFRAME_OPT1_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 // Search
 $modversion['hasSearch'] = 0;

Spacing +3 added lines, -3 removed lines

@@ -69,15 +69,15 @@
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
     $i = 0;
-    include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+    include_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
     $myts = MyTextSanitizer::getInstance();
     if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
+        $sql    = 'SELECT * FROM '.$xoopsDB->prefix('myiframe').' ORDER BY frame_description';
         $result = $xoopsDB->query($sql);
         while ($myrow = $xoopsDB->fetchArray($result)) {
             if (xoops_trim($myrow['frame_description']) !== '') {
                 $modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+                $modversion['sub'][$i]['url']  = 'index.php?iframeid='.(int) $myrow['frame_frameid'];
                 $i++;
             }
         }

blocks/myiframe_iframe.php

Indentation +48 added lines, -48 removed lines

@@ -14,35 +14,35 @@ 
  */
 function b_myiframe_iframe_show($options)
 {
-    $block         = array();
-    $tblalign      = array(
-        'top',
-        'middle',
-        'bottom',
-        'left',
-        'rigth'
-    );
-    $tblscrolling  = array(
-        'yes',
-        'no',
-        'auto'
-    );
-    $iframeHandler = xoops_getModuleHandler('myiframe', 'myiframe');
-    $frame         = null;
-    $frame         = $iframeHandler->get($options[0]);
+	$block         = array();
+	$tblalign      = array(
+		'top',
+		'middle',
+		'bottom',
+		'left',
+		'rigth'
+	);
+	$tblscrolling  = array(
+		'yes',
+		'no',
+		'auto'
+	);
+	$iframeHandler = xoops_getModuleHandler('myiframe', 'myiframe');
+	$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');
-    }
-    return $block;
+	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;
 }
 
 /**
@@ -51,22 +51,22 @@ 
  */
 function b_myiframe_iframe_edit($options)
 {
-    $iframeHandler = xoops_getModuleHandler('myiframe', 'myiframe');
-    $frarray       = array();
-    $critere       = new Criteria('1', '1', '=');
-    $critere->setSort('frame_description');
-    $frarray = $iframeHandler->getObjects($critere);
+	$iframeHandler = xoops_getModuleHandler('myiframe', 'myiframe');
+	$frarray       = array();
+	$critere       = new Criteria('1', '1', '=');
+	$critere->setSort('frame_description');
+	$frarray = $iframeHandler->getObjects($critere);
 
-    $form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
-    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;
+	$form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
+	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;
 }
 
 /**
@@ -74,10 +74,10 @@ 
  */
 function b_myiframe_iframe_onthefly($options)
 {
-    $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');
 }

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
  * ****************************************************************************
  */
 
-include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
 
 /**
  * @param $options
@@ -22,7 +22,7 @@ 
         'left',
         'rigth'
     );
-    $tblscrolling  = array(
+    $tblscrolling = array(
         'yes',
         'no',
         'auto'
@@ -35,11 +35,11 @@ 
         $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['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['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling')-1];
         $block['url']          = $frame->getVar('frame_url');
     }
     return $block;
@@ -57,13 +57,13 @@ 
     $critere->setSort('frame_description');
     $frarray = $iframeHandler->getObjects($critere);
 
-    $form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
+    $form = ''._MB_MYIFRAME_IFRAME."&nbsp;<select name='options[0]'>";
     foreach ($frarray as $oneframe) {
-        $form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
+        $form .= "<option value='".$oneframe->getVar('frame_frameid')."'";
         if ($options[0] == $oneframe->getVar('frame_frameid')) {
             $form .= " selected='selected'";
         }
-        $form .= '>' . $oneframe->getVar('frame_description') . '</option>';
+        $form .= '>'.$oneframe->getVar('frame_description').'</option>';
     }
     $form .= "</select>\n";
     return $form;

admin/manage.php

Indentation +212 added lines, -212 removed lines

@@ -11,20 +11,20 @@ 
 
 // Verify if the table is up to date
 if (!myiframe_FieldExists('frame_frameid', $xoopsDB->prefix('myiframe'))) {
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
-    header('Location : ' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
+	header('Location : ' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
 }
 
 $module_id     = $xoopsModule->getVar('mid');
@@ -48,48 +48,48 @@ 
  */
 function addEditForm($frameid, $Action, $FormTitle, $longdesc, $width, $height, $align, $frameborder, $marginwidth, $marginheight, $scrolling, $url, $LabelSubmitButton)
 {
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-    global $xoopsModule;
+	include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	global $xoopsModule;
 
-    $sform = new XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php');
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_DESC, 'longdesc', 50, 255, $longdesc), false);
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_WIDTH, 'width', 10, 15, $width), false);
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_HEIGHT, 'height', 10, 15, $height), false);
+	$sform = new XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php');
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_DESC, 'longdesc', 50, 255, $longdesc), false);
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_WIDTH, 'width', 10, 15, $width), false);
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_HEIGHT, 'height', 10, 15, $height), false);
 
-    $selalign = new XoopsFormSelect(_AM_MYIFRAME_ALIGN, 'align', $align);
-    $selalign->addOption(1, _AM_MYIFRAME_ALIGN_TOP);
-    $selalign->addOption(2, _AM_MYIFRAME_ALIGN_MIDDLE);
-    $selalign->addOption(3, _AM_MYIFRAME_ALIGN_BOTTOM);
-    $selalign->addOption(4, _AM_MYIFRAME_ALIGN_LEFT);
-    $selalign->addOption(5, _AM_MYIFRAME_ALIGN_RIGHT);
-    $selalign->setValue($align);
-    $sform->addElement($selalign);
+	$selalign = new XoopsFormSelect(_AM_MYIFRAME_ALIGN, 'align', $align);
+	$selalign->addOption(1, _AM_MYIFRAME_ALIGN_TOP);
+	$selalign->addOption(2, _AM_MYIFRAME_ALIGN_MIDDLE);
+	$selalign->addOption(3, _AM_MYIFRAME_ALIGN_BOTTOM);
+	$selalign->addOption(4, _AM_MYIFRAME_ALIGN_LEFT);
+	$selalign->addOption(5, _AM_MYIFRAME_ALIGN_RIGHT);
+	$selalign->setValue($align);
+	$sform->addElement($selalign);
 
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_FRAMEBORDER, 'frameborder', 3, 3, $frameborder), false);
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_MARGINWIDTH, 'marginwidth', 3, 3, $marginwidth), false);
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_MARGINHEIGHT, 'marginheight', 3, 3, $marginheight), false);
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_FRAMEBORDER, 'frameborder', 3, 3, $frameborder), false);
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_MARGINWIDTH, 'marginwidth', 3, 3, $marginwidth), false);
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_MARGINHEIGHT, 'marginheight', 3, 3, $marginheight), false);
 
-    $selscroll = new XoopsFormSelect(_AM_MYIFRAME_SCROLLING, 'scrolling', $scrolling);
-    $selscroll->addOption(1, _YES);
-    $selscroll->addOption(2, _NO);
-    $selscroll->addOption(3, _AM_MYIFRAME_AUTO);
-    $selscroll->setValue($scrolling);
-    $sform->addElement($selscroll);
+	$selscroll = new XoopsFormSelect(_AM_MYIFRAME_SCROLLING, 'scrolling', $scrolling);
+	$selscroll->addOption(1, _YES);
+	$selscroll->addOption(2, _NO);
+	$selscroll->addOption(3, _AM_MYIFRAME_AUTO);
+	$selscroll->setValue($scrolling);
+	$sform->addElement($selscroll);
 
-    $sform->addElement(new XoopsFormText(_AM_MYIFRAME_URL, 'url', 50, 255, $url), true);
-    $sform->addElement(new XoopsFormHidden('op', $Action), false);
-    if (!empty($frameid)) {
-        $sform->addElement(new XoopsFormHidden('frameid', $frameid), false);
-    }
+	$sform->addElement(new XoopsFormText(_AM_MYIFRAME_URL, 'url', 50, 255, $url), true);
+	$sform->addElement(new XoopsFormHidden('op', $Action), false);
+	if (!empty($frameid)) {
+		$sform->addElement(new XoopsFormHidden('frameid', $frameid), false);
+	}
 
-    $button_tray = new XoopsFormElementTray('', '');
-    $submit_btn  = new XoopsFormButton('', 'submit', $LabelSubmitButton, 'submit');
-    $button_tray->addElement($submit_btn);
-    $cancel_btn = new XoopsFormButton('', 'reset', _AM_MYIFRAME_RESETBUTTON, 'reset');
-    $button_tray->addElement($cancel_btn);
-    $sform->addElement($button_tray);
-    $sform->display();
-    include_once __DIR__ . '/admin_footer.php';
+	$button_tray = new XoopsFormElementTray('', '');
+	$submit_btn  = new XoopsFormButton('', 'submit', $LabelSubmitButton, 'submit');
+	$button_tray->addElement($submit_btn);
+	$cancel_btn = new XoopsFormButton('', 'reset', _AM_MYIFRAME_RESETBUTTON, 'reset');
+	$button_tray->addElement($cancel_btn);
+	$sform->addElement($button_tray);
+	$sform->display();
+	include_once __DIR__ . '/admin_footer.php';
 }
 
 // ******************************************************************************************************************************************
@@ -97,178 +97,178 @@ 
 // ******************************************************************************************************************************************
 
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 } elseif (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 
 switch ($op) {
-    case 'verifybeforeedit':
-        if (isset($_POST['submit']) && $_POST['submit'] !== '') {
-            if ($_POST['longdesc'] === '') {
-                xoops_cp_header();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-                echo '</td></tr></table>';
-                include_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                exit();
-            }
+	case 'verifybeforeedit':
+		if (isset($_POST['submit']) && $_POST['submit'] !== '') {
+			if ($_POST['longdesc'] === '') {
+				xoops_cp_header();
+				$adminObject = \Xmf\Module\Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+				echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+				echo '<tr><td class="odd">';
+				echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+				echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+				echo '</td></tr></table>';
+				include_once __DIR__ . '/admin_footer.php';
+				xoops_cp_footer();
+				exit();
+			}
 
-            $frameid = $_POST['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            $frame->unsetNew();
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
-                exit();
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-            exit();
-        }
-        break;
+			$frameid = $_POST['frameid'];
+			$frame   = $iframeHandler->get($frameid);
+			$frame->unsetNew();
+			$frame->setVar('frame_description', $_POST['longdesc']);
+			$frame->setVar('frame_width', $_POST['width']);
+			$frame->setVar('frame_height', $_POST['height']);
+			$frame->setVar('frame_align', $_POST['align']);
+			$frame->setVar('frame_frameborder', $_POST['frameborder']);
+			$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+			$frame->setVar('frame_marginheight', $_POST['marginheight']);
+			$frame->setVar('frame_scrolling', $_POST['scrolling']);
+			$frame->setVar('frame_url', $_POST['url']);
+			$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+			$res = $iframeHandler->insert($frame);
+			if (!$res) {
+				redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
+				exit();
+			}
+			redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+			exit();
+		}
+		break;
 
-    case 'edit':
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        if (isset($_GET['frameid'])) {
-            $frameid = (int)$_GET['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
-                        $frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
-        } else {
-            xoops_cp_header();
-            $adminObject = \Xmf\Module\Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-            echo '<tr><td class="odd">';
-            echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-            echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-            echo "</td></tr></table>\n";
-            include_once __DIR__ . '/admin_footer.php';
-            xoops_cp_footer();
-            exit();
-        }
-        break;
+	case 'edit':
+		xoops_cp_header();
+		$adminObject = \Xmf\Module\Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		if (isset($_GET['frameid'])) {
+			$frameid = (int)$_GET['frameid'];
+			$frame   = $iframeHandler->get($frameid);
+			AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
+						$frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
+		} else {
+			xoops_cp_header();
+			$adminObject = \Xmf\Module\Admin::getInstance();
+			$adminObject->displayNavigation(basename(__FILE__));
+			echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+			echo '<tr><td class="odd">';
+			echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+			echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+			echo "</td></tr></table>\n";
+			include_once __DIR__ . '/admin_footer.php';
+			xoops_cp_footer();
+			exit();
+		}
+		break;
 
-    case 'delete':
-        if (!isset($_POST['ok'])) {
-            xoops_cp_header();
-            $adminObject = \Xmf\Module\Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
-            xoops_confirm(array(
-                              'op'      => 'delete',
-                              'frameid' => (int)$_GET['frameid'],
-                              'ok'      => 1
-                          ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
-            include_once __DIR__ . '/admin_footer.php';
-        } else {
-            if (empty($_POST['frameid'])) {
-                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
-                exit();
-            }
-            $frameid = (int)$_POST['frameid'];
-            $critere = new Criteria('frame_frameid', $frameid, '=');
-            $iframeHandler->deleteAll($critere);
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-            exit();
-        }
-        break;
+	case 'delete':
+		if (!isset($_POST['ok'])) {
+			xoops_cp_header();
+			$adminObject = \Xmf\Module\Admin::getInstance();
+			$adminObject->displayNavigation(basename(__FILE__));
+			echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+			xoops_confirm(array(
+							  'op'      => 'delete',
+							  'frameid' => (int)$_GET['frameid'],
+							  'ok'      => 1
+						  ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
+			include_once __DIR__ . '/admin_footer.php';
+		} else {
+			if (empty($_POST['frameid'])) {
+				redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
+				exit();
+			}
+			$frameid = (int)$_POST['frameid'];
+			$critere = new Criteria('frame_frameid', $frameid, '=');
+			$iframeHandler->deleteAll($critere);
+			redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+			exit();
+		}
+		break;
 
-    case 'verifytoadd':
-        if (isset($_POST['submit']) && $_POST['submit'] !== '') {
-            if ($_POST['url'] === '') {
-                xoops_cp_header();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-                echo "</td></tr></table>\n";
-                include_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                exit();
-            }
-            $frame = $iframeHandler->create(true);
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_created', time());
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
-                exit();
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
-        }
-        break;
+	case 'verifytoadd':
+		if (isset($_POST['submit']) && $_POST['submit'] !== '') {
+			if ($_POST['url'] === '') {
+				xoops_cp_header();
+				$adminObject = \Xmf\Module\Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+				echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+				echo '<tr><td class="odd">';
+				echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+				echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+				echo "</td></tr></table>\n";
+				include_once __DIR__ . '/admin_footer.php';
+				xoops_cp_footer();
+				$adminObject = \Xmf\Module\Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+				exit();
+			}
+			$frame = $iframeHandler->create(true);
+			$frame->setVar('frame_description', $_POST['longdesc']);
+			$frame->setVar('frame_width', $_POST['width']);
+			$frame->setVar('frame_height', $_POST['height']);
+			$frame->setVar('frame_align', $_POST['align']);
+			$frame->setVar('frame_frameborder', $_POST['frameborder']);
+			$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+			$frame->setVar('frame_marginheight', $_POST['marginheight']);
+			$frame->setVar('frame_scrolling', $_POST['scrolling']);
+			$frame->setVar('frame_url', $_POST['url']);
+			$frame->setVar('frame_created', time());
+			$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+			$res = $iframeHandler->insert($frame);
+			if (!$res) {
+				redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
+				exit();
+			}
+			redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
+		}
+		break;
 
-    case 'addframe':
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
-        break;
+	case 'addframe':
+		xoops_cp_header();
+		$adminObject = \Xmf\Module\Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
+		break;
 
-    case 'default':
-    default:
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-        echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
-             . _AM_MYIFRAME_ACTION . "</th></tr>\n";
-        $critere = new Criteria('1', '1', '=');
-        $critere->setSort('frame_description');
-        $frarray = $iframeHandler->getObjects($critere);
-        $class   = 'even';
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
-        if (count($frarray) > 0) {
-            foreach ($frarray as $frame) {
-                $action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
-                $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
-                if (xoops_trim($frame->getVar('frame_description') === '')) {
-                    $liendesc = $frame->getVar('frame_url');
-                } else {
-                    $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
-                }
-                echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
-                     . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
-                $class = ($class === 'even') ? 'odd' : 'even';
-            }
-        }
-        echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
-             . "'></td></tr>";
-        echo '</table>';
-        include_once __DIR__ . '/admin_footer.php';
-        break;
+	case 'default':
+	default:
+		xoops_cp_header();
+		$adminObject = \Xmf\Module\Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+		echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
+			 . _AM_MYIFRAME_ACTION . "</th></tr>\n";
+		$critere = new Criteria('1', '1', '=');
+		$critere->setSort('frame_description');
+		$frarray = $iframeHandler->getObjects($critere);
+		$class   = 'even';
+		$baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
+		if (count($frarray) > 0) {
+			foreach ($frarray as $frame) {
+				$action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
+				$action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
+				if (xoops_trim($frame->getVar('frame_description') === '')) {
+					$liendesc = $frame->getVar('frame_url');
+				} else {
+					$liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+				}
+				echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
+					 . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
+				$class = ($class === 'even') ? 'odd' : 'even';
+			}
+		}
+		echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
+			 . "'></td></tr>";
+		echo '</table>';
+		include_once __DIR__ . '/admin_footer.php';
+		break;
 }
 
 xoops_cp_footer();

Switch Indentation +160 added lines, -160 removed lines

@@ -103,172 +103,172 @@
 }
 
 switch ($op) {
-    case 'verifybeforeedit':
-        if (isset($_POST['submit']) && $_POST['submit'] !== '') {
-            if ($_POST['longdesc'] === '') {
-                xoops_cp_header();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-                echo '</td></tr></table>';
-                include_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                exit();
-            }
+    	case 'verifybeforeedit':
+        	if (isset($_POST['submit']) && $_POST['submit'] !== '') {
+            	if ($_POST['longdesc'] === '') {
+                	xoops_cp_header();
+                	$adminObject = \Xmf\Module\Admin::getInstance();
+                	$adminObject->displayNavigation(basename(__FILE__));
+                	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+                	echo '<tr><td class="odd">';
+                	echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+                	echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+                	echo '</td></tr></table>';
+                	include_once __DIR__ . '/admin_footer.php';
+                	xoops_cp_footer();
+                	exit();
+            	}
 
-            $frameid = $_POST['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            $frame->unsetNew();
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
-                exit();
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-            exit();
-        }
-        break;
+            	$frameid = $_POST['frameid'];
+            	$frame   = $iframeHandler->get($frameid);
+            	$frame->unsetNew();
+            	$frame->setVar('frame_description', $_POST['longdesc']);
+            	$frame->setVar('frame_width', $_POST['width']);
+            	$frame->setVar('frame_height', $_POST['height']);
+            	$frame->setVar('frame_align', $_POST['align']);
+            	$frame->setVar('frame_frameborder', $_POST['frameborder']);
+            	$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+            	$frame->setVar('frame_marginheight', $_POST['marginheight']);
+            	$frame->setVar('frame_scrolling', $_POST['scrolling']);
+            	$frame->setVar('frame_url', $_POST['url']);
+            	$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+            	$res = $iframeHandler->insert($frame);
+            	if (!$res) {
+                	redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
+                	exit();
+            	}
+            	redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+            	exit();
+        	}
+        	break;
 
-    case 'edit':
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        if (isset($_GET['frameid'])) {
-            $frameid = (int)$_GET['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
-                        $frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
-        } else {
-            xoops_cp_header();
-            $adminObject = \Xmf\Module\Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-            echo '<tr><td class="odd">';
-            echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-            echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-            echo "</td></tr></table>\n";
-            include_once __DIR__ . '/admin_footer.php';
-            xoops_cp_footer();
-            exit();
-        }
-        break;
+    	case 'edit':
+        	xoops_cp_header();
+        	$adminObject = \Xmf\Module\Admin::getInstance();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	if (isset($_GET['frameid'])) {
+            	$frameid = (int)$_GET['frameid'];
+            	$frame   = $iframeHandler->get($frameid);
+            	AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
+                        	$frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
+        	} else {
+            	xoops_cp_header();
+            	$adminObject = \Xmf\Module\Admin::getInstance();
+            	$adminObject->displayNavigation(basename(__FILE__));
+            	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+            	echo '<tr><td class="odd">';
+            	echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+            	echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+            	echo "</td></tr></table>\n";
+            	include_once __DIR__ . '/admin_footer.php';
+            	xoops_cp_footer();
+            	exit();
+        	}
+        	break;
 
-    case 'delete':
-        if (!isset($_POST['ok'])) {
-            xoops_cp_header();
-            $adminObject = \Xmf\Module\Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
-            xoops_confirm(array(
-                              'op'      => 'delete',
-                              'frameid' => (int)$_GET['frameid'],
-                              'ok'      => 1
-                          ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
-            include_once __DIR__ . '/admin_footer.php';
-        } else {
-            if (empty($_POST['frameid'])) {
-                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
-                exit();
-            }
-            $frameid = (int)$_POST['frameid'];
-            $critere = new Criteria('frame_frameid', $frameid, '=');
-            $iframeHandler->deleteAll($critere);
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-            exit();
-        }
-        break;
+    	case 'delete':
+        	if (!isset($_POST['ok'])) {
+            	xoops_cp_header();
+            	$adminObject = \Xmf\Module\Admin::getInstance();
+            	$adminObject->displayNavigation(basename(__FILE__));
+            	echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+            	xoops_confirm(array(
+                              	'op'      => 'delete',
+                              	'frameid' => (int)$_GET['frameid'],
+                              	'ok'      => 1
+                          	), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
+            	include_once __DIR__ . '/admin_footer.php';
+        	} else {
+            	if (empty($_POST['frameid'])) {
+                	redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
+                	exit();
+            	}
+            	$frameid = (int)$_POST['frameid'];
+            	$critere = new Criteria('frame_frameid', $frameid, '=');
+            	$iframeHandler->deleteAll($critere);
+            	redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+            	exit();
+        	}
+        	break;
 
-    case 'verifytoadd':
-        if (isset($_POST['submit']) && $_POST['submit'] !== '') {
-            if ($_POST['url'] === '') {
-                xoops_cp_header();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-                echo "</td></tr></table>\n";
-                include_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                exit();
-            }
-            $frame = $iframeHandler->create(true);
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_created', time());
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
-                exit();
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
-        }
-        break;
+    	case 'verifytoadd':
+        	if (isset($_POST['submit']) && $_POST['submit'] !== '') {
+            	if ($_POST['url'] === '') {
+                	xoops_cp_header();
+                	$adminObject = \Xmf\Module\Admin::getInstance();
+                	$adminObject->displayNavigation(basename(__FILE__));
+                	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+                	echo '<tr><td class="odd">';
+                	echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+                	echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+                	echo "</td></tr></table>\n";
+                	include_once __DIR__ . '/admin_footer.php';
+                	xoops_cp_footer();
+                	$adminObject = \Xmf\Module\Admin::getInstance();
+                	$adminObject->displayNavigation(basename(__FILE__));
+                	exit();
+            	}
+            	$frame = $iframeHandler->create(true);
+            	$frame->setVar('frame_description', $_POST['longdesc']);
+            	$frame->setVar('frame_width', $_POST['width']);
+            	$frame->setVar('frame_height', $_POST['height']);
+            	$frame->setVar('frame_align', $_POST['align']);
+            	$frame->setVar('frame_frameborder', $_POST['frameborder']);
+            	$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+            	$frame->setVar('frame_marginheight', $_POST['marginheight']);
+            	$frame->setVar('frame_scrolling', $_POST['scrolling']);
+            	$frame->setVar('frame_url', $_POST['url']);
+            	$frame->setVar('frame_created', time());
+            	$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+            	$res = $iframeHandler->insert($frame);
+            	if (!$res) {
+                	redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
+                	exit();
+            	}
+            	redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
+        	}
+        	break;
 
-    case 'addframe':
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
-        break;
+    	case 'addframe':
+        	xoops_cp_header();
+        	$adminObject = \Xmf\Module\Admin::getInstance();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
+        	break;
 
-    case 'default':
-    default:
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-        echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
-             . _AM_MYIFRAME_ACTION . "</th></tr>\n";
-        $critere = new Criteria('1', '1', '=');
-        $critere->setSort('frame_description');
-        $frarray = $iframeHandler->getObjects($critere);
-        $class   = 'even';
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
-        if (count($frarray) > 0) {
-            foreach ($frarray as $frame) {
-                $action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
-                $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
-                if (xoops_trim($frame->getVar('frame_description') === '')) {
-                    $liendesc = $frame->getVar('frame_url');
-                } else {
-                    $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
-                }
-                echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
-                     . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
-                $class = ($class === 'even') ? 'odd' : 'even';
-            }
-        }
-        echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
-             . "'></td></tr>";
-        echo '</table>';
-        include_once __DIR__ . '/admin_footer.php';
-        break;
+    	case 'default':
+    	default:
+        	xoops_cp_header();
+        	$adminObject = \Xmf\Module\Admin::getInstance();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
+        	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+        	echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
+             	. _AM_MYIFRAME_ACTION . "</th></tr>\n";
+        	$critere = new Criteria('1', '1', '=');
+        	$critere->setSort('frame_description');
+        	$frarray = $iframeHandler->getObjects($critere);
+        	$class   = 'even';
+        	$baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
+        	if (count($frarray) > 0) {
+            	foreach ($frarray as $frame) {
+                	$action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
+                	$action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
+                	if (xoops_trim($frame->getVar('frame_description') === '')) {
+                    	$liendesc = $frame->getVar('frame_url');
+                	} else {
+                    	$liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+                	}
+                	echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
+                     	. "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
+                	$class = ($class === 'even') ? 'odd' : 'even';
+            	}
+        	}
+        	echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
+             	. "'></td></tr>";
+        	echo '</table>';
+        	include_once __DIR__ . '/admin_footer.php';
+        	break;
 }
 
 xoops_cp_footer();

Spacing +41 added lines, -41 removed lines

@@ -6,25 +6,25 @@ 
  * ****************************************************************************
  */
 
-include __DIR__ . '/../../../include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+include __DIR__.'/../../../include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
 
 // Verify if the table is up to date
 if (!myiframe_FieldExists('frame_frameid', $xoopsDB->prefix('myiframe'))) {
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . " CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $xoopsDB->queryF('ALTER TABLE ' . $xoopsDB->prefix('myiframe') . ' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
-    header('Location : ' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe').' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe').' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe').' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe').' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe')." CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+    $result = $xoopsDB->queryF('ALTER TABLE '.$xoopsDB->prefix('myiframe').' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
+    header('Location : '.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
 }
 
 $module_id     = $xoopsModule->getVar('mid');
@@ -48,10 +48,10 @@ 
  */
 function addEditForm($frameid, $Action, $FormTitle, $longdesc, $width, $height, $align, $frameborder, $marginwidth, $marginheight, $scrolling, $url, $LabelSubmitButton)
 {
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     global $xoopsModule;
 
-    $sform = new XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php');
+    $sform = new XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/manage.php');
     $sform->addElement(new XoopsFormText(_AM_MYIFRAME_DESC, 'longdesc', 50, 255, $longdesc), false);
     $sform->addElement(new XoopsFormText(_AM_MYIFRAME_WIDTH, 'width', 10, 15, $width), false);
     $sform->addElement(new XoopsFormText(_AM_MYIFRAME_HEIGHT, 'height', 10, 15, $height), false);
@@ -89,7 +89,7 @@ 
     $button_tray->addElement($cancel_btn);
     $sform->addElement($button_tray);
     $sform->display();
-    include_once __DIR__ . '/admin_footer.php';
+    include_once __DIR__.'/admin_footer.php';
 }
 
 // ******************************************************************************************************************************************
@@ -111,10 +111,10 @@ 
                 $adminObject->displayNavigation(basename(__FILE__));
                 echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
                 echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+                echo "<a href='manage.php'><h4>"._AM_MYIFRAME_CONFIG.'</h4></a>';
                 echo _AM_MYIFRAME_ERROR_ADD_INDEX;
                 echo '</td></tr></table>';
-                include_once __DIR__ . '/admin_footer.php';
+                include_once __DIR__.'/admin_footer.php';
                 xoops_cp_footer();
                 exit();
             }
@@ -147,7 +147,7 @@ 
         $adminObject = \Xmf\Module\Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
         if (isset($_GET['frameid'])) {
-            $frameid = (int)$_GET['frameid'];
+            $frameid = (int) $_GET['frameid'];
             $frame   = $iframeHandler->get($frameid);
             AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
                         $frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
@@ -157,10 +157,10 @@ 
             $adminObject->displayNavigation(basename(__FILE__));
             echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
             echo '<tr><td class="odd">';
-            echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+            echo "<a href='manage.php'><h4>"._AM_MYIFRAME_CONFIG.'</h4></a>';
             echo _AM_MYIFRAME_ERROR_ADD_INDEX;
             echo "</td></tr></table>\n";
-            include_once __DIR__ . '/admin_footer.php';
+            include_once __DIR__.'/admin_footer.php';
             xoops_cp_footer();
             exit();
         }
@@ -171,19 +171,19 @@ 
             xoops_cp_header();
             $adminObject = \Xmf\Module\Admin::getInstance();
             $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+            echo '<h4>'._AM_MYIFRAME_CONFIG.'</h4>';
             xoops_confirm(array(
                               'op'      => 'delete',
-                              'frameid' => (int)$_GET['frameid'],
+                              'frameid' => (int) $_GET['frameid'],
                               'ok'      => 1
                           ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
-            include_once __DIR__ . '/admin_footer.php';
+            include_once __DIR__.'/admin_footer.php';
         } else {
             if (empty($_POST['frameid'])) {
                 redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
                 exit();
             }
-            $frameid = (int)$_POST['frameid'];
+            $frameid = (int) $_POST['frameid'];
             $critere = new Criteria('frame_frameid', $frameid, '=');
             $iframeHandler->deleteAll($critere);
             redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
@@ -199,10 +199,10 @@ 
                 $adminObject->displayNavigation(basename(__FILE__));
                 echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
                 echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+                echo "<a href='manage.php'><h4>"._AM_MYIFRAME_CONFIG.'</h4></a>';
                 echo _AM_MYIFRAME_ERROR_ADD_INDEX;
                 echo "</td></tr></table>\n";
-                include_once __DIR__ . '/admin_footer.php';
+                include_once __DIR__.'/admin_footer.php';
                 xoops_cp_footer();
                 $adminObject = \Xmf\Module\Admin::getInstance();
                 $adminObject->displayNavigation(basename(__FILE__));
@@ -241,33 +241,33 @@ 
         xoops_cp_header();
         $adminObject = \Xmf\Module\Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
+        echo '<h4>'._AM_MYIFRAME_CONFIG."</h4><br />\n";
         echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-        echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
-             . _AM_MYIFRAME_ACTION . "</th></tr>\n";
+        echo "<tr><th align='center'>"._AM_MYIFRAME_ID."</th><th align='center'>"._AM_MYIFRAME_DESC."</th><th align='center'>"._AM_MYIFRAME_CREATED."</th><th align='center'>"._AM_MYIFRAME_HITS."</th><th align='center'>"
+             . _AM_MYIFRAME_ACTION."</th></tr>\n";
         $critere = new Criteria('1', '1', '=');
         $critere->setSort('frame_description');
         $frarray = $iframeHandler->getObjects($critere);
         $class   = 'even';
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
+        $baseurl = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/manage.php';
         if (count($frarray) > 0) {
             foreach ($frarray as $frame) {
-                $action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
-                $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
+                $action_edit   = "<a href='".$baseurl.'?op=edit&frameid='.$frame->getVar('frame_frameid')."'><img src='../assets/images/edit.png' alt='"._AM_MYIFRAME_EDIT."'></a>";
+                $action_delete = "<a href='".$baseurl.'?op=delete&frameid='.$frame->getVar('frame_frameid')."'><img src='../assets/images/delete.png' alt='"._AM_MYIFRAME_DELETE."'></a>";
                 if (xoops_trim($frame->getVar('frame_description') === '')) {
                     $liendesc = $frame->getVar('frame_url');
                 } else {
-                    $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+                    $liendesc = "<a href='".XOOPS_URL.'/modules/myiframe/index.php?iframeid='.$frame->getVar('frame_frameid')."'>".$frame->getVar('frame_description').'</a>';
                 }
-                echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
-                     . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
+                echo "<tr class='".$class."'><td align='center'>".$frame->getVar('frame_frameid')."</td><td align='center'>".$liendesc."</td><td align='center'>".formatTimestamp($frame->getVar('frame_created'))
+                     . "</td><td align='center'>".$frame->getVar('frame_hits')."</td><td align='center'>".$action_edit.'&nbsp;-&nbsp;'.$action_delete."</td></tr>\n";
                 $class = ($class === 'even') ? 'odd' : 'even';
             }
         }
-        echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
+        echo "<tr class='".$class."'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='"._AM_MYIFRAME_ADD
              . "'></td></tr>";
         echo '</table>';
-        include_once __DIR__ . '/admin_footer.php';
+        include_once __DIR__.'/admin_footer.php';
         break;
 }
 

admin/admin_footer.php

Indentation +5 added lines, -5 removed lines

@@ -20,10 +20,10 @@
 $pathIcon32      = Xmf\Module\Admin::iconUrl('', 32);
 
 echo "<div class='adminfooter'>\n"
-     ."  <div style='text-align: center;'>\n"
-     ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-     ."  </div>\n"
-     .'  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
-     .'</div>';
+	 ."  <div style='text-align: center;'>\n"
+	 ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+	 ."  </div>\n"
+	 .'  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+	 .'</div>';
 
 xoops_cp_footer();

Spacing +2 added lines, -2 removed lines

@@ -17,13 +17,13 @@
  * @author     XOOPS Development Team
  */
 
-$pathIcon32      = Xmf\Module\Admin::iconUrl('', 32);
+$pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
 
 echo "<div class='adminfooter'>\n"
      ."  <div style='text-align: center;'>\n"
      ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
      ."  </div>\n"
-     .'  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+     .'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"
      .'</div>';
 
 xoops_cp_footer();

admin/menu.php

Indentation +18 added lines, -18 removed lines

@@ -6,12 +6,12 @@ 
  * ****************************************************************************
  */
 if (!isset($moduleDirName)) {
-    $moduleDirName = basename(dirname(__DIR__));
+	$moduleDirName = basename(dirname(__DIR__));
 }
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
 } else {
-    $moduleHelper = Xmf\Module\Helper::getHelper('system');
+	$moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 $adminObject   = \Xmf\Module\Admin::getInstance();
 $pathIcon32    = \Xmf\Module\Admin::menuIconPath('');
@@ -20,22 +20,22 @@ 
 $moduleHelper->loadLanguage('admin');
 
 $adminmenu = array(
-    array(
-        'title' => _MI_MYIFRAME_NAME,
-        'link'  => 'admin/index.php',
-        'icon'  => $pathIcon32 . '/home.png'
-    ),
+	array(
+		'title' => _MI_MYIFRAME_NAME,
+		'link'  => 'admin/index.php',
+		'icon'  => $pathIcon32 . '/home.png'
+	),
 
-    array(
-        'title' => _MI_MYIFRAME_ADMENU1,
-        'link'  => 'admin/manage.php',
-        'icon'  => $pathIcon32 . '/manage.png'
-    ),
+	array(
+		'title' => _MI_MYIFRAME_ADMENU1,
+		'link'  => 'admin/manage.php',
+		'icon'  => $pathIcon32 . '/manage.png'
+	),
 
-    // Category
-    array(
-        'title' => _MI_MYIFRAME_ADMENU2,
-        'link'  => 'admin/about.php',
-        'icon'  => $pathIcon32 . '/about.png'
-    ),
+	// Category
+	array(
+		'title' => _MI_MYIFRAME_ADMENU2,
+		'link'  => 'admin/about.php',
+		'icon'  => $pathIcon32 . '/about.png'
+	),
 );

Spacing +3 added lines, -3 removed lines

@@ -23,19 +23,19 @@
     array(
         'title' => _MI_MYIFRAME_NAME,
         'link'  => 'admin/index.php',
-        'icon'  => $pathIcon32 . '/home.png'
+        'icon'  => $pathIcon32.'/home.png'
     ),
 
     array(
         'title' => _MI_MYIFRAME_ADMENU1,
         'link'  => 'admin/manage.php',
-        'icon'  => $pathIcon32 . '/manage.png'
+        'icon'  => $pathIcon32.'/manage.png'
     ),
 
     // Category
     array(
         'title' => _MI_MYIFRAME_ADMENU2,
         'link'  => 'admin/about.php',
-        'icon'  => $pathIcon32 . '/about.png'
+        'icon'  => $pathIcon32.'/about.png'
     ),
 );

admin/about.php

Spacing +2 added lines, -2 removed lines

@@ -9,11 +9,11 @@
 #  Licence : GPL 							#
 #######################################################
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
 $adminObject->displayNavigation(basename(__FILE__));
 \Xmf\Module\Admin::setPaypal('aerograf@shmel.org');
 $adminObject->displayAbout(false);
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/index.php

Spacing +2 added lines, -2 removed lines

@@ -10,10 +10,10 @@
  * @version             $Id: blocks_mytype.php 2017-06-06
  **/
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject->displayIndex();
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';