@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | //Smartobject\Utility::getAdminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name')); |
| 108 | 108 | |
| 109 | - require_once XOOPS_ROOT_PATH . '/class/template.php'; |
|
| 109 | + require_once XOOPS_ROOT_PATH.'/class/template.php'; |
|
| 110 | 110 | |
| 111 | 111 | // --- |
| 112 | 112 | // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated. |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $this->_tpl = new \XoopsTpl(); |
| 115 | 115 | // --- |
| 116 | 116 | |
| 117 | - $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/'); |
|
| 117 | + $this->_tpl->assign('module_url', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'); |
|
| 118 | 118 | $this->_tpl->assign('module_image', $versioninfo->getInfo('image')); |
| 119 | 119 | $this->_tpl->assign('module_name', $versioninfo->getInfo('name')); |
| 120 | 120 | $this->_tpl->assign('module_version', $versioninfo->getInfo('version')); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | // Left headings... |
| 124 | 124 | if ('' !== $versioninfo->getInfo('author_realname')) { |
| 125 | - $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')'; |
|
| 125 | + $author_name = $versioninfo->getInfo('author').' ('.$versioninfo->getInfo('author_realname').')'; |
|
| 126 | 126 | } else { |
| 127 | 127 | $author_name = $versioninfo->getInfo('author'); |
| 128 | 128 | } |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | // For changelog thanks to 3Dev |
| 169 | 169 | global $xoopsModule; |
| 170 | - $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt'; |
|
| 170 | + $filename = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/changelog.txt'; |
|
| 171 | 171 | if (is_file($filename)) { |
| 172 | 172 | $filesize = filesize($filename); |
| 173 | 173 | $handle = fopen($filename, 'r'); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function addActionButton($op, $caption = false, $text = false) |
| 94 | 94 | { |
| 95 | - $action = [ |
|
| 95 | + $action = [ |
|
| 96 | 96 | 'op' => $op, |
| 97 | 97 | 'caption' => $caption, |
| 98 | 98 | 'text' => $text |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | { |
| 128 | 128 | $current_urls = Smartobject\Utility::getCurrentUrls(); |
| 129 | 129 | $current_url = $current_urls['full']; |
| 130 | - $this->_printerFriendlyPage = $current_url . '&print'; |
|
| 130 | + $this->_printerFriendlyPage = $current_url.'&print'; |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function addDefaultIntroButton($caption) |
| 162 | 162 | { |
| 163 | - $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption); |
|
| 163 | + $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page.'?op=mod', $caption); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
@@ -185,9 +185,9 @@ discard block |
||
| 185 | 185 | public function getDefaultSort() |
| 186 | 186 | { |
| 187 | 187 | if ($this->_sortsel) { |
| 188 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel); |
|
| 188 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel); |
|
| 189 | 189 | } else { |
| 190 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName); |
|
| 190 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_objectHandler->identifierName); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
@@ -205,9 +205,9 @@ discard block |
||
| 205 | 205 | public function getDefaultOrder() |
| 206 | 206 | { |
| 207 | 207 | if ($this->_ordersel) { |
| 208 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel); |
|
| 208 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel); |
|
| 209 | 209 | } else { |
| 210 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC'); |
|
| 210 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', 'ASC'); |
|
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | 213 | |
@@ -256,21 +256,21 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | public function setSortOrder() |
| 258 | 258 | { |
| 259 | - $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort(); |
|
| 259 | + $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] : $this->getDefaultSort(); |
|
| 260 | 260 | //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel; |
| 261 | - Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel); |
|
| 261 | + Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel); |
|
| 262 | 262 | $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel); |
| 263 | 263 | |
| 264 | 264 | if (isset($this->_tempObject->vars[$this->_sortsel]['itemName']) |
| 265 | 265 | && $this->_tempObject->vars[$this->_sortsel]['itemName']) { |
| 266 | - $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel); |
|
| 266 | + $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'].'.'.$this->_sortsel); |
|
| 267 | 267 | } else { |
| 268 | - $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel); |
|
| 268 | + $this->_criteria->setSort($this->_objectHandler->_itemname.'.'.$this->_sortsel); |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | - $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder(); |
|
| 271 | + $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : $this->getDefaultOrder(); |
|
| 272 | 272 | //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel; |
| 273 | - Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel); |
|
| 273 | + Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel); |
|
| 274 | 274 | $ordersArray = $this->getOrdersArray(); |
| 275 | 275 | $this->_criteria->setOrder($this->_ordersel); |
| 276 | 276 | } |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | //$object->initiateCustomFields(); |
| 321 | 321 | } |
| 322 | 322 | if ('checked' === $column->_keyname) { |
| 323 | - $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">'; |
|
| 323 | + $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'">'; |
|
| 324 | 324 | } elseif ($column->_customMethodForValue |
| 325 | 325 | && method_exists($object, $column->_customMethodForValue)) { |
| 326 | 326 | $method = $column->_customMethodForValue; |
@@ -405,9 +405,9 @@ discard block |
||
| 405 | 405 | public function getDefaultFilter() |
| 406 | 406 | { |
| 407 | 407 | if ($this->_filtersel) { |
| 408 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel); |
|
| 408 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel); |
|
| 409 | 409 | } else { |
| 410 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default'); |
|
| 410 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', 'default'); |
|
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | |
@@ -457,9 +457,9 @@ discard block |
||
| 457 | 457 | public function getDefaultFilter2() |
| 458 | 458 | { |
| 459 | 459 | if ($this->_filtersel2) { |
| 460 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2); |
|
| 460 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2); |
|
| 461 | 461 | } else { |
| 462 | - return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default'); |
|
| 462 | + return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', 'default'); |
|
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | 465 | |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | */ |
| 588 | 588 | public function render($fetchOnly = false, $debug = false) |
| 589 | 589 | { |
| 590 | - require_once XOOPS_ROOT_PATH . '/class/template.php'; |
|
| 590 | + require_once XOOPS_ROOT_PATH.'/class/template.php'; |
|
| 591 | 591 | |
| 592 | 592 | $this->_tpl = new \XoopsTpl(); |
| 593 | 593 | |
@@ -598,24 +598,24 @@ discard block |
||
| 598 | 598 | */ |
| 599 | 599 | $this->_tempObject = $this->_objectHandler->create(); |
| 600 | 600 | |
| 601 | - $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0); |
|
| 601 | + $this->_criteria->setStart(isset($_GET['start'.$this->_objectHandler->keyName]) ? (int) $_GET['start'.$this->_objectHandler->keyName] : 0); |
|
| 602 | 602 | |
| 603 | 603 | $this->setSortOrder(); |
| 604 | 604 | |
| 605 | 605 | if (!$this->_isTree) { |
| 606 | - $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15'); |
|
| 606 | + $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_limitsel', '15'); |
|
| 607 | 607 | } else { |
| 608 | 608 | $this->_limitsel = 'all'; |
| 609 | 609 | } |
| 610 | 610 | |
| 611 | 611 | $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel; |
| 612 | - Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel); |
|
| 612 | + Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_limitsel', $this->_limitsel); |
|
| 613 | 613 | $limitsArray = $this->getLimitsArray(); |
| 614 | 614 | $this->_criteria->setLimit($this->_limitsel); |
| 615 | 615 | |
| 616 | 616 | $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter(); |
| 617 | 617 | $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel; |
| 618 | - Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel); |
|
| 618 | + Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel); |
|
| 619 | 619 | $filtersArray = $this->getFiltersArray(); |
| 620 | 620 | |
| 621 | 621 | if ($filtersArray) { |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | $filters2Array = $this->getFilters2Array(); |
| 642 | 642 | $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array); |
| 643 | 643 | |
| 644 | - Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2); |
|
| 644 | + Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2); |
|
| 645 | 645 | if ('default' !== $this->_filtersel2) { |
| 646 | 646 | $this->_criteria->add(new \Criteria($this->_filtersel, $this->_filtersel2)); |
| 647 | 647 | } |
@@ -650,21 +650,21 @@ discard block |
||
| 650 | 650 | } |
| 651 | 651 | // Check if we have a quicksearch |
| 652 | 652 | |
| 653 | - if (isset($_POST['quicksearch_' . $this->_id]) && '' != $_POST['quicksearch_' . $this->_id]) { |
|
| 653 | + if (isset($_POST['quicksearch_'.$this->_id]) && '' != $_POST['quicksearch_'.$this->_id]) { |
|
| 654 | 654 | $quicksearch_criteria = new \CriteriaCompo(); |
| 655 | 655 | if (is_array($this->_quickSearch['fields'])) { |
| 656 | 656 | foreach ($this->_quickSearch['fields'] as $v) { |
| 657 | - $quicksearch_criteria->add(new \Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR'); |
|
| 657 | + $quicksearch_criteria->add(new \Criteria($v, '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'), 'OR'); |
|
| 658 | 658 | } |
| 659 | 659 | } else { |
| 660 | - $quicksearch_criteria->add(new \Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE')); |
|
| 660 | + $quicksearch_criteria->add(new \Criteria($this->_quickSearch['fields'], '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE')); |
|
| 661 | 661 | } |
| 662 | 662 | $this->_criteria->add($quicksearch_criteria); |
| 663 | 663 | } |
| 664 | 664 | |
| 665 | 665 | $this->_objects = $this->fetchObjects($debug); |
| 666 | 666 | |
| 667 | - require_once XOOPS_ROOT_PATH . '/class/pagenav.php'; |
|
| 667 | + require_once XOOPS_ROOT_PATH.'/class/pagenav.php'; |
|
| 668 | 668 | if ($this->_criteria->getLimit() > 0) { |
| 669 | 669 | |
| 670 | 670 | /** |
@@ -680,7 +680,7 @@ discard block |
||
| 680 | 680 | */ |
| 681 | 681 | $params_of_the_options_sel = []; |
| 682 | 682 | |
| 683 | - $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName]; |
|
| 683 | + $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start'.$this->_objectHandler->keyName]; |
|
| 684 | 684 | foreach ($_GET as $k => $v) { |
| 685 | 685 | if (!in_array($k, $not_needed_params)) { |
| 686 | 686 | $new_get_array[] = "$k=$v"; |
@@ -691,12 +691,12 @@ discard block |
||
| 691 | 691 | /** |
| 692 | 692 | * Adding the new params of the pagenav |
| 693 | 693 | */ |
| 694 | - $new_get_array[] = 'sortsel=' . $this->_sortsel; |
|
| 695 | - $new_get_array[] = 'ordersel=' . $this->_ordersel; |
|
| 696 | - $new_get_array[] = 'limitsel=' . $this->_limitsel; |
|
| 694 | + $new_get_array[] = 'sortsel='.$this->_sortsel; |
|
| 695 | + $new_get_array[] = 'ordersel='.$this->_ordersel; |
|
| 696 | + $new_get_array[] = 'limitsel='.$this->_limitsel; |
|
| 697 | 697 | $otherParams = implode('&', $new_get_array); |
| 698 | 698 | |
| 699 | - $pagenav = new \XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams); |
|
| 699 | + $pagenav = new \XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start'.$this->_objectHandler->keyName, $otherParams); |
|
| 700 | 700 | $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav()); |
| 701 | 701 | } |
| 702 | 702 | $this->renderOptionSelection($limitsArray, $params_of_the_options_sel); |
@@ -732,20 +732,20 @@ discard block |
||
| 732 | 732 | $aColumn['align'] = $column->getAlign(); |
| 733 | 733 | $aColumn['key'] = $column->getKeyName(); |
| 734 | 734 | if ('checked' === $column->_keyname) { |
| 735 | - $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">'; |
|
| 735 | + $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"'.' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');">'; |
|
| 736 | 736 | } elseif ($column->getCustomCaption()) { |
| 737 | 737 | $aColumn['caption'] = $column->getCustomCaption(); |
| 738 | 738 | } else { |
| 739 | 739 | $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName(); |
| 740 | 740 | } |
| 741 | 741 | // Are we doing a GET sort on this column ? |
| 742 | - $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) |
|
| 743 | - && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName()) |
|
| 742 | + $getSort = (isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel']) |
|
| 743 | + && $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] == $column->getKeyName()) |
|
| 744 | 744 | || ($this->_sortsel == $column->getKeyName()); |
| 745 | - $order = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC'; |
|
| 745 | + $order = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : 'DESC'; |
|
| 746 | 746 | |
| 747 | - if (isset($_REQUEST['quicksearch_' . $this->_id]) && '' != $_REQUEST['quicksearch_' . $this->_id]) { |
|
| 748 | - $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id]; |
|
| 747 | + if (isset($_REQUEST['quicksearch_'.$this->_id]) && '' != $_REQUEST['quicksearch_'.$this->_id]) { |
|
| 748 | + $qs_param = '&quicksearch_'.$this->_id.'='.$_REQUEST['quicksearch_'.$this->_id]; |
|
| 749 | 749 | } |
| 750 | 750 | if (!$this->_enableColumnsSorting || 'checked' === $column->_keyname || !$column->isSortable()) { |
| 751 | 751 | $aColumn['caption'] = $aColumn['caption']; |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | . $orderArray[$order]['image'] |
| 773 | 773 | . '" alt="ASC"></a>'; |
| 774 | 774 | } else { |
| 775 | - $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>'; |
|
| 775 | + $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>'; |
|
| 776 | 776 | } |
| 777 | 777 | $aColumns[] = $aColumn; |
| 778 | 778 | } |
@@ -802,9 +802,9 @@ discard block |
||
| 802 | 802 | |
| 803 | 803 | $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl'; |
| 804 | 804 | if ($fetchOnly) { |
| 805 | - return $this->_tpl->fetch('db:' . $smartobjectTable_template); |
|
| 805 | + return $this->_tpl->fetch('db:'.$smartobjectTable_template); |
|
| 806 | 806 | } else { |
| 807 | - $this->_tpl->display('db:' . $smartobjectTable_template); |
|
| 807 | + $this->_tpl->display('db:'.$smartobjectTable_template); |
|
| 808 | 808 | } |
| 809 | 809 | } |
| 810 | 810 | |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | $space .= ' '; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $aColumn['value'] = $space . $value; |
|
| 105 | + $aColumn['value'] = $space.$value; |
|
| 106 | 106 | $aColumn['class'] = $class; |
| 107 | 107 | $aColumn['width'] = $column->getWidth(); |
| 108 | 108 | $aColumn['align'] = $column->getAlign(); |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | * Licence: GNU |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | -include __DIR__ . '/../../mainfile.php'; |
|
| 10 | -require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php'; |
|
| 9 | +include __DIR__.'/../../mainfile.php'; |
|
| 10 | +require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php'; |
|
| 11 | 11 | |
| 12 | 12 | Smartobject\Utility::loadCommonLanguageFile(); |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | */ |
| 9 | 9 | function smartobject_addto_show($options) |
| 10 | 10 | { |
| 11 | - require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php'; |
|
| 11 | + require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php'; |
|
| 12 | 12 | // require_once SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php'; |
| 13 | 13 | $smartaddto = new XoopsModules\Smartobject\AddTo($options[0]); |
| 14 | 14 | $block = $smartaddto->renderForBlock(); |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | function smartobject_addto_edit($options) |
| 24 | 24 | { |
| 25 | - require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; |
|
| 25 | + require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php'; |
|
| 26 | 26 | |
| 27 | 27 | $form = ''; |
| 28 | 28 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1); |
| 32 | 32 | $layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2); |
| 33 | 33 | $layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3); |
| 34 | - $form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>'; |
|
| 34 | + $form .= $layout_select->getCaption().' '.$layout_select->render().'<br>'; |
|
| 35 | 35 | |
| 36 | 36 | return $form; |
| 37 | 37 | } |
@@ -17,30 +17,30 @@ discard block |
||
| 17 | 17 | * SmartObject library path |
| 18 | 18 | */ |
| 19 | 19 | if (!defined('SMARTOBJECT_URL')) { |
| 20 | - define('SMARTOBJECT_URL', XOOPS_URL . '/modules/smartobject/'); |
|
| 20 | + define('SMARTOBJECT_URL', XOOPS_URL.'/modules/smartobject/'); |
|
| 21 | 21 | } |
| 22 | 22 | if (!defined('SMARTOBJECT_ROOT_PATH')) { |
| 23 | - define('SMARTOBJECT_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/smartobject/'); |
|
| 23 | + define('SMARTOBJECT_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/smartobject/'); |
|
| 24 | 24 | } |
| 25 | 25 | if (!defined('SMARTOBJECT_IMAGES_URL')) { |
| 26 | - define('SMARTOBJECT_IMAGES_URL', SMARTOBJECT_URL . 'assets/images/'); |
|
| 26 | + define('SMARTOBJECT_IMAGES_URL', SMARTOBJECT_URL.'assets/images/'); |
|
| 27 | 27 | } |
| 28 | 28 | if (!defined('SMARTOBJECT_IMAGES_ROOT_PATH')) { |
| 29 | - define('SMARTOBJECT_IMAGES_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/'); |
|
| 29 | + define('SMARTOBJECT_IMAGES_ROOT_PATH', SMARTOBJECT_ROOT_PATH.'assets/images/'); |
|
| 30 | 30 | } |
| 31 | 31 | if (!defined('SMARTOBJECT_IMAGES_ACTIONS_URL')) { |
| 32 | - define('SMARTOBJECT_IMAGES_ACTIONS_URL', SMARTOBJECT_URL . 'assets/images/actions/'); |
|
| 32 | + define('SMARTOBJECT_IMAGES_ACTIONS_URL', SMARTOBJECT_URL.'assets/images/actions/'); |
|
| 33 | 33 | } |
| 34 | 34 | if (!defined('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH')) { |
| 35 | - define('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH', SMARTOBJECT_ROOT_PATH . 'assets/images/actions/'); |
|
| 35 | + define('SMARTOBJECT_IMAGES_ACTIONS_ROOT_PATH', SMARTOBJECT_ROOT_PATH.'assets/images/actions/'); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Version of the SmartObject Framework |
| 40 | 40 | */ |
| 41 | -require_once SMARTOBJECT_ROOT_PATH . 'include/version.php'; |
|
| 41 | +require_once SMARTOBJECT_ROOT_PATH.'include/version.php'; |
|
| 42 | 42 | //require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php'; |
| 43 | -require_once SMARTOBJECT_ROOT_PATH . 'include/xoops_core_common_functions.php'; |
|
| 43 | +require_once SMARTOBJECT_ROOT_PATH.'include/xoops_core_common_functions.php'; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * Some constants used by the SmartObjects |
@@ -69,4 +69,4 @@ discard block |
||
| 69 | 69 | // get previous page |
| 70 | 70 | $smart_previous_page = Smartobject\Utility::getEnv('HTTP_REFERER'); |
| 71 | 71 | |
| 72 | -require_once SMARTOBJECT_ROOT_PATH . 'class/smartloader.php'; |
|
| 72 | +require_once SMARTOBJECT_ROOT_PATH.'class/smartloader.php'; |
|
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
| 21 | 21 | |
| 22 | -require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php'; |
|
| 22 | +require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php'; |
|
| 23 | 23 | //require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartdbupdater.php'; |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | $dbupdater = new XoopsModules\Smartobject\Dbupdater(); |
| 39 | 39 | |
| 40 | - echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>'; |
|
| 40 | + echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>'; |
|
| 41 | 41 | |
| 42 | 42 | // db migrate version = 1 |
| 43 | 43 | $newDbVersion = 1; |
| 44 | 44 | if ($dbVersion < $newDbVersion) { |
| 45 | - echo 'Database migrate to version ' . $newDbVersion . '<br>'; |
|
| 45 | + echo 'Database migrate to version '.$newDbVersion.'<br>'; |
|
| 46 | 46 | |
| 47 | 47 | // Create table smartobject_link |
| 48 | 48 | $table = new XoopsModules\Smartobject\DbTable('smartobject_link'); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | // db migrate version = 2 |
| 146 | 146 | $newDbVersion = 2; |
| 147 | 147 | if ($dbVersion < $newDbVersion) { |
| 148 | - echo 'Database migrate to version ' . $newDbVersion . '<br>'; |
|
| 148 | + echo 'Database migrate to version '.$newDbVersion.'<br>'; |
|
| 149 | 149 | |
| 150 | 150 | // Create table smartobject_rating |
| 151 | 151 | $table = new XoopsModules\Smartobject\DbTable('smartobject_rating'); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | // db migrate version = 3 |
| 186 | 186 | $newDbVersion = 3; |
| 187 | 187 | if ($dbVersion < $newDbVersion) { |
| 188 | - echo 'Database migrate to version ' . $newDbVersion . '<br>'; |
|
| 188 | + echo 'Database migrate to version '.$newDbVersion.'<br>'; |
|
| 189 | 189 | |
| 190 | 190 | // Create table smartobject_customtag |
| 191 | 191 | $table = new XoopsModules\Smartobject\DbTable('smartobject_customtag'); |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | // db migrate version = 4 |
| 211 | 211 | $newDbVersion = 4; |
| 212 | 212 | if ($dbVersion < $newDbVersion) { |
| 213 | - echo 'Database migrate to version ' . $newDbVersion . '<br>'; |
|
| 213 | + echo 'Database migrate to version '.$newDbVersion.'<br>'; |
|
| 214 | 214 | |
| 215 | 215 | // Create table smartobject_currency |
| 216 | 216 | $table = new XoopsModules\Smartobject\DbTable('smartobject_currency'); |
@@ -236,12 +236,12 @@ discard block |
||
| 236 | 236 | // db migrate version = 6 |
| 237 | 237 | $newDbVersion = 6; |
| 238 | 238 | if ($dbVersion < $newDbVersion) { |
| 239 | - echo 'Database migrate to version ' . $newDbVersion . '<br>'; |
|
| 239 | + echo 'Database migrate to version '.$newDbVersion.'<br>'; |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | $newDbVersion = 7; |
| 243 | 243 | if ($dbVersion < $newDbVersion) { |
| 244 | - echo 'Database migrate to version ' . $newDbVersion . '<br>'; |
|
| 244 | + echo 'Database migrate to version '.$newDbVersion.'<br>'; |
|
| 245 | 245 | |
| 246 | 246 | // Create table smartobject_file |
| 247 | 247 | $table = new XoopsModules\Smartobject\DbTable('smartobject_file'); |
@@ -16,13 +16,13 @@ |
||
| 16 | 16 | global $xoopsTpl, $smartobjectAdsenseHandler; |
| 17 | 17 | if (is_object($xoopsTpl)) { |
| 18 | 18 | foreach ($smartobjectAdsenseHandler->objects as $k => $v) { |
| 19 | - $xoopsTpl->assign('adsense_' . $k, $v->render()); |
|
| 19 | + $xoopsTpl->assign('adsense_'.$k, $v->render()); |
|
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | if (!defined('SMARTOBJECT_URL')) { |
| 25 | - require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php'; |
|
| 25 | + require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php'; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | //require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php'; |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | use XoopsModules\Smartobject\PluginHandler; |
| 13 | 13 | |
| 14 | 14 | if (!defined('SMARTOBJECT_URL')) { |
| 15 | - require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php'; |
|
| 15 | + require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php'; |
|
| 16 | 16 | } |
| 17 | 17 | //require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php'; |
| 18 | 18 | //require_once SMARTOBJECT_ROOT_PATH . 'include/functions.php'; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $urls = Smartobject\Utility::getCurrentUrls(); |
| 47 | 47 | $xoopsTpl->assign('smartobject_rating_current_page', $urls['full']); |
| 48 | 48 | if (isset($xoTheme) && is_object($xoTheme)) { |
| 49 | - $xoTheme->addStylesheet(SMARTOBJECT_URL . 'assets/css/module.css'); |
|
| 49 | + $xoTheme->addStylesheet(SMARTOBJECT_URL.'assets/css/module.css'); |
|
| 50 | 50 | } else { |
| 51 | 51 | //probleme d'inclusion de css apres le flashplayer. Style plac� dans css du theme |
| 52 | 52 | //$xoopsTpl->assign('smartobject_css',"<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartobject/assets/css/module.css'>"); |