Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13212] XoopsModules/xoopspartners/branches/zyspec/ xoopspartners
|
From: <zy...@us...> - 2016-05-29 22:57:55
|
Revision: 13212
http://sourceforge.net/p/xoops/svn/13212
Author: zyspec
Date: 2016-05-29 22:57:53 +0000 (Sun, 29 May 2016)
Log Message:
-----------
- remove pass by reference for non-vars (prep for PHP7)
Modified Paths:
--------------
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/menu.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/blocks/partners.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/class/partners.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/index.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/join.php
XoopsModules/xoopspartners/branches/zyspec/xoopspartners/vpartner.php
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -23,9 +23,9 @@
*/
if (!isset($moduleInfo) || !is_a($moduleInfo, 'XoopsModule')) {
- $module_handler =& xoops_gethandler('module');
- $xoopsModule =& XoopsModule::getByDirname('mylinks');
- $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+ $module_handler = xoops_gethandler('module');
+ $xoopsModule = XoopsModule::getByDirname('mylinks');
+ $moduleInfo = $module_handler->get($xoopsModule->getVar('mid'));
$pathIcon32 = $moduleInfo->getInfo('icons32');
}
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -43,15 +43,15 @@
//return false;
}
-$moduleHandler =& xoops_gethandler('module');
-$moduleInfo =& $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid'));
+$moduleHandler = xoops_gethandler('module');
+$moduleInfo = $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid'));
$pathIcon16 = $GLOBALS['xoopsModule']->getInfo('icons16');
$pathIcon32 = $GLOBALS['xoopsModule']->getInfo('icons32');
$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
//$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-$myts =& MyTextSanitizer::getInstance();
+$myts = MyTextSanitizer::getInstance();
if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
include_once $GLOBALS['xoops']->path("/class/template.php");
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -46,7 +46,7 @@
$adminClass = new ModuleAdmin();
//-----------------------
-$xpPartnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname', 'n'));
+$xpPartnerHandler = xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname', 'n'));
$totalPartners = $xpPartnerHandler->getCount();
$totalNonActivePartners = $xpPartnerHandler->getCount(new Criteria('status', 0, '='));
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -64,7 +64,7 @@
case 'partnersAdmin':
default:
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
echo $adminClass->addNavigation('main.php');
$adminClass->addItemButton(_AM_XPARTNERS_ADD, 'main.php' . '?op=partnersAdminAdd', $icon = 'add');
@@ -168,7 +168,7 @@
$weight = isset($_POST['weight']) ? XoopsRequest::getArray('weight', array(), 'POST') : null;
$status = isset($_POST['status']) ? XoopsRequest::getArray('status', array(), 'POST') : null;
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
$partnerCount = $xpPartnerHandler->getCount();
if ($partnerCount) {
foreach ($weight as $id => $order) {
@@ -190,7 +190,7 @@
break;
case 'reorderAutoPartners':
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
$partnerObjs = $xpPartnerHandler->getAll(null, array('weight'));
$partnerCount = count($partnerObjs);
$weight = XoopspartnersConstants::DEFAULT_WEIGHT;
@@ -240,7 +240,7 @@
break;
case 'addPartner':
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
$newPartner = $xpPartnerHandler->create();
$status = ((!empty($status)) && (intval($status) > 0)) ? intval($status) : XoopspartnersConstants::STATUS_INACTIVE;
$weight = XoopsRequest::getInt('weight', XoopspartnersConstants::DEFAULT_WEIGHT, 'POST');
@@ -272,7 +272,7 @@
echo $adminClass->addNavigation('main.php');
$id = (intval($id) > XoopspartnersConstants::DEFAULT_PID) ? intval($id) : XoopspartnersConstants::DEFAULT_PID;
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
$partnerObj = $xpPartnerHandler->get($id);
if (!empty($partnerObj) && ($partnerObj instanceof XoopspartnersPartners)) {
$partnerVars = $partnerObj->getValues();
@@ -331,7 +331,7 @@
}
}
*/
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
$partnerObj = $xpPartnerHandler->get($id);
if ($GLOBALS['xoopsSecurity']->check() && ($partnerObj instanceof XoopspartnersPartners)) {
$partnerObj->setVar('url', $myts->addSlashes(formatURL($url)));
@@ -351,7 +351,7 @@
case 'delPartner':
if ((XoopspartnersConstants::CONFIRM_OK == $del) && ($id > XoopspartnersConstants::DEFAULT_PID)) {
- $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
+ $xpPartnerHandler = xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname'));
$partnerObj = $xpPartnerHandler->get($id);
if ($partnerObj instanceof XoopspartnersPartners) {
if ($xpPartnerHandler->delete($partnerObj)) {
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/menu.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/menu.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/menu.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -42,9 +42,9 @@
* @link http://xoops.org XOOPS
*/
-$moduleHandler =& xoops_gethandler('module');
-$moduleObj =& XoopsModule::getByDirname('xoopspartners');
-$moduleInfo =& $moduleHandler->get($moduleObj->getVar('mid'));
+$moduleHandler = xoops_gethandler('module');
+$moduleObj = XoopsModule::getByDirname('xoopspartners');
+$moduleInfo = $moduleHandler->get($moduleObj->getVar('mid'));
$pathIcon32 = '../../' . $moduleInfo->getInfo('icons32');
xoops_loadLanguage('modinfo', $moduleObj->dirname());
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/blocks/partners.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/blocks/partners.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/blocks/partners.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -60,13 +60,13 @@
*/
function b_xoopspartners_show($options)
{
- $myts =& MyTextSanitizer::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$block = array();
$moduleDirName = basename(dirname(__DIR__));
$block['xpDir'] = $moduleDirName;
- $partner_handler =& xoops_getmodulehandler('partners', $moduleDirName);
+ $partner_handler = xoops_getmodulehandler('partners', $moduleDirName);
$pFields = array('id', 'url', 'image', 'title', 'description');
$criteria = new CriteriaCompo();
$criteria->setLimit($options[3]);
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/class/partners.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/class/partners.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/class/partners.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -53,7 +53,7 @@
*/
function __construct($id=null)
{
- $this->db =& XoopsDatabaseFactory::getDatabaseConnection();
+ $this->db = XoopsDatabaseFactory::getDatabaseConnection();
$this->initVar('id', XOBJ_DTYPE_INT, null, false);
$this->initVar('weight', XOBJ_DTYPE_INT, null, false, 10);
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/index.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/index.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/index.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -47,10 +47,10 @@
$start = XoopsRequest::getInt('start', 0, 'GET');
-$xpPartnersHandler =& xoops_getmodulehandler('partners', $moduleDirName);
+$xpPartnersHandler = xoops_getmodulehandler('partners', $moduleDirName);
-$moduleHandler =& xoops_gethandler('module');
-$moduleInfo =& $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid'));
+$moduleHandler = xoops_gethandler('module');
+$moduleInfo = $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid'));
$pathIcon16 = $GLOBALS['xoops']->url("www/". $GLOBALS['xoopsModule']->getInfo('icons16'));
$criteria = new CriteriaCompo();
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/join.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/join.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/join.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -44,7 +44,7 @@
include __DIR__ . '/header.php';
$xoopsOption['template_main'] = 'xoopspartners_join.tpl';
include $GLOBALS['xoops']->path('/header.php');
-$myts =& MyTextSanitizer::getInstance();
+$myts = MyTextSanitizer::getInstance();
$op = XoopsRequest::getCmd('op', '', 'POST');
@@ -113,7 +113,7 @@
exit();
}
}
- $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path("/modules/". $GLOBALS['xoopsModule']->getVar('dirname', 'n') . "/language/{$GLOBALS['xoopsConfig']['language']}/mail_template/"));
$xoopsMailer->setTemplate("join.tpl");
Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/vpartner.php
===================================================================
--- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/vpartner.php 2016-05-29 22:53:05 UTC (rev 13211)
+++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/vpartner.php 2016-05-29 22:57:53 UTC (rev 13212)
@@ -42,7 +42,7 @@
*/
include __DIR__ . '/header.php';
-$xpPartnerHandler =& xoops_getmodulehandler('partners', $moduleDirName);
+$xpPartnerHandler = xoops_getmodulehandler('partners', $moduleDirName);
$id = XoopsRequest::getInt('id', XoopspartnersConstants::DEFAULT_PID, 'GET');
if (XoopspartnersConstants::DEFAULT_PID == $id) {
|
