mambax7 / smartobject

include/functions.php

Indentation +705 added lines, -705 removed lines

@@ -11,9 +11,9 @@ 
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
+	$ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -21,9 +21,9 @@ 
  */
 function smart_get_page_before_form()
 {
-    global $smart_previous_page;
+	global $smart_previous_page;
 
-    return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
+	return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
 }
 
 /**
@@ -34,29 +34,29 @@ 
  */
 function smart_userIsAdmin($module = false)
 {
-    global $xoopsUser;
-    static $smart_isAdmin;
-    if (!$module) {
-        global $xoopsModule;
-        $module = $xoopsModule->getVar('dirname');
-    }
-    if (isset($smart_isAdmin[$module])) {
-        return $smart_isAdmin[$module];
-    }
-    if (!$xoopsUser) {
-        $smart_isAdmin[$module] = false;
-
-        return $smart_isAdmin[$module];
-    }
-    $smart_isAdmin[$module] = false;
-    $smartModule            = smart_getModuleInfo($module);
-    if (!is_object($smartModule)) {
-        return false;
-    }
-    $module_id              = $smartModule->getVar('mid');
-    $smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
-
-    return $smart_isAdmin[$module];
+	global $xoopsUser;
+	static $smart_isAdmin;
+	if (!$module) {
+		global $xoopsModule;
+		$module = $xoopsModule->getVar('dirname');
+	}
+	if (isset($smart_isAdmin[$module])) {
+		return $smart_isAdmin[$module];
+	}
+	if (!$xoopsUser) {
+		$smart_isAdmin[$module] = false;
+
+		return $smart_isAdmin[$module];
+	}
+	$smart_isAdmin[$module] = false;
+	$smartModule            = smart_getModuleInfo($module);
+	if (!is_object($smartModule)) {
+		return false;
+	}
+	$module_id              = $smartModule->getVar('mid');
+	$smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
+
+	return $smart_isAdmin[$module];
 }
 
 /**
@@ -64,13 +64,13 @@ 
  */
 function smart_isXoops22()
 {
-    $xoops22 = false;
-    $xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
-    if (substr($xv, 2, 1) == '2') {
-        $xoops22 = true;
-    }
+	$xoops22 = false;
+	$xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
+	if (substr($xv, 2, 1) == '2') {
+		$xoops22 = true;
+	}
 
-    return $xoops22;
+	return $xoops22;
 }
 
 /**
@@ -81,34 +81,34 @@ 
  */
 function smart_getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false)
 {
-    if (!$moduleName) {
-        global $xoopsModule;
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (!isset($smartModule)) {
-        return '';
-    }
-
-    if ($forBreadCrumb && (isset($smartModuleConfig['show_mod_name_breadcrumb']) && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
-        return '';
-    }
-    if (!$withLink) {
-        return $smartModule->getVar('name');
-    } else {
-        $seoMode = smart_getModuleModeSEO($moduleName);
-        if ($seoMode === 'rewrite') {
-            $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
-        } elseif ($seoMode === 'pathinfo') {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
-        } else {
-            $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
-        }
-
-        return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
-    }
+	if (!$moduleName) {
+		global $xoopsModule;
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (!isset($smartModule)) {
+		return '';
+	}
+
+	if ($forBreadCrumb && (isset($smartModuleConfig['show_mod_name_breadcrumb']) && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
+		return '';
+	}
+	if (!$withLink) {
+		return $smartModule->getVar('name');
+	} else {
+		$seoMode = smart_getModuleModeSEO($moduleName);
+		if ($seoMode === 'rewrite') {
+			$seoModuleName = smart_getModuleNameForSEO($moduleName);
+			$ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+		} elseif ($seoMode === 'pathinfo') {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+		} else {
+			$ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+		}
+
+		return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+	}
 }
 
 /**
@@ -117,14 +117,14 @@ 
  */
 function smart_getModuleNameForSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
-    if (isset($smartModuleConfig['seo_module_name'])) {
-        return $smartModuleConfig['seo_module_name'];
-    }
-    $ret = smart_getModuleName(false, false, $moduleName);
-
-    return strtolower($ret);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
+	if (isset($smartModuleConfig['seo_module_name'])) {
+		return $smartModuleConfig['seo_module_name'];
+	}
+	$ret = smart_getModuleName(false, false, $moduleName);
+
+	return strtolower($ret);
 }
 
 /**
@@ -133,10 +133,10 @@ 
  */
 function smart_getModuleModeSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
+	return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
 }
 
 /**
@@ -145,10 +145,10 @@ 
  */
 function smart_getModuleIncludeIdSEO($moduleName = false)
 {
-    $smartModule       = smart_getModuleInfo($moduleName);
-    $smartModuleConfig = smart_getModuleConfig($moduleName);
+	$smartModule       = smart_getModuleInfo($moduleName);
+	$smartModuleConfig = smart_getModuleConfig($moduleName);
 
-    return !empty($smartModuleConfig['seo_inc_id']);
+	return !empty($smartModuleConfig['seo_inc_id']);
 }
 
 /**
@@ -157,26 +157,26 @@ 
  */
 function smart_getenv($key)
 {
-    $ret = '';
-    $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
+	$ret = '';
+	$ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
 
-    return $ret;
+	return $ret;
 }
 
 function smart_xoops_cp_header()
 {
-    xoops_cp_header();
-    global $xoopsModule, $xoopsConfig;
-    /**
-     * include SmartObject admin language file
-     */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    if (file_exists($fileName)) {
-        include_once $fileName;
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    ?>
+	xoops_cp_header();
+	global $xoopsModule, $xoopsConfig;
+	/**
+	 * include SmartObject admin language file
+	 */
+	$fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	if (file_exists($fileName)) {
+		include_once $fileName;
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	?>
     <script type='text/javascript'>
         <!--
         var smart_url = '<?php echo SMARTOBJECT_URL ?>';
@@ -189,14 +189,14 @@ 
         src='<?php echo SMARTOBJECT_URL ?>include/smart.js'></script>
     <?php
 
-    /**
-     * Include the admin language constants for the SmartObject Framework
-     */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
-    if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
-    }
-    include_once($admin_file);
+	/**
+	 * Include the admin language constants for the SmartObject Framework
+	 */
+	$admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+	if (!file_exists($admin_file)) {
+		$admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+	}
+	include_once($admin_file);
 }
 
 /**
@@ -210,21 +210,21 @@ 
  */
 function smart_TableExists($table)
 {
-    $bRetVal = false;
-    //Verifies that a MySQL table exists
-    $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
-    $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
-    $ret      = $xoopsDB->queryF($sql);
-    while (list($m_table) = $xoopsDB->fetchRow($ret)) {
-        if ($m_table == $realname) {
-            $bRetVal = true;
-            break;
-        }
-    }
-    $xoopsDB->freeRecordSet($ret);
-
-    return $bRetVal;
+	$bRetVal = false;
+	//Verifies that a MySQL table exists
+	$xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
+	$realname = $xoopsDB->prefix($table);
+	$sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+	$ret      = $xoopsDB->queryF($sql);
+	while (list($m_table) = $xoopsDB->fetchRow($ret)) {
+		if ($m_table == $realname) {
+			$bRetVal = true;
+			break;
+		}
+	}
+	$xoopsDB->freeRecordSet($ret);
+
+	return $bRetVal;
 }
 
 /**
@@ -239,19 +239,19 @@ 
  */
 function smart_GetMeta($key, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
-    $ret     = $xoopsDB->query($sql);
-    if (!$ret) {
-        $value = false;
-    } else {
-        list($value) = $xoopsDB->fetchRow($ret);
-    }
-
-    return $value;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$sql     = sprintf('SELECT metavalue FROM %s WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+	$ret     = $xoopsDB->query($sql);
+	if (!$ret) {
+		$value = false;
+	} else {
+		list($value) = $xoopsDB->fetchRow($ret);
+	}
+
+	return $value;
 }
 
 /**
@@ -259,12 +259,12 @@ 
  */
 function smart_getCurrentModuleName()
 {
-    global $xoopsModule;
-    if (is_object($xoopsModule)) {
-        return $xoopsModule->getVar('dirname');
-    } else {
-        return false;
-    }
+	global $xoopsModule;
+	if (is_object($xoopsModule)) {
+		return $xoopsModule->getVar('dirname');
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -280,22 +280,22 @@ 
  */
 function smart_SetMeta($key, $value, $moduleName = false)
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-    $ret     = smart_GetMeta($key, $moduleName);
-    if ($ret === '0' || $ret > 0) {
-        $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
-    } else {
-        $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
-    }
-    $ret = $xoopsDB->queryF($sql);
-    if (!$ret) {
-        return false;
-    }
-
-    return true;
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
+	$ret     = smart_GetMeta($key, $moduleName);
+	if ($ret === '0' || $ret > 0) {
+		$sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+	} else {
+		$sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+	}
+	$ret = $xoopsDB->queryF($sql);
+	if (!$ret) {
+		return false;
+	}
+
+	return true;
 }
 
 // Thanks to Mithrandir:-)
@@ -308,20 +308,20 @@ 
  */
 function smart_substr($str, $start, $length, $trimmarker = '...')
 {
-    // if the string is empty, let's get out ;-)
-    if ($str == '') {
-        return $str;
-    }
-    // reverse a string that is shortened with '' as trimmarker
-    $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
-    // find first space in reversed string
-    $position_of_space = strpos($reversed_string, ' ', 0);
-    // truncate the original string to a length of $length
-    // minus the position of the last space
-    // plus the length of the $trimmarker
-    $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
-
-    return $truncated_string;
+	// if the string is empty, let's get out ;-)
+	if ($str == '') {
+		return $str;
+	}
+	// reverse a string that is shortened with '' as trimmarker
+	$reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+	// find first space in reversed string
+	$position_of_space = strpos($reversed_string, ' ', 0);
+	// truncate the original string to a length of $length
+	// minus the position of the last space
+	// plus the length of the $trimmarker
+	$truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
+
+	return $truncated_string;
 }
 
 /**
@@ -332,19 +332,19 @@ 
  */
 function smart_getConfig($key, $moduleName = false, $default = 'default_is_undefined')
 {
-    if (!$moduleName) {
-        $moduleName = smart_getCurrentModuleName();
-    }
-    $configs = smart_getModuleConfig($moduleName);
-    if (isset($configs[$key])) {
-        return $configs[$key];
-    } else {
-        if ($default === 'default_is_undefined') {
-            return null;
-        } else {
-            return $default;
-        }
-    }
+	if (!$moduleName) {
+		$moduleName = smart_getCurrentModuleName();
+	}
+	$configs = smart_getModuleConfig($moduleName);
+	if (isset($configs[$key])) {
+		return $configs[$key];
+	} else {
+		if ($default === 'default_is_undefined') {
+			return null;
+		} else {
+			return $default;
+		}
+	}
 }
 
 /**
@@ -357,32 +357,32 @@ 
  */
 function smart_copyr($source, $dest)
 {
-    // Simple copy for a file
-    if (is_file($source)) {
-        return copy($source, $dest);
-    }
-    // Make destination directory
-    if (!is_dir($dest)) {
-        mkdir($dest);
-    }
-    // Loop through the folder
-    $dir = dir($source);
-    while (false !== $entry = $dir->read()) {
-        // Skip pointers
-        if ($entry === '.' || $entry === '..') {
-            continue;
-        }
-        // Deep copy directories
-        if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
-            copyr("$source/$entry", "$dest/$entry");
-        } else {
-            copy("$source/$entry", "$dest/$entry");
-        }
-    }
-    // Clean up
-    $dir->close();
-
-    return true;
+	// Simple copy for a file
+	if (is_file($source)) {
+		return copy($source, $dest);
+	}
+	// Make destination directory
+	if (!is_dir($dest)) {
+		mkdir($dest);
+	}
+	// Loop through the folder
+	$dir = dir($source);
+	while (false !== $entry = $dir->read()) {
+		// Skip pointers
+		if ($entry === '.' || $entry === '..') {
+			continue;
+		}
+		// Deep copy directories
+		if (is_dir("$source/$entry") && ($dest !== "$source/$entry")) {
+			copyr("$source/$entry", "$dest/$entry");
+		} else {
+			copy("$source/$entry", "$dest/$entry");
+		}
+	}
+	// Clean up
+	$dir->close();
+
+	return true;
 }
 
 /**
@@ -392,26 +392,26 @@ 
  */
 function smart_admin_mkdir($target)
 {
-    // http://www.php.net/manual/en/function.mkdir.php
-    // saint at corenova.com
-    // bart at cdasites dot com
-    if (is_dir($target) || empty($target)) {
-        return true; // best case check first
-    }
-    if (file_exists($target) && !is_dir($target)) {
-        return false;
-    }
-    if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
-        if (!file_exists($target)) {
-            $res = mkdir($target, 0777); // crawl back up & create dir tree
-            smart_admin_chmod($target);
-
-            return $res;
-        }
-    }
-    $res = is_dir($target);
-
-    return $res;
+	// http://www.php.net/manual/en/function.mkdir.php
+	// saint at corenova.com
+	// bart at cdasites dot com
+	if (is_dir($target) || empty($target)) {
+		return true; // best case check first
+	}
+	if (file_exists($target) && !is_dir($target)) {
+		return false;
+	}
+	if (smart_admin_mkdir(substr($target, 0, strrpos($target, '/')))) {
+		if (!file_exists($target)) {
+			$res = mkdir($target, 0777); // crawl back up & create dir tree
+			smart_admin_chmod($target);
+
+			return $res;
+		}
+	}
+	$res = is_dir($target);
+
+	return $res;
 }
 
 /**
@@ -422,7 +422,7 @@ 
  */
 function smart_admin_chmod($target, $mode = 0777)
 {
-    return @ chmod($target, $mode);
+	return @ chmod($target, $mode);
 }
 
 /**
@@ -433,31 +433,31 @@ 
  */
 function smart_imageResize($src, $maxWidth, $maxHeight)
 {
-    $width  = '';
-    $height = '';
-    $type   = '';
-    $attr   = '';
-    if (file_exists($src)) {
-        list($width, $height, $type, $attr) = getimagesize($src);
-        if ($width > $maxWidth) {
-            $originalWidth = $width;
-            $width         = $maxWidth;
-            $height        = $width * $height / $originalWidth;
-        }
-        if ($height > $maxHeight) {
-            $originalHeight = $height;
-            $height         = $maxHeight;
-            $width          = $height * $width / $originalHeight;
-        }
-        $attr = " width='$width' height='$height'";
-    }
-
-    return array(
-        $width,
-        $height,
-        $type,
-        $attr
-    );
+	$width  = '';
+	$height = '';
+	$type   = '';
+	$attr   = '';
+	if (file_exists($src)) {
+		list($width, $height, $type, $attr) = getimagesize($src);
+		if ($width > $maxWidth) {
+			$originalWidth = $width;
+			$width         = $maxWidth;
+			$height        = $width * $height / $originalWidth;
+		}
+		if ($height > $maxHeight) {
+			$originalHeight = $height;
+			$height         = $maxHeight;
+			$width          = $height * $width / $originalHeight;
+		}
+		$attr = " width='$width' height='$height'";
+	}
+
+	return array(
+		$width,
+		$height,
+		$type,
+		$attr
+	);
 }
 
 /**
@@ -466,34 +466,34 @@ 
  */
 function smart_getModuleInfo($moduleName = false)
 {
-    static $smartModules;
-    if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
-
-            return $smartModules[$xoopsModule->getVar('dirname')];
-        }
-    }
-    if (!isset($smartModules[$moduleName])) {
-        if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-            $smartModules[$moduleName] = $xoopsModule;
-        } else {
-            $hModule = xoops_getHandler('module');
-            if ($moduleName !== 'xoops') {
-                $smartModules[$moduleName] = $hModule->getByDirname($moduleName);
-            } else {
-                $smartModules[$moduleName] = $hModule->getByDirname('system');
-            }
-        }
-    }
-
-    return $smartModules[$moduleName];
+	static $smartModules;
+	if (isset($smartModules[$moduleName])) {
+		$ret =& $smartModules[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
+
+			return $smartModules[$xoopsModule->getVar('dirname')];
+		}
+	}
+	if (!isset($smartModules[$moduleName])) {
+		if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+			$smartModules[$moduleName] = $xoopsModule;
+		} else {
+			$hModule = xoops_getHandler('module');
+			if ($moduleName !== 'xoops') {
+				$smartModules[$moduleName] = $hModule->getByDirname($moduleName);
+			} else {
+				$smartModules[$moduleName] = $hModule->getByDirname('system');
+			}
+		}
+	}
+
+	return $smartModules[$moduleName];
 }
 
 /**
@@ -502,40 +502,40 @@ 
  */
 function smart_getModuleConfig($moduleName = false)
 {
-    static $smartConfigs;
-    if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
-
-        return $ret;
-    }
-    global $xoopsModule, $xoopsModuleConfig;
-    if (!$moduleName) {
-        if (isset($xoopsModule) && is_object($xoopsModule)) {
-            $smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
-
-            return $smartConfigs[$xoopsModule->getVar('dirname')];
-        }
-    }
-    // if we still did not found the xoopsModule, this is because there is none
-    if (!$moduleName) {
-        $ret = false;
-
-        return $ret;
-    }
-    if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-        $smartConfigs[$moduleName] = $xoopsModuleConfig;
-    } else {
-        $module = smart_getModuleInfo($moduleName);
-        if (!is_object($module)) {
-            $ret = false;
-
-            return $ret;
-        }
-        $hModConfig                = xoops_getHandler('config');
-        $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
-    }
-
-    return $smartConfigs[$moduleName];
+	static $smartConfigs;
+	if (isset($smartConfigs[$moduleName])) {
+		$ret =& $smartConfigs[$moduleName];
+
+		return $ret;
+	}
+	global $xoopsModule, $xoopsModuleConfig;
+	if (!$moduleName) {
+		if (isset($xoopsModule) && is_object($xoopsModule)) {
+			$smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
+
+			return $smartConfigs[$xoopsModule->getVar('dirname')];
+		}
+	}
+	// if we still did not found the xoopsModule, this is because there is none
+	if (!$moduleName) {
+		$ret = false;
+
+		return $ret;
+	}
+	if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+		$smartConfigs[$moduleName] = $xoopsModuleConfig;
+	} else {
+		$module = smart_getModuleInfo($moduleName);
+		if (!is_object($module)) {
+			$ret = false;
+
+			return $ret;
+		}
+		$hModConfig                = xoops_getHandler('config');
+		$smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+	}
+
+	return $smartConfigs[$moduleName];
 }
 
 /**
@@ -544,10 +544,10 @@ 
  */
 function smart_deleteFile($dirname)
 {
-    // Simple delete for a file
-    if (is_file($dirname)) {
-        return unlink($dirname);
-    }
+	// Simple delete for a file
+	if (is_file($dirname)) {
+		return unlink($dirname);
+	}
 }
 
 /**
@@ -556,12 +556,12 @@ 
  */
 function smart_formatErrors($errors = array())
 {
-    $ret = '';
-    foreach ($errors as $key => $value) {
-        $ret .= '<br /> - ' . $value;
-    }
+	$ret = '';
+	foreach ($errors as $key => $value) {
+		$ret .= '<br /> - ' . $value;
+	}
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -575,46 +575,46 @@ 
  */
 function smart_getLinkedUnameFromId($userid = 0, $name = 0, $users = array(), $withContact = false)
 {
-    if (!is_numeric($userid)) {
-        return $userid;
-    }
-    $userid = (int)$userid;
-    if ($userid > 0) {
-        if ($users == array()) {
-            //fetching users
-            $memberHandler = xoops_getHandler('member');
-            $user           =& $memberHandler->getUser($userid);
-        } else {
-            if (!isset($users[$userid])) {
-                return $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $user =& $users[$userid];
-        }
-        if (is_object($user)) {
-            $ts        = MyTextSanitizer:: getInstance();
-            $username  = $user->getVar('uname');
-            $fullname  = '';
-            $fullname2 = $user->getVar('name');
-            if ($name && !empty($fullname2)) {
-                $fullname = $user->getVar('name');
-            }
-            if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
-            } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
-            }
-            // add contact info: email + PM
-            if ($withContact) {
-                $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"/></a>';
-                $js = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"/></a>';
-            }
-
-            return $linkeduser;
-        }
-    }
-
-    return $GLOBALS['xoopsConfig']['anonymous'];
+	if (!is_numeric($userid)) {
+		return $userid;
+	}
+	$userid = (int)$userid;
+	if ($userid > 0) {
+		if ($users == array()) {
+			//fetching users
+			$memberHandler = xoops_getHandler('member');
+			$user           =& $memberHandler->getUser($userid);
+		} else {
+			if (!isset($users[$userid])) {
+				return $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$user =& $users[$userid];
+		}
+		if (is_object($user)) {
+			$ts        = MyTextSanitizer:: getInstance();
+			$username  = $user->getVar('uname');
+			$fullname  = '';
+			$fullname2 = $user->getVar('name');
+			if ($name && !empty($fullname2)) {
+				$fullname = $user->getVar('name');
+			}
+			if (!empty($fullname)) {
+				$linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+			} else {
+				$linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+			}
+			// add contact info: email + PM
+			if ($withContact) {
+				$linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"/></a>';
+				$js = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
+				$linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"/></a>';
+			}
+
+			return $linkeduser;
+		}
+	}
+
+	return $GLOBALS['xoopsConfig']['anonymous'];
 }
 
 /**
@@ -625,33 +625,33 @@ 
  */
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
-    global $xoopsModule, $xoopsConfig;
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
-    }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
-    } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
-    }
-    $headermenu = array();
-    $adminmenu  = array();
-    include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
-    $tpl = new XoopsTpl();
-    $tpl->assign(array(
-                     'headermenu'      => $headermenu,
-                     'adminmenu'       => $adminmenu,
-                     'current'         => $currentoption,
-                     'breadcrumb'      => $breadcrumb,
-                     'headermenucount' => count($headermenu),
-                     'submenus'        => $submenus,
-                     'currentsub'      => $currentsub,
-                     'submenuscount'   => count($submenus)
-                 ));
-    $tpl->display('db:smartobject_admin_menu.tpl');
+	global $xoopsModule, $xoopsConfig;
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+	}
+	if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+	} else {
+		include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+	}
+	$headermenu = array();
+	$adminmenu  = array();
+	include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+	$tpl = new XoopsTpl();
+	$tpl->assign(array(
+					 'headermenu'      => $headermenu,
+					 'adminmenu'       => $adminmenu,
+					 'current'         => $currentoption,
+					 'breadcrumb'      => $breadcrumb,
+					 'headermenucount' => count($headermenu),
+					 'submenus'        => $submenus,
+					 'currentsub'      => $currentsub,
+					 'submenuscount'   => count($submenus)
+				 ));
+	$tpl->display('db:smartobject_admin_menu.tpl');
 }
 
 /**
@@ -661,13 +661,13 @@ 
  */
 function smart_collapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ($dsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ($dsc != '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -677,15 +677,15 @@ 
  */
 function smart_ajaxCollapsableBar($id = '', $title = '', $dsc = '')
 {
-    global $xoopsModule;
-    $onClick = "ajaxtogglecollapse('$id')";
-    //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-    echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-    echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
-    echo "<div id='" . $id . "'>";
-    if ($dsc != '') {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
-    }
+	global $xoopsModule;
+	$onClick = "ajaxtogglecollapse('$id')";
+	//$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
+	echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
+	echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt='' /></a>&nbsp;" . $title . '</h3>';
+	echo "<div id='" . $id . "'>";
+	if ($dsc != '') {
+		echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $dsc . '</span>';
+	}
 }
 
 /**
@@ -712,20 +712,20 @@ 
  */
 function smart_openclose_collapsable($name)
 {
-    $urls        = smart_getCurrentUrls();
-    $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
-    $cookie_name = str_replace('.', '_', $cookie_name);
-    $cookie      = smart_getCookieVar($cookie_name, '');
-    if ($cookie === 'none') {
-        echo '
+	$urls        = smart_getCurrentUrls();
+	$path        = $urls['phpself'];
+	$cookie_name = $path . '_smart_collaps_' . $name;
+	$cookie_name = str_replace('.', '_', $cookie_name);
+	$cookie      = smart_getCookieVar($cookie_name, '');
+	if ($cookie === 'none') {
+		echo '
                 <script type="text/javascript"><!--
                 togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
                     //-->
                 </script>
                 ';
-    }
-    /*  if ($cookie == 'none') {
+	}
+	/*  if ($cookie == 'none') {
      echo '
      <script type="text/javascript"><!--
      hideElement("' . $name . '");
@@ -741,9 +741,9 @@ 
  */
 function smart_close_collapsable($name)
 {
-    echo '</div>';
-    smart_openclose_collapsable($name);
-    echo '<br />';
+	echo '</div>';
+	smart_openclose_collapsable($name);
+	echo '<br />';
 }
 
 /**
@@ -753,11 +753,11 @@ 
  */
 function smart_setCookieVar($name, $value, $time = 0)
 {
-    if ($time == 0) {
-        $time = time() + 3600 * 24 * 365;
-        //$time = '';
-    }
-    setcookie($name, $value, $time, '/');
+	if ($time == 0) {
+		$time = time() + 3600 * 24 * 365;
+		//$time = '';
+	}
+	setcookie($name, $value, $time, '/');
 }
 
 /**
@@ -767,12 +767,12 @@ 
  */
 function smart_getCookieVar($name, $default = '')
 {
-    $name = str_replace('.', '_', $name);
-    if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
-        return $_COOKIE[$name];
-    } else {
-        return $default;
-    }
+	$name = str_replace('.', '_', $name);
+	if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
+		return $_COOKIE[$name];
+	} else {
+		return $default;
+	}
 }
 
 /**
@@ -780,25 +780,25 @@ 
  */
 function smart_getCurrentUrls()
 {
-    $urls        = array();
-    $http        = (strpos(XOOPS_URL, 'https://') === false) ? 'http://' : 'https://';
-    $phpself     = $_SERVER['PHP_SELF'];
-    $httphost    = $_SERVER['HTTP_HOST'];
-    $querystring = $_SERVER['QUERY_STRING'];
-    if ($querystring != '') {
-        $querystring = '?' . $querystring;
-    }
-    $currenturl           = $http . $httphost . $phpself . $querystring;
-    $urls                 = array();
-    $urls['http']         = $http;
-    $urls['httphost']     = $httphost;
-    $urls['phpself']      = $phpself;
-    $urls['querystring']  = $querystring;
-    $urls['full_phpself'] = $http . $httphost . $phpself;
-    $urls['full']         = $currenturl;
-    $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
-
-    return $urls;
+	$urls        = array();
+	$http        = (strpos(XOOPS_URL, 'https://') === false) ? 'http://' : 'https://';
+	$phpself     = $_SERVER['PHP_SELF'];
+	$httphost    = $_SERVER['HTTP_HOST'];
+	$querystring = $_SERVER['QUERY_STRING'];
+	if ($querystring != '') {
+		$querystring = '?' . $querystring;
+	}
+	$currenturl           = $http . $httphost . $phpself . $querystring;
+	$urls                 = array();
+	$urls['http']         = $http;
+	$urls['httphost']     = $httphost;
+	$urls['phpself']      = $phpself;
+	$urls['querystring']  = $querystring;
+	$urls['full_phpself'] = $http . $httphost . $phpself;
+	$urls['full']         = $currenturl;
+	$urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+
+	return $urls;
 }
 
 /**
@@ -806,9 +806,9 @@ 
  */
 function smart_getCurrentPage()
 {
-    $urls = smart_getCurrentUrls();
+	$urls = smart_getCurrentUrls();
 
-    return $urls['full'];
+	return $urls['full'];
 }
 
 /**
@@ -855,29 +855,29 @@ 
  */
 function smart_modFooter()
 {
-    global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    $tpl = new XoopsTpl();
-
-    $hModule      = xoops_getHandler('module');
-    $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-    $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-    $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
-    $tpl->assign('modfooter', $modfooter);
-
-    if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
-        define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br />Do you need new features not yet available?');
-    }
-    $smartobjectConfig = smart_getModuleConfig('smartobject');
-    $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
+	global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+	include_once XOOPS_ROOT_PATH . '/class/template.php';
+	$tpl = new XoopsTpl();
+
+	$hModule      = xoops_getHandler('module');
+	$versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
+	$modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
+	$modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'/></a>";
+	$tpl->assign('modfooter', $modfooter);
+
+	if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
+		define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br />Do you need new features not yet available?');
+	}
+	$smartobjectConfig = smart_getModuleConfig('smartobject');
+	$tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
+	$tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
 }
 
 function smart_xoops_cp_footer()
 {
-    smart_modFooter();
-    xoops_cp_footer();
+	smart_modFooter();
+	xoops_cp_footer();
 }
 
 /**
@@ -886,11 +886,11 @@ 
  */
 function smart_sanitizeForCommonTags($text)
 {
-    global $xoopsConfig;
-    $text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
-    $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
+	global $xoopsConfig;
+	$text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
+	$text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -898,7 +898,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+	echo '<script src="' . $src . '" type="text/javascript"></script>';
 }
 
 /**
@@ -906,17 +906,17 @@ 
  */
 function smart_addStyle($src)
 {
-    if ($src === 'smartobject') {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
-    }
-    echo smart_get_css_link($src);
+	if ($src === 'smartobject') {
+		$src = SMARTOBJECT_URL . 'assets/css/module.css';
+	}
+	echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
+	smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -925,11 +925,11 @@ 
  */
 function smart_sanitizeForSmartpopupLink($text)
 {
-    $patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
-    $replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
-    $ret            = preg_replace($patterns, $replacements, $text);
+	$patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
+	$replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
+	$ret            = preg_replace($patterns, $replacements, $text);
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -944,25 +944,25 @@ 
  */
 function smart_getImageSize($url, & $width, & $height)
 {
-    if (empty($width) || empty($height)) {
-        if (!$dimension = @ getimagesize($url)) {
-            return false;
-        }
-        if (!empty($width)) {
-            $height = $dimension[1] * $width / $dimension[0];
-        } elseif (!empty($height)) {
-            $width = $dimension[0] * $height / $dimension[1];
-        } else {
-            list($width, $height) = array(
-                $dimension[0],
-                $dimension[1]
-            );
-        }
-
-        return true;
-    } else {
-        return true;
-    }
+	if (empty($width) || empty($height)) {
+		if (!$dimension = @ getimagesize($url)) {
+			return false;
+		}
+		if (!empty($width)) {
+			$height = $dimension[1] * $width / $dimension[0];
+		} elseif (!empty($height)) {
+			$width = $dimension[0] * $height / $dimension[1];
+		} else {
+			list($width, $height) = array(
+				$dimension[0],
+				$dimension[1]
+			);
+		}
+
+		return true;
+	} else {
+		return true;
+	}
 }
 
 /**
@@ -975,8 +975,8 @@ 
  */
 function smart_htmlnumericentities($str)
 {
-    //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
+	//    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
+	return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
 }
 
 /**
@@ -986,24 +986,24 @@ 
  */
 function smart_getcorehandler($name, $optional = false)
 {
-    static $handlers;
-    $name = strtolower(trim($name));
-    if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
-            require_once $hnd_file;
-        }
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
-        if (class_exists($class)) {
-            $handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
-        }
-    }
-    if (!isset($handlers[$name]) && !$optional) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br />Handler Name: ' . $name, E_USER_ERROR);
-    }
-    if (isset($handlers[$name])) {
-        return $handlers[$name];
-    }
-    $inst = false;
+	static $handlers;
+	$name = strtolower(trim($name));
+	if (!isset($handlers[$name])) {
+		if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+			require_once $hnd_file;
+		}
+		$class = 'Xoops' . ucfirst($name) . 'Handler';
+		if (class_exists($class)) {
+			$handlers[$name] = new $class ($GLOBALS['xoopsDB'], 'xoops');
+		}
+	}
+	if (!isset($handlers[$name]) && !$optional) {
+		trigger_error('Class <b>' . $class . '</b> does not exist<br />Handler Name: ' . $name, E_USER_ERROR);
+	}
+	if (isset($handlers[$name])) {
+		return $handlers[$name];
+	}
+	$inst = false;
 }
 
 /**
@@ -1012,15 +1012,15 @@ 
  */
 function smart_sanitizeAdsenses_callback($matches)
 {
-    global $smartobjectAdsenseHandler;
-    if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
-        $adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
-        $ret        = $adsenseObj->render();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectAdsenseHandler;
+	if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
+		$adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
+		$ret        = $adsenseObj->render();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1029,13 +1029,13 @@ 
  */
 function smart_sanitizeAdsenses($text)
 {
-    $patterns     = array();
-    $replacements = array();
+	$patterns     = array();
+	$replacements = array();
 
-    $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
+	$patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeAdsenses_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1044,15 +1044,15 @@ 
  */
 function smart_sanitizeCustomtags_callback($matches)
 {
-    global $smartobjectCustomtagHandler;
-    if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
-        $customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
-        $ret       = $customObj->renderWithPhp();
-
-        return $ret;
-    } else {
-        return '';
-    }
+	global $smartobjectCustomtagHandler;
+	if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
+		$customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
+		$ret       = $customObj->renderWithPhp();
+
+		return $ret;
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1061,13 +1061,13 @@ 
  */
 function smart_sanitizeCustomtags($text)
 {
-    $patterns     = array();
-    $replacements = array();
+	$patterns     = array();
+	$replacements = array();
 
-    $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
-    $text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
+	$patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
+	$text       = preg_replace_callback($patterns, 'smart_sanitizeCustomtags_callback', $text);
 
-    return $text;
+	return $text;
 }
 
 /**
@@ -1076,20 +1076,20 @@ 
  */
 function smart_loadLanguageFile($module, $file)
 {
-    global $xoopsConfig;
-
-    $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
-    if (!file_exists($filename)) {
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
-    }
-    if (file_exists($filename)) {
-        include_once($filename);
-    }
+	global $xoopsConfig;
+
+	$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+	if (!file_exists($filename)) {
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+	}
+	if (file_exists($filename)) {
+		include_once($filename);
+	}
 }
 
 function smart_loadCommonLanguageFile()
 {
-    smart_loadLanguageFile('smartobject', 'common');
+	smart_loadLanguageFile('smartobject', 'common');
 }
 
 /**
@@ -1099,35 +1099,35 @@ 
  */
 function smart_purifyText($text, $keyword = false)
 {
-    global $myts;
-    $text = str_replace('&nbsp;', ' ', $text);
-    $text = str_replace('<br />', ' ', $text);
-    $text = str_replace('<br/>', ' ', $text);
-    $text = str_replace('<br', ' ', $text);
-    $text = strip_tags($text);
-    $text = html_entity_decode($text);
-    $text = $myts->undoHtmlSpecialChars($text);
-    $text = str_replace(')', ' ', $text);
-    $text = str_replace('(', ' ', $text);
-    $text = str_replace(':', ' ', $text);
-    $text = str_replace('&euro', ' euro ', $text);
-    $text = str_replace('&hellip', '...', $text);
-    $text = str_replace('&rsquo', ' ', $text);
-    $text = str_replace('!', ' ', $text);
-    $text = str_replace('?', ' ', $text);
-    $text = str_replace('"', ' ', $text);
-    $text = str_replace('-', ' ', $text);
-    $text = str_replace('\n', ' ', $text);
-    $text = str_replace('&#8213;', ' ', $text);
-
-    if ($keyword) {
-        $text = str_replace('.', ' ', $text);
-        $text = str_replace(',', ' ', $text);
-        $text = str_replace('\'', ' ', $text);
-    }
-    $text = str_replace(';', ' ', $text);
-
-    return $text;
+	global $myts;
+	$text = str_replace('&nbsp;', ' ', $text);
+	$text = str_replace('<br />', ' ', $text);
+	$text = str_replace('<br/>', ' ', $text);
+	$text = str_replace('<br', ' ', $text);
+	$text = strip_tags($text);
+	$text = html_entity_decode($text);
+	$text = $myts->undoHtmlSpecialChars($text);
+	$text = str_replace(')', ' ', $text);
+	$text = str_replace('(', ' ', $text);
+	$text = str_replace(':', ' ', $text);
+	$text = str_replace('&euro', ' euro ', $text);
+	$text = str_replace('&hellip', '...', $text);
+	$text = str_replace('&rsquo', ' ', $text);
+	$text = str_replace('!', ' ', $text);
+	$text = str_replace('?', ' ', $text);
+	$text = str_replace('"', ' ', $text);
+	$text = str_replace('-', ' ', $text);
+	$text = str_replace('\n', ' ', $text);
+	$text = str_replace('&#8213;', ' ', $text);
+
+	if ($keyword) {
+		$text = str_replace('.', ' ', $text);
+		$text = str_replace(',', ' ', $text);
+		$text = str_replace('\'', ' ', $text);
+	}
+	$text = str_replace(';', ' ', $text);
+
+	return $text;
 }
 
 /**
@@ -1136,49 +1136,49 @@ 
  */
 function smart_html2text($document)
 {
-    // PHP Manual:: function preg_replace
-    // $document should contain an HTML document.
-    // This will remove HTML tags, javascript sections
-    // and white space. It will also convert some
-    // common HTML entities to their text equivalent.
-    // Credits: newbb2
-    $search = array(
-        "'<script[^>]*?>.*?</script>'si",  // Strip out javascript
-        "'<img.*?/>'si",       // Strip out img tags
-        "'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
-        "'([\r\n])[\s]+'",                // Strip out white space
-        "'&(quot|#34);'i",                // Replace HTML entities
-        "'&(amp|#38);'i",
-        "'&(lt|#60);'i",
-        "'&(gt|#62);'i",
-        "'&(nbsp|#160);'i",
-        "'&(iexcl|#161);'i",
-        "'&(cent|#162);'i",
-        "'&(pound|#163);'i",
-        "'&(copy|#169);'i",
-        "'&#(\d+);'e"
-    );                    // evaluate as php
-
-    $replace = array(
-        '',
-        '',
-        '',
-        "\\1",
-        "\"",
-        '&',
-        '<',
-        '>',
-        ' ',
-        chr(161),
-        chr(162),
-        chr(163),
-        chr(169),
-        "chr(\\1)"
-    );
-
-    $text = preg_replace($search, $replace, $document);
-
-    return $text;
+	// PHP Manual:: function preg_replace
+	// $document should contain an HTML document.
+	// This will remove HTML tags, javascript sections
+	// and white space. It will also convert some
+	// common HTML entities to their text equivalent.
+	// Credits: newbb2
+	$search = array(
+		"'<script[^>]*?>.*?</script>'si",  // Strip out javascript
+		"'<img.*?/>'si",       // Strip out img tags
+		"'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
+		"'([\r\n])[\s]+'",                // Strip out white space
+		"'&(quot|#34);'i",                // Replace HTML entities
+		"'&(amp|#38);'i",
+		"'&(lt|#60);'i",
+		"'&(gt|#62);'i",
+		"'&(nbsp|#160);'i",
+		"'&(iexcl|#161);'i",
+		"'&(cent|#162);'i",
+		"'&(pound|#163);'i",
+		"'&(copy|#169);'i",
+		"'&#(\d+);'e"
+	);                    // evaluate as php
+
+	$replace = array(
+		'',
+		'',
+		'',
+		"\\1",
+		"\"",
+		'&',
+		'<',
+		'>',
+		' ',
+		chr(161),
+		chr(162),
+		chr(163),
+		chr(169),
+		"chr(\\1)"
+	);
+
+	$text = preg_replace($search, $replace, $document);
+
+	return $text;
 }
 
 /**
@@ -1192,32 +1192,32 @@ 
  */
 function smart_getfloat($str, $set = false)
 {
-    if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
-        // Found number in $str, so set $str that number
-        $str = $match[0];
-        if (false !== strpos($str, ',')) {
-            // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-            $str = str_replace('.', '', $str);    // Erase thousand seps
-            $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
-
-            return (float)$str;
-        } else {
-            // No comma exists, so we have to decide, how a single dot shall be treated
-            if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == true && $set['single_dot_as_decimal'] == true) {
-                // Treat single dot as decimal separator
-                return (float)$str;
-            } else {
-                //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
-                // Else, treat all dots as thousand seps
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-
-                return (float)$str;
-            }
-        }
-    } else {
-        // No number found, return zero
-        return 0;
-    }
+	if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
+		// Found number in $str, so set $str that number
+		$str = $match[0];
+		if (false !== strpos($str, ',')) {
+			// A comma exists, that makes it easy, cos we assume it separates the decimal part.
+			$str = str_replace('.', '', $str);    // Erase thousand seps
+			$str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+
+			return (float)$str;
+		} else {
+			// No comma exists, so we have to decide, how a single dot shall be treated
+			if (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == true && $set['single_dot_as_decimal'] == true) {
+				// Treat single dot as decimal separator
+				return (float)$str;
+			} else {
+				//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br/><br/> ";
+				// Else, treat all dots as thousand seps
+				$str = str_replace('.', '', $str);    // Erase thousand seps
+
+				return (float)$str;
+			}
+		}
+	} else {
+		// No number found, return zero
+		return 0;
+	}
 }
 
 /**
@@ -1227,26 +1227,26 @@ 
  */
 function smart_currency($var, $currencyObj = false)
 {
-    $ret = smart_getfloat($var, array('single_dot_as_decimal' => true));
-    $ret = round($ret, 2);
-    // make sur we have at least .00 in the $var
-    $decimal_section_original = strstr($ret, '.');
-    $decimal_section          = $decimal_section_original;
-    if ($decimal_section) {
-        if (strlen($decimal_section) == 1) {
-            $decimal_section = '.00';
-        } elseif (strlen($decimal_section) == 2) {
-            $decimal_section = $decimal_section . '0';
-        }
-        $ret = str_replace($decimal_section_original, $decimal_section, $ret);
-    } else {
-        $ret = $ret . '.00';
-    }
-    if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
-    }
-
-    return $ret;
+	$ret = smart_getfloat($var, array('single_dot_as_decimal' => true));
+	$ret = round($ret, 2);
+	// make sur we have at least .00 in the $var
+	$decimal_section_original = strstr($ret, '.');
+	$decimal_section          = $decimal_section_original;
+	if ($decimal_section) {
+		if (strlen($decimal_section) == 1) {
+			$decimal_section = '.00';
+		} elseif (strlen($decimal_section) == 2) {
+			$decimal_section = $decimal_section . '0';
+		}
+		$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+	} else {
+		$ret = $ret . '.00';
+	}
+	if ($currencyObj) {
+		$ret = $ret . ' ' . $currencyObj->getCode();
+	}
+
+	return $ret;
 }
 
 /**
@@ -1255,7 +1255,7 @@ 
  */
 function smart_float($var)
 {
-    return smart_currency($var);
+	return smart_currency($var);
 }
 
 /**
@@ -1264,16 +1264,16 @@ 
  */
 function smart_getModuleAdminLink($moduleName = false)
 {
-    global $xoopsModule;
-    if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
-        $moduleName = $xoopsModule->getVar('dirname');
-    }
-    $ret = '';
-    if ($moduleName) {
-        $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
-    }
-
-    return $ret;
+	global $xoopsModule;
+	if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
+		$moduleName = $xoopsModule->getVar('dirname');
+	}
+	$ret = '';
+	if ($moduleName) {
+		$ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+	}
+
+	return $ret;
 }
 
 /**
@@ -1281,19 +1281,19 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
-    if (!file_exists($filename)) {
-        return false;
-    }
-    include_once $filename;
-    $xoopseditorHandler = XoopsEditorHandler::getInstance();
-    $aList               = $xoopseditorHandler->getList();
-    $ret                 = array();
-    foreach ($aList as $k => $v) {
-        $ret[$v] = $k;
-    }
-
-    return $ret;
+	$filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+	if (!file_exists($filename)) {
+		return false;
+	}
+	include_once $filename;
+	$xoopseditorHandler = XoopsEditorHandler::getInstance();
+	$aList               = $xoopseditorHandler->getList();
+	$ret                 = array();
+	foreach ($aList as $k => $v) {
+		$ret[$v] = $k;
+	}
+
+	return $ret;
 }
 
 /**
@@ -1303,11 +1303,11 @@ 
  */
 function smart_getTablesArray($moduleName, $items)
 {
-    $ret = array();
-    foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
-    }
-    $ret[] = $moduleName . '_meta';
+	$ret = array();
+	foreach ($items as $item) {
+		$ret[] = $moduleName . '_' . $item;
+	}
+	$ret[] = $moduleName . '_meta';
 
-    return $ret;
+	return $ret;
 }

admin/rating.php

Indentation +78 added lines, -78 removed lines

@@ -11,44 +11,44 @@ 
 
 function editclass($showmenu = false, $ratingid = 0)
 {
-    global $smartobjectRatingHandler;
-
-    $ratingObj = $smartobjectRatingHandler->get($ratingid);
-
-    if (!$ratingObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('ratingedit', _AM_SOBJECT_RATINGS_EDIT, _AM_SOBJECT_RATINGS_EDIT_INFO);
-
-        $sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_EDIT, 'addrating');
-        $sform->display();
-        smart_close_collapsable('ratingedit');
-    } else {
-        $ratingObj->hideFieldFromForm(array('item', 'itemid', 'uid', 'date', 'rate'));
-
-        if (isset($_POST['op'])) {
-            $controller = new SmartObjectController($smartobjectRatingHandler);
-            $controller->postDataToObject($ratingObj);
-
-            if ($_POST['op'] === 'changedField') {
-                switch ($_POST['changedField']) {
-                    case 'dirname':
-                        $ratingObj->showFieldOnForm(array('item', 'itemid', 'uid', 'date', 'rate'));
-                        break;
-                }
-            }
-        }
-
-        if ($showmenu) {
-            //smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('ratingcreate', _AM_SOBJECT_RATINGS_CREATE, _AM_SOBJECT_RATINGS_CREATE_INFO);
-        $sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_CREATE, 'addrating');
-        $sform->display();
-        smart_close_collapsable('ratingcreate');
-    }
+	global $smartobjectRatingHandler;
+
+	$ratingObj = $smartobjectRatingHandler->get($ratingid);
+
+	if (!$ratingObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('ratingedit', _AM_SOBJECT_RATINGS_EDIT, _AM_SOBJECT_RATINGS_EDIT_INFO);
+
+		$sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_EDIT, 'addrating');
+		$sform->display();
+		smart_close_collapsable('ratingedit');
+	} else {
+		$ratingObj->hideFieldFromForm(array('item', 'itemid', 'uid', 'date', 'rate'));
+
+		if (isset($_POST['op'])) {
+			$controller = new SmartObjectController($smartobjectRatingHandler);
+			$controller->postDataToObject($ratingObj);
+
+			if ($_POST['op'] === 'changedField') {
+				switch ($_POST['changedField']) {
+					case 'dirname':
+						$ratingObj->showFieldOnForm(array('item', 'itemid', 'uid', 'date', 'rate'));
+						break;
+				}
+			}
+		}
+
+		if ($showmenu) {
+			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('ratingcreate', _AM_SOBJECT_RATINGS_CREATE, _AM_SOBJECT_RATINGS_CREATE_INFO);
+		$sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_CREATE, 'addrating');
+		$sform->display();
+		smart_close_collapsable('ratingcreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -60,60 +60,60 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
-    case 'changedField';
+	case 'mod':
+	case 'changedField';
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+		$ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $ratingid);
-        break;
+		editclass(true, $ratingid);
+		break;
 
-    case 'addrating':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+	case 'addrating':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectRatingHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
-        break;
+		break;
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectRatingHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(4, _AM_SOBJECT_RATINGS);
+		//smart_adminMenu(4, _AM_SOBJECT_RATINGS);
 
-        smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
+		smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectRatingHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('item', 'left', false, 'getItemValue'));
-        $objectTable->addColumn(new SmartObjectColumn('date', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectRatingHandler);
+		$objectTable->addColumn(new SmartObjectColumn('name', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn('dirname', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn('item', 'left', false, 'getItemValue'));
+		$objectTable->addColumn(new SmartObjectColumn('date', 'center', 150));
+		$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+		//      $objectTable->addCustomAction('getCreateItemLink');
+		//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
-        /*
+		$objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
+		/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -138,13 +138,13 @@ 
                 ));
         */
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdratings');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdratings');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/adsense.php

Indentation +77 added lines, -77 removed lines

@@ -12,32 +12,32 @@ 
 
 function editclass($showmenu = false, $adsenseid = 0, $clone = false)
 {
-    global $smartobjectAdsenseHandler;
-
-    $adsenseObj = $smartobjectAdsenseHandler->get($adsenseid);
-
-    if (!$clone && !$adsenseObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('adsenseedit', _AM_SOBJECT_ADSENSES_EDIT, _AM_SOBJECT_ADSENSES_EDIT_INFO);
-
-        $sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_EDIT, 'addadsense');
-        $sform->display();
-        smart_close_collapsable('adsenseedit');
-    } else {
-        $adsenseObj->setVar('adsenseid', 0);
-        $adsenseObj->setVar('tag', '');
-
-        if ($showmenu) {
-            //smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('adsensecreate', _AM_SOBJECT_ADSENSES_CREATE, _AM_SOBJECT_ADSENSES_CREATE_INFO);
-        $sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_CREATE, 'addadsense', false, false, false, true);
-        $sform->display();
-        smart_close_collapsable('adsensecreate');
-    }
+	global $smartobjectAdsenseHandler;
+
+	$adsenseObj = $smartobjectAdsenseHandler->get($adsenseid);
+
+	if (!$clone && !$adsenseObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('adsenseedit', _AM_SOBJECT_ADSENSES_EDIT, _AM_SOBJECT_ADSENSES_EDIT_INFO);
+
+		$sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_EDIT, 'addadsense');
+		$sform->display();
+		smart_close_collapsable('adsenseedit');
+	} else {
+		$adsenseObj->setVar('adsenseid', 0);
+		$adsenseObj->setVar('tag', '');
+
+		if ($showmenu) {
+			//smart_adminMenu(3, _AM_SOBJECT_ADSENSES . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('adsensecreate', _AM_SOBJECT_ADSENSES_CREATE, _AM_SOBJECT_ADSENSES_CREATE_INFO);
+		$sform = $adsenseObj->getForm(_AM_SOBJECT_ADSENSES_CREATE, 'addadsense', false, false, false, true);
+		$sform->display();
+		smart_close_collapsable('adsensecreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -50,73 +50,73 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
+	case 'mod':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+		$adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid);
-        break;
+		editclass(true, $adsenseid);
+		break;
 
-    case 'clone':
+	case 'clone':
 
-        $adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
+		$adsenseid = isset($_GET['adsenseid']) ? (int)$_GET['adsenseid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid, true);
-        break;
+		editclass(true, $adsenseid, true);
+		break;
 
-    case 'addadsense':
-        if (@include_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
-            $xoopsCaptcha = XoopsCaptcha::instance();
-            if (!$xoopsCaptcha->verify()) {
-                redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
-                exit;
-            }
-        }
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectAdsenseHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
-        break;
+	case 'addadsense':
+		if (@include_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
+			$xoopsCaptcha = XoopsCaptcha::instance();
+			if (!$xoopsCaptcha->verify()) {
+				redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
+				exit;
+			}
+		}
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectAdsenseHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
+		break;
 
-    case 'del':
+	case 'del':
 
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectAdsenseHandler);
-        $controller->handleObjectDeletion();
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectAdsenseHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(3, _AM_SOBJECT_ADSENSES);
+		//smart_adminMenu(3, _AM_SOBJECT_ADSENSES);
 
-        smart_collapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
+		smart_collapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectAdsenseHandler);
-        $objectTable->addColumn(new SmartObjectColumn('description', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectAdsenseHandler);
+		$objectTable->addColumn(new SmartObjectColumn('description', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+		//      $objectTable->addCustomAction('getCreateItemLink');
+		//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
-        /*
+		$objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
+		/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -140,16 +140,16 @@ 
                                             'criteria' => $criteria_last30days
                 ));
         */
-        $objectTable->addQuickSearch(array('title', 'summary', 'description'));
-        $objectTable->addCustomAction('getCloneLink');
+		$objectTable->addQuickSearch(array('title', 'summary', 'description'));
+		$objectTable->addCustomAction('getCloneLink');
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdadsenses');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdadsenses');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/tag.php

Indentation +85 added lines, -85 removed lines

@@ -12,45 +12,45 @@ 
 
 function edittag($tagid = 0, $language = false, $fct = false)
 {
-    global $smartobjectTagHandler;
-
-    $tagObj = $smartobjectTagHandler->get($tagid);
-
-    if ($tagObj->isNew()) {
-        $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
-        $title                 = _AM_SOBJECT_TAG_CREATE;
-        $info                  = _AM_SOBJECT_TAG_CREATE_INFO;
-        $collaps_name          = 'tagcreate';
-        $form_name             = _AM_SOBJECT_TAG_CREATE;
-        $submit_button_caption = null;
-        //$tagObj->stripMultilanguageFields();
-    } else {
-        if ($language) {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
-            $title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
-            $info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
-            $collaps_name          = 'tageditlanguage';
-            $form_name             = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
-            $submit_button_caption = null;
-            $tagObj->makeNonMLFieldReadOnly();
-        } else {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
-            $title                 = _AM_SOBJECT_TAG_EDIT;
-            $info                  = _AM_SOBJECT_TAG_EDIT_INFO;
-            $collaps_name          = 'tagedit';
-            $form_name             = _AM_SOBJECT_TAG_EDIT;
-            $submit_button_caption = null;
-            $tagObj->stripMultilanguageFields();
-        }
-    }
-
-    //smart_adminMenu(2, $breadcrumb);
-
-    smart_collapsableBar($collaps_name, $title, $info);
-
-    $sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
-    $sform->display();
-    smart_close_collapsable($collaps_name);
+	global $smartobjectTagHandler;
+
+	$tagObj = $smartobjectTagHandler->get($tagid);
+
+	if ($tagObj->isNew()) {
+		$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
+		$title                 = _AM_SOBJECT_TAG_CREATE;
+		$info                  = _AM_SOBJECT_TAG_CREATE_INFO;
+		$collaps_name          = 'tagcreate';
+		$form_name             = _AM_SOBJECT_TAG_CREATE;
+		$submit_button_caption = null;
+		//$tagObj->stripMultilanguageFields();
+	} else {
+		if ($language) {
+			$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
+			$title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
+			$info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
+			$collaps_name          = 'tageditlanguage';
+			$form_name             = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
+			$submit_button_caption = null;
+			$tagObj->makeNonMLFieldReadOnly();
+		} else {
+			$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
+			$title                 = _AM_SOBJECT_TAG_EDIT;
+			$info                  = _AM_SOBJECT_TAG_EDIT_INFO;
+			$collaps_name          = 'tagedit';
+			$form_name             = _AM_SOBJECT_TAG_EDIT;
+			$submit_button_caption = null;
+			$tagObj->stripMultilanguageFields();
+		}
+	}
+
+	//smart_adminMenu(2, $breadcrumb);
+
+	smart_collapsableBar($collaps_name, $title, $info);
+
+	$sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
+	$sform->display();
+	smart_close_collapsable($collaps_name);
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -62,10 +62,10 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 $tagid    = isset($_GET['tagid']) ? $_GET['tagid'] : 0;
@@ -74,66 +74,66 @@ 
 
 switch ($op) {
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'addtag':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $tagObj     = $controller->storeSmartObject();
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-            exit;
-        }
+	case 'addtag':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$tagObj     = $controller->storeSmartObject();
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+			exit;
+		}
 
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-        } else {
-            redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
-        }
-        exit;
-        break;
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+		} else {
+			redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
+		}
+		exit;
+		break;
 
-    case 'mod':
-        smart_xoops_cp_header();
-        edittag($tagid, $language, $fct);
-        break;
+	case 'mod':
+		smart_xoops_cp_header();
+		edittag($tagid, $language, $fct);
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(2, _AM_SOBJECT_TAGS);
+		//smart_adminMenu(2, _AM_SOBJECT_TAGS);
 
-        smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
+		smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectTagHandler, false, array('delete'));
-        $objectTable->addColumn(new SmartObjectColumn('name'));
-        $objectTable->addColumn(new SmartObjectColumn('language'));
-        $objectTable->addColumn(new SmartObjectColumn('value'));
-        //      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectTagHandler, false, array('delete'));
+		$objectTable->addColumn(new SmartObjectColumn('name'));
+		$objectTable->addColumn(new SmartObjectColumn('language'));
+		$objectTable->addColumn(new SmartObjectColumn('value'));
+		//      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
 
-        $objectTable->addFilter('language', 'getLanguages');
+		$objectTable->addFilter('language', 'getLanguages');
 
-        $objectTable->addCustomAction('getEditLanguageLink');
-        $objectTable->addCustomAction('getEditItemLink');
+		$objectTable->addCustomAction('getEditLanguageLink');
+		$objectTable->addCustomAction('getEditItemLink');
 
-        $objectTable->setDefaultSort('tagid');
+		$objectTable->setDefaultSort('tagid');
 
-        $objectTable->addIntroButton('addtag', 'tag.php?op=mod', _AM_SOBJECT_TAG_CREATE);
+		$objectTable->addIntroButton('addtag', 'tag.php?op=mod', _AM_SOBJECT_TAG_CREATE);
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('tags');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('tags');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/link.php

Indentation +47 added lines, -47 removed lines

@@ -21,81 +21,81 @@
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectLinkHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'view':
-        $linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+	case 'view':
+		$linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
+		$linkObj = $smartobjectLinkHandler->get($linkid);
 
-        if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
-        }
+		if ($linkObj->isNew()) {
+			redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+		}
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+		include_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $xoopsTpl = new XoopsTpl();
-        $xoopsTpl = new XoopsTpl();
-        //---
+		// ---
+		// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+		//      $xoopsTpl = new XoopsTpl();
+		$xoopsTpl = new XoopsTpl();
+		//---
 
-        $xoopsTpl->assign('link', $linkObj->toArray());
-        $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
+		$xoopsTpl->assign('link', $linkObj->toArray());
+		$xoopsTpl->display('db:smartobject_sentlink_display.tpl');
 
-        echo '<br />';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
+		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectLinkHandler, null, array('delete'));
-        $objectTable->addColumn(new SmartObjectColumn('date'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new SmartObjectColumn('link'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectLinkHandler, null, array('delete'));
+		$objectTable->addColumn(new SmartObjectColumn('date'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+		$objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+		$objectTable->addColumn(new SmartObjectColumn('link'));
 
-        $objectTable->addCustomAction('getViewItemLink');
+		$objectTable->addCustomAction('getViewItemLink');
 
-        $objectTable->setDefaultSort('date');
-        $objectTable->setDefaultOrder('DESC');
+		$objectTable->setDefaultSort('date');
+		$objectTable->setDefaultOrder('DESC');
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/customtag.php

Indentation +73 added lines, -73 removed lines

@@ -12,32 +12,32 @@ 
 
 function editcustomtag($showmenu = false, $customtagid = 0, $clone = false)
 {
-    global $smartobjectCustomtagHandler;
-
-    $customtagObj = $smartobjectCustomtagHandler->get($customtagid);
-
-    if (!$clone && !$customtagObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(2, _AM_SOBJECT_CUSTOMTAGS . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('customtagedit', _AM_SOBJECT_CUSTOMTAGS_EDIT, _AM_SOBJECT_CUSTOMTAGS_EDIT_INFO);
-
-        $sform = $customtagObj->getForm(_AM_SOBJECT_CUSTOMTAGS_EDIT, 'addcustomtag');
-        $sform->display();
-        smart_close_collapsable('customtagedit');
-    } else {
-        $customtagObj->setVar('customtagid', 0);
-        $customtagObj->setVar('tag', '');
-
-        if ($showmenu) {
-            //smart_adminMenu(2, _AM_SOBJECT_CUSTOMTAGS . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('customtagcreate', _AM_SOBJECT_CUSTOMTAGS_CREATE, _AM_SOBJECT_CUSTOMTAGS_CREATE_INFO);
-        $sform = $customtagObj->getForm(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'addcustomtag');
-        $sform->display();
-        smart_close_collapsable('customtagcreate');
-    }
+	global $smartobjectCustomtagHandler;
+
+	$customtagObj = $smartobjectCustomtagHandler->get($customtagid);
+
+	if (!$clone && !$customtagObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(2, _AM_SOBJECT_CUSTOMTAGS . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('customtagedit', _AM_SOBJECT_CUSTOMTAGS_EDIT, _AM_SOBJECT_CUSTOMTAGS_EDIT_INFO);
+
+		$sform = $customtagObj->getForm(_AM_SOBJECT_CUSTOMTAGS_EDIT, 'addcustomtag');
+		$sform->display();
+		smart_close_collapsable('customtagedit');
+	} else {
+		$customtagObj->setVar('customtagid', 0);
+		$customtagObj->setVar('tag', '');
+
+		if ($showmenu) {
+			//smart_adminMenu(2, _AM_SOBJECT_CUSTOMTAGS . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('customtagcreate', _AM_SOBJECT_CUSTOMTAGS_CREATE, _AM_SOBJECT_CUSTOMTAGS_CREATE_INFO);
+		$sform = $customtagObj->getForm(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'addcustomtag');
+		$sform->display();
+		smart_close_collapsable('customtagcreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -52,70 +52,70 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
+	case 'mod':
 
-        $customtagid = isset($_GET['customtagid']) ? (int)$_GET['customtagid'] : 0;
+		$customtagid = isset($_GET['customtagid']) ? (int)$_GET['customtagid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editcustomtag(true, $customtagid);
-        break;
+		editcustomtag(true, $customtagid);
+		break;
 
-    case 'clone':
+	case 'clone':
 
-        $customtagid = isset($_GET['customtagid']) ? (int)$_GET['customtagid'] : 0;
+		$customtagid = isset($_GET['customtagid']) ? (int)$_GET['customtagid'] : 0;
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-        editcustomtag(true, $customtagid, true);
-        break;
+		editcustomtag(true, $customtagid, true);
+		break;
 
-    case 'addcustomtag':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCustomtagHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CUSTOMTAGS_CREATED, _AM_SOBJECT_CUSTOMTAGS_MODIFIED);
-        break;
+	case 'addcustomtag':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectCustomtagHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_CUSTOMTAGS_CREATED, _AM_SOBJECT_CUSTOMTAGS_MODIFIED);
+		break;
 
-    case 'del':
+	case 'del':
 
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCustomtagHandler);
-        $controller->handleObjectDeletion();
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectCustomtagHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        echo $indexAdmin->addNavigation(basename(__FILE__));
-        $indexAdmin->addItemButton(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'customtag.php?op=mod', 'add', '');
-        echo $indexAdmin->renderButton('left', '');
+		smart_xoops_cp_header();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
+		$indexAdmin->addItemButton(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'customtag.php?op=mod', 'add', '');
+		echo $indexAdmin->renderButton('left', '');
 
-        //smart_adminMenu(2, _AM_SOBJECT_CUSTOMTAGS);
+		//smart_adminMenu(2, _AM_SOBJECT_CUSTOMTAGS);
 
-        smart_collapsableBar('createdcustomtags', _AM_SOBJECT_CUSTOMTAGS, _AM_SOBJECT_CUSTOMTAGS_DSC);
+		smart_collapsableBar('createdcustomtags', _AM_SOBJECT_CUSTOMTAGS, _AM_SOBJECT_CUSTOMTAGS_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectCustomtagHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left', 150, 'getCustomtagName'));
-        $objectTable->addColumn(new SmartObjectColumn('description', 'left'));
-        $objectTable->addColumn(new SmartObjectColumn('language', 'center', 150));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectCustomtagHandler);
+		$objectTable->addColumn(new SmartObjectColumn('name', 'left', 150, 'getCustomtagName'));
+		$objectTable->addColumn(new SmartObjectColumn('description', 'left'));
+		$objectTable->addColumn(new SmartObjectColumn('language', 'center', 150));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+		//      $objectTable->addCustomAction('getCreateItemLink');
+		//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        //      $objectTable->addIntroButton('addcustomtag', 'customtag.php?op=mod', _AM_SOBJECT_CUSTOMTAGS_CREATE); //mb button
+		//      $objectTable->addIntroButton('addcustomtag', 'customtag.php?op=mod', _AM_SOBJECT_CUSTOMTAGS_CREATE); //mb button
 
-        /*
+		/*
                 $criteria_upcoming = new CriteriaCompo();
                 $criteria_upcoming->add(new Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -139,16 +139,16 @@ 
                                             'criteria' => $criteria_last30days
                 ));
         */
-        $objectTable->addQuickSearch(array('title', 'summary', 'description'));
-        $objectTable->addCustomAction('getCloneLink');
+		$objectTable->addQuickSearch(array('title', 'summary', 'description'));
+		$objectTable->addCustomAction('getCloneLink');
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdcustomtags');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdcustomtags');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/menu.php

Indentation +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
 $pathLanguage    = $path . $pathModuleAdmin;
 
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+	$fileinc = $pathLanguage . '/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -60,43 +60,43 @@ 
 //---------------------------------
 
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
+	include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
 }
 
 $smartobjectConfig = smart_getModuleConfig('smartobject');
 
 if (isset($smartobjectConfig['enable_currencyman']) && $smartobjectConfig['enable_currencyman'] == true) {
-    ++$i;
-    $adminmenu[$i]['title'] = _MI_SOBJECT_CURRENCIES;
-    $adminmenu[$i]['link']  = 'admin/currency.php';
-    $adminmenu[$i]['icon']  = $pathIcon32 . '/cash_stack.png';
+	++$i;
+	$adminmenu[$i]['title'] = _MI_SOBJECT_CURRENCIES;
+	$adminmenu[$i]['link']  = 'admin/currency.php';
+	$adminmenu[$i]['icon']  = $pathIcon32 . '/cash_stack.png';
 }
 
 global $xoopsModule;
 if (isset($xoopsModule)) {
-    //  $i = -1;
-
-    // --- for XCL ---
-    //  $headermenu[$i]['link'] = '../../system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid');
-    $mid = $xoopsModule->getVar('mid');
-    if (defined('XOOPS_CUBE_LEGACY')) {
-        $link_pref = XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
-    } else {
-        $link_pref = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
-    }
-    $headermenu[$i]['link'] = $link_pref;
-    // -----
-
-    // --- for XCL ---
-    //  $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
-    $dirname = $xoopsModule->getVar('dirname');
-    if (defined('XOOPS_CUBE_LEGACY')) {
-        $link_module = XOOPS_URL . '/modules/legacy/admin/index.php?action=ModuleUpdate&dirname=' . $dirname;
-    } else {
-        $link_module = XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=' . $dirname;
-    }
-    $headermenu[$i]['link'] = $link_module;
-    // -----
-
-    ++$i;
+	//  $i = -1;
+
+	// --- for XCL ---
+	//  $headermenu[$i]['link'] = '../../system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid');
+	$mid = $xoopsModule->getVar('mid');
+	if (defined('XOOPS_CUBE_LEGACY')) {
+		$link_pref = XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
+	} else {
+		$link_pref = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
+	}
+	$headermenu[$i]['link'] = $link_pref;
+	// -----
+
+	// --- for XCL ---
+	//  $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
+	$dirname = $xoopsModule->getVar('dirname');
+	if (defined('XOOPS_CUBE_LEGACY')) {
+		$link_module = XOOPS_URL . '/modules/legacy/admin/index.php?action=ModuleUpdate&dirname=' . $dirname;
+	} else {
+		$link_module = XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=' . $dirname;
+	}
+	$headermenu[$i]['link'] = $link_module;
+	// -----
+
+	++$i;
 }

admin/currency.php

Indentation +73 added lines, -73 removed lines

@@ -10,29 +10,29 @@ 
 
 function editclass($showmenu = false, $currencyid = 0)
 {
-    global $smartobjectCurrencyHandler;
-
-    $currencyObj = $smartobjectCurrencyHandler->get($currencyid);
-
-    if (!$currencyObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('currencyedit', _AM_SOBJECT_CURRENCIES_EDIT, _AM_SOBJECT_CURRENCIES_EDIT_INFO);
-
-        $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_EDIT, 'addcurrency');
-        $sform->display();
-        smart_close_collapsable('currencyedit');
-    } else {
-        if ($showmenu) {
-            //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('currencycreate', _AM_SOBJECT_CURRENCIES_CREATE, _AM_SOBJECT_CURRENCIES_CREATE_INFO);
-        $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_CREATE, 'addcurrency');
-        $sform->display();
-        smart_close_collapsable('currencycreate');
-    }
+	global $smartobjectCurrencyHandler;
+
+	$currencyObj = $smartobjectCurrencyHandler->get($currencyid);
+
+	if (!$currencyObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('currencyedit', _AM_SOBJECT_CURRENCIES_EDIT, _AM_SOBJECT_CURRENCIES_EDIT_INFO);
+
+		$sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_EDIT, 'addcurrency');
+		$sform->display();
+		smart_close_collapsable('currencyedit');
+	} else {
+		if ($showmenu) {
+			//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('currencycreate', _AM_SOBJECT_CURRENCIES_CREATE, _AM_SOBJECT_CURRENCIES_CREATE_INFO);
+		$sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_CREATE, 'addcurrency');
+		$sform->display();
+		smart_close_collapsable('currencycreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -43,37 +43,37 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
-        $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
+	case 'mod':
+		$currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        editclass(true, $currencyid);
-        break;
+		editclass(true, $currencyid);
+		break;
 
-    case 'updateCurrencies':
+	case 'updateCurrencies':
 
-        if (!isset($_POST['SmartobjectCurrency_objects']) || count($_POST['SmartobjectCurrency_objects']) == 0) {
-            redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
-            exit;
-        }
+		if (!isset($_POST['SmartobjectCurrency_objects']) || count($_POST['SmartobjectCurrency_objects']) == 0) {
+			redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
+			exit;
+		}
 
-        if (isset($_POST['default_currency'])) {
-            $newDefaultCurrency = $_POST['default_currency'];
-            $sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
-            $smartobjectCurrencyHandler->query($sql);
-            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
-            $smartobjectCurrencyHandler->query($sql);
-        }
+		if (isset($_POST['default_currency'])) {
+			$newDefaultCurrency = $_POST['default_currency'];
+			$sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
+			$smartobjectCurrencyHandler->query($sql);
+			$sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
+			$smartobjectCurrencyHandler->query($sql);
+		}
 
-        /*
+		/*
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('currencyid', '(' . implode(', ', $_POST['SmartobjectCurrency_objects']) . ')', 'IN'));
         $currenciesObj = $smartobjectCurrencyHandler->getObjects($criteria, true);
@@ -83,51 +83,51 @@ 
             $smartobjectCurrencyHandler->insert($currencyObj);
         }
         */
-        redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
-        exit;
+		redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
+		exit;
 
-        break;
+		break;
 
-    case 'addcurrency':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
+	case 'addcurrency':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectCurrencyHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
 
-        break;
+		break;
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectCurrencyHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
+		//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
 
-        smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
+		smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
-        $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
+		$objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
+		$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
+		$objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
+		$objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
 
-        $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
+		$objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
 
-        $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
+		$objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdcurrencies');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdcurrencies');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

admin/update.php

Indentation +272 added lines, -272 removed lines

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