mambax7 / smartobject

class/smartobjecttable.php

Indentation +675 added lines, -677 removed lines

@@ -5,9 +5,7 @@ 
  *
  * @license GNU
  * @author marcan <marcan@smartfactory.ca>
-
  * @version $Id: smartobjecttable.php 2067 2008-05-08 16:12:18Z fx2024 $
-
  * @link http://smartfactory.ca The SmartFactory
  * @package SmartObject
  * @subpackage SmartObjectTable
@@ -24,48 +22,48 @@ 
  */
 class SmartObjectColumn {
 
-    var $_keyname;
-    var $_align;
-    var $_width;
-    var $_customMethodForValue;
-    var $_extraParams;
-    var $_sortable;
-    var $_customCaption;
-
-    function SmartObjectColumn($keyname, $align='left', $width=false, $customMethodForValue=false, $param = false, $customCaption = false, $sortable = true) {
-        $this->_keyname = $keyname;
-        $this->_align = $align;
-        $this->_width = $width;
-        $this->_customMethodForValue = $customMethodForValue;
-        $this->_sortable = $sortable;
-        $this->_param = $param;
-        $this->_customCaption = $customCaption;
-    }
-
-    function getKeyName() {
-        return $this->_keyname;
-    }
-
-    function getAlign() {
-        return $this->_align;
-    }
-
-    function isSortable() {
-        return $this->_sortable;
-    }
-
-    function getWidth() {
-        if ($this->_width) {
-            $ret = $this->_width;
-        } else {
-            $ret = '';
-        }
-        return $ret;
-    }
-
-    function getCustomCaption() {
-        return $this->_customCaption;
-    }
+	var $_keyname;
+	var $_align;
+	var $_width;
+	var $_customMethodForValue;
+	var $_extraParams;
+	var $_sortable;
+	var $_customCaption;
+
+	function SmartObjectColumn($keyname, $align='left', $width=false, $customMethodForValue=false, $param = false, $customCaption = false, $sortable = true) {
+		$this->_keyname = $keyname;
+		$this->_align = $align;
+		$this->_width = $width;
+		$this->_customMethodForValue = $customMethodForValue;
+		$this->_sortable = $sortable;
+		$this->_param = $param;
+		$this->_customCaption = $customCaption;
+	}
+
+	function getKeyName() {
+		return $this->_keyname;
+	}
+
+	function getAlign() {
+		return $this->_align;
+	}
+
+	function isSortable() {
+		return $this->_sortable;
+	}
+
+	function getWidth() {
+		if ($this->_width) {
+			$ret = $this->_width;
+		} else {
+			$ret = '';
+		}
+		return $ret;
+	}
+
+	function getCustomCaption() {
+		return $this->_customCaption;
+	}
 
 }
 
@@ -80,639 +78,639 @@ 
  */
 class SmartObjectTable {
 
-    var $_id;
-    var $_objectHandler;
-    var $_columns;
-    var $_criteria;
-    var $_actions;
-    var $_objects=false;
-    var $_aObjects;
-    var $_custom_actions;
-    var $_sortsel;
-    var $_ordersel;
-    var $_limitsel;
-    var $_filtersel;
-    var $_filterseloptions;
-    var $_filtersel2;
-    var $_filtersel2options;
-    var $_filtersel2optionsDefault;
-
-    var $_tempObject;
-    var $_tpl;
-    var $_introButtons;
-    var $_quickSearch=false;
-    var $_actionButtons=false;
-    var $_head_css_class='bg3';
-    var $_hasActions=false;
-    var $_userSide=false;
-    var $_printerFriendlyPage=false;
-    var $_tableHeader=false;
-    var $_tableFooter=false;
-    var $_showActionsColumnTitle = true;
-    var $_isTree = false;
-    var $_showFilterAndLimit = true;
-    var $_enableColumnsSorting = true;
-    var $_customTemplate = false;
-    var $_withSelectedActions = array();
-
-    /**
-     * Constructor
-     *
-     * @param object $objectHandler {@link SmartPersistableObjectHandler}
-     * @param array $columns array representing the columns to display in the table
-     * @param object $criteria
-     * @param array $actions array representing the actions to offer
-     *
-     * @return array
-     */
-    function SmartObjectTable(&$objectHandler, $criteria=false, $actions=array('edit', 'delete'), $userSide=false)
-    {
-        $this->_id = $objectHandler->className;
-        $this->_objectHandler = $objectHandler;
-
-        if (!$criteria) {
-            $criteria = new CriteriaCompo();
-        }
-        $this->_criteria = $criteria;
-        $this->_actions = $actions;
-        $this->_custom_actions = array();
-        $this->_userSide = $userSide;
-        if ($userSide) {
-            $this->_head_css_class = 'head';
-        }
-    }
-
-    function addActionButton($op, $caption=false, $text=false) {
-        $action = array(
-            'op' => $op,
-            'caption' => $caption,
-            'text' => $text
-        );
-        $this->_actionButtons[] = $action;
-    }
-
-    function addColumn($columnObj) {
-        $this->_columns[] = $columnObj;
-    }
-
-    function addIntroButton($name, $location, $value) {
-        $introButton = array();
-        $introButton['name'] = $name;
-        $introButton['location'] = $location;
-        $introButton['value'] = $value;
-        $this->_introButtons[] = $introButton;
-        unset($introButton);
-    }
-
-    function addPrinterFriendlyLink() {
-        $current_urls = smart_getCurrentUrls();
-        $current_url = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
-    }
-
-    function addQuickSearch($fields, $caption=_CO_SOBJECT_QUICK_SEARCH) {
-        $this->_quickSearch = array('fields' => $fields, 'caption' => $caption);
-    }
-
-    function addHeader($content) {
-        $this->_tableHeader = $content;
-    }
-
-    function addFooter($content) {
-        $this->_tableFooter = $content;
-    }
-
-    function addDefaultIntroButton($caption) {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . "?op=mod", $caption);
-    }
-
-    function addCustomAction($method) {
-        $this->_custom_actions[] = $method;
-    }
-
-    function setDefaultSort($default_sort) {
-        $this->_sortsel = $default_sort;
-    }
-
-    function getDefaultSort() {
-        if ($this->_sortsel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
-        }
-    }
-
-    function setDefaultOrder($default_order) {
-        $this->_ordersel = $default_order;
-    }
-
-    function getDefaultOrder() {
-        if ($this->_ordersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
-        }
-    }
-    function addWithSelectedActions($actions = array()){
-        $this->addColumn(new SmartObjectColumn('checked', 'center', 20, false, false, '&nbsp;'));
-        $this->_withSelectedActions = $actions;
-    }
-
-    /**
-     * Adding a filter in the table
-     *
-     * @param string $key key to the field that will be used for sorting
-     * @param string $method method of the handler that will be called to populate the options when this filter is selected
-     */
-    function addFilter($key, $method, $default=false) {
-        $this->_filterseloptions[$key] = $method;
-        $this->_filtersel2optionsDefault = $default;
-    }
-
-    function setDefaultFilter($default_filter) {
-        $this->_filtersel = $default_filter;
-    }
-
-    function isForUserSide() {
-        $this->_userSide = true;
-    }
-    function setCustomTemplate($template) {
-        $this->_customTemplate = $template;
-    }
-    function setSortOrder() {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
-        //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel'] : $this->_sortsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
-        $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
-
-        if (isset($this->_tempObject->vars[$this->_sortsel]['itemName']) && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . "." . $this->_sortsel);
-        } else {
-
-            $this->_criteria->setSort($this->_objectHandler->_itemname . "." . $this->_sortsel);
-        }
-
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
-        //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel'] :$this->_ordersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
-        $ordersArray = $this->getOrdersArray();
-        $this->_criteria->setOrder($this->_ordersel);
-    }
-
-    function setTableId($id) {
-        $this->_id = $id;
-    }
-
-    function setObjects($objects) {
-        $this->_objects = $objects;
-    }
-
-    function createTableRows() {
-        $this->_aObjects = array();
-
-        $doWeHaveActions = false;
-
-        $objectclass = 'odd';
-        if (count($this->_objects) > 0) {
-            foreach ($this->_objects as $object) {
-
-                $aObject = array();
-
-                $i=0;
-
-                $aColumns = array();
-
-                foreach ($this->_columns as $column) {
-
-                    $aColumn = array();
-
-                    if ($i==0) {
-                        $class = "head";
-                    } elseif ($i % 2 == 0) {
-                        $class = "even";
-                    } else {
-                        $class = "odd";
-                    }
-                    if(method_exists($object, 'initiateCustomFields')){
-                        //$object->initiateCustomFields();
-                    }
-                    if($column->_keyname == 'checked'){
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'" />';
-                    }elseif ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
-                        $method = $column->_customMethodForValue;
-                        if($column->_param){
-                            $value = $object->$method($column->_param);
-                        }else{
-                            $value = $object->$method();
-                        }
-                    } else {
-                        /**
-                         * If the column is the identifier, then put a link on it
-                         */
-                        if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                            $value = $object->getItemLink();
-                        } else {
-                            $value = $object->getVar($column->getKeyName());
-                        }
-                    }
-
-                    $aColumn['value'] = $value;
-                    $aColumn['class'] = $class;
-                    $aColumn['width'] = $column->getWidth();
-                    $aColumn['align'] = $column->getAlign();
-
-                    $aColumns[] = $aColumn;
-                    $i++;
-                }
-
-                $aObject['columns'] = $aColumns;
-                $aObject['id'] = $object->id();
-
-                $objectclass = ($objectclass == 'even') ? 'odd' : 'even';
-
-                $aObject['class'] = $objectclass;
-
-                $actions = array();
-
-                // Adding the custom actions if any
-                foreach ($this->_custom_actions as $action) {
-                    if (method_exists($object, $action)) {
-                        $actions[] = $object->$action();
-                    }
-                }
-
-                include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
-                $controller = new SmartObjectController($this->_objectHandler);
-
-                if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
-                    $actions[] = $controller->getEditItemLink($object, false, true, $this->_userSide);
-                }
-                if ((!is_array($this->_actions)) || in_array('delete', $this->_actions)) {
-                    $actions[] = $controller->getDeleteItemLink($object, false, true, $this->_userSide);
-                }
-                $aObject['actions'] = $actions;
-
-                $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-
-                $doWeHaveActions = $doWeHaveActions ? true : count($actions) > 0;
-
-                $this->_aObjects[] = $aObject;
-            }
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-        $this->_hasActions = $doWeHaveActions;
-    }
-
-    function fetchObjects($debug=false) {
-        return $this->_objectHandler->getObjects($this->_criteria, true,true, false, $debug);
-    }
-
-    function getDefaultFilter() {
-        if ($this->_filtersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
-        }
-    }
-
-    function getFiltersArray() {
-        $ret = array();
-        $field = array();
-        $field['caption'] = _CO_OBJ_NONE;
-        $field['selected'] = '';
-        $ret['default'] = $field;
-        unset($field);
-
-        if ($this->_filterseloptions) {
-            foreach($this->_filterseloptions as $key=>$value) {
-                $field = array();
-                if (is_array($value)) {
-                    $field['caption'] = $key;
-                    $field['selected'] = $this->_filtersel == $key ? "selected='selected'" : '';
-                } else {
-                    $field['caption'] = $this->_tempObject->vars[$key]['form_caption'];
-                    $field['selected'] = $this->_filtersel == $key ? "selected='selected'" : '';
-                }
-                $ret[$key] = $field;
-                unset($field);
-            }
-        } else {
-            $ret = false;
-        }
-        return $ret;
-    }
-
-    function setDefaultFilter2($default_filter2) {
-        $this->_filtersel2 = $default_filter2;
-    }
-
-    function getDefaultFilter2() {
-        if ($this->_filtersel2) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
-        } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
-        }
-    }
-
-    function getFilters2Array() {
-        $ret = array();
-
-        foreach($this->_filtersel2options as $key=>$value) {
-            $field = array();
-            $field['caption'] = $value;
-            $field['selected'] = $this->_filtersel2 == $key ? "selected='selected'" : '';
-            $ret[$key] = $field;
-            unset($field);
-        }
-        return $ret;
-    }
-
-    function renderOptionSelection($limitsArray, $params_of_the_options_sel) {
-        // Rendering the form to select options on the table
-        $current_urls = smart_getCurrentUrls();
-        $current_url = $current_urls['full'];
-
-        /**
-         * What was $params_of_the_options_sel doing again ?
-         */
-        //$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
-        $this->_tpl->assign('smartobject_optionssel_action', $current_url );
-        $this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
-    }
-
-    function getLimitsArray() {
-        $ret = array();
-        $ret['all']['caption'] = _CO_SOBJECT_LIMIT_ALL;
-        $ret['all']['selected'] = ('all' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['5']['caption'] = '5';
-        $ret['5']['selected'] = ('5' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['10']['caption'] = '10';
-        $ret['10']['selected'] = ('10' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['15']['caption'] = '15';
-        $ret['15']['selected'] = ('15' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['20']['caption'] = '20';
-        $ret['20']['selected'] = ('20' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['25']['caption'] = '25';
-        $ret['25']['selected'] = ('25' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['30']['caption'] = '30';
-        $ret['30']['selected'] = ('30' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['35']['caption'] = '35';
-        $ret['35']['selected'] = ('35' == $this->_limitsel) ? "selected='selected'" : "";
-
-        $ret['40']['caption'] = '40';
-        $ret['40']['selected'] = ('40' == $this->_limitsel) ? "selected='selected'" : "";
-        return $ret;
-    }
-
-    function getObjects() {
-        return $this->_objects;
-    }
-
-    function hideActionColumnTitle() {
-        $this->_showActionsColumnTitle = false;
-    }
-
-    function hideFilterAndLimit() {
-        $this->_showFilterAndLimit = false;
-    }
-
-    function getOrdersArray() {
-        $ret = array();
-        $ret['ASC']['caption'] = _CO_SOBJECT_SORT_ASC;
-        $ret['ASC']['selected'] = ('ASC' == $this->_ordersel) ? "selected='selected'" : "";
-
-        $ret['DESC']['caption'] = _CO_SOBJECT_SORT_DESC;
-        $ret['DESC']['selected'] = ('DESC' == $this->_ordersel) ? "selected='selected'" : "";
-
-        return $ret;
-    }
-
-    function renderD() {
-        return $this->render(false, true);
-    }
-
-    function renderForPrint() {
-
-    }
-
-    function render($fetchOnly=false, $debug=false)
-    {
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
-
-        $this->_tpl = new XoopsTpl();
-
-        /**
-         * We need access to the vars of the SmartObject for a few things in the table creation.
-         * Since we may not have a SmartObject to look into now, let's create one for this purpose
-         * and we will free it after
-         */
-        $this->_tempObject =& $this->_objectHandler->create();
-
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? intval($_GET['start' . $this->_objectHandler->keyName]) : 0);
-
-        $this->setSortOrder();
-
-        if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
-        } else {
-            $this->_limitsel = 'all';
-        }
-
-        $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
-        $limitsArray = $this->getLimitsArray();
-        $this->_criteria->setLimit($this->_limitsel);
-
-        $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
-        $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
-        $filtersArray = $this->getFiltersArray();
-
-        if ($filtersArray) {
-            $this->_tpl->assign('smartobject_optionssel_filtersArray', $filtersArray);
-        }
-
-        // Check if the selected filter is defined and if so, create the selfilter2
-        if (isset($this->_filterseloptions[$this->_filtersel])) {
-            // check if method associate with this filter exists in the handler
-            if (is_array($this->_filterseloptions[$this->_filtersel])) {
-                $filter = $this->_filterseloptions[$this->_filtersel];
-                $this->_criteria->add($filter['criteria']);
-            } else {
-                if (method_exists($this->_objectHandler, $this->_filterseloptions[$this->_filtersel])) {
-
-                    // then we will create the selfilter2 options by calling this method
-                    $method = $this->_filterseloptions[$this->_filtersel];
-                    $this->_filtersel2options = $this->_objectHandler->$method();
-
-                    $this->_filtersel2 = isset($_GET['filtersel2']) ? $_GET['filtersel2'] : $this->getDefaultFilter2();
-                    $this->_filtersel2 = isset($_POST['filtersel2']) ? $_POST['filtersel2'] : $this->_filtersel2;
-
-                    $filters2Array = $this->getFilters2Array();
-                    $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
-
-                    smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
-                    if ($this->_filtersel2 != 'default') {
-                        $this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
-                    }
-                }
-            }
-        }
-        // Check if we have a quicksearch
-
-        if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
-            $quicksearch_criteria = new CriteriaCompo();
-            if (is_array($this->_quickSearch['fields'])) {
-                foreach($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
-                }
-            } else {
-                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
-            }
-            $this->_criteria->add($quicksearch_criteria);
-        }
-
-        $this->_objects = $this->fetchObjects($debug);
-
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        if ($this->_criteria->getLimit() > 0) {
-
-            /**
-             * Geeting rid of the old params
-             * $new_get_array is an array containing the new GET parameters
-             */
-            $new_get_array = array();
-
-            /**
-             * $params_of_the_options_sel is an array with all the parameters of the page
-             * but without the pagenave parameters. This array will be used in the
-             * OptionsSelection
-             */
-            $params_of_the_options_sel = array();
-
-            $not_needed_params = array('sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName);
-            foreach ($_GET as $k => $v) {
-                if (!in_array($k, $not_needed_params)) {
-                    $new_get_array[] = "$k=$v";
-                    $params_of_the_options_sel[] = "$k=$v";
-                }
-            }
-
-            /**
-             * Adding the new params of the pagenav
-             */
-            $new_get_array[] = "sortsel=" . $this->_sortsel;
-            $new_get_array[] = "ordersel=" . $this->_ordersel;
-            $new_get_array[] = "limitsel=" . $this->_limitsel;
-            $otherParams = implode('&', $new_get_array);
-
-            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
-            $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
-        }
-        $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
-
-        // retreive the current url and the query string
-        $current_urls = smart_getCurrentUrls();
-        $current_url = $current_urls['full_phpself'];
-        $query_string = $current_urls['querystring'];
-        if ($query_string) {
-            $query_string = str_replace('?', '',$query_string);
-        }
-        $query_stringArray = explode('&', $query_string);
-        $new_query_stringArray = array();
-        foreach($query_stringArray as $query_string) {
-            if (strpos($query_string, 'sortsel') == FALSE && strpos($query_string, 'ordersel') == FALSE) {
-                $new_query_stringArray[] = $query_string;
-            }
-        }
-        $new_query_string = implode('&', $new_query_stringArray);
-
-        $orderArray = array();
-        $orderArray['ASC']['image'] = 'desc.png';
-        $orderArray['ASC']['neworder'] = 'DESC';
-        $orderArray['DESC']['image'] = 'asc.png';
-        $orderArray['DESC']['neworder'] = 'ASC';
-
-        $aColumns = array();
-
-        foreach ($this->_columns as $column) {
-            $qs_param = '';
-            $aColumn = array();
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key'] = $column->getKeyName();
-            if($column->_keyname == 'checked'){
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' .
-                        ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');" />';
-            }elseif($column->getCustomCaption()){
-                $aColumn['caption'] = $column->getCustomCaption();
-            }else{
-                $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
-            }
-            // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName()) || ($this->_sortsel == $column->getKeyName());
-            $order = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
-
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
-                $qs_param = "&quicksearch_".$this->_id."=".$_REQUEST['quicksearch_' . $this->_id];
-            }
-            if (!$this->_enableColumnsSorting || $column->_keyname == 'checked' || !$column->isSortable()) {
-                $aColumn['caption'] =  $aColumn['caption'];
-            } elseif ($getSort) {
-                $aColumn['caption'] =  '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=' . $orderArray[$order]['neworder'].$qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . ' <img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . $orderArray[$order]['image'] . '" alt="ASC" /></a>';
-            } else {
-                $aColumn['caption'] =  '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC'.$qs_param.'&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
-            }
-            $aColumns[] = $aColumn;
-        }
-        $this->_tpl->assign('smartobject_columns', $aColumns);
-
-        if ($this->_quickSearch) {
-            $this->_tpl->assign('smartobject_quicksearch', $this->_quickSearch['caption']);
-        }
-
-        $this->createTableRows();
-
-        $this->_tpl->assign('smartobject_showFilterAndLimit', $this->_showFilterAndLimit);
-        $this->_tpl->assign('smartobject_isTree', $this->_isTree);
-        $this->_tpl->assign('smartobject_show_action_column_title', $this->_showActionsColumnTitle);
-        $this->_tpl->assign('smartobject_table_header', $this->_tableHeader);
-        $this->_tpl->assign('smartobject_table_footer', $this->_tableFooter);
-        $this->_tpl->assign('smartobject_printer_friendly_page', $this->_printerFriendlyPage);
-        $this->_tpl->assign('smartobject_user_side', $this->_userSide);
-        $this->_tpl->assign('smartobject_has_actions', $this->_hasActions);
-        $this->_tpl->assign('smartobject_head_css_class', $this->_head_css_class);
-        $this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
-        $this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
-        $this->_tpl->assign('smartobject_id', $this->_id);
-        if(!empty($this->_withSelectedActions)){
-            $this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
-        }
-
-        $smartobject_table_template = $this->_customTemplate ? $this->_customTemplate : 'smartobject_smarttable_display.html';
-        if ($fetchOnly) {
-            return $this->_tpl->fetch( 'db:' . $smartobject_table_template );
-        } else {
-            $this->_tpl->display( 'db:' . $smartobject_table_template );
-        }
-    }
-
-    function disableColumnsSorting() {
-        $this->_enableColumnsSorting = false;
-    }
-    function fetch($debug=false) {
-        return $this->render(true, $debug);
-    }
+	var $_id;
+	var $_objectHandler;
+	var $_columns;
+	var $_criteria;
+	var $_actions;
+	var $_objects=false;
+	var $_aObjects;
+	var $_custom_actions;
+	var $_sortsel;
+	var $_ordersel;
+	var $_limitsel;
+	var $_filtersel;
+	var $_filterseloptions;
+	var $_filtersel2;
+	var $_filtersel2options;
+	var $_filtersel2optionsDefault;
+
+	var $_tempObject;
+	var $_tpl;
+	var $_introButtons;
+	var $_quickSearch=false;
+	var $_actionButtons=false;
+	var $_head_css_class='bg3';
+	var $_hasActions=false;
+	var $_userSide=false;
+	var $_printerFriendlyPage=false;
+	var $_tableHeader=false;
+	var $_tableFooter=false;
+	var $_showActionsColumnTitle = true;
+	var $_isTree = false;
+	var $_showFilterAndLimit = true;
+	var $_enableColumnsSorting = true;
+	var $_customTemplate = false;
+	var $_withSelectedActions = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param object $objectHandler {@link SmartPersistableObjectHandler}
+	 * @param array $columns array representing the columns to display in the table
+	 * @param object $criteria
+	 * @param array $actions array representing the actions to offer
+	 *
+	 * @return array
+	 */
+	function SmartObjectTable(&$objectHandler, $criteria=false, $actions=array('edit', 'delete'), $userSide=false)
+	{
+		$this->_id = $objectHandler->className;
+		$this->_objectHandler = $objectHandler;
+
+		if (!$criteria) {
+			$criteria = new CriteriaCompo();
+		}
+		$this->_criteria = $criteria;
+		$this->_actions = $actions;
+		$this->_custom_actions = array();
+		$this->_userSide = $userSide;
+		if ($userSide) {
+			$this->_head_css_class = 'head';
+		}
+	}
+
+	function addActionButton($op, $caption=false, $text=false) {
+		$action = array(
+			'op' => $op,
+			'caption' => $caption,
+			'text' => $text
+		);
+		$this->_actionButtons[] = $action;
+	}
+
+	function addColumn($columnObj) {
+		$this->_columns[] = $columnObj;
+	}
+
+	function addIntroButton($name, $location, $value) {
+		$introButton = array();
+		$introButton['name'] = $name;
+		$introButton['location'] = $location;
+		$introButton['value'] = $value;
+		$this->_introButtons[] = $introButton;
+		unset($introButton);
+	}
+
+	function addPrinterFriendlyLink() {
+		$current_urls = smart_getCurrentUrls();
+		$current_url = $current_urls['full'];
+		$this->_printerFriendlyPage = $current_url . '&print';
+	}
+
+	function addQuickSearch($fields, $caption=_CO_SOBJECT_QUICK_SEARCH) {
+		$this->_quickSearch = array('fields' => $fields, 'caption' => $caption);
+	}
+
+	function addHeader($content) {
+		$this->_tableHeader = $content;
+	}
+
+	function addFooter($content) {
+		$this->_tableFooter = $content;
+	}
+
+	function addDefaultIntroButton($caption) {
+		$this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . "?op=mod", $caption);
+	}
+
+	function addCustomAction($method) {
+		$this->_custom_actions[] = $method;
+	}
+
+	function setDefaultSort($default_sort) {
+		$this->_sortsel = $default_sort;
+	}
+
+	function getDefaultSort() {
+		if ($this->_sortsel) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+		}
+	}
+
+	function setDefaultOrder($default_order) {
+		$this->_ordersel = $default_order;
+	}
+
+	function getDefaultOrder() {
+		if ($this->_ordersel) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+		}
+	}
+	function addWithSelectedActions($actions = array()){
+		$this->addColumn(new SmartObjectColumn('checked', 'center', 20, false, false, '&nbsp;'));
+		$this->_withSelectedActions = $actions;
+	}
+
+	/**
+	 * Adding a filter in the table
+	 *
+	 * @param string $key key to the field that will be used for sorting
+	 * @param string $method method of the handler that will be called to populate the options when this filter is selected
+	 */
+	function addFilter($key, $method, $default=false) {
+		$this->_filterseloptions[$key] = $method;
+		$this->_filtersel2optionsDefault = $default;
+	}
+
+	function setDefaultFilter($default_filter) {
+		$this->_filtersel = $default_filter;
+	}
+
+	function isForUserSide() {
+		$this->_userSide = true;
+	}
+	function setCustomTemplate($template) {
+		$this->_customTemplate = $template;
+	}
+	function setSortOrder() {
+		$this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+		//$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel'] : $this->_sortsel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+		$fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
+
+		if (isset($this->_tempObject->vars[$this->_sortsel]['itemName']) && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
+			$this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . "." . $this->_sortsel);
+		} else {
+
+			$this->_criteria->setSort($this->_objectHandler->_itemname . "." . $this->_sortsel);
+		}
+
+		$this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+		//$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel'] :$this->_ordersel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+		$ordersArray = $this->getOrdersArray();
+		$this->_criteria->setOrder($this->_ordersel);
+	}
+
+	function setTableId($id) {
+		$this->_id = $id;
+	}
+
+	function setObjects($objects) {
+		$this->_objects = $objects;
+	}
+
+	function createTableRows() {
+		$this->_aObjects = array();
+
+		$doWeHaveActions = false;
+
+		$objectclass = 'odd';
+		if (count($this->_objects) > 0) {
+			foreach ($this->_objects as $object) {
+
+				$aObject = array();
+
+				$i=0;
+
+				$aColumns = array();
+
+				foreach ($this->_columns as $column) {
+
+					$aColumn = array();
+
+					if ($i==0) {
+						$class = "head";
+					} elseif ($i % 2 == 0) {
+						$class = "even";
+					} else {
+						$class = "odd";
+					}
+					if(method_exists($object, 'initiateCustomFields')){
+						//$object->initiateCustomFields();
+					}
+					if($column->_keyname == 'checked'){
+						$value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'" />';
+					}elseif ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
+						$method = $column->_customMethodForValue;
+						if($column->_param){
+							$value = $object->$method($column->_param);
+						}else{
+							$value = $object->$method();
+						}
+					} else {
+						/**
+						 * If the column is the identifier, then put a link on it
+						 */
+						if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+							$value = $object->getItemLink();
+						} else {
+							$value = $object->getVar($column->getKeyName());
+						}
+					}
+
+					$aColumn['value'] = $value;
+					$aColumn['class'] = $class;
+					$aColumn['width'] = $column->getWidth();
+					$aColumn['align'] = $column->getAlign();
+
+					$aColumns[] = $aColumn;
+					$i++;
+				}
+
+				$aObject['columns'] = $aColumns;
+				$aObject['id'] = $object->id();
+
+				$objectclass = ($objectclass == 'even') ? 'odd' : 'even';
+
+				$aObject['class'] = $objectclass;
+
+				$actions = array();
+
+				// Adding the custom actions if any
+				foreach ($this->_custom_actions as $action) {
+					if (method_exists($object, $action)) {
+						$actions[] = $object->$action();
+					}
+				}
+
+				include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
+				$controller = new SmartObjectController($this->_objectHandler);
+
+				if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
+					$actions[] = $controller->getEditItemLink($object, false, true, $this->_userSide);
+				}
+				if ((!is_array($this->_actions)) || in_array('delete', $this->_actions)) {
+					$actions[] = $controller->getDeleteItemLink($object, false, true, $this->_userSide);
+				}
+				$aObject['actions'] = $actions;
+
+				$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+
+				$doWeHaveActions = $doWeHaveActions ? true : count($actions) > 0;
+
+				$this->_aObjects[] = $aObject;
+			}
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+		$this->_hasActions = $doWeHaveActions;
+	}
+
+	function fetchObjects($debug=false) {
+		return $this->_objectHandler->getObjects($this->_criteria, true,true, false, $debug);
+	}
+
+	function getDefaultFilter() {
+		if ($this->_filtersel) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+		}
+	}
+
+	function getFiltersArray() {
+		$ret = array();
+		$field = array();
+		$field['caption'] = _CO_OBJ_NONE;
+		$field['selected'] = '';
+		$ret['default'] = $field;
+		unset($field);
+
+		if ($this->_filterseloptions) {
+			foreach($this->_filterseloptions as $key=>$value) {
+				$field = array();
+				if (is_array($value)) {
+					$field['caption'] = $key;
+					$field['selected'] = $this->_filtersel == $key ? "selected='selected'" : '';
+				} else {
+					$field['caption'] = $this->_tempObject->vars[$key]['form_caption'];
+					$field['selected'] = $this->_filtersel == $key ? "selected='selected'" : '';
+				}
+				$ret[$key] = $field;
+				unset($field);
+			}
+		} else {
+			$ret = false;
+		}
+		return $ret;
+	}
+
+	function setDefaultFilter2($default_filter2) {
+		$this->_filtersel2 = $default_filter2;
+	}
+
+	function getDefaultFilter2() {
+		if ($this->_filtersel2) {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+		} else {
+			return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+		}
+	}
+
+	function getFilters2Array() {
+		$ret = array();
+
+		foreach($this->_filtersel2options as $key=>$value) {
+			$field = array();
+			$field['caption'] = $value;
+			$field['selected'] = $this->_filtersel2 == $key ? "selected='selected'" : '';
+			$ret[$key] = $field;
+			unset($field);
+		}
+		return $ret;
+	}
+
+	function renderOptionSelection($limitsArray, $params_of_the_options_sel) {
+		// Rendering the form to select options on the table
+		$current_urls = smart_getCurrentUrls();
+		$current_url = $current_urls['full'];
+
+		/**
+		 * What was $params_of_the_options_sel doing again ?
+		 */
+		//$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
+		$this->_tpl->assign('smartobject_optionssel_action', $current_url );
+		$this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
+	}
+
+	function getLimitsArray() {
+		$ret = array();
+		$ret['all']['caption'] = _CO_SOBJECT_LIMIT_ALL;
+		$ret['all']['selected'] = ('all' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['5']['caption'] = '5';
+		$ret['5']['selected'] = ('5' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['10']['caption'] = '10';
+		$ret['10']['selected'] = ('10' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['15']['caption'] = '15';
+		$ret['15']['selected'] = ('15' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['20']['caption'] = '20';
+		$ret['20']['selected'] = ('20' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['25']['caption'] = '25';
+		$ret['25']['selected'] = ('25' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['30']['caption'] = '30';
+		$ret['30']['selected'] = ('30' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['35']['caption'] = '35';
+		$ret['35']['selected'] = ('35' == $this->_limitsel) ? "selected='selected'" : "";
+
+		$ret['40']['caption'] = '40';
+		$ret['40']['selected'] = ('40' == $this->_limitsel) ? "selected='selected'" : "";
+		return $ret;
+	}
+
+	function getObjects() {
+		return $this->_objects;
+	}
+
+	function hideActionColumnTitle() {
+		$this->_showActionsColumnTitle = false;
+	}
+
+	function hideFilterAndLimit() {
+		$this->_showFilterAndLimit = false;
+	}
+
+	function getOrdersArray() {
+		$ret = array();
+		$ret['ASC']['caption'] = _CO_SOBJECT_SORT_ASC;
+		$ret['ASC']['selected'] = ('ASC' == $this->_ordersel) ? "selected='selected'" : "";
+
+		$ret['DESC']['caption'] = _CO_SOBJECT_SORT_DESC;
+		$ret['DESC']['selected'] = ('DESC' == $this->_ordersel) ? "selected='selected'" : "";
+
+		return $ret;
+	}
+
+	function renderD() {
+		return $this->render(false, true);
+	}
+
+	function renderForPrint() {
+
+	}
+
+	function render($fetchOnly=false, $debug=false)
+	{
+		include_once XOOPS_ROOT_PATH . '/class/template.php';
+
+		$this->_tpl = new XoopsTpl();
+
+		/**
+		 * We need access to the vars of the SmartObject for a few things in the table creation.
+		 * Since we may not have a SmartObject to look into now, let's create one for this purpose
+		 * and we will free it after
+		 */
+		$this->_tempObject =& $this->_objectHandler->create();
+
+		$this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? intval($_GET['start' . $this->_objectHandler->keyName]) : 0);
+
+		$this->setSortOrder();
+
+		if (!$this->_isTree) {
+			$this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+		} else {
+			$this->_limitsel = 'all';
+		}
+
+		$this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+		$limitsArray = $this->getLimitsArray();
+		$this->_criteria->setLimit($this->_limitsel);
+
+		$this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
+		$this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
+		smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+		$filtersArray = $this->getFiltersArray();
+
+		if ($filtersArray) {
+			$this->_tpl->assign('smartobject_optionssel_filtersArray', $filtersArray);
+		}
+
+		// Check if the selected filter is defined and if so, create the selfilter2
+		if (isset($this->_filterseloptions[$this->_filtersel])) {
+			// check if method associate with this filter exists in the handler
+			if (is_array($this->_filterseloptions[$this->_filtersel])) {
+				$filter = $this->_filterseloptions[$this->_filtersel];
+				$this->_criteria->add($filter['criteria']);
+			} else {
+				if (method_exists($this->_objectHandler, $this->_filterseloptions[$this->_filtersel])) {
+
+					// then we will create the selfilter2 options by calling this method
+					$method = $this->_filterseloptions[$this->_filtersel];
+					$this->_filtersel2options = $this->_objectHandler->$method();
+
+					$this->_filtersel2 = isset($_GET['filtersel2']) ? $_GET['filtersel2'] : $this->getDefaultFilter2();
+					$this->_filtersel2 = isset($_POST['filtersel2']) ? $_POST['filtersel2'] : $this->_filtersel2;
+
+					$filters2Array = $this->getFilters2Array();
+					$this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
+
+					smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+					if ($this->_filtersel2 != 'default') {
+						$this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
+					}
+				}
+			}
+		}
+		// Check if we have a quicksearch
+
+		if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
+			$quicksearch_criteria = new CriteriaCompo();
+			if (is_array($this->_quickSearch['fields'])) {
+				foreach($this->_quickSearch['fields'] as $v) {
+					$quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+				}
+			} else {
+				$quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+			}
+			$this->_criteria->add($quicksearch_criteria);
+		}
+
+		$this->_objects = $this->fetchObjects($debug);
+
+		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+		if ($this->_criteria->getLimit() > 0) {
+
+			/**
+			 * Geeting rid of the old params
+			 * $new_get_array is an array containing the new GET parameters
+			 */
+			$new_get_array = array();
+
+			/**
+			 * $params_of_the_options_sel is an array with all the parameters of the page
+			 * but without the pagenave parameters. This array will be used in the
+			 * OptionsSelection
+			 */
+			$params_of_the_options_sel = array();
+
+			$not_needed_params = array('sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName);
+			foreach ($_GET as $k => $v) {
+				if (!in_array($k, $not_needed_params)) {
+					$new_get_array[] = "$k=$v";
+					$params_of_the_options_sel[] = "$k=$v";
+				}
+			}
+
+			/**
+			 * Adding the new params of the pagenav
+			 */
+			$new_get_array[] = "sortsel=" . $this->_sortsel;
+			$new_get_array[] = "ordersel=" . $this->_ordersel;
+			$new_get_array[] = "limitsel=" . $this->_limitsel;
+			$otherParams = implode('&', $new_get_array);
+
+			$pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+			$this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
+		}
+		$this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
+
+		// retreive the current url and the query string
+		$current_urls = smart_getCurrentUrls();
+		$current_url = $current_urls['full_phpself'];
+		$query_string = $current_urls['querystring'];
+		if ($query_string) {
+			$query_string = str_replace('?', '',$query_string);
+		}
+		$query_stringArray = explode('&', $query_string);
+		$new_query_stringArray = array();
+		foreach($query_stringArray as $query_string) {
+			if (strpos($query_string, 'sortsel') == FALSE && strpos($query_string, 'ordersel') == FALSE) {
+				$new_query_stringArray[] = $query_string;
+			}
+		}
+		$new_query_string = implode('&', $new_query_stringArray);
+
+		$orderArray = array();
+		$orderArray['ASC']['image'] = 'desc.png';
+		$orderArray['ASC']['neworder'] = 'DESC';
+		$orderArray['DESC']['image'] = 'asc.png';
+		$orderArray['DESC']['neworder'] = 'ASC';
+
+		$aColumns = array();
+
+		foreach ($this->_columns as $column) {
+			$qs_param = '';
+			$aColumn = array();
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key'] = $column->getKeyName();
+			if($column->_keyname == 'checked'){
+				$aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' .
+						' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');" />';
+			}elseif($column->getCustomCaption()){
+				$aColumn['caption'] = $column->getCustomCaption();
+			}else{
+				$aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
+			}
+			// Are we doing a GET sort on this column ?
+			$getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName()) || ($this->_sortsel == $column->getKeyName());
+			$order = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+
+			if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
+				$qs_param = "&quicksearch_".$this->_id."=".$_REQUEST['quicksearch_' . $this->_id];
+			}
+			if (!$this->_enableColumnsSorting || $column->_keyname == 'checked' || !$column->isSortable()) {
+				$aColumn['caption'] =  $aColumn['caption'];
+			} elseif ($getSort) {
+				$aColumn['caption'] =  '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=' . $orderArray[$order]['neworder'].$qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . ' <img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . $orderArray[$order]['image'] . '" alt="ASC" /></a>';
+			} else {
+				$aColumn['caption'] =  '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC'.$qs_param.'&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+			}
+			$aColumns[] = $aColumn;
+		}
+		$this->_tpl->assign('smartobject_columns', $aColumns);
+
+		if ($this->_quickSearch) {
+			$this->_tpl->assign('smartobject_quicksearch', $this->_quickSearch['caption']);
+		}
+
+		$this->createTableRows();
+
+		$this->_tpl->assign('smartobject_showFilterAndLimit', $this->_showFilterAndLimit);
+		$this->_tpl->assign('smartobject_isTree', $this->_isTree);
+		$this->_tpl->assign('smartobject_show_action_column_title', $this->_showActionsColumnTitle);
+		$this->_tpl->assign('smartobject_table_header', $this->_tableHeader);
+		$this->_tpl->assign('smartobject_table_footer', $this->_tableFooter);
+		$this->_tpl->assign('smartobject_printer_friendly_page', $this->_printerFriendlyPage);
+		$this->_tpl->assign('smartobject_user_side', $this->_userSide);
+		$this->_tpl->assign('smartobject_has_actions', $this->_hasActions);
+		$this->_tpl->assign('smartobject_head_css_class', $this->_head_css_class);
+		$this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
+		$this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
+		$this->_tpl->assign('smartobject_id', $this->_id);
+		if(!empty($this->_withSelectedActions)){
+			$this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
+		}
+
+		$smartobject_table_template = $this->_customTemplate ? $this->_customTemplate : 'smartobject_smarttable_display.html';
+		if ($fetchOnly) {
+			return $this->_tpl->fetch( 'db:' . $smartobject_table_template );
+		} else {
+			$this->_tpl->display( 'db:' . $smartobject_table_template );
+		}
+	}
+
+	function disableColumnsSorting() {
+		$this->_enableColumnsSorting = false;
+	}
+	function fetch($debug=false) {
+		return $this->render(true, $debug);
+	}
 }
 
 ?>
\ No newline at end of file

class/smartobjectlink.php

Indentation +86 added lines, -86 removed lines

@@ -28,120 +28,120 @@
 // -------------------------------------------------------------------------//
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
 class SmartobjectLink extends SmartObject {
 
-    function SmartobjectLink() {
-        $this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
-        $this->initVar('date', XOBJ_DTYPE_INT, 0, false, null,'', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
-        $this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
-        $this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
-        $this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
-        $this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
-        $this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
-        $this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
-        $this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
+	function SmartobjectLink() {
+		$this->initVar('linkid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('date', XOBJ_DTYPE_INT, 0, false, null,'', false, _CO_SOBJECT_LINK_DATE, '', true, true, false);
+		$this->initVar('from_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_FROM_UID, _CO_SOBJECT_LINK_FROM_UID_DSC);
+		$this->initVar('from_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_EMAIL, _CO_SOBJECT_LINK_FROM_EMAIL_DSC, true);
+		$this->initVar('from_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_FROM_NAME, _CO_SOBJECT_LINK_FROM_NAME_DSC, true);
+		$this->initVar('to_uid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_TO_UID, _CO_SOBJECT_LINK_TO_UID_DSC);
+		$this->initVar('to_email', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_EMAIL, _CO_SOBJECT_LINK_TO_EMAIL_DSC, true);
+		$this->initVar('to_name', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_TO_NAME, _CO_SOBJECT_LINK_TO_NAME_DSC, true);
+		$this->initVar('link', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_LINK, _CO_SOBJECT_LINK_LINK_DSC, true);
 		$this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true, 255, '', false, _CO_SOBJECT_LINK_SUBJECT, _CO_SOBJECT_LINK_SUBJECT_DSC, true);
 		$this->initVar('body', XOBJ_DTYPE_TXTAREA, '', true, null, '', false, _CO_SOBJECT_LINK_BODY, _CO_SOBJECT_LINK_BODY_DSC);
-        $this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
-        $this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
-    }
-
-
-    /**
-    * returns a specific variable for the object in a proper format
-    *
-    * @access public
-    * @param string $key key of the object's variable to be returned
-    * @param string $format format to use for the output
-    * @return mixed formatted value of the variable
-    */
-    function getVar($key, $format = 's') {
-        if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
-            return call_user_func(array($this,$key));
-        }
-        return parent::getVar($key, $format);
-    }
-
-    function from_uid() {
-        $ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
-        return $ret;
-    }
-
-    function to_uid($withContact=false) {
-  	    $ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
-        return $ret;
-    }
-
-    function date() {
-        $ret = formatTimestamp($this->getVar('date','e'));
-        return $ret;
-    }
-
-    function link($full=false) {
-        $ret = $this->getVar('link','e');
-        if ($full) {
-        	$myts = MyTextSanitizer::getInstance();
-        	$ret = $myts->displayTarea($ret);
-        	return $ret;
-        } else {
-        	$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link','e') . '" title="' . $this->getVar('link','e') . '">' .  _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
-        	return $ret;
-        }
-    }
-
-    function getViewItemLink() {
+		$this->initVar('mid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_LINK_MID, _CO_SOBJECT_LINK_MID_DSC);
+		$this->initVar('mid_name', XOBJ_DTYPE_TXTBOX, '', false, 255, '', false, _CO_SOBJECT_LINK_MID_NAME, _CO_SOBJECT_LINK_MID_NAME_DSC, true);
+	}
+
+
+	/**
+	 * returns a specific variable for the object in a proper format
+	 *
+	 * @access public
+	 * @param string $key key of the object's variable to be returned
+	 * @param string $format format to use for the output
+	 * @return mixed formatted value of the variable
+	 */
+	function getVar($key, $format = 's') {
+		if ($format == 's' && in_array($key, array('from_uid', 'to_uid', 'date', 'link'))) {
+			return call_user_func(array($this,$key));
+		}
+		return parent::getVar($key, $format);
+	}
+
+	function from_uid() {
+		$ret = smart_getLinkedUnameFromId($this->getVar('from_uid', 'e'), 1, null, true);
+		return $ret;
+	}
+
+	function to_uid($withContact=false) {
+  		$ret = smart_getLinkedUnameFromId($this->getVar('to_uid', 'e'), 1, null, true);
+		return $ret;
+	}
+
+	function date() {
+		$ret = formatTimestamp($this->getVar('date','e'));
+		return $ret;
+	}
+
+	function link($full=false) {
+		$ret = $this->getVar('link','e');
+		if ($full) {
+			$myts = MyTextSanitizer::getInstance();
+			$ret = $myts->displayTarea($ret);
+			return $ret;
+		} else {
+			$ret = '<a href="' . $ret . '" alt="' . $this->getVar('link','e') . '" title="' . $this->getVar('link','e') . '">' .  _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+			return $ret;
+		}
+	}
+
+	function getViewItemLink() {
 		$ret = '<a href="' . SMARTOBJECT_URL . 'admin/link.php?op=view&linkid=' . $this->getVar('linkid') . '"><img src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'mail_find.png" alt="' . _AM_SOBJECT_SENT_LINK_VIEW . '" title="' . _AM_SOBJECT_SENT_LINK_VIEW . '" /></a>';
 		return $ret;
-    }
+	}
 
-    function getFromInfo() {
-    	// check if from_uid represent a user
+	function getFromInfo() {
+		// check if from_uid represent a user
 
-    	if ($this->getVar('from_uid')) {
+		if ($this->getVar('from_uid')) {
 			$user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
 			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
 				$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
 			}
-    	} else {
-    		$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
-    	}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+		}
 
-    	return $user;
+		return $user;
 
-    }
+	}
 
-    function toArray() {
-    	$ret = parent::toArray();
-    	$ret['fromInfo'] = $this->getFromInfo();
-    	$ret['toInfo'] = $this->getToInfo();
-    	$ret['fullLink'] = $this->link(true);
-    	return $ret;
-    }
+	function toArray() {
+		$ret = parent::toArray();
+		$ret['fromInfo'] = $this->getFromInfo();
+		$ret['toInfo'] = $this->getToInfo();
+		$ret['fullLink'] = $this->link(true);
+		return $ret;
+	}
 
-    function getToInfo() {
-    	// check if from_uid represent a user
+	function getToInfo() {
+		// check if from_uid represent a user
 
-    	if ($this->getVar('to_uid')) {
+		if ($this->getVar('to_uid')) {
 			$user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
 			if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
 				$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
 			}
-    	} else {
-    		$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
-    	}
+		} else {
+			$user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+		}
 
-    	return $user;
+		return $user;
 
-    }
+	}
 }
 class SmartobjectLinkHandler extends SmartPersistableObjectHandler {
-    function SmartobjectLinkHandler($db) {
+	function SmartobjectLinkHandler($db) {
 
-        $this->SmartPersistableObjectHandler($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
-    }
+		$this->SmartPersistableObjectHandler($db, 'link', 'linkid', 'subject', 'body', 'smartobject');
+	}
 
 }
 ?>
\ No newline at end of file

class/smarthighlighter.php

Indentation +77 added lines, -77 removed lines

@@ -21,91 +21,91 @@
 
 class SmartHighlighter {
 
-    /**
-     * @access private
-     */
-    var $preg_keywords = '';
-    /**
-     * @access private
-     */
-    var $keywords = '';
-    /**
-     * @access private
-     */
-    var $singlewords = false;
-    /**
-     * @access private
-     */
-    var $replace_callback = null;
+	/**
+	 * @access private
+	 */
+	var $preg_keywords = '';
+	/**
+	 * @access private
+	 */
+	var $keywords = '';
+	/**
+	 * @access private
+	 */
+	var $singlewords = false;
+	/**
+	 * @access private
+	 */
+	var $replace_callback = null;
 
-    var $content;
+	var $content;
 
-    /**
-     * Main constructor
-     *
-     * This is the main constructor of keyhighlighter class. <br />
-     * It's the only public method of the class.
-     * @param string $keywords the keywords you want to highlight
-     * @param boolean $singlewords specify if it has to highlight also the single words.
-     * @param callback $replace_callback a custom callback for keyword highlight.
-     * <code>
-     * <?php
-     * require ('keyhighlighter.class.php');
-     *
-     * function my_highlighter ($matches) {
-     * 	return '<span style="font-weight: bolder; color: #FF0000;">' . $matches[0] . '</span>';
-     * }
-     *
-     * new keyhighlighter ('W3C', false, 'my_highlighter');
-     * readfile ('http://www.w3c.org/');
-     * ?>
-     * </code>
-     */
-    // public function __construct ()
-    function SmartHighlighter ($keywords, $singlewords = false, $replace_callback = null ) {
-        $this->keywords = $keywords;
-        $this->singlewords = $singlewords;
-        $this->replace_callback = $replace_callback;
-    }
+	/**
+	 * Main constructor
+	 *
+	 * This is the main constructor of keyhighlighter class. <br />
+	 * It's the only public method of the class.
+	 * @param string $keywords the keywords you want to highlight
+	 * @param boolean $singlewords specify if it has to highlight also the single words.
+	 * @param callback $replace_callback a custom callback for keyword highlight.
+	 * <code>
+	 * <?php
+	 * require ('keyhighlighter.class.php');
+	 *
+	 * function my_highlighter ($matches) {
+	 * 	return '<span style="font-weight: bolder; color: #FF0000;">' . $matches[0] . '</span>';
+	 * }
+	 *
+	 * new keyhighlighter ('W3C', false, 'my_highlighter');
+	 * readfile ('http://www.w3c.org/');
+	 * ?>
+	 * </code>
+	 */
+	// public function __construct ()
+	function SmartHighlighter ($keywords, $singlewords = false, $replace_callback = null ) {
+		$this->keywords = $keywords;
+		$this->singlewords = $singlewords;
+		$this->replace_callback = $replace_callback;
+	}
 
-    /**
-     * @access private
-     */
-    function replace ($replace_matches) {
+	/**
+	 * @access private
+	 */
+	function replace ($replace_matches) {
 
-        $patterns = array ();
-        if ($this->singlewords) {
-            $keywords = explode (' ', $this->preg_keywords);
-            foreach ($keywords as $keyword) {
-                $patterns[] = '/(?' . '>' . $keyword . '+)/si';
-            }
-        } else {
-            $patterns[] = '/(?' . '>' . $this->preg_keywords . '+)/si';
-        }
+		$patterns = array ();
+		if ($this->singlewords) {
+			$keywords = explode (' ', $this->preg_keywords);
+			foreach ($keywords as $keyword) {
+				$patterns[] = '/(?' . '>' . $keyword . '+)/si';
+			}
+		} else {
+			$patterns[] = '/(?' . '>' . $this->preg_keywords . '+)/si';
+		}
 
-        $result = $replace_matches[0];
+		$result = $replace_matches[0];
 
-        foreach ($patterns as $pattern) {
-            if (!is_null ($this->replace_callback)) {
-                $result = preg_replace_callback ($pattern, $this->replace_callback, $result);
-            } else {
-                $result = preg_replace ($pattern, '<span class="highlightedkey">\\0</span>', $result);
-            }
-        }
+		foreach ($patterns as $pattern) {
+			if (!is_null ($this->replace_callback)) {
+				$result = preg_replace_callback ($pattern, $this->replace_callback, $result);
+			} else {
+				$result = preg_replace ($pattern, '<span class="highlightedkey">\\0</span>', $result);
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * @access private
-     */
-    function highlight ($buffer) {
-        $buffer = '>' . $buffer . '<';
-        $this->preg_keywords = preg_replace ('/[^\w ]/si', '', $this->keywords);
-        $buffer = preg_replace_callback ("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", array (&$this, 'replace'), $buffer);
-        $buffer = substr ($buffer, 1, -1);
-        return $buffer;
-    }
+	/**
+	 * @access private
+	 */
+	function highlight ($buffer) {
+		$buffer = '>' . $buffer . '<';
+		$this->preg_keywords = preg_replace ('/[^\w ]/si', '', $this->keywords);
+		$buffer = preg_replace_callback ("/(\>(((?" . ">[^><]+)|(?R))*)\<)/is", array (&$this, 'replace'), $buffer);
+		$buffer = substr ($buffer, 1, -1);
+		return $buffer;
+	}
 }
 
 ?>
\ No newline at end of file

class/smartobjecttreetable.php

Indentation +133 added lines, -133 removed lines

@@ -23,139 +23,139 @@
  */
 class SmartObjectTreeTable extends SmartObjectTable {
 
-    function SmartObjectTreeTable(&$objectHandler, $criteria=false, $actions=array('edit', 'delete'), $userSide=false)
-    {
-        $this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
-        $this->_isTree = true;
-    }
-    /**
-     * Get children objects given a specific parentid
-     *
-     * @var int $parentid id of the parent which children we want to retreive
-     * @return array of SmartObject
-     */
-    function getChildrenOf($parentid=0) {
-        return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
-    }
-
-    function createTableRow($object, $level=0) {
-
-        $aObject = array();
-
-        $i=0;
-
-        $aColumns = array();
-        $doWeHaveActions = false;
-
-        foreach ($this->_columns as $column) {
-
-            $aColumn = array();
-
-            if ($i==0) {
-                $class = "head";
-            } elseif ($i % 2 == 0) {
-                $class = "even";
-            } else {
-                $class = "odd";
-            }
-
-            if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
-                $method = $column->_customMethodForValue;
-                $value = $object->$method();
-            } else {
-                /**
-                 * If the column is the identifier, then put a link on it
-                 */
-                if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                    $value = $object->getItemLink();
-                } else {
-                    $value = $object->getVar($column->getKeyName());
-                }
-            }
-
-            $space = '';
-            if($column->getKeyName() == $this->_objectHandler->identifierName){
-                for ($i = 0; $i < $level; $i++) {
-                    $space = $space . '--';
-                }
-            }
-
-            if ($space != '') {
-                $space .= '&nbsp;';
-            }
-
-            $aColumn['value'] = $space . $value;
-            $aColumn['class'] = $class;
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key'] = $column->getKeyName();
-
-            $aColumns[] = $aColumn;
-            $i++;
-        }
-
-        $aObject['columns'] = $aColumns;
-
-        $class = $class == 'even' ? 'odd' : 'even';
-        $aObject['class'] = $class;
-
-        $actions = array();
-
-        // Adding the custom actions if any
-        foreach ($this->_custom_actions as $action) {
-            if (method_exists($object, $action)) {
-                $actions[] = $object->$action();
-            }
-        }
-
-        include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
-        $controller = new SmartObjectController($this->_objectHandler);
-
-        if (in_array('edit', $this->_actions)) {
-            $actions[] = $controller->getEditItemLink($object, false, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $actions[] = $controller->getDeleteItemLink($object, false, true);
-        }
-        $aObject['actions'] = $actions;
-
-        $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-        $aObject['id'] = $object->id();
-        $this->_aObjects[] = $aObject;
-
-        $childrenObjects = $this->getChildrenOf($object->id());
-
-        $this->_hasActions =$this->_hasActions  ? true : count($actions) > 0;
-
-        if ($childrenObjects) {
-            $level++;
-            foreach ($childrenObjects as $subObject) {
-                $this->createTableRow($subObject, $level);
-            }
-        }
-    }
-
-    function createTableRows() {
-        $this->_aObjects = array();
-
-        if (count($this->_objects) > 0) {
-
-            foreach ($this->getChildrenOf() as $object) {
-                $this->createTableRow($object);
-            }
-
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-    }
-
-    function fetchObjects() {
-        $ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
-        return $ret;
-
-    }
+	function SmartObjectTreeTable(&$objectHandler, $criteria=false, $actions=array('edit', 'delete'), $userSide=false)
+	{
+		$this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
+		$this->_isTree = true;
+	}
+	/**
+	 * Get children objects given a specific parentid
+	 *
+	 * @var int $parentid id of the parent which children we want to retreive
+	 * @return array of SmartObject
+	 */
+	function getChildrenOf($parentid=0) {
+		return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
+	}
+
+	function createTableRow($object, $level=0) {
+
+		$aObject = array();
+
+		$i=0;
+
+		$aColumns = array();
+		$doWeHaveActions = false;
+
+		foreach ($this->_columns as $column) {
+
+			$aColumn = array();
+
+			if ($i==0) {
+				$class = "head";
+			} elseif ($i % 2 == 0) {
+				$class = "even";
+			} else {
+				$class = "odd";
+			}
+
+			if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
+				$method = $column->_customMethodForValue;
+				$value = $object->$method();
+			} else {
+				/**
+				 * If the column is the identifier, then put a link on it
+				 */
+				if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+					$value = $object->getItemLink();
+				} else {
+					$value = $object->getVar($column->getKeyName());
+				}
+			}
+
+			$space = '';
+			if($column->getKeyName() == $this->_objectHandler->identifierName){
+				for ($i = 0; $i < $level; $i++) {
+					$space = $space . '--';
+				}
+			}
+
+			if ($space != '') {
+				$space .= '&nbsp;';
+			}
+
+			$aColumn['value'] = $space . $value;
+			$aColumn['class'] = $class;
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key'] = $column->getKeyName();
+
+			$aColumns[] = $aColumn;
+			$i++;
+		}
+
+		$aObject['columns'] = $aColumns;
+
+		$class = $class == 'even' ? 'odd' : 'even';
+		$aObject['class'] = $class;
+
+		$actions = array();
+
+		// Adding the custom actions if any
+		foreach ($this->_custom_actions as $action) {
+			if (method_exists($object, $action)) {
+				$actions[] = $object->$action();
+			}
+		}
+
+		include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
+		$controller = new SmartObjectController($this->_objectHandler);
+
+		if (in_array('edit', $this->_actions)) {
+			$actions[] = $controller->getEditItemLink($object, false, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$actions[] = $controller->getDeleteItemLink($object, false, true);
+		}
+		$aObject['actions'] = $actions;
+
+		$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+		$aObject['id'] = $object->id();
+		$this->_aObjects[] = $aObject;
+
+		$childrenObjects = $this->getChildrenOf($object->id());
+
+		$this->_hasActions =$this->_hasActions  ? true : count($actions) > 0;
+
+		if ($childrenObjects) {
+			$level++;
+			foreach ($childrenObjects as $subObject) {
+				$this->createTableRow($subObject, $level);
+			}
+		}
+	}
+
+	function createTableRows() {
+		$this->_aObjects = array();
+
+		if (count($this->_objects) > 0) {
+
+			foreach ($this->getChildrenOf() as $object) {
+				$this->createTableRow($object);
+			}
+
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+	}
+
+	function fetchObjects() {
+		$ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
+		return $ret;
+
+	}
 }
 
 ?>

class/smartobjectpermission.php

Indentation +169 added lines, -169 removed lines

@@ -8,17 +8,17 @@ 
  * Licence: GNU
  */
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 class SmartobjectPermissionHandler extends XoopsObjectHandler
 {
-    var $handler;
-    function SmartObjectPermissionHandler($handler) {
-        $this->handler=$handler;
-    }
+	var $handler;
+	function SmartObjectPermissionHandler($handler) {
+		$this->handler=$handler;
+	}
 
-    /*
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -26,62 +26,62 @@ 
      *
      * @return array
      */
-    function getGrantedGroups($gperm_name, $id = null) {
-        static $groups;
-
-        if (!isset($groups[$gperm_name]) || ($id != null && !isset($groups[$gperm_name][$id]))) {
-            $smartModule =& $this->handler->getModuleInfo();
-            //Get group permissions handler
-            $gperm_handler =& xoops_gethandler('groupperm');
-
-            //Get groups allowed for an item id
-            $allowedgroups = $gperm_handler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
-            $groups[$gperm_name][$id] = $allowedgroups;
-        }
-        //Return the permission array
-        return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : array();
-    }
-
-    function getGrantedGroupsForIds($item_ids_array, $gperm_name=false) {
-
-        static $groups;
-
-        if ($gperm_name){
-            if (isset($groups[$gperm_name])) {
-                return $groups[$gperm_name];
-            }
-        } else {
-            // if !$gperm_name then we will fetch all permissions in the module so we don't need them again
-            return $groups;
-        }
-
-        $smartModule =& $this->handler->getModuleInfo();
-
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
-
-        if ($gperm_name) {
-            $criteria->add(new Criteria('gperm_name', $gperm_name));
-        }
-
-        //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-        $permissionsObj = $gperm_handler->getObjects($criteria);
-
-        foreach ($permissionsObj as $permissionObj) {
-            $groups[$permissionObj->getVar('gperm_name')][$permissionObj->getVar('gperm_itemid')][] = $permissionObj->getVar('gperm_groupid');
-        }
-
-        //Return the permission array
-        if ($gperm_name) {
-            return isset($groups[$gperm_name]) ? $groups[$gperm_name] : array();
-        } else {
-            return isset($groups) ? $groups : array();
-        }
-    }
-
-    /*
+	function getGrantedGroups($gperm_name, $id = null) {
+		static $groups;
+
+		if (!isset($groups[$gperm_name]) || ($id != null && !isset($groups[$gperm_name][$id]))) {
+			$smartModule =& $this->handler->getModuleInfo();
+			//Get group permissions handler
+			$gperm_handler =& xoops_gethandler('groupperm');
+
+			//Get groups allowed for an item id
+			$allowedgroups = $gperm_handler->getGroupIds($gperm_name, $id, $smartModule->getVar('mid'));
+			$groups[$gperm_name][$id] = $allowedgroups;
+		}
+		//Return the permission array
+		return isset($groups[$gperm_name][$id]) ? $groups[$gperm_name][$id] : array();
+	}
+
+	function getGrantedGroupsForIds($item_ids_array, $gperm_name=false) {
+
+		static $groups;
+
+		if ($gperm_name){
+			if (isset($groups[$gperm_name])) {
+				return $groups[$gperm_name];
+			}
+		} else {
+			// if !$gperm_name then we will fetch all permissions in the module so we don't need them again
+			return $groups;
+		}
+
+		$smartModule =& $this->handler->getModuleInfo();
+
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('gperm_modid', $smartModule->getVar('mid')));
+
+		if ($gperm_name) {
+			$criteria->add(new Criteria('gperm_name', $gperm_name));
+		}
+
+		//Get group permissions handler
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+		$permissionsObj = $gperm_handler->getObjects($criteria);
+
+		foreach ($permissionsObj as $permissionObj) {
+			$groups[$permissionObj->getVar('gperm_name')][$permissionObj->getVar('gperm_itemid')][] = $permissionObj->getVar('gperm_groupid');
+		}
+
+		//Return the permission array
+		if ($gperm_name) {
+			return isset($groups[$gperm_name]) ? $groups[$gperm_name] : array();
+		} else {
+			return isset($groups) ? $groups : array();
+		}
+	}
+
+	/*
      * Returns permissions for a certain type
      *
      * @param string $type "global", "forum" or "topic" (should perhaps have "post" as well - but I don't know)
@@ -89,112 +89,112 @@ 
      *
      * @return array
      */
-    function getGrantedItems($gperm_name, $id = null) {
-        global $xoopsUser;
-        static $permissions;
-
-        if (!isset($permissions[$gperm_name]) || ($id != null && !isset($permissions[$gperm_name][$id]))) {
-
-            $smartModule =& $this->handler->getModuleInfo();
-
-            if (is_object($smartModule)) {
-
-                //Get group permissions handler
-                $gperm_handler =& xoops_gethandler('groupperm');
-
-                //Get user's groups
-                $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
-
-                //Get all allowed item ids in this module and for this user's groups
-                $userpermissions =& $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
-                $permissions[$gperm_name] = $userpermissions;
-            }
-        }
-        //Return the permission array
-        return isset($permissions[$gperm_name]) ? $permissions[$gperm_name] : array();
-    }
-
-    function storeAllPermissionsForId($id) {
-        foreach ($this->handler->getPermissions() as $permission) {
-            $this->saveItem_Permissions($_POST[$permission['perm_name']], $id, $permission['perm_name']);
-        }
-    }
-
-    /**
-     * Saves permissions for the selected category
-     *
-     *  saveCategory_Permissions()
-     *
-     * @param array $groups : group with granted permission
-     * @param integer $categoryID : categoryID on which we are setting permissions for Categories and Forums
-     * @param string $perm_name : name of the permission
-     * @return boolean : TRUE if the no errors occured
-     **/
-
-    function saveItem_Permissions($groups, $itemid, $perm_name)
-    {
-        $smartModule =& $this->handler->getModuleInfo();
-
-        $result = true;
-        $module_id = $smartModule->getVar('mid');
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-        // First, if the permissions are already there, delete them
-        $gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
-        //echo "itemid : $itemid - perm : $perm_name - modid : $module_id";
-        //exit;
-        // Save the new permissions
-
-        if (count($groups) > 0) {
-            foreach ($groups as $group_id) {
-                $gperm_handler->addRight($perm_name, $itemid, $group_id, $module_id);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Delete all permission for a specific item
-     *
-     *  deletePermissions()
-     *
-     * @param integer $itemid : id of the item for which to delete the permissions
-     * @return boolean : TRUE if the no errors occured
-     **/
-    function deletePermissions($itemid, $gperm_name)
-    {
-        global $xoopsModule;
-
-        $smartModule =& smartsection_getModuleInfo();
-
-        $result = true;
-        $module_id = $smartModule->getVar('mid')   ;
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-
-        $gperm_handler->deleteByModule($module_id, $gperm_name, $itemid);
-
-        return $result;
-    }
-
-    /**
-     * Checks if the user has access to a specific permission on a given object
-     *
-     * @param string $gperm_name name of the permission to test
-     * @param int $gperm_itemid id of the object to check
-     * @return boolean : TRUE if user has access, FALSE if not
-     **/
-    function accessGranted($gperm_name, $gperm_itemid) {
-        global $xoopsUser;
-
-        $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
-        $smartModule =& $this->handler->getModuleInfo();
-        $gperm_modid = $smartModule->getVar('mid')   ;
-
-        //Get group permissions handler
-        $gperm_handler =& xoops_gethandler('groupperm');
-
-        return $gperm_handler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
-    }
+	function getGrantedItems($gperm_name, $id = null) {
+		global $xoopsUser;
+		static $permissions;
+
+		if (!isset($permissions[$gperm_name]) || ($id != null && !isset($permissions[$gperm_name][$id]))) {
+
+			$smartModule =& $this->handler->getModuleInfo();
+
+			if (is_object($smartModule)) {
+
+				//Get group permissions handler
+				$gperm_handler =& xoops_gethandler('groupperm');
+
+				//Get user's groups
+				$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
+
+				//Get all allowed item ids in this module and for this user's groups
+				$userpermissions =& $gperm_handler->getItemIds($gperm_name, $groups, $smartModule->getVar('mid'));
+				$permissions[$gperm_name] = $userpermissions;
+			}
+		}
+		//Return the permission array
+		return isset($permissions[$gperm_name]) ? $permissions[$gperm_name] : array();
+	}
+
+	function storeAllPermissionsForId($id) {
+		foreach ($this->handler->getPermissions() as $permission) {
+			$this->saveItem_Permissions($_POST[$permission['perm_name']], $id, $permission['perm_name']);
+		}
+	}
+
+	/**
+	 * Saves permissions for the selected category
+	 *
+	 *  saveCategory_Permissions()
+	 *
+	 * @param array $groups : group with granted permission
+	 * @param integer $categoryID : categoryID on which we are setting permissions for Categories and Forums
+	 * @param string $perm_name : name of the permission
+	 * @return boolean : TRUE if the no errors occured
+	 **/
+
+	function saveItem_Permissions($groups, $itemid, $perm_name)
+	{
+		$smartModule =& $this->handler->getModuleInfo();
+
+		$result = true;
+		$module_id = $smartModule->getVar('mid');
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+		// First, if the permissions are already there, delete them
+		$gperm_handler->deleteByModule($module_id, $perm_name, $itemid);
+		//echo "itemid : $itemid - perm : $perm_name - modid : $module_id";
+		//exit;
+		// Save the new permissions
+
+		if (count($groups) > 0) {
+			foreach ($groups as $group_id) {
+				$gperm_handler->addRight($perm_name, $itemid, $group_id, $module_id);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Delete all permission for a specific item
+	 *
+	 *  deletePermissions()
+	 *
+	 * @param integer $itemid : id of the item for which to delete the permissions
+	 * @return boolean : TRUE if the no errors occured
+	 **/
+	function deletePermissions($itemid, $gperm_name)
+	{
+		global $xoopsModule;
+
+		$smartModule =& smartsection_getModuleInfo();
+
+		$result = true;
+		$module_id = $smartModule->getVar('mid')   ;
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+
+		$gperm_handler->deleteByModule($module_id, $gperm_name, $itemid);
+
+		return $result;
+	}
+
+	/**
+	 * Checks if the user has access to a specific permission on a given object
+	 *
+	 * @param string $gperm_name name of the permission to test
+	 * @param int $gperm_itemid id of the object to check
+	 * @return boolean : TRUE if user has access, FALSE if not
+	 **/
+	function accessGranted($gperm_name, $gperm_itemid) {
+		global $xoopsUser;
+
+		$gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
+		$smartModule =& $this->handler->getModuleInfo();
+		$gperm_modid = $smartModule->getVar('mid')   ;
+
+		//Get group permissions handler
+		$gperm_handler =& xoops_gethandler('groupperm');
+
+		return $gperm_handler->checkRight($gperm_name, $gperm_itemid, $gperm_groupid, $gperm_modid);
+	}
 }
 ?>

class/rating.php

Indentation +55 added lines, -55 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 if (!defined("XOOPS_ROOT_PATH")) {
-    die("XOOPS root path not defined");
+	die("XOOPS root path not defined");
 }
 
 include_once XOOPS_ROOT_PATH."/modules/smartobject/class/smartobject.php";
@@ -38,8 +38,8 @@ 
 
 	var $_modulePlugin=false;
 
-    function SmartobjectRating() {
-        $this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
+	function SmartobjectRating() {
+		$this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
 		$this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
 		$this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
 		$this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
@@ -49,47 +49,47 @@ 
 
 		$this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
 
-        $this->setControl('dirname', array(
-        						'handler' => 'rating',
-        						'method' => 'getModuleList',
+		$this->setControl('dirname', array(
+								'handler' => 'rating',
+								'method' => 'getModuleList',
 								'onSelect' => 'submit'));
 
-        $this->setControl('item', array(
-        						'object' => &$this,
-        						'method' => 'getItemList'));
+		$this->setControl('item', array(
+								'object' => &$this,
+								'method' => 'getItemList'));
 
-        $this->setControl('uid', 'user');
+		$this->setControl('uid', 'user');
 
-        $this->setControl('rate', array(
-        						'handler' => 'rating',
-        						'method' => 'getRateList'));
-    }
+		$this->setControl('rate', array(
+								'handler' => 'rating',
+								'method' => 'getRateList'));
+	}
 
-    function getVar($key, $format = 's') {
-        if ($format == 's' && in_array($key, array('name', 'dirname'))) {
-            return call_user_func(array($this,$key));
-        }
-        return parent::getVar($key, $format);
-    }
+	function getVar($key, $format = 's') {
+		if ($format == 's' && in_array($key, array('name', 'dirname'))) {
+			return call_user_func(array($this,$key));
+		}
+		return parent::getVar($key, $format);
+	}
 
-    function name() {
-        $ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, array());
+	function name() {
+		$ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, array());
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    function dirname() {
-    	global $smartobject_rating_handler;
-    	$moduleArray = $smartobject_rating_handler->getModuleList();
-        return $moduleArray[$this->getVar('dirname', 'n')];
-    }
+	function dirname() {
+		global $smartobject_rating_handler;
+		$moduleArray = $smartobject_rating_handler->getModuleList();
+		return $moduleArray[$this->getVar('dirname', 'n')];
+	}
 
-    function getItemList() {
-    	$plugin = $this->getModulePlugin();
-    	return $plugin->getItemList();
-    }
+	function getItemList() {
+		$plugin = $this->getModulePlugin();
+		return $plugin->getItemList();
+	}
 
-    function getItemValue() {
+	function getItemValue() {
 		$moduleUrl = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
 		$plugin = $this->getModulePlugin();
 		$pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
@@ -99,19 +99,19 @@ 
 		$itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
 		$ret = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
 		return $ret;
-    }
+	}
 
-    function getRateValue() {
-    	return $this->getVar('rate');
-    }
+	function getRateValue() {
+		return $this->getVar('rate');
+	}
 
-    function getModulePlugin() {
+	function getModulePlugin() {
 		if (!$this->_modulePlugin) {
 			global $smartobject_rating_handler;
 			$this->_modulePlugin = $smartobject_rating_handler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
 		}
 		return $this->_modulePlugin;
-    }
+	}
 }
 class SmartobjectRatingHandler extends SmartPersistableObjectHandler {
 
@@ -119,18 +119,18 @@ 
 	var $_moduleList=false;
 	var $pluginsObject;
 
-    function SmartobjectRatingHandler($db) {
-        $this->SmartPersistableObjectHandler($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
+	function SmartobjectRatingHandler($db) {
+		$this->SmartPersistableObjectHandler($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
 		$this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
 
-        $this->_rateOptions[1] = 1;
-        $this->_rateOptions[2] = 2;
-        $this->_rateOptions[3] = 3;
-        $this->_rateOptions[4] = 4;
-        $this->_rateOptions[5] = 5;
+		$this->_rateOptions[1] = 1;
+		$this->_rateOptions[2] = 2;
+		$this->_rateOptions[3] = 3;
+		$this->_rateOptions[4] = 4;
+		$this->_rateOptions[5] = 5;
 
-        $this->pluginsObject = new SmartPluginHandler();
-    }
+		$this->pluginsObject = new SmartPluginHandler();
+	}
 
 	function getModuleList() {
 		if (!$this->_moduleList) {
@@ -151,12 +151,12 @@ 
 		$sql = "SELECT AVG(rate), COUNT(ratingid) FROM " . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
 		$result = $this->db->query($sql);
 		if (!$result) {
-            return 0;
-        }
-        list($average, $sum) = $this->db->fetchRow($result);
-        $ret['average'] = isset($average) ? $average : 0;
-        $ret['sum'] = isset($sum) ? $sum : 0;
-        return $ret;
+			return 0;
+		}
+		list($average, $sum) = $this->db->fetchRow($result);
+		$ret['average'] = isset($average) ? $average : 0;
+		$ret['sum'] = isset($sum) ? $sum : 0;
+		return $ret;
 	}
 	function already_rated($item, $itemid, $dirname, $uid){
 

class/smartobjectabout.php

Indentation +10 added lines, -10 removed lines

@@ -158,16 +158,16 @@
 		// Author's note
 		$this->_tpl->assign('module_author_word', $versioninfo->getInfo('author_word'));
 
-	    // For changelog thanks to 3Dev
-	    global $xoopsModule;
-	    $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
-	    if(is_file($filename)){
-
-	        $filesize = filesize($filename);
-	        $handle = fopen($filename, 'r');
-	        $this->_tpl->assign('module_version_history', $myts->displayTarea(fread($handle, $filesize), true));
-	        fclose($handle);
-	    }
+		// For changelog thanks to 3Dev
+		global $xoopsModule;
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+		if(is_file($filename)){
+
+			$filesize = filesize($filename);
+			$handle = fopen($filename, 'r');
+			$this->_tpl->assign('module_version_history', $myts->displayTarea(fread($handle, $filesize), true));
+			fclose($handle);
+		}
 
 		$this->_tpl->display( 'db:smartobject_about.html' );
 

class/smartexport.php

Indentation +22 added lines, -22 removed lines

@@ -246,37 +246,37 @@
 			trigger_error('Unable to write in ' . $fullFileName, E_USER_WARNING);
 		} else {
 			$mimeType = 'text/csv';
-		    $file = strrev($this->filename);
-		    $temp_name = strtolower(strrev(substr($file,0,strpos($file,"--"))) );
+			$file = strrev($this->filename);
+			$temp_name = strtolower(strrev(substr($file,0,strpos($file,"--"))) );
 			if ($temp_name == '') {
 				$file_name = $this->filename;
 			} else {
 				$file_name = $temp_name;
 			}
-		    $fullFileName = $this->filepath . stripslashes(trim($this->filename));
+			$fullFileName = $this->filepath . stripslashes(trim($this->filename));
 
-		    if(ini_get('zlib.output_compression')) {
-		        ini_set('zlib.output_compression', 'Off');
-		    }
+			if(ini_get('zlib.output_compression')) {
+				ini_set('zlib.output_compression', 'Off');
+			}
 
-		    header("Pragma: public");
-		    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-		    header("Cache-Control: private",false);
-		    header("Content-Transfer-Encoding: binary");
-		    if(isset($mimeType)) {
-		        header("Content-Type: " . $mimeType);
-		    }
+			header("Pragma: public");
+			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+			header("Cache-Control: private",false);
+			header("Content-Transfer-Encoding: binary");
+			if(isset($mimeType)) {
+				header("Content-Type: " . $mimeType);
+			}
 
-		    header("Content-Disposition: attachment; filename=" . $file_name);
+			header("Content-Disposition: attachment; filename=" . $file_name);
 
-		    if(isset($mimeType) && strstr($mimeType, "text/")) {
-		        $fp = fopen($fullFileName, "r");
-		    }
-		    else {
-		        $fp = fopen($fullFileName, "rb");
-		    }
-		    fpassthru($fp);
-		    exit();
+			if(isset($mimeType) && strstr($mimeType, "text/")) {
+				$fp = fopen($fullFileName, "r");
+			}
+			else {
+				$fp = fopen($fullFileName, "rb");
+			}
+			fpassthru($fp);
+			exit();
 		}
 		fclose($handle);
 	}

class/smartobjectcategory.php

Indentation +76 added lines, -77 removed lines

@@ -6,7 +6,6 @@ 
  * @license GNU
  * @author marcan <marcan@smartfactory.ca>
  * @version $Id: smartobjectcategory.php 799 2008-02-04 22:14:27Z malanciault $
-
  * @link http://smartfactory.ca The SmartFactory
  * @package SmartObject
  * @subpackage SmartObjectItems
@@ -21,74 +20,74 @@ 
 	var $_categoryPath;
 
 	function SmartobjectCategory() {
-	    $this->initVar('categoryid', XOBJ_DTYPE_INT, '', true);
-    	$this->initVar('parentid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_CATEGORY_PARENTID, _CO_SOBJECT_CATEGORY_PARENTID_DSC);
-    	$this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, null, '', false, _CO_SOBJECT_CATEGORY_NAME, _CO_SOBJECT_CATEGORY_NAME_DSC);
-        $this->initVar('description', XOBJ_DTYPE_TXTAREA, '', false, null, '', false, _CO_SOBJECT_CATEGORY_DESCRIPTION, _CO_SOBJECT_CATEGORY_DESCRIPTION_DSC);
-        $this->initVar('image', XOBJ_DTYPE_TXTBOX, '', false, null, '',  false, _CO_SOBJECT_CATEGORY_IMAGE, _CO_SOBJECT_CATEGORY_IMAGE_DSC);
-
-        $this->initCommonVar('doxcode');
-
-        $this->setControl('image', array('name' => 'image'));
-        $this->setControl('parentid', array('name' => 'parentcategory'));
-        $this->setControl('description', array('name' => 'textarea',
-                                            'itemHandler' => false,
-                                            'method' => false,
-                                            'module' => false,
-                                            'form_editor' => 'default'));
-
-        // call parent constructor to get SEO fields initiated
-        $this->SmartSeoObject();
+		$this->initVar('categoryid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('parentid', XOBJ_DTYPE_INT, '', false, null, '', false, _CO_SOBJECT_CATEGORY_PARENTID, _CO_SOBJECT_CATEGORY_PARENTID_DSC);
+		$this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, null, '', false, _CO_SOBJECT_CATEGORY_NAME, _CO_SOBJECT_CATEGORY_NAME_DSC);
+		$this->initVar('description', XOBJ_DTYPE_TXTAREA, '', false, null, '', false, _CO_SOBJECT_CATEGORY_DESCRIPTION, _CO_SOBJECT_CATEGORY_DESCRIPTION_DSC);
+		$this->initVar('image', XOBJ_DTYPE_TXTBOX, '', false, null, '',  false, _CO_SOBJECT_CATEGORY_IMAGE, _CO_SOBJECT_CATEGORY_IMAGE_DSC);
+
+		$this->initCommonVar('doxcode');
+
+		$this->setControl('image', array('name' => 'image'));
+		$this->setControl('parentid', array('name' => 'parentcategory'));
+		$this->setControl('description', array('name' => 'textarea',
+											'itemHandler' => false,
+											'method' => false,
+											'module' => false,
+											'form_editor' => 'default'));
+
+		// call parent constructor to get SEO fields initiated
+		$this->SmartSeoObject();
+	}
+
+	/**
+	 * returns a specific variable for the object in a proper format
+	 *
+	 * @access public
+	 * @param string $key key of the object's variable to be returned
+	 * @param string $format format to use for the output
+	 * @return mixed formatted value of the variable
+	 */
+	function getVar($key, $format = 's') {
+		if ($format == 's' && in_array($key, array('description', 'image'))) {
+			return call_user_func(array($this,$key));
+		}
+		return parent::getVar($key, $format);
+	}
+
+	function description() {
+		return $this->getValueFor('description', false);
+	}
+
+	function image() {
+		$ret = $this->getVar('image', 'e');
+		if ($ret == '-1') {
+			return false;
+		} else {
+			return $ret;
+		}
 	}
 
-    /**
-    * returns a specific variable for the object in a proper format
-    *
-    * @access public
-    * @param string $key key of the object's variable to be returned
-    * @param string $format format to use for the output
-    * @return mixed formatted value of the variable
-    */
-    function getVar($key, $format = 's') {
-        if ($format == 's' && in_array($key, array('description', 'image'))) {
-            return call_user_func(array($this,$key));
-        }
-        return parent::getVar($key, $format);
-    }
-
-    function description() {
-    	return $this->getValueFor('description', false);
-    }
-
-    function image() {
-    	$ret = $this->getVar('image', 'e');
-    	if ($ret == '-1') {
-    		return false;
-    	} else {
-    		return $ret;
-    	}
-    }
-
-    function toArray() {
-    	$this->setVar('doxcode', true);
-    	global $myts;
-    	$objectArray = parent::toArray();
-    	if ($objectArray['image']) {
-    		$objectArray['image'] = $this->getImageDir() . $objectArray['image'];
-    	}
-    	return $objectArray;
-    }
-    /**
-     * Create the complete path of a category
-     *
-     * @todo this could be improved as it uses multiple queries
-     * @param bool $withAllLink make all name clickable
-     * @return string complete path (breadcrumb)
-     */
+	function toArray() {
+		$this->setVar('doxcode', true);
+		global $myts;
+		$objectArray = parent::toArray();
+		if ($objectArray['image']) {
+			$objectArray['image'] = $this->getImageDir() . $objectArray['image'];
+		}
+		return $objectArray;
+	}
+	/**
+	 * Create the complete path of a category
+	 *
+	 * @todo this could be improved as it uses multiple queries
+	 * @param bool $withAllLink make all name clickable
+	 * @return string complete path (breadcrumb)
+	 */
 	function getCategoryPath($withAllLink=true, $currentCategory=false)	{
 
 		include_once SMARTOBJECT_ROOT_PATH . "class/smartobjectcontroller.php";
-        $controller = new SmartObjectController($this->handler);
+		$controller = new SmartObjectController($this->handler);
 
 		if (!$this->_categoryPath) {
 			if ($withAllLink && !$currentCategory) {
@@ -107,7 +106,7 @@ 
 				$ret = $parentObj->getCategoryPath($withAllLink, $currentCategory) . " > " .$ret;
 			}
 			$this->_categoryPath = $ret;
-        }
+		}
 
 		return $this->_categoryPath;
 	}
@@ -119,9 +118,9 @@ 
 	var $allCategoriesObj = false;
 	var $_allCategoriesId = false;
 
-    function SmartobjectCategoryHandler($db, $modulename) {
-        $this->SmartPersistableObjectHandler($db, 'category', 'categoryid', 'name', 'description', $modulename);
-    }
+	function SmartobjectCategoryHandler($db, $modulename) {
+		$this->SmartPersistableObjectHandler($db, 'category', 'categoryid', 'name', 'description', $modulename);
+	}
 
 	function getAllCategoriesArray($parentid=0, $perm_name=false, $sort = 'parentid', $order='ASC') {
 
@@ -158,18 +157,18 @@ 
 
 		if (!$this->allCategoriesId) {
 
-	    	$ret = array();
-	        $sql = 'SELECT categoryid, parentid FROM '.$this->table . " AS " . $this->_itemname . ' ORDER BY parentid';
+			$ret = array();
+			$sql = 'SELECT categoryid, parentid FROM '.$this->table . " AS " . $this->_itemname . ' ORDER BY parentid';
 
-	        $result = $this->db->query($sql);
+			$result = $this->db->query($sql);
 
-	        if (!$result) {
-	            return $ret;
-	        }
+			if (!$result) {
+				return $ret;
+			}
 
-	        while ($myrow = $this->db->fetchArray($result)) {
-	        	$this->allCategoriesId[$myrow['categoryid']] =  $myrow['parentid'];
-	        }
+			while ($myrow = $this->db->fetchArray($result)) {
+				$this->allCategoriesId[$myrow['categoryid']] =  $myrow['parentid'];
+			}
 		}
 
 		$retArray = array($parentid);