mambax7 / smartobject

include/update.php

Indentation +182 added lines, -182 removed lines

@@ -28,26 +28,26 @@ 
  */
 function xoops_module_update_smartobject(\XoopsModule $module)
 {
-    ob_start();
+	ob_start();
 
-    $dbVersion = Smartobject\Utility::getMeta('version', 'smartobject');
-    if (!$dbVersion) {
-        $dbVersion = 0;
-    }
+	$dbVersion = Smartobject\Utility::getMeta('version', 'smartobject');
+	if (!$dbVersion) {
+		$dbVersion = 0;
+	}
 
-    $dbupdater = new XoopsModules\Smartobject\Dbupdater();
+	$dbupdater = new XoopsModules\Smartobject\Dbupdater();
 
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+	echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
 
-    // db migrate version = 1
-    $newDbVersion = 1;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+	// db migrate version = 1
+	$newDbVersion = 1;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
 
-        // Create table smartobject_link
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_link');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE `%s` (
+		// Create table smartobject_link
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_link');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE `%s` (
               `linkid` int(11) NOT NULL auto_increment,
               `from_uid` int(11) NOT NULL default '0',
               `from_email` varchar(255) NOT NULL default '',
@@ -64,63 +64,63 @@ 
               PRIMARY KEY  (`linkid`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-        // Create table smartobject_link
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_link');
-        if (!$table->fieldExists('date')) {
-            $table->addNewField('date', "int(11) NOT NULL default '0'");
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-
-        // Create table smartobject_tag
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_tag');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+		// Create table smartobject_link
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_link');
+		if (!$table->fieldExists('date')) {
+			$table->addNewField('date', "int(11) NOT NULL default '0'");
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+
+		// Create table smartobject_tag
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_tag');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `tagid` int(11) NOT NULL auto_increment,
               `name` varchar(255) NOT NULL default '',
               `description` TEXT NOT NULL,
               PRIMARY KEY  (`id`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        // Create table smartobject_tag_text
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_tag_text');
-        if (!$table->exists()) {
-            $table->setStructure("CREATE TABLE %s (
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		// Create table smartobject_tag_text
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_tag_text');
+		if (!$table->exists()) {
+			$table->setStructure("CREATE TABLE %s (
               `tagid` int(11) NOT NULL default 0,
               `language` varchar(255) NOT NULL default '',
               `value` TEXT NOT NULL,
               PRIMARY KEY  (`id`, `language`)
             ) ENGINE=MyISAM COMMENT='SmartObject by The SmartFactory <www.smartfactory.ca>' AUTO_INCREMENT=1 ;");
 
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        // Create table smartobject_adsense
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_adsense');
-        if (!$table->exists()) {
-            $table->setStructure("
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		// Create table smartobject_adsense
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_adsense');
+		if (!$table->exists()) {
+			$table->setStructure("
   `adsenseid` int(11) NOT NULL auto_increment,
   `format` VARCHAR(100) NOT NULL,
   `description` TEXT NOT NULL,
@@ -134,23 +134,23 @@ 
   `tag` varchar(50) NOT NULL default '',
   PRIMARY KEY  (`adsenseid`)
             ");
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-    // db migrate version = 2
-    $newDbVersion = 2;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_rating
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_rating');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+	// db migrate version = 2
+	$newDbVersion = 2;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_rating
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_rating');
+		if (!$table->exists()) {
+			$table->setStructure('
   `ratingid` int(11) NOT NULL auto_increment,
   `dirname` VARCHAR(255) NOT NULL,
   `item` VARCHAR(255) NOT NULL,
@@ -161,36 +161,36 @@ 
   PRIMARY KEY  (`ratingid`),
   UNIQUE (`dirname`, `item`, `itemid`, `uid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-
-        // Create table smartobject_currency
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_currency');
-        $table->setData("2, 'EUR', 'Euro', '�', 0.65, 0");
-        $table->setData("3, 'USD', 'American dollar', '$', 0.9, 0");
-        $table->setData("1, 'CAD', 'Canadian dollar', '$', 1, 1");
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 3
-    $newDbVersion = 3;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_customtag
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_customtag');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+
+		// Create table smartobject_currency
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_currency');
+		$table->setData("2, 'EUR', 'Euro', '�', 0.65, 0");
+		$table->setData("3, 'USD', 'American dollar', '$', 0.9, 0");
+		$table->setData("1, 'CAD', 'Canadian dollar', '$', 1, 1");
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 3
+	$newDbVersion = 3;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_customtag
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_customtag');
+		if (!$table->exists()) {
+			$table->setStructure('
               `customtagid` int(11) NOT NULL auto_increment,
               `name` VARCHAR(255) NOT NULL,
               `description` TEXT NOT NULL,
@@ -198,24 +198,24 @@ 
               `language` TEXT NOT NULL,
               PRIMARY KEY  (`customtagid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 4
-    $newDbVersion = 4;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_currency
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_currency');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 4
+	$newDbVersion = 4;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_currency
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_currency');
+		if (!$table->exists()) {
+			$table->setStructure('
               `currencyid` int(11) NOT NULL auto_increment,
               `iso4217` VARCHAR(5) NOT NULL,
               `name` VARCHAR(255) NOT NULL,
@@ -224,46 +224,46 @@ 
               `default_currency` int(1) NOT NULL,
               PRIMARY KEY  (`currencyid`)
             ');
-        }
-
-        if (!$dbupdater->updateTable($table)) {
-            /**
-             * @todo trap the errors
-             */
-        }
-    }
-
-    // db migrate version = 6
-    $newDbVersion = 6;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-    }
-
-    $newDbVersion = 7;
-    if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
-
-        // Create table smartobject_file
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_file');
-        if (!$table->exists()) {
-            $table->setStructure('
+		}
+
+		if (!$dbupdater->updateTable($table)) {
+			/**
+			 * @todo trap the errors
+			 */
+		}
+	}
+
+	// db migrate version = 6
+	$newDbVersion = 6;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+	}
+
+	$newDbVersion = 7;
+	if ($dbVersion < $newDbVersion) {
+		echo 'Database migrate to version ' . $newDbVersion . '<br>';
+
+		// Create table smartobject_file
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_file');
+		if (!$table->exists()) {
+			$table->setStructure('
               `fileid` int(11) NOT NULL auto_increment,
               `caption` varchar(255) collate latin1_general_ci NOT NULL,
               `url` varchar(255) collate latin1_general_ci NOT NULL,
               `description` text collate latin1_general_ci NOT NULL,
                PRIMARY KEY  (`fileid`)
             ');
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-        // Create table smartobject_urllink
-        $table = new XoopsModules\Smartobject\DbTable('smartobject_urllink');
-        if (!$table->exists()) {
-            $table->setStructure('
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+		// Create table smartobject_urllink
+		$table = new XoopsModules\Smartobject\DbTable('smartobject_urllink');
+		if (!$table->exists()) {
+			$table->setStructure('
               `urllinkid` int(11) NOT NULL auto_increment,
               `caption` varchar(255) collate latin1_general_ci NOT NULL,
               `url` varchar(255) collate latin1_general_ci NOT NULL,
@@ -271,25 +271,25 @@ 
               `target` varchar(10) collate latin1_general_ci NOT NULL,
                 PRIMARY KEY  (`urllinkid`)
             ');
-            if (!$dbupdater->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-        unset($table);
-    }
-    echo '</code>';
-
-    $feedback = ob_get_clean();
-    if (method_exists($module, 'setMessage')) {
-        $module->setMessage($feedback);
-    } else {
-        echo $feedback;
-    }
-    Smartobject\Utility::setMeta('version', $newDbVersion, 'smartobject'); //Set meta version to current
-
-    return true;
+			if (!$dbupdater->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+		unset($table);
+	}
+	echo '</code>';
+
+	$feedback = ob_get_clean();
+	if (method_exists($module, 'setMessage')) {
+		$module->setMessage($feedback);
+	} else {
+		echo $feedback;
+	}
+	Smartobject\Utility::setMeta('version', $newDbVersion, 'smartobject'); //Set meta version to current
+
+	return true;
 }
 
 /**
@@ -298,10 +298,10 @@ 
  */
 function xoops_module_install_smartobject(\XoopsModule $module)
 {
-    ob_start();
+	ob_start();
 
-    echo 'Using the ImpressCMS onInstall event';
-    $feedback = ob_get_clean();
+	echo 'Using the ImpressCMS onInstall event';
+	$feedback = ob_get_clean();
 
-    return $feedback;
+	return $feedback;
 }

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 //require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartdbupdater.php';
 
 /**
@@ -37,12 +37,12 @@ 
 
     $dbupdater = new XoopsModules\Smartobject\Dbupdater();
 
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+    echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
     // db migrate version = 1
     $newDbVersion = 1;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_link
         $table = new XoopsModules\Smartobject\DbTable('smartobject_link');
@@ -145,7 +145,7 @@ 
     // db migrate version = 2
     $newDbVersion = 2;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_rating
         $table = new XoopsModules\Smartobject\DbTable('smartobject_rating');
@@ -185,7 +185,7 @@ 
     // db migrate version = 3
     $newDbVersion = 3;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_customtag
         $table = new XoopsModules\Smartobject\DbTable('smartobject_customtag');
@@ -210,7 +210,7 @@ 
     // db migrate version = 4
     $newDbVersion = 4;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_currency
         $table = new XoopsModules\Smartobject\DbTable('smartobject_currency');
@@ -236,12 +236,12 @@ 
     // db migrate version = 6
     $newDbVersion = 6;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
     }
 
     $newDbVersion = 7;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_file
         $table = new XoopsModules\Smartobject\DbTable('smartobject_file');

include/adsense.php

Indentation +7 added lines, -7 removed lines

@@ -13,16 +13,16 @@
 
 function smart_adsense_initiate_smartytags()
 {
-    global $xoopsTpl, $smartobjectAdsenseHandler;
-    if (is_object($xoopsTpl)) {
-        foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
-            $xoopsTpl->assign('adsense_' . $k, $v->render());
-        }
-    }
+	global $xoopsTpl, $smartobjectAdsenseHandler;
+	if (is_object($xoopsTpl)) {
+		foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
+			$xoopsTpl->assign('adsense_' . $k, $v->render());
+		}
+	}
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 
 //require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';

Spacing +2 added lines, -2 removed lines

@@ -16,13 +16,13 @@
     global $xoopsTpl, $smartobjectAdsenseHandler;
     if (is_object($xoopsTpl)) {
         foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
-            $xoopsTpl->assign('adsense_' . $k, $v->render());
+            $xoopsTpl->assign('adsense_'.$k, $v->render());
         }
     }
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 
 //require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';

include/rating.rate.php

Indentation +46 added lines, -46 removed lines

@@ -12,7 +12,7 @@ 
 use XoopsModules\Smartobject\PluginHandler;
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 //require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php';
@@ -26,52 +26,52 @@ 
 $smartobjectPluginHandler = new XoopsModules\Smartobject\PluginHandler();
 $pluginObj                = $smartobjectPluginHandler->getPlugin($module_dirname);
 if ($pluginObj) {
-    $rating_item = $pluginObj->getItem();
-    if ($rating_item) {
-        $rating_itemid = $pluginObj->getItemIdForItem($rating_item);
-        $stats         = $smartobjectRatingHandler->getRatingAverageByItemId($rating_itemid, $module_dirname, $rating_item);
-        $xoopsTpl->assign('smartobject_rating_stats_total', $stats['sum']);
-        $xoopsTpl->assign('smartobject_rating_stats_average', $stats['average']);
-        $xoopsTpl->assign('smartobject_rating_item', $rating_item);
-        if (is_object($xoopsUser)) {
-            $ratingObj = $smartobjectRatingHandler->already_rated($rating_item, $rating_itemid, $module_dirname, $xoopsUser->getVar('uid'));
-            $xoopsTpl->assign('smartobject_user_can_rate', true);
-        }
-        if (isset($ratingObj) && is_object($ratingObj)) {
-            $xoopsTpl->assign('smartobject_user_rate', $ratingObj->getVar('rate'));
-            $xoopsTpl->assign('smartobject_rated', true);
-        } else {
-            $xoopsTpl->assign('smartobject_rating_dirname', $module_dirname);
-            $xoopsTpl->assign('smartobject_rating_itemid', $rating_itemid);
-            $urls = Smartobject\Utility::getCurrentUrls();
-            $xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
-            if (isset($xoTheme) && is_object($xoTheme)) {
-                $xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
-            } else {
-                //probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
-                //$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");
-            }
-        }
-    }
+	$rating_item = $pluginObj->getItem();
+	if ($rating_item) {
+		$rating_itemid = $pluginObj->getItemIdForItem($rating_item);
+		$stats         = $smartobjectRatingHandler->getRatingAverageByItemId($rating_itemid, $module_dirname, $rating_item);
+		$xoopsTpl->assign('smartobject_rating_stats_total', $stats['sum']);
+		$xoopsTpl->assign('smartobject_rating_stats_average', $stats['average']);
+		$xoopsTpl->assign('smartobject_rating_item', $rating_item);
+		if (is_object($xoopsUser)) {
+			$ratingObj = $smartobjectRatingHandler->already_rated($rating_item, $rating_itemid, $module_dirname, $xoopsUser->getVar('uid'));
+			$xoopsTpl->assign('smartobject_user_can_rate', true);
+		}
+		if (isset($ratingObj) && is_object($ratingObj)) {
+			$xoopsTpl->assign('smartobject_user_rate', $ratingObj->getVar('rate'));
+			$xoopsTpl->assign('smartobject_rated', true);
+		} else {
+			$xoopsTpl->assign('smartobject_rating_dirname', $module_dirname);
+			$xoopsTpl->assign('smartobject_rating_itemid', $rating_itemid);
+			$urls = Smartobject\Utility::getCurrentUrls();
+			$xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
+			if (isset($xoTheme) && is_object($xoTheme)) {
+				$xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
+			} else {
+				//probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
+				//$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");
+			}
+		}
+	}
 }
 
 if (isset($_POST['smartobject_rating_submit'])) {
-    // The rating form has just been posted. Let's save the info
-    $ratingObj = $smartobjectRatingHandler->create();
-    $ratingObj->setVar('dirname', $module_dirname);
-    $ratingObj->setVar('item', $rating_item);
-    $ratingObj->setVar('itemid', $rating_itemid);
-    $ratingObj->setVar('uid', $xoopsUser->getVar('uid'));
-    $ratingObj->setVar('date', time());
-    $ratingObj->setVar('rate', $_POST['smartobject_rating_value']);
-    if (!$smartobjectRatingHandler->insert($ratingObj)) {
-        if (1062 == $xoopsDB->errno()) {
-            $message = _SOBJECT_RATING_DUPLICATE_ENTRY;
-        } else {
-            $message = _SOBJECT_RATING_ERROR;
-        }
-    } else {
-        $message = _SOBJECT_RATING_SUCCESS;
-    }
-    redirect_header('', 3, $message);
+	// The rating form has just been posted. Let's save the info
+	$ratingObj = $smartobjectRatingHandler->create();
+	$ratingObj->setVar('dirname', $module_dirname);
+	$ratingObj->setVar('item', $rating_item);
+	$ratingObj->setVar('itemid', $rating_itemid);
+	$ratingObj->setVar('uid', $xoopsUser->getVar('uid'));
+	$ratingObj->setVar('date', time());
+	$ratingObj->setVar('rate', $_POST['smartobject_rating_value']);
+	if (!$smartobjectRatingHandler->insert($ratingObj)) {
+		if (1062 == $xoopsDB->errno()) {
+			$message = _SOBJECT_RATING_DUPLICATE_ENTRY;
+		} else {
+			$message = _SOBJECT_RATING_ERROR;
+		}
+	} else {
+		$message = _SOBJECT_RATING_SUCCESS;
+	}
+	redirect_header('', 3, $message);
 }

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 use XoopsModules\Smartobject\PluginHandler;
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 //require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php';
@@ -46,7 +46,7 @@ 
             $urls = Smartobject\Utility::getCurrentUrls();
             $xoopsTpl->assign('smartobject_rating_current_page', $urls['full']);
             if (isset($xoTheme) && is_object($xoTheme)) {
-                $xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css');
+                $xoTheme->addStylesheet(SMARTOBJECT_URL.'assets/css/module.css');
             } else {
                 //probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme
                 //$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>");

include/currency.php

Indentation +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@
 $smartobjectCurrencyHandler = Smartobject\Helper::getInstance()->getHandler('Currency');
 
 if (!$smartobjectCurrenciesObj) {
-    $smartobjectCurrenciesObj = $smartobjectCurrencyHandler->getCurrencies();
+	$smartobjectCurrenciesObj = $smartobjectCurrencyHandler->getCurrencies();
 }
 if (!$smartobjectCurrenciesArray) {
-    foreach ($smartobjectCurrenciesObj as $currencyid => $currencyObj) {
-        if ($currencyObj->getVar('default_currency', 'e')) {
-            $smartobjectDefaultCurrency = $currencyObj;
-        }
-        $smartobjectCurrenciesArray[$currencyid] = $currencyObj->getCode();
-    }
+	foreach ($smartobjectCurrenciesObj as $currencyid => $currencyObj) {
+		if ($currencyObj->getVar('default_currency', 'e')) {
+			$smartobjectDefaultCurrency = $currencyObj;
+		}
+		$smartobjectCurrenciesArray[$currencyid] = $currencyObj->getCode();
+	}
 }

include/customtag.php

Indentation +7 added lines, -7 removed lines

@@ -13,16 +13,16 @@
 
 function smart_customtag_initiate()
 {
-    global $xoopsTpl, $smartobjectCustomtagHandler;
-    if (is_object($xoopsTpl)) {
-        foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
-            $xoopsTpl->assign($k, $v->render());
-        }
-    }
+	global $xoopsTpl, $smartobjectCustomtagHandler;
+	if (is_object($xoopsTpl)) {
+		foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
+			$xoopsTpl->assign($k, $v->render());
+		}
+	}
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 
 Smartobject\Utility::loadLanguageFile('smartobject', 'customtag');

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 
 Smartobject\Utility::loadLanguageFile('smartobject', 'customtag');

admin/link.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 use XoopsModules\Smartobject\ObjectController;
 use XoopsModules\Smartobject\Table;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectlink.php';
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -46,7 +46,7 @@ 
         $linkObj = $smartobjectLinkHandler->get($linkid);
 
         if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+            redirect_header(SMARTOBJECT_URL.'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
         }
 
         Smartobject\Utility::getXoopsCpHeader();
@@ -55,7 +55,7 @@ 
 
         Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         // ---
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -105,4 +105,4 @@ 
 
 //Smartobject\Utility::getModFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +45 added lines, -45 removed lines

@@ -26,81 +26,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':
+	case 'del':
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+		$controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'view':
-        $linkid  = \Xmf\Request::getInt('linkid', 0, 'GET');
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+	case 'view':
+		$linkid  = \Xmf\Request::getInt('linkid', 0, 'GET');
+		$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);
+		}
 
-        Smartobject\Utility::getXoopsCpHeader();
+		Smartobject\Utility::getXoopsCpHeader();
 
-        //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+		//Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+		Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+		require_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>';
-        Smartobject\Utility::closeCollapsable('sentlinks');
-        echo '<br>';
+		echo '<br>';
+		Smartobject\Utility::closeCollapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 
-    default:
+	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
+		Smartobject\Utility::getXoopsCpHeader();
 
-        $adminObject->displayNavigation(basename(__FILE__));
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
+		//Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+		Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
 //        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
-        $objectTable->addColumn(new Smartobject\ObjectColumn('date'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn('link'));
+		$objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
+		$objectTable->addColumn(new Smartobject\ObjectColumn('date'));
+		$objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+		$objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+		$objectTable->addColumn(new Smartobject\ObjectColumn('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>';
-        Smartobject\Utility::closeCollapsable('sentlinks');
-        echo '<br>';
+		echo '<br>';
+		Smartobject\Utility::closeCollapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //Smartobject\Utility::getModFooter();

Switch Indentation +45 added lines, -45 removed lines

@@ -34,73 +34,73 @@
 
 switch ($op) {
 
-    case 'del':
-//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+    	case 'del':
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
+        	$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+        	break;
 
-    case 'view':
-        $linkid  = \Xmf\Request::getInt('linkid', 0, 'GET');
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+    	case 'view':
+        	$linkid  = \Xmf\Request::getInt('linkid', 0, 'GET');
+        	$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);
+        	}
 
-        Smartobject\Utility::getXoopsCpHeader();
+        	Smartobject\Utility::getXoopsCpHeader();
 
-        //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+        	//Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+        	Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        	require_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>';
-        Smartobject\Utility::closeCollapsable('sentlinks');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
+        	Smartobject\Utility::getXoopsCpHeader();
 
-        $adminObject->displayNavigation(basename(__FILE__));
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
+        	//Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+        	Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
-        $objectTable->addColumn(new Smartobject\ObjectColumn('date'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn('link'));
+	//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
+        	$objectTable->addColumn(new Smartobject\ObjectColumn('date'));
+        	$objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+        	$objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+        	$objectTable->addColumn(new Smartobject\ObjectColumn('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>';
-        Smartobject\Utility::closeCollapsable('sentlinks');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //Smartobject\Utility::getModFooter();

admin/tag.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
     $tagObj = $smartobjectTagHandler->get($tagid);
 
     if ($tagObj->isNew()) {
-        $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
+        $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_TAG_CREATE;
         $title                 = _AM_SOBJECT_TAG_CREATE;
         $info                  = _AM_SOBJECT_TAG_CREATE_INFO;
         $collaps_name          = 'tagcreate';
@@ -31,7 +31,7 @@ 
     //$tagObj->stripMultilanguageFields();
     } else {
         if ($language) {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_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';
@@ -39,7 +39,7 @@ 
             $submit_button_caption = null;
             $tagObj->makeNonMLFieldReadOnly();
         } else {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
+            $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_EDITING;
             $title                 = _AM_SOBJECT_TAG_EDIT;
             $info                  = _AM_SOBJECT_TAG_EDIT_INFO;
             $collaps_name          = 'tagedit';
@@ -58,7 +58,7 @@ 
     Smartobject\Utility::closeCollapsable($collaps_name);
 }
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttag.php';
 
@@ -91,11 +91,11 @@ 
         $controller = new ObjectController($smartobjectTagHandler);
         $tagObj     = $controller->storeSmartObject();
         if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$tagObj->getHtmlErrors());
         }
 
         if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$tagObj->getHtmlErrors());
         } else {
             redirect_header(Smartobject\Utility::getPageBeforeForm(), 3, _CO_SOBJECT_SAVE_SUCCESS);
         }
@@ -142,4 +142,4 @@ 
 
 //Smartobject\Utility::getModFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +81 added lines, -81 removed lines

@@ -17,45 +17,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();
-        }
-    }
-
-    //Smartobject\Utility::getAdminMenu(2, $breadcrumb);
-
-    Smartobject\Utility::getCollapsableBar($collaps_name, $title, $info);
-
-    $sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
-    $sform->display();
-    Smartobject\Utility::closeCollapsable($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();
+		}
+	}
+
+	//Smartobject\Utility::getAdminMenu(2, $breadcrumb);
+
+	Smartobject\Utility::getCollapsableBar($collaps_name, $title, $info);
+
+	$sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
+	$sform->display();
+	Smartobject\Utility::closeCollapsable($collaps_name);
 }
 
 require_once __DIR__ . '/admin_header.php';
@@ -67,10 +67,10 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 $tagid    = \Xmf\Request::getInt('tagid', 0, 'GET');
@@ -79,65 +79,65 @@ 
 
 switch ($op) {
 
-    case 'del':
+	case 'del':
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new ObjectController($smartobjectTagHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
+		$controller = new ObjectController($smartobjectTagHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'addtag':
+	case 'addtag':
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new ObjectController($smartobjectTagHandler);
-        $tagObj     = $controller->storeSmartObject();
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-        }
+		$controller = new ObjectController($smartobjectTagHandler);
+		$tagObj     = $controller->storeSmartObject();
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+		}
 
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-        } else {
-            redirect_header(Smartobject\Utility::getPageBeforeForm(), 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(Smartobject\Utility::getPageBeforeForm(), 3, _CO_SOBJECT_SAVE_SUCCESS);
+		}
+		exit;
+		break;
 
-    case 'mod':
-        Smartobject\Utility::getXoopsCpHeader();
-        edittag($tagid, $language, $fct);
-        break;
+	case 'mod':
+		Smartobject\Utility::getXoopsCpHeader();
+		edittag($tagid, $language, $fct);
+		break;
 
-    default:
+	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
+		Smartobject\Utility::getXoopsCpHeader();
 
-        //Smartobject\Utility::getAdminMenu(2, _AM_SOBJECT_TAGS);
+		//Smartobject\Utility::getAdminMenu(2, _AM_SOBJECT_TAGS);
 
-        Smartobject\Utility::getCollapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
+		Smartobject\Utility::getCollapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
 
 //        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new Table($smartobjectTagHandler, false, ['delete']);
-        $objectTable->addColumn(new ObjectColumn('name'));
-        $objectTable->addColumn(new ObjectColumn('language'));
-        $objectTable->addColumn(new ObjectColumn('value'));
-        //      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
+		$objectTable = new Table($smartobjectTagHandler, false, ['delete']);
+		$objectTable->addColumn(new ObjectColumn('name'));
+		$objectTable->addColumn(new ObjectColumn('language'));
+		$objectTable->addColumn(new ObjectColumn('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>';
-        Smartobject\Utility::closeCollapsable('tags');
-        echo '<br>';
+		echo '<br>';
+		Smartobject\Utility::closeCollapsable('tags');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //Smartobject\Utility::getModFooter();

admin/admin_header2.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * Licence: GNU
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 Smartobject\Utility::loadCommonLanguageFile();

admin/menu.php

Indentation +48 added lines, -48 removed lines

@@ -18,9 +18,9 @@ 
 $adminmenu = [];
 
 $adminmenu[] = [
-    'title' => _MI_SOBJECT_HOME,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+	'title' => _MI_SOBJECT_HOME,
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . '/home.png',
 ];
 
 //$adminmenu[] = [
@@ -30,33 +30,33 @@ 
 //];
 
 $adminmenu[] = [
-    'title' => _MI_SOBJECT_SENT_LINKS,
-    'link'  => 'admin/link.php',
-    'icon'  => $pathIcon32 . '/addlink.png',
+	'title' => _MI_SOBJECT_SENT_LINKS,
+	'link'  => 'admin/link.php',
+	'icon'  => $pathIcon32 . '/addlink.png',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SOBJECT_TAGS,
-    'link'  => 'admin/customtag.php',
-    'icon'  => $pathIcon32 . '/identity.png',
+	'title' => _MI_SOBJECT_TAGS,
+	'link'  => 'admin/customtag.php',
+	'icon'  => $pathIcon32 . '/identity.png',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SOBJECT_ADSENSES,
-    'link'  => 'admin/adsense.php',
-    'icon'  => $pathIcon32 . '/alert.png',
+	'title' => _MI_SOBJECT_ADSENSES,
+	'link'  => 'admin/adsense.php',
+	'icon'  => $pathIcon32 . '/alert.png',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SOBJECT_RATINGS,
-    'link'  => 'admin/rating.php',
-    'icon'  => $pathIcon32 . '/stats.png',
+	'title' => _MI_SOBJECT_RATINGS,
+	'link'  => 'admin/rating.php',
+	'icon'  => $pathIcon32 . '/stats.png',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SOBJECT_ABOUT,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+	'title' => _MI_SOBJECT_ABOUT,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . '/about.png',
 ];
 
 //---------------------------------
@@ -68,38 +68,38 @@ 
 $smartobjectConfig = Smartobject\Utility::getModuleConfig('smartobject');
 
 if (isset($smartobjectConfig['enable_currencyman']) && true === $smartobjectConfig['enable_currencyman']) {
-    $adminmenu[] = [
-        'title' => _MI_SOBJECT_CURRENCIES,
-        'link'  => 'admin/currency.php',
-        'icon'  => $pathIcon32 . '/cash_stack.png',
-    ];
+	$adminmenu[] = [
+		'title' => _MI_SOBJECT_CURRENCIES,
+		'link'  => 'admin/currency.php',
+		'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;
 }

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
 $adminmenu[] = [
     'title' => _MI_SOBJECT_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
 ];
 
 //$adminmenu[] = [
@@ -32,31 +32,31 @@ 
 $adminmenu[] = [
     'title' => _MI_SOBJECT_SENT_LINKS,
     'link'  => 'admin/link.php',
-    'icon'  => $pathIcon32 . '/addlink.png',
+    'icon'  => $pathIcon32.'/addlink.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SOBJECT_TAGS,
     'link'  => 'admin/customtag.php',
-    'icon'  => $pathIcon32 . '/identity.png',
+    'icon'  => $pathIcon32.'/identity.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SOBJECT_ADSENSES,
     'link'  => 'admin/adsense.php',
-    'icon'  => $pathIcon32 . '/alert.png',
+    'icon'  => $pathIcon32.'/alert.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SOBJECT_RATINGS,
     'link'  => 'admin/rating.php',
-    'icon'  => $pathIcon32 . '/stats.png',
+    'icon'  => $pathIcon32.'/stats.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SOBJECT_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
 ];
 
 //---------------------------------
@@ -71,7 +71,7 @@ 
     $adminmenu[] = [
         'title' => _MI_SOBJECT_CURRENCIES,
         'link'  => 'admin/currency.php',
-        'icon'  => $pathIcon32 . '/cash_stack.png',
+        'icon'  => $pathIcon32.'/cash_stack.png',
     ];
 }
 
@@ -83,9 +83,9 @@ 
     //  $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;
+        $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;
+        $link_pref = XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
     }
     $headermenu[$i]['link'] = $link_pref;
     // -----
@@ -94,9 +94,9 @@ 
     //  $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;
+        $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;
+        $link_module = XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module='.$dirname;
     }
     $headermenu[$i]['link'] = $link_module;
     // -----