|
From: <tr...@us...> - 2013-01-04 19:22:51
|
Revision: 10661
http://sourceforge.net/p/xoops/svn/10661
Author: trabis
Date: 2013-01-04 19:22:48 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Fixing category permissions bug. Removing assign by reference for non variables.
Modified Paths:
--------------
XoopsModules/publisher/trunk/publisher/admin/admin_header.php
XoopsModules/publisher/trunk/publisher/admin/category.php
XoopsModules/publisher/trunk/publisher/admin/item.php
XoopsModules/publisher/trunk/publisher/admin/main.php
XoopsModules/publisher/trunk/publisher/class/category.php
XoopsModules/publisher/trunk/publisher/class/item.php
XoopsModules/publisher/trunk/publisher/class/permission.php
XoopsModules/publisher/trunk/publisher/include/functions.php
Modified: XoopsModules/publisher/trunk/publisher/admin/admin_header.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/admin/admin_header.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/admin/admin_header.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -38,7 +38,7 @@
echo xoops_error('/Frameworks/moduleclasses/moduleadmin/ is required!!!');
}
/*
-$myts =& MyTextSanitizer::getInstance();
+$myts = MyTextSanitizer::getInstance();
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH."/class/template.php");
Modified: XoopsModules/publisher/trunk/publisher/admin/category.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/admin/category.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/admin/category.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -379,7 +379,7 @@
echo "</tr>";
if ($totalitems > 0) {
for ($i = 0; $i < $totalitemsOnPage; $i++) {
- $categoryObj =& $allcats[$itemsObj[$i]->categoryid()];
+ $categoryObj = $allcats[$itemsObj[$i]->categoryid()];
$modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
echo "<tr>";
Modified: XoopsModules/publisher/trunk/publisher/admin/item.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/admin/item.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/admin/item.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -194,7 +194,7 @@
echo "</tr>";
if ($totalitems > 0) {
for ($i = 0; $i < $totalItemsOnPage; $i++) {
- $categoryObj =& $itemsObj[$i]->category();
+ $categoryObj = $itemsObj[$i]->category();
$approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a> ";
$clone = '';
@@ -243,7 +243,7 @@
echo "</tr>";
if ($totalitems > 0) {
for ($i = 0; $i < $totalItemsOnPage; $i++) {
- $categoryObj =& $itemsObj[$i]->category();
+ $categoryObj = $itemsObj[$i]->category();
$modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
@@ -290,7 +290,7 @@
echo "</tr>";
if ($totalitems > 0) {
for ($i = 0; $i < $totalItemsOnPage; $i++) {
- $categoryObj =& $itemsObj[$i]->category();
+ $categoryObj = $itemsObj[$i]->category();
$modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
@@ -338,7 +338,7 @@
echo "</tr>";
if ($totalitems > 0) {
for ($i = 0; $i < $totalItemsOnPage; $i++) {
- $categoryObj =& $itemsObj[$i]->category();
+ $categoryObj = $itemsObj[$i]->category();
$modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>";
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>";
Modified: XoopsModules/publisher/trunk/publisher/admin/main.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/admin/main.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/admin/main.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -226,7 +226,7 @@
for ($i = 0; $i < $totalItemsOnPage; $i++) {
// Creating the category object to which this item is linked
- $categoryObj =& $itemsObj[$i]->category();
+ $categoryObj = $itemsObj[$i]->category();
$approve = '';
switch ($itemsObj[$i]->status()) {
Modified: XoopsModules/publisher/trunk/publisher/class/category.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/class/category.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/class/category.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -94,7 +94,7 @@
if (is_object($xoopsUser) && $xoopsUser->getVar('uid') == $this->moderator()) {
return true;
}
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
if (in_array($this->categoryid(), $categoriesGranted)) {
$ret = true;
}
@@ -464,7 +464,7 @@
$criteria->add(new Criteria('parentid', $parentid));
}
if (!$publisher_isAdmin) {
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
if (count($categoriesGranted) > 0) {
$criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
} else {
@@ -504,7 +504,7 @@
$criteria->setSort('name');
$criteria->setOrder('ASC');
if (!$publisher_isAdmin) {
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('item_submit');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('item_submit');
if (count($categoriesGranted) > 0) {
$criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
} else {
@@ -545,7 +545,7 @@
$criteria->setSort('name');
$criteria->setOrder('ASC');
if (!$publisher_isAdmin) {
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
if (count($categoriesGranted) > 0) {
$criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
} else {
@@ -590,7 +590,7 @@
if (isset($parentid) && ($parentid != -1)) {
$criteria->add(new criteria('parentid', $parentid));
if (!$publisher_isAdmin) {
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
if (count($categoriesGranted) > 0) {
$criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
} else {
@@ -617,7 +617,7 @@
$criteria = new CriteriaCompo(new Criteria('parentid', "(" . implode(',', array_keys($categories)) . ")", 'IN'));
$ret = array();
if (!$publisher_isAdmin) {
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
if (count($categoriesGranted) > 0) {
$criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
} else {
Modified: XoopsModules/publisher/trunk/publisher/class/item.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/class/item.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/class/item.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -1219,7 +1219,7 @@
if (!$publisher_isAdmin) {
$criteriaPermissions = new CriteriaCompo();
// Categories for which user has access
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
if (!empty($categoriesGranted)) {
$grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
$criteriaPermissions->add($grantedCategories, 'AND');
@@ -1375,8 +1375,8 @@
if (!$publisher_isAdmin) {
$criteriaPermissions = new CriteriaCompo();
// Categories for which user has access
- $categoriesGranted =& $this->publisher->getHandler('permission')->getGrantedItems('category_read');
- if (!empty($grantedCategories)) {
+ $categoriesGranted = $this->publisher->getHandler('permission')->getGrantedItems('category_read');
+ if (!empty($categoriesGranted)) {
$grantedCategories = new Criteria('categoryid', "(" . implode(',', $categoriesGranted) . ")", 'IN');
$criteriaPermissions->add($grantedCategories, 'AND');
} else {
Modified: XoopsModules/publisher/trunk/publisher/class/permission.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/class/permission.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/class/permission.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -119,7 +119,7 @@
if (!$id) {
return false;
}
- $permissions =& $this->getGrantedItems($gperm_name);
+ $permissions = $this->getGrantedItems($gperm_name);
if (!empty($permissions) && isset ($permissions[$id])) {
return true;
} else {
Modified: XoopsModules/publisher/trunk/publisher/include/functions.php
===================================================================
--- XoopsModules/publisher/trunk/publisher/include/functions.php 2013-01-04 19:12:30 UTC (rev 10660)
+++ XoopsModules/publisher/trunk/publisher/include/functions.php 2013-01-04 19:22:48 UTC (rev 10661)
@@ -383,7 +383,7 @@
function publisher_userIsModerator($itemObj)
{
$publisher = PublisherPublisher::getInstance();
- $categoriesGranted =& $publisher->getHandler('permission')->getGrantedItems('category_moderation');
+ $categoriesGranted = $publisher->getHandler('permission')->getGrantedItems('category_moderation');
return (is_object($itemObj) && in_array($itemObj->categoryid(), $categoriesGranted));
}
|