Menu
▾
▴
[xc-tokai-svnlog] SF.net SVN: xc-tokai:[532] modules_bizpoll/trunk/xoops_trust_path/modules/ bizpoll
|
From: <ki...@us...> - 2011-04-26 14:50:32
|
Revision: 532
http://xc-tokai.svn.sourceforge.net/xc-tokai/?rev=532&view=rev
Author: kilica
Date: 2011-04-26 14:50:25 +0000 (Tue, 26 Apr 2011)
Log Message:
-----------
PHP5.3 ready
Modified Paths:
--------------
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/README.txt
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceDeleteAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceEditAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceListAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqDeleteAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqEditAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqListAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqViewAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDeleteAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollEditAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollListAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/BizpollAdminRenderSystem.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstallUtils.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstaller.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUninstaller.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUpdater.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractFilterForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractListAction.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AssetManager.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/Module.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceDeleteForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceEditForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqDeleteForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqEditForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollDeleteForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollEditForm.class.php
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/xoops_version.php
Removed Paths:
-------------
modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/.xml/
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/README.txt
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/README.txt 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/README.txt 2011-04-26 14:50:25 UTC (rev 532)
@@ -18,6 +18,10 @@
\x8DX\x90V\x97\x9A\x97\xF0
--------
+0.24(2011.04.21)
+\x81E\x83J\x83e\x83S\x83\x8A\x96\xA2\x90ݒ莞\x82ɃA\x83\x93\x83P\x81[\x83g\x82\xF0\x8D쐬\x82\xB5\x82悤\x82Ƃ\xB7\x82\xE9\x82ƃG\x83\x89\x81[\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD\x82̂\xF0\x8FC\x90\xB3
+\x81EPHP5.3\x82ŏo\x82\xE9 & new \x82\xCC Warning \x82\xF0\x8FC\x90\xB3
+
0.23(2011.03.17)
\x81E\x81u\x8C\x8B\x89ʂ\xF0\x8AJ\x8E\xA6\x82\xB5\x82Ȃ\xA2\x81v\x82ɂ\xB5\x82\xBD\x8Fꍇ\x82ɊǗ\x9D\x8Eҁieditor\x81j\x82\xE0\x8C\xA9\x82\xEA\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xB5\x82܂\xA4\x83o\x83O\x82\xF0\x8FC\x90\xB3\x81iThanks chipy\x81j
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceDeleteAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceDeleteAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceDeleteAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -51,7 +51,7 @@
**/
protected function _setupActionForm()
{
- // $this->mActionForm =& new Bizpoll_ChoiceDeleteForm();
+ // $this->mActionForm = new Bizpoll_ChoiceDeleteForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'choice',false,'delete');
$this->mActionForm->prepare();
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceEditAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceEditAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceEditAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -70,7 +70,7 @@
**/
protected function _setupActionForm()
{
- // $this->mActionForm =& new Bizpoll_ChoiceEditForm();
+ // $this->mActionForm = new Bizpoll_ChoiceEditForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'choice',false,'edit');
$this->mActionForm->prepare();
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceListAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceListAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/ChoiceListAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -39,7 +39,7 @@
**/
protected function &_getFilterForm()
{
- // $filter =& new Bizpoll_ChoiceFilterForm();
+ // $filter = new Bizpoll_ChoiceFilterForm();
$filter =& $this->mAsset->getObject('filter', 'choice',false);
$filter->prepare($this->_getPageNavi(), $this->_getHandler());
return $filter;
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqDeleteAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqDeleteAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqDeleteAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -51,7 +51,7 @@
**/
protected function _setupActionForm()
{
- // $this->mActionForm =& new Bizpoll_EnqDeleteForm();
+ // $this->mActionForm = new Bizpoll_EnqDeleteForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'enq',false,'delete');
$this->mActionForm->prepare();
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqEditAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqEditAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqEditAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -70,7 +70,7 @@
**/
protected function _setupActionForm()
{
- // $this->mActionForm =& new Bizpoll_EnqEditForm();
+ // $this->mActionForm = new Bizpoll_EnqEditForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'enq', false, 'edit');
$this->mActionForm->prepare();
}
@@ -80,7 +80,6 @@
*/
public function prepare()
{
- $xcatHandler = new Bizpoll_XcatHandler($this->mAsset->mDirname);
$this->mUseCat = ($this->mModule->getModuleConfig('gr_id')>0) ? true : false;
@@ -99,8 +98,11 @@
}
}
else{
- if(! $xcatHandler->checkPermit($this->mObject->get('cat_id'), 'editor', $this->mObject->get('uid'))){
- $this->mRoot->mController->executeRedirect('./index.php?action=EnqList', 1, _MD_BIZPOLL_ERROR_NOT_PERMITTED);
+ if($this->mUseCat){
+ $xcatHandler = new Bizpoll_XcatHandler($this->mAsset->mDirname);
+ if(! $xcatHandler->checkPermit($this->mObject->get('cat_id'), 'editor', $this->mObject->get('uid'))){
+ $this->mRoot->mController->executeRedirect('./index.php?action=EnqList', 1, _MD_BIZPOLL_ERROR_NOT_PERMITTED);
+ }
}
}
}
@@ -228,10 +230,17 @@
**/
public function execute()
{
- $xcatHandler = new Bizpoll_XcatHandler($this->mAsset->mDirname);
- if(! $xcatHandler->checkPermit($this->mObject->get('cat_id'), 'editor', $this->mObject->get('uid'))){
- $this->mRoot->mController->executeRedirect('./index.php?action=EnqList', 1, _MD_BIZPOLL_ERROR_NOT_PERMITTED);
+ if(! $this->mUseCat){
+ if(! $this->mRoot->mContext->mXoopsUser){
+ $this->mRoot->mController->executeRedirect('./index.php?action=EnqList', 1, _MD_BIZPOLL_ERROR_NOT_PERMITTED);
+ }
}
+ else{
+ $xcatHandler = new Bizpoll_XcatHandler($this->mAsset->mDirname);
+ if(! $xcatHandler->checkPermit($this->mObject->get('cat_id'), 'editor', $this->mObject->get('uid'))){
+ $this->mRoot->mController->executeRedirect('./index.php?action=EnqList', 1, _MD_BIZPOLL_ERROR_NOT_PERMITTED);
+ }
+ }
if ($this->mObject == null)
{
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqListAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqListAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqListAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -44,7 +44,7 @@
**/
protected function &_getFilterForm()
{
- // $filter =& new Bizpoll_EnqFilterForm();
+ // $filter = new Bizpoll_EnqFilterForm();
$filter =& $this->mAsset->getObject('filter', 'enq',false);
$filter->prepare($this->_getPageNavi(), $this->_getHandler());
return $filter;
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqViewAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqViewAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/EnqViewAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -52,7 +52,7 @@
**/
protected function _setupPollActionForm()
{
- // $this->mActionForm =& new Bizpoll_PollEditForm();
+ // $this->mActionForm = new Bizpoll_PollEditForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'poll', false, 'edit');
$this->mActionForm->prepare();
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDeleteAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDeleteAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDeleteAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -51,7 +51,7 @@
**/
protected function _setupActionForm()
{
- // $this->mActionForm =& new Bizpoll_PollDeleteForm();
+ // $this->mActionForm = new Bizpoll_PollDeleteForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'poll',false,'delete');
$this->mActionForm->prepare();
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollDetailAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -57,7 +57,7 @@
**/
protected function &_getFilterForm()
{
- // $filter =& new Bizpoll_PollFilterForm();
+ // $filter = new Bizpoll_PollFilterForm();
$filter =& $this->mAsset->getObject('filter', 'poll',false);
$filter->prepare($this->_getPageNavi(), $this->_getHandler());
return $filter;
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollEditAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollEditAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollEditAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -57,7 +57,7 @@
**/
protected function _setupActionForm()
{
- // $this->mActionForm =& new Bizpoll_PollEditForm();
+ // $this->mActionForm = new Bizpoll_PollEditForm();
$this->mActionForm =& $this->mAsset->getObject('form', 'poll', false, 'edit');
$this->mActionForm->prepare();
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollListAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollListAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/actions/PollListAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -37,7 +37,7 @@
**/
protected function &_getFilterForm()
{
- // $filter =& new Bizpoll_PollFilterForm();
+ // $filter = new Bizpoll_PollFilterForm();
$filter =& $this->mAsset->getObject('filter', 'poll',false);
$filter->prepare($this->_getPageNavi(), $this->_getHandler());
return $filter;
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/BizpollAdminRenderSystem.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/BizpollAdminRenderSystem.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/BizpollAdminRenderSystem.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -30,7 +30,7 @@
{
$this->mController =& $controller;
- $this->mSmarty =& new Legacy_AdminSmarty(); // TODO will be use other class?
+ $this->mSmarty = new Legacy_AdminSmarty(); // TODO will be use other class?
$this->mSmarty->register_modifier('theme',array($this,'modifierTheme'));
$this->mSmarty->register_function('stylesheet',array($this,'functionStylesheet'));
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstallUtils.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstallUtils.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstallUtils.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -50,7 +50,7 @@
}
require_once XOOPS_MODULE_PATH . '/legacy/admin/class/Legacy_SQLScanner.class.php'; // TODO will be use other class?
- $scanner =& new Legacy_SQLScanner();
+ $scanner = new Legacy_SQLScanner();
$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
$scanner->setDirname($dirname);
if(!$scanner->loadFile($sqlFilePath))
@@ -92,7 +92,7 @@
public static function DBquery(/*** string ***/ $query,/*** XoopsModule ***/ &$module,/*** Legacy_ModuleInstallLog ***/ &$log)
{
require_once XOOPS_MODULE_PATH . '/legacy/admin/class/Legacy_SQLScanner.class.php'; // TODO will be use other class?
- $scanner =& new Legacy_SQLScanner();
+ $scanner = new Legacy_SQLScanner();
$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
$scanner->setDirname($module->get('dirname'));
$scanner->setBuffer($query);
@@ -286,7 +286,7 @@
if(is_array($delTemplates) && count($delTemplates) > 0)
{
- $xoopsTpl =& new XoopsTpl();
+ $xoopsTpl = new XoopsTpl();
$xoopsTpl->clear_cache(null,'mod_' . $module->get('dirname'));
foreach($delTemplates as $tpl)
{
@@ -492,7 +492,7 @@
);
$tplHandler =& Bizpoll_Utils::getXoopsHandler('tplfile');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('tpl_type','block'));
$cri->add(new Criteria('tpl_tplset','default'));
$cri->add(new Criteria('tpl_module',$module->get('dirname')));
@@ -559,7 +559,7 @@
$blockHandler =& Bizpoll_Utils::getXoopsHandler('block');
$gpermHandler =& Bizpoll_Utils::getXoopsHandler('groupperm');
- $cri =& new Criteria('mid',$module->get('mid'));
+ $cri = new Criteria('mid',$module->get('mid'));
$blocks =& $blockHandler->getObjectsDirectly($cri);
foreach($blocks as $block)
@@ -584,7 +584,7 @@
$successFlag = false;
}
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('gperm_name','block_read'));
$cri->add(new Criteria('gperm_itemid',$block->get('bid')));
$cri->add(new Criteria('gperm_modid',1));
@@ -615,8 +615,8 @@
{
$dirname = $module->get('dirname');
- $fileReader =& new Legacy_ModinfoX2FileReader($dirname);
- $dbReader =& new Legacy_ModinfoX2DBReader($dirname);
+ $fileReader = new Legacy_ModinfoX2FileReader($dirname);
+ $dbReader = new Legacy_ModinfoX2DBReader($dirname);
$blocks =& $dbReader->loadBlockInformations();
$blocks->update($fileReader->loadBlockInformations());
@@ -655,7 +655,7 @@
public static function updateBlockTemplateByInfo(/*** Legacy_BlockInformation ***/ &$info,/*** XoopsModule ***/ &$module,/*** Legacy_ModuleInstallLog ***/ &$log)
{
$blockHandler =& Bizpoll_Utils::getModuleHandler('newblocks','legacy');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('dirname',$module->get('dirname')));
$cri->add(new Criteria('func_num',$info->mFuncNum));
$blocks =& $blockHandler->getObjects($cri);
@@ -679,7 +679,7 @@
public static function updateBlockByInfo(/*** Legacy_BlockInformation ***/ &$info,/*** XoopsModule ***/ &$module,/*** Legacy_ModuleInstallLog ***/ &$log)
{
$blockHandler =& Bizpoll_Utils::getModuleHandler('newblocks','legacy');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('dirname',$module->get('dirname')));
$cri->add(new Criteria('func_num',$info->mFuncNum));
$blocks =& $blockHandler->getObjects($cri);
@@ -787,7 +787,7 @@
public static function uninstallBlockByFuncNum(/*** int ***/ $func_num,/*** XoopsModule ***/ &$module,/*** Legacy_ModuleInstallLog ***/ &$log)
{
$blockHandler =& Bizpoll_Utils::getModuleHandler('newblocks','legacy');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('dirname',$module->get('dirname')));
$cri->add(new Criteria('func_num',$func_num));
$blocks =& $blockHandler->getObjects($cri);
@@ -870,7 +870,7 @@
{
$successFlag = true;
$configHandler =& Bizpoll_Utils::getXoopsHandler('config');
- $fileReader =& new Legacy_ModinfoX2FileReader($module->get('dirname')); // TODO will be use other class?
+ $fileReader = new Legacy_ModinfoX2FileReader($module->get('dirname')); // TODO will be use other class?
$preferences =& $fileReader->loadPreferenceInformations();
foreach($preferences->mPreferences as $info)
@@ -1040,7 +1040,7 @@
{
$configHandler =& Bizpoll_Utils::getXoopsHandler('config');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('conf_modid',$module->get('mid')));
$cri->add(new Criteria('conf_catid',0));
$cri->add(new Criteria('conf_order',$order));
@@ -1081,8 +1081,8 @@
{
$dirname = $module->get('dirname');
- $fileReader =& new Legacy_ModinfoX2FileReader($dirname);
- $dbReader =& new Legacy_ModinfoX2DBReader($dirname);
+ $fileReader = new Legacy_ModinfoX2FileReader($dirname);
+ $dbReader = new Legacy_ModinfoX2DBReader($dirname);
$configs =& $dbReader->loadPreferenceInformations();
$configs->update($fileReader->loadPreferenceInformations());
@@ -1121,7 +1121,7 @@
public static function updateConfigByInfo(/*** Legacy_PreferenceInformation ***/ &$info,/*** XoopsModule ***/ &$module,/*** Legacy_ModuleInstallLog ***/ &$log)
{
$configHandler =& Bizpoll_Utils::getXoopsHandler('config');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('conf_modid',$module->get('mid')));
$cri->add(new Criteria('conf_catid',0));
$cri->add(new Criteria('conf_name',$info->mName));
@@ -1203,7 +1203,7 @@
public static function updateConfigOrderByInfo(/*** Legacy_PreferenceInformation ***/ &$info,/*** XoopsModule ***/ &$module,/*** Legacy_ModuleInstallLog ***/ &$log)
{
$configHandler =& Bizpoll_Utils::getXoopsHandler('config');
- $cri =& new CriteriaCompo();
+ $cri = new CriteriaCompo();
$cri->add(new Criteria('conf_modid',$module->get('mid')));
$cri->add(new Criteria('conf_catid',0));
$cri->add(new Criteria('conf_name',$info->mName));
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstaller.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstaller.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollInstaller.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -41,7 +41,7 @@
**/
public function __construct()
{
- $this->mLog =& new Legacy_ModuleInstallLog();
+ $this->mLog = new Legacy_ModuleInstallLog();
}
/**
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUninstaller.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUninstaller.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUninstaller.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -41,7 +41,7 @@
**/
public function __construct()
{
- $this->mLog =& new Legacy_ModuleInstallLog();
+ $this->mLog = new Legacy_ModuleInstallLog();
}
/**
@@ -160,7 +160,7 @@
Bizpoll_InstallUtils::uninstallAllOfBlocks($this->_mXoopsModule,$this->mLog);
$tplHandler =& Bizpoll_Utils::getXoopsHandler('tplfile');
- $cri =& new Criteria('tpl_module',$this->_mXoopsModule->get('dirname'));
+ $cri = new Criteria('tpl_module',$this->_mXoopsModule->get('dirname'));
if(!$tplHandler->deleteAll($cri))
{
$this->mLog->addError(
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUpdater.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUpdater.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/admin/class/installer/BizpollUpdater.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -61,7 +61,7 @@
**/
public function __construct()
{
- $this->mLog =& new Legacy_ModuleInstallLog();
+ $this->mLog = new Legacy_ModuleInstallLog();
}
/**
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractFilterForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractFilterForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractFilterForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -71,7 +71,7 @@
**/
public function __construct()
{
- $this->_mCriteria =& new CriteriaCompo();
+ $this->_mCriteria = new CriteriaCompo();
}
/**
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractListAction.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractListAction.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AbstractListAction.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -69,7 +69,7 @@
**/
protected function &_getPageNavi()
{
- $navi =& new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
+ $navi = new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
return $navi;
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AssetManager.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AssetManager.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/AssetManager.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -174,11 +174,11 @@
if($type == 'handler')
{
$root =& XCube_Root::getSingleton();
- $instance =& new $className($root->mController->getDB(),$this->mDirname);
+ $instance = new $className($root->mController->getDB(),$this->mDirname);
}
else
{
- $instance =& new $className();
+ $instance = new $className();
}
return $instance;
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/Module.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/Module.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/class/Module.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -360,7 +360,7 @@
. ucfirst($this->mActionName) . 'Action';
if(class_exists($className))
{
- $this->mAction =& new $className();
+ $this->mAction = new $className();
}
if(!$this->mAction instanceof Bizpoll_AbstractAction)
{
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceDeleteForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceDeleteForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceDeleteForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -42,12 +42,12 @@
//
// Set form properties
//
- $this->mFormProperties['choice_id'] =& new XCube_IntProperty('choice_id');
+ $this->mFormProperties['choice_id'] = new XCube_IntProperty('choice_id');
//
// Set field properties
//
- $this->mFieldProperties['choice_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['choice_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['choice_id']->setDependsByArray(array('required'));
$this->mFieldProperties['choice_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_CHOICE_ID);
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceEditForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceEditForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/ChoiceEditForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -42,31 +42,31 @@
//
// Set form properties
//
- $this->mFormProperties['choice_id'] =& new XCube_IntProperty('choice_id');
- $this->mFormProperties['title'] =& new XCube_StringProperty('title');
- $this->mFormProperties['enq_id'] =& new XCube_IntProperty('enq_id');
- $this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
- $this->mFormProperties['weight'] =& new XCube_IntProperty('weight');
- $this->mFormProperties['description'] =& new XCube_TextProperty('description');
+ $this->mFormProperties['choice_id'] = new XCube_IntProperty('choice_id');
+ $this->mFormProperties['title'] = new XCube_StringProperty('title');
+ $this->mFormProperties['enq_id'] = new XCube_IntProperty('enq_id');
+ $this->mFormProperties['uid'] = new XCube_IntProperty('uid');
+ $this->mFormProperties['weight'] = new XCube_IntProperty('weight');
+ $this->mFormProperties['description'] = new XCube_TextProperty('description');
//
// Set field properties
//
- $this->mFieldProperties['choice_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['choice_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['choice_id']->setDependsByArray(array('required'));
$this->mFieldProperties['choice_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_CHOICE_ID);
- $this->mFieldProperties['title'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['title'] = new XCube_FieldProperty($this);
$this->mFieldProperties['title']->setDependsByArray(array('required','maxlength'));
$this->mFieldProperties['title']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_TITLE, '255');
$this->mFieldProperties['title']->addMessage('maxlength', _MD_BIZPOLL_ERROR_MAXLENGTH, _MD_BIZPOLL_LANG_TITLE, '255');
$this->mFieldProperties['title']->addVar('maxlength', '255');
- $this->mFieldProperties['enq_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['enq_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['enq_id']->setDependsByArray(array('required'));
$this->mFieldProperties['enq_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_ENQ_ID);
- $this->mFieldProperties['weight'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['weight'] = new XCube_FieldProperty($this);
$this->mFieldProperties['weight']->setDependsByArray(array('required'));
$this->mFieldProperties['weight']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_WEIGHT);
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqDeleteForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqDeleteForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqDeleteForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -42,12 +42,12 @@
//
// Set form properties
//
- $this->mFormProperties['enq_id'] =& new XCube_IntProperty('enq_id');
+ $this->mFormProperties['enq_id'] = new XCube_IntProperty('enq_id');
//
// Set field properties
//
- $this->mFieldProperties['enq_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['enq_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['enq_id']->setDependsByArray(array('required'));
$this->mFieldProperties['enq_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_ENQ_ID);
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqEditForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqEditForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/EnqEditForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -42,40 +42,40 @@
//
// Set form properties
//
- $this->mFormProperties['enq_id'] =& new XCube_IntProperty('enq_id');
- $this->mFormProperties['title'] =& new XCube_StringProperty('title');
- $this->mFormProperties['cat_id'] =& new XCube_IntProperty('cat_id');
- $this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
- $this->mFormProperties['type'] =& new XCube_IntProperty('type');
- $this->mFormProperties['pub_unixtime'] =& new XCube_IntProperty('pub_unixtime');
- $this->mFormProperties['pub_date'] =& new XCube_StringProperty('pub_date');
- $this->mFormProperties['pub_Hour'] =& new XCube_StringProperty('pub_Hour');
- $this->mFormProperties['pub_Minute'] =& new XCube_StringProperty('pub_Minute');
- $this->mFormProperties['end_unixtime'] =& new XCube_IntProperty('end_unixtime');
- $this->mFormProperties['end_date'] =& new XCube_TextProperty('end_date');
- $this->mFormProperties['end_Hour'] =& new XCube_StringProperty('end_Hour');
- $this->mFormProperties['end_Minute'] =& new XCube_StringProperty('end_Minute');
- $this->mFormProperties['choices'] =& new XCube_TextProperty('choices');
- $this->mFormProperties['description'] =& new XCube_TextProperty('description');
- $this->mFormProperties['option'] =& new XCube_TextProperty('option');
- $this->mFormProperties['reg_unixtime'] =& new XCube_IntProperty('reg_unixtime');
- $this->mFormProperties['opt_show_result'] =& new XCube_IntProperty('opt_show_result');
- $this->mFormProperties['opt_add_choice'] =& new XCube_IntProperty('opt_add_choice');
+ $this->mFormProperties['enq_id'] = new XCube_IntProperty('enq_id');
+ $this->mFormProperties['title'] = new XCube_StringProperty('title');
+ $this->mFormProperties['cat_id'] = new XCube_IntProperty('cat_id');
+ $this->mFormProperties['uid'] = new XCube_IntProperty('uid');
+ $this->mFormProperties['type'] = new XCube_IntProperty('type');
+ $this->mFormProperties['pub_unixtime'] = new XCube_IntProperty('pub_unixtime');
+ $this->mFormProperties['pub_date'] = new XCube_StringProperty('pub_date');
+ $this->mFormProperties['pub_Hour'] = new XCube_StringProperty('pub_Hour');
+ $this->mFormProperties['pub_Minute'] = new XCube_StringProperty('pub_Minute');
+ $this->mFormProperties['end_unixtime'] = new XCube_IntProperty('end_unixtime');
+ $this->mFormProperties['end_date'] = new XCube_TextProperty('end_date');
+ $this->mFormProperties['end_Hour'] = new XCube_StringProperty('end_Hour');
+ $this->mFormProperties['end_Minute'] = new XCube_StringProperty('end_Minute');
+ $this->mFormProperties['choices'] = new XCube_TextProperty('choices');
+ $this->mFormProperties['description'] = new XCube_TextProperty('description');
+ $this->mFormProperties['option'] = new XCube_TextProperty('option');
+ $this->mFormProperties['reg_unixtime'] = new XCube_IntProperty('reg_unixtime');
+ $this->mFormProperties['opt_show_result'] = new XCube_IntProperty('opt_show_result');
+ $this->mFormProperties['opt_add_choice'] = new XCube_IntProperty('opt_add_choice');
//
// Set field properties
//
- $this->mFieldProperties['enq_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['enq_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['enq_id']->setDependsByArray(array('required'));
$this->mFieldProperties['enq_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_ENQ_ID);
- $this->mFieldProperties['title'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['title'] = new XCube_FieldProperty($this);
$this->mFieldProperties['title']->setDependsByArray(array('required','maxlength'));
$this->mFieldProperties['title']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_TITLE, '255');
$this->mFieldProperties['title']->addMessage('maxlength', _MD_BIZPOLL_ERROR_MAXLENGTH, _MD_BIZPOLL_LANG_TITLE, '255');
$this->mFieldProperties['title']->addVar('maxlength', '255');
- $this->mFieldProperties['type'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['type'] = new XCube_FieldProperty($this);
$this->mFieldProperties['type']->setDependsByArray(array('required'));
$this->mFieldProperties['type']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_TYPE);
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollDeleteForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollDeleteForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollDeleteForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -42,12 +42,12 @@
//
// Set form properties
//
- $this->mFormProperties['poll_id'] =& new XCube_IntProperty('poll_id');
+ $this->mFormProperties['poll_id'] = new XCube_IntProperty('poll_id');
//
// Set field properties
//
- $this->mFieldProperties['poll_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['poll_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['poll_id']->setDependsByArray(array('required'));
$this->mFieldProperties['poll_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_POLL_ID);
}
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollEditForm.class.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollEditForm.class.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/forms/PollEditForm.class.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -43,33 +43,33 @@
//
// Set form properties
//
- $this->mFormProperties['poll_id'] =& new XCube_IntProperty('poll_id');
- $this->mFormProperties['enq_id'] =& new XCube_IntProperty('enq_id');
- $this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
- $this->mFormProperties['name'] =& new XCube_StringProperty('name');
- $this->mFormProperties['choice_id'] =& new XCube_TextProperty('choice_id');
- $this->mFormProperties['ip'] =& new XCube_StringProperty('ip');
- $this->mFormProperties['comment'] =& new XCube_TextProperty('comment');
- $this->mFormProperties['reg_unixtime'] =& new XCube_IntProperty('reg_unixtime');
+ $this->mFormProperties['poll_id'] = new XCube_IntProperty('poll_id');
+ $this->mFormProperties['enq_id'] = new XCube_IntProperty('enq_id');
+ $this->mFormProperties['uid'] = new XCube_IntProperty('uid');
+ $this->mFormProperties['name'] = new XCube_StringProperty('name');
+ $this->mFormProperties['choice_id'] = new XCube_TextProperty('choice_id');
+ $this->mFormProperties['ip'] = new XCube_StringProperty('ip');
+ $this->mFormProperties['comment'] = new XCube_TextProperty('comment');
+ $this->mFormProperties['reg_unixtime'] = new XCube_IntProperty('reg_unixtime');
//
// Set field properties
//
- $this->mFieldProperties['poll_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['poll_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['poll_id']->setDependsByArray(array('required'));
$this->mFieldProperties['poll_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_POLL_ID);
- $this->mFieldProperties['enq_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['enq_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['enq_id']->setDependsByArray(array('required'));
$this->mFieldProperties['enq_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_ENQ_ID);
if(! $root->mContext->mXoopsUser){
- $this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['name'] = new XCube_FieldProperty($this);
$this->mFieldProperties['name']->setDependsByArray(array('required'));
$this->mFieldProperties['name']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_NAME);
}
- $this->mFieldProperties['choice_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['choice_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['choice_id']->setDependsByArray(array('required'));
$this->mFieldProperties['choice_id']->addMessage('required', _MD_BIZPOLL_ERROR_REQUIRED, _MD_BIZPOLL_LANG_CHOICE_ID);
Modified: modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/xoops_version.php
===================================================================
--- modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/xoops_version.php 2011-04-26 14:27:13 UTC (rev 531)
+++ modules_bizpoll/trunk/xoops_trust_path/modules/bizpoll/xoops_version.php 2011-04-26 14:50:25 UTC (rev 532)
@@ -21,7 +21,7 @@
// Define a basic manifesto.
//
$modversion['name'] = _MI_BIZPOLL_LANG_BIZPOLL;
-$modversion['version'] = 0.23;
+$modversion['version'] = 0.24;
$modversion['description'] = _MI_BIZPOLL_DESC_BIZPOLL;
$modversion['author'] = _MI_BIZPOLL_LANG_AUTHOR;
$modversion['credits'] = _MI_BIZPOLL_LANG_CREDITS;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
