mambax7 / smartobject

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');
+	}
 }
 
 require_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();
-        $adminObject->displayNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        editclass(true, $ratingid);
-        break;
+		editclass(true, $ratingid);
+		break;
 
-    case 'addrating':
-        require_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':
+		require_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':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectRatingHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		$adminObject->displayNavigation(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);
 
-        require_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'));
+		require_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/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':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+	case 'del':
+		require_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);
 
-        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>';
-        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();
 
-        $adminObject->displayNavigation(basename(__FILE__));
+		$adminObject->displayNavigation(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);
 
-        require_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'));
+		require_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/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);
 }
 
 require_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':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
+	case 'del':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'addtag':
-        require_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':
+		require_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);
 
-        require_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'));
+		require_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/update.php

Indentation +273 added lines, -273 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>';
-    $moduleHandler = xoops_getModuleHandler('modification', 'wfdownloads');
-    $mod_table     = new WfdownloadsTable('wfdownloads_mod');
-    $fields        = get_table_info($moduleHandler->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>';
+	$moduleHandler = xoops_getModuleHandler('modification', 'wfdownloads');
+	$mod_table     = new WfdownloadsTable('wfdownloads_mod');
+	$fields        = get_table_info($moduleHandler->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 NULL", '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 NULL", '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,60 +315,60 @@ 
  */
 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?
-        /** @var XoopsModuleHandler $moduleHandler */
-        $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?
+		/** @var XoopsModuleHandler $moduleHandler */
+		$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();

include/adsense.php

Indentation +7 added lines, -7 removed lines

@@ -10,16 +10,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';

include/customtag.php

Indentation +7 added lines, -7 removed lines

@@ -10,16 +10,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';
 }
 
 smart_loadLanguageFile('smartobject', 'customtag');

include/rating.rate.php

Indentation +47 added lines, -47 removed lines

@@ -9,7 +9,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 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';
@@ -23,53 +23,53 @@ 
 $smartobjectPluginHandler = new SmartPluginHandler();
 $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 = smart_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 = smart_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 ($xoopsDB->errno() == 1062) {
-            $message = _SOBJECT_RATING_DUPLICATE_ENTRY;
-        } else {
-            $message = _SOBJECT_RATING_ERROR;
-        }
-    } else {
-        $message = _SOBJECT_RATING_SUCCESS;
-    }
-    redirect_header('', 3, $message);
-    exit;
+	// 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 ($xoopsDB->errno() == 1062) {
+			$message = _SOBJECT_RATING_DUPLICATE_ENTRY;
+		} else {
+			$message = _SOBJECT_RATING_ERROR;
+		}
+	} else {
+		$message = _SOBJECT_RATING_SUCCESS;
+	}
+	redirect_header('', 3, $message);
+	exit;
 }

include/projax/classes/Scriptaculous.php

Indentation +317 added lines, -317 removed lines

@@ -15,322 +15,322 @@ 
  */
 class Scriptaculous extends Prototype
 {
-    public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
-
-    /**
-     * Scriptaculous constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @param         $element_id
-     * @param  null   $options
-     * @return string
-     */
-    public function dragable_element($element_id, $options = null)
-    {
-        return $this->tag($this->_dragable_element_js($element_id, $options));
-    }
-
-    /**
-     * @param         $element_id
-     * @param  null   $options
-     * @return string
-     */
-    public function drop_receiving_element($element_id, $options = null)
-    {
-        return $this->tag($this->_drop_receiving_element($element_id, $options));
-    }
-
-    /**
-     * @param         $name
-     * @param  bool   $element_id
-     * @param  null   $js_options
-     * @return string
-     */
-    public function visual_effect($name, $element_id = false, $js_options = null)
-    {
-        $element = $element_id ? "'$element_id'" : 'element';
-
-        $js_queue = '';
-        if (isset($js_options) && is_array($js_options['queue'])) {
-        } elseif (isset($js_options)) {
-            $js_queue = "'$js_options'";
-        }
-
-        if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
-        } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
-        }
-    }
-
-    /**
-     * @param         $element_id
-     * @param  null   $options
-     * @return string
-     */
-    public function sortabe_element($element_id, $options = null)
-    {
-        return $this->tag($this->_sortabe_element($element_id, $options));
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-
-    public function _sortabe_element($element_id, $options)
-    {
-        //if (isset($options['with']))
-        {
-            $options['with'] = "Sortable.serialize('$element_id')";
-        }
-
-        //if (isset($option['onUpdate']))
-        {
-            $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
-        }
-
-        foreach ($options as $var => $val) {
-            if (in_array($var, $this->AJAX_OPTIONS)) {
-                unset($options[$var]);
-            }
-        }
-
-        $arr = array('tag', 'overlap', 'contraint', 'handle');
-
-        foreach ($arr as $var) {
-            if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
-            }
-        }
-
-        if (isset($options['containment'])) {
-            $options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
-        }
-
-        if (isset($options['only'])) {
-            $options['only'] = $this->_array_or_string_for_javascript($options['only']);
-        }
-
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _dragable_element_js($element_id, $options)
-    {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /**
-     * @param $element_id
-     * @param $options
-     * @return string
-     */
-    public function _drop_receiving_element($element_id, $options)
-    {
-
-        //if (isset($options['with']))
-        {
-            $options['with'] = '\'id=\' + encodeURIComponent(element.id)';
-        }
-
-        //if (isset($option['onDrop']))
-        {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
-        }
-
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (in_array($var, $this->AJAX_OPTIONS)) {
-                    unset($options[$var]);
-                }
-            }
-        }
-
-        if (isset($options['accept'])) {
-            $options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
-        }
-
-        if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
-        }
-
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
-    }
-
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                            Merged Javascript macro
-    /////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param         $field_id
-     * @param         $options
-     * @param  bool   $tag
-     * @return string
-     */
-    public function in_place_editor($field_id, $options, $tag = true)
-    {
-        $function = 'new Ajax.InPlaceEditor(';
-        $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['cancel_text'])) {
-            $js_options['cancelText'] = $options['cancel_text'];
-        }
-        if (isset($options['save_text'])) {
-            $js_options['okText'] = $options['save_text'];
-        }
-        if (isset($options['loading_text'])) {
-            $js_options['loadingText'] = $options['loading_text'];
-        }
-        if (isset($options['rows'])) {
-            $js_options['rows'] = $options['rows'];
-        }
-        if (isset($options['cols'])) {
-            $js_options['cols'] = $options['cols'];
-        }
-        if (isset($options['size'])) {
-            $js_options['size'] = $options['size'];
-        }
-        if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
-        }
-        if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
-        }
-        if (isset($options['options'])) {
-            $js_options['ajaxOptions'] = $options['options'];
-        }
-        if (isset($options['script'])) {
-            $js_options['evalScripts'] = $options['script'];
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-        if ($tag) {
-            return $this->tag($function);
-        } else {
-            return $function;
-        }
-    }
-
-    /**
-     * @param         $object
-     * @param  null   $tag_options
-     * @param  null   $in_place_editor_options
-     * @return string
-     */
-    public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
-    {
-        $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
-        $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @param $field_id
-     * @param $options
-     * @return mixed
-     */
-    public function auto_complete_field($field_id, $options)
-    {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
-        $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
-
-        $js_options = array();
-        if (isset($options['tokens'])) {
-            $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
-        }
-        if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
-        }
-        if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
-        }
-        if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
-        }
-
-        foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
-            if (isset($options[$var])) {
-                $js_options['$val'] = $options['var'];
-            }
-        }
-
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
-
-        return $this->tag($function);
-    }
-
-    /**
-     * @param      $entries
-     * @param      $field
-     * @param null $phrase
-     */
-    public function auto_complete_results($entries, $field, $phrase = null)
-    {
-        if (!is_array($entries)) {
-            return;
-        }
-        $ret_val = '<ul>';
-        //  Complete this function
-    }
-
-    /**
-     * @param         $object
-     * @param  null   $tag_options
-     * @param  null   $completion_options
-     * @return string
-     */
-    public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
-    {
-        $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="'
-                    . $object
-                    . '" name="'
-                    . $object
-                    . '" size="'
-                    . (isset($tag_options['size']) ? $tag_options['size'] : 30)
-                    . '" type="text" value="'
-                    . (isset($tag_options['size']) ? $tag_options['value'] : '')
-                    . '" '
-                    . (isset($tag_options['class']) ? 'class = "'
-                                                      . $tag_options['class']
-                                                      . '" ' : '')
-                    . '>';
-
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
-        $ret_val .= $this->auto_complete_field($object, $completion_options);
-
-        return $ret_val;
-    }
-
-    /**
-     * @return string
-     */
-    public function _auto_complete_stylesheet()
-    {
-        return '<style> div.auto_complete {
+	public $TOGGLE_EFFECTS = array('toggle_appear', 'toggle_slide', 'toggle_blind');
+
+	/**
+	 * Scriptaculous constructor.
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * @param         $element_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function dragable_element($element_id, $options = null)
+	{
+		return $this->tag($this->_dragable_element_js($element_id, $options));
+	}
+
+	/**
+	 * @param         $element_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function drop_receiving_element($element_id, $options = null)
+	{
+		return $this->tag($this->_drop_receiving_element($element_id, $options));
+	}
+
+	/**
+	 * @param         $name
+	 * @param  bool   $element_id
+	 * @param  null   $js_options
+	 * @return string
+	 */
+	public function visual_effect($name, $element_id = false, $js_options = null)
+	{
+		$element = $element_id ? "'$element_id'" : 'element';
+
+		$js_queue = '';
+		if (isset($js_options) && is_array($js_options['queue'])) {
+		} elseif (isset($js_options)) {
+			$js_queue = "'$js_options'";
+		}
+
+		if (in_array($name, $this->TOGGLE_EFFECTS)) {
+			return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+		} else {
+			return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+		}
+	}
+
+	/**
+	 * @param         $element_id
+	 * @param  null   $options
+	 * @return string
+	 */
+	public function sortabe_element($element_id, $options = null)
+	{
+		return $this->tag($this->_sortabe_element($element_id, $options));
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+
+	public function _sortabe_element($element_id, $options)
+	{
+		//if (isset($options['with']))
+		{
+			$options['with'] = "Sortable.serialize('$element_id')";
+		}
+
+		//if (isset($option['onUpdate']))
+		{
+			$options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+		}
+
+		foreach ($options as $var => $val) {
+			if (in_array($var, $this->AJAX_OPTIONS)) {
+				unset($options[$var]);
+			}
+		}
+
+		$arr = array('tag', 'overlap', 'contraint', 'handle');
+
+		foreach ($arr as $var) {
+			if (isset($options[$var])) {
+				$options[$var] = "'" . $options[$var] . "'";
+			}
+		}
+
+		if (isset($options['containment'])) {
+			$options['containment'] = $this->_array_or_string_for_javascript($options['containment']);
+		}
+
+		if (isset($options['only'])) {
+			$options['only'] = $this->_array_or_string_for_javascript($options['only']);
+		}
+
+		return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _dragable_element_js($element_id, $options)
+	{
+		return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/**
+	 * @param $element_id
+	 * @param $options
+	 * @return string
+	 */
+	public function _drop_receiving_element($element_id, $options)
+	{
+
+		//if (isset($options['with']))
+		{
+			$options['with'] = '\'id=\' + encodeURIComponent(element.id)';
+		}
+
+		//if (isset($option['onDrop']))
+		{
+			$options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+		}
+
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (in_array($var, $this->AJAX_OPTIONS)) {
+					unset($options[$var]);
+				}
+			}
+		}
+
+		if (isset($options['accept'])) {
+			$options['accept'] = $this->_array_or_string_for_javascript($options['accept']);
+		}
+
+		if (isset($options['hoverclass'])) {
+			$options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+		}
+
+		return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+	}
+
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                            Merged Javascript macro
+	/////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param         $field_id
+	 * @param         $options
+	 * @param  bool   $tag
+	 * @return string
+	 */
+	public function in_place_editor($field_id, $options, $tag = true)
+	{
+		$function = 'new Ajax.InPlaceEditor(';
+		$function .= "'$field_id', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['cancel_text'])) {
+			$js_options['cancelText'] = $options['cancel_text'];
+		}
+		if (isset($options['save_text'])) {
+			$js_options['okText'] = $options['save_text'];
+		}
+		if (isset($options['loading_text'])) {
+			$js_options['loadingText'] = $options['loading_text'];
+		}
+		if (isset($options['rows'])) {
+			$js_options['rows'] = $options['rows'];
+		}
+		if (isset($options['cols'])) {
+			$js_options['cols'] = $options['cols'];
+		}
+		if (isset($options['size'])) {
+			$js_options['size'] = $options['size'];
+		}
+		if (isset($options['external_control'])) {
+			$js_options['externalControl'] = "'" . $options['external_control'] . "'";
+		}
+		if (isset($options['load_text_url'])) {
+			$js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+		}
+		if (isset($options['options'])) {
+			$js_options['ajaxOptions'] = $options['options'];
+		}
+		if (isset($options['script'])) {
+			$js_options['evalScripts'] = $options['script'];
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+		if ($tag) {
+			return $this->tag($function);
+		} else {
+			return $function;
+		}
+	}
+
+	/**
+	 * @param         $object
+	 * @param  null   $tag_options
+	 * @param  null   $in_place_editor_options
+	 * @return string
+	 */
+	public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
+	{
+		$ret_val = '';
+		$ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+		$ret_val .= $this->in_place_editor($object, $in_place_editor_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @param $field_id
+	 * @param $options
+	 * @return mixed
+	 */
+	public function auto_complete_field($field_id, $options)
+	{
+		$function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+		$function .= "'$field_id', ";
+		$function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
+		$function .= "'" . $options['url'] . "'";
+
+		$js_options = array();
+		if (isset($options['tokens'])) {
+			$js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
+		}
+		if (isset($options['with'])) {
+			$js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+		}
+		if (isset($options['indicator'])) {
+			$js_options['indicator'] = "'" . $options['indicator'] . "'";
+		}
+		if (isset($options['select'])) {
+			$js_options['select'] = "'" . $options['select'] . "'";
+		}
+
+		foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
+			if (isset($options[$var])) {
+				$js_options['$val'] = $options['var'];
+			}
+		}
+
+		$function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+
+		return $this->tag($function);
+	}
+
+	/**
+	 * @param      $entries
+	 * @param      $field
+	 * @param null $phrase
+	 */
+	public function auto_complete_results($entries, $field, $phrase = null)
+	{
+		if (!is_array($entries)) {
+			return;
+		}
+		$ret_val = '<ul>';
+		//  Complete this function
+	}
+
+	/**
+	 * @param         $object
+	 * @param  null   $tag_options
+	 * @param  null   $completion_options
+	 * @return string
+	 */
+	public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
+	{
+		$ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
+		$ret_val .= '<input autocomplete="off" id="'
+					. $object
+					. '" name="'
+					. $object
+					. '" size="'
+					. (isset($tag_options['size']) ? $tag_options['size'] : 30)
+					. '" type="text" value="'
+					. (isset($tag_options['size']) ? $tag_options['value'] : '')
+					. '" '
+					. (isset($tag_options['class']) ? 'class = "'
+													  . $tag_options['class']
+													  . '" ' : '')
+					. '>';
+
+		$ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+		$ret_val .= $this->auto_complete_field($object, $completion_options);
+
+		return $ret_val;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function _auto_complete_stylesheet()
+	{
+		return '<style> div.auto_complete {
                   width: 350px;
                   background: #fff;
                  }
@@ -354,5 +354,5 @@ 
                    padding:0;
                  }
                  </style>';
-    }
+	}
 }

include/projax/classes/JavaScript.php

Indentation +75 added lines, -75 removed lines

@@ -15,90 +15,90 @@
  */
 class JavaScript
 {
-    /**
-     * @param         $name
-     * @param  null   $function
-     * @return string
-     */
-    public function button_to_function($name, $function = null)
-    {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '">';
-    }
+	/**
+	 * @param         $name
+	 * @param  null   $function
+	 * @return string
+	 */
+	public function button_to_function($name, $function = null)
+	{
+		return '<input type="button" value="' . $name . '" onclick="' . $function . '">';
+	}
 
-    /**
-     * @param $javascript
-     * @return mixed|string
-     */
-    public function escape($javascript)
-    {
-        $javascript = addslashes($javascript);
-        $javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
+	/**
+	 * @param $javascript
+	 * @return mixed|string
+	 */
+	public function escape($javascript)
+	{
+		$javascript = addslashes($javascript);
+		$javascript = str_replace(array("\r\n", "\n", "\r"), array("\n"), $javascript);
 
-        return $javascript;
-    }
+		return $javascript;
+	}
 
-    /**
-     * @param $content
-     * @return string
-     */
-    public function tag($content)
-    {
-        return '<script type="text/javascript">' . $content . '</script>';
-    }
+	/**
+	 * @param $content
+	 * @return string
+	 */
+	public function tag($content)
+	{
+		return '<script type="text/javascript">' . $content . '</script>';
+	}
 
-    /**
-     * @param         $name
-     * @param         $function
-     * @param  null   $html_options
-     * @return string
-     */
-    public function link_to_function($name, $function, $html_options = null)
-    {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;">' . $name . '</a>';
-    }
+	/**
+	 * @param         $name
+	 * @param         $function
+	 * @param  null   $html_options
+	 * @return string
+	 */
+	public function link_to_function($name, $function, $html_options = null)
+	{
+		return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;">' . $name . '</a>';
+	}
 
-    /////////////////////////////////////////////////////////////////////////////////////
-    //                             Private functions
-    /////////////////////////////////////////////////////////////////////////////////////
+	/////////////////////////////////////////////////////////////////////////////////////
+	//                             Private functions
+	/////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @param $option
-     * @return string
-     */
-    public function _array_or_string_for_javascript($option)
-    {
-        $return_val = '';
-        if (is_array($option)) {
-            foreach ($option as $value) {
-                if (!empty($return_val)) {
-                    $ret_val .= ', ';
-                }
-                $return_val .= $value;
-            }
+	/**
+	 * @param $option
+	 * @return string
+	 */
+	public function _array_or_string_for_javascript($option)
+	{
+		$return_val = '';
+		if (is_array($option)) {
+			foreach ($option as $value) {
+				if (!empty($return_val)) {
+					$ret_val .= ', ';
+				}
+				$return_val .= $value;
+			}
 
-            return '[' . $return_val . ']';
-        }
+			return '[' . $return_val . ']';
+		}
 
-        return "'$option'";
-    }
+		return "'$option'";
+	}
 
-    /**
-     * @param $options
-     * @return string
-     */
-    public function _options_for_javascript($options)
-    {
-        $return_val = '';
+	/**
+	 * @param $options
+	 * @return string
+	 */
+	public function _options_for_javascript($options)
+	{
+		$return_val = '';
 
-        if (is_array($options)) {
-            foreach ($options as $var => $val) {
-                if (!empty($return_val)) {
-                    $return_val .= ', ';
-                }
-                $return_val .= "$var:$val";
-            }
-        }
+		if (is_array($options)) {
+			foreach ($options as $var => $val) {
+				if (!empty($return_val)) {
+					$return_val .= ', ';
+				}
+				$return_val .= "$var:$val";
+			}
+		}
 
-        return '{' . $return_val . '}';
-    }
+		return '{' . $return_val . '}';
+	}
 }