Menu
▾
▴
[xc-tokai-svnlog] SF.net SVN: xc-tokai:[527] modules_xcat/trunk
|
From: <ki...@us...> - 2011-02-22 15:23:35
|
Revision: 527
http://xc-tokai.svn.sourceforge.net/xc-tokai/?rev=527&view=rev
Author: kilica
Date: 2011-02-22 15:23:28 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
xcl2.2 readiness
Modified Paths:
--------------
modules_xcat/trunk/README.txt
modules_xcat/trunk/actions/CatDeleteAction.class.php
modules_xcat/trunk/actions/CatEditAction.class.php
modules_xcat/trunk/actions/GrDeleteAction.class.php
modules_xcat/trunk/actions/GrEditAction.class.php
modules_xcat/trunk/actions/GrListAction.class.php
modules_xcat/trunk/actions/ModDeleteAction.class.php
modules_xcat/trunk/actions/ModEditAction.class.php
modules_xcat/trunk/actions/ModListAction.class.php
modules_xcat/trunk/actions/PermitDeleteAction.class.php
modules_xcat/trunk/actions/PermitEditAction.class.php
modules_xcat/trunk/class/AbstractFilterForm.class.php
modules_xcat/trunk/class/AbstractListAction.class.php
modules_xcat/trunk/class/AssetManager.class.php
modules_xcat/trunk/class/Module.class.php
modules_xcat/trunk/forms/CatDeleteForm.class.php
modules_xcat/trunk/forms/CatEditForm.class.php
modules_xcat/trunk/forms/GrDeleteForm.class.php
modules_xcat/trunk/forms/GrEditForm.class.php
modules_xcat/trunk/forms/ModDeleteForm.class.php
modules_xcat/trunk/forms/ModEditForm.class.php
modules_xcat/trunk/forms/PermitDeleteForm.class.php
modules_xcat/trunk/forms/PermitEditForm.class.php
modules_xcat/trunk/preload/AssetPreload.class.php
modules_xcat/trunk/preload/CatPreload.class.php
modules_xcat/trunk/templates/xcat_cat_list.html
modules_xcat/trunk/templates/xcat_cat_view.html
modules_xcat/trunk/templates/xcat_gr_view.html
modules_xcat/trunk/xoops_version.php
Added Paths:
-----------
modules_xcat/trunk/templates/xcat_inc_tree.html
Removed Paths:
-------------
modules_xcat/trunk/.xml/
modules_xcat/trunk/admin/.xml/
Modified: modules_xcat/trunk/README.txt
===================================================================
--- modules_xcat/trunk/README.txt 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/README.txt 2011-02-22 15:23:28 UTC (rev 527)
@@ -26,6 +26,9 @@
\x8DX\x90V\x97\x9A\x97\xF0
--------
+0.44(2011.02.22)
+\x81Excl2.2\x8C\xFC\x82\xAF\x82ɏC\x90\xB3\x81ismarty plugin legacy_tree \x82\xF0\x8Eg\x97p\x81j
+
0.43(2008.09.19)
\x81Eservice \x82\xCC getCatPath \x82\xF0\x8F\xB8\x8F\x87\x8Ew\x92\xE8(order="ASC")\x82Ŏ擾\x82\xB5\x82\xBD\x8Fꍇ\x81A\x94z\x97\xF1\x82̕\xC0\x82я\x87\x82\xAA\x95s\x90\xB3\x82\xBE\x82\xC1\x82\xBD\x82̂\xF0\x8FC\x90\xB3
Modified: modules_xcat/trunk/actions/CatDeleteAction.class.php
===================================================================
--- modules_xcat/trunk/actions/CatDeleteAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/CatDeleteAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -33,7 +33,7 @@
*/
function &_setupActionForm()
{
- // $this->mActionForm =& new Xcat_CatDeleteForm();
+ // $this->mActionForm = new Xcat_CatDeleteForm();
$this->mActionForm =& $this->mAsset->create('form', "delete_cat");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/actions/CatEditAction.class.php
===================================================================
--- modules_xcat/trunk/actions/CatEditAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/CatEditAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -45,7 +45,7 @@
*/
function _setupActionForm()
{
- // $this->mActionForm =& new Xcat_CatEditForm();
+ // $this->mActionForm = new Xcat_CatEditForm();
$this->mActionForm =& $this->mAsset->create('form', "edit_cat");
$this->mActionForm->prepare();
}
@@ -61,9 +61,6 @@
//add new record
if ($this->mObject->isNew()) {
- if($this->mRoot->mContext->mXoopsUser){
- $this->mObject->set('uid', $this->mRoot->mContext->mXoopsUser->get('uid'));
- }
//set parent category if requested
if(xoops_getrequest('p_id')){
$this->mObject->set('p_id', xoops_getrequest('p_id'));
@@ -76,8 +73,8 @@
}
//set default values
- $this->mObject->set('count1', 0);
- $this->mObject->set('count2', 0);
+ //$this->mObject->set('count1', 0);
+ //$this->mObject->set('count2', 0);
}
else{ //load permission data if not new category
$this->mObject->loadPermit();
Modified: modules_xcat/trunk/actions/GrDeleteAction.class.php
===================================================================
--- modules_xcat/trunk/actions/GrDeleteAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/GrDeleteAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -41,7 +41,7 @@
*/
function &_setupActionForm()
{
- // $this->mActionForm =& new Xcat_GrDeleteForm();
+ // $this->mActionForm = new Xcat_GrDeleteForm();
$this->mActionForm =& $this->mAsset->create('form', "delete_gr");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/actions/GrEditAction.class.php
===================================================================
--- modules_xcat/trunk/actions/GrEditAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/GrEditAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -69,7 +69,7 @@
*/
function _setupActionForm()
{
- // $this->mActionForm =& new Xcat_GrEditForm();
+ // $this->mActionForm = new Xcat_GrEditForm();
$this->mActionForm =& $this->mAsset->create('form', "edit_gr");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/actions/GrListAction.class.php
===================================================================
--- modules_xcat/trunk/actions/GrListAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/GrListAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -33,7 +33,7 @@
*/
function &_getFilterForm()
{
- // $filter =& new Xcat_GrFilterForm();
+ // $filter = new Xcat_GrFilterForm();
$filter =& $this->mAsset->create('filter', "gr");
$filter->prepare($this->_getPageNavi(), $this->_getHandler());
return $filter;
Modified: modules_xcat/trunk/actions/ModDeleteAction.class.php
===================================================================
--- modules_xcat/trunk/actions/ModDeleteAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/ModDeleteAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -41,7 +41,7 @@
*/
function &_setupActionForm()
{
- // $this->mActionForm =& new Xcat_ModDeleteForm();
+ // $this->mActionForm = new Xcat_ModDeleteForm();
$this->mActionForm =& $this->mAsset->create('form', "delete_mod");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/actions/ModEditAction.class.php
===================================================================
--- modules_xcat/trunk/actions/ModEditAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/ModEditAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -41,7 +41,7 @@
*/
function _setupActionForm()
{
- // $this->mActionForm =& new Xcat_ModEditForm();
+ // $this->mActionForm = new Xcat_ModEditForm();
$this->mActionForm =& $this->mAsset->create('form', "edit_mod");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/actions/ModListAction.class.php
===================================================================
--- modules_xcat/trunk/actions/ModListAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/ModListAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -25,7 +25,7 @@
*/
function &_getFilterForm()
{
- // $filter =& new Xcat_ModFilterForm();
+ // $filter = new Xcat_ModFilterForm();
$filter =& $this->mAsset->create('filter', "mod");
$filter->prepare($this->_getPageNavi(), $this->_getHandler());
return $filter;
Modified: modules_xcat/trunk/actions/PermitDeleteAction.class.php
===================================================================
--- modules_xcat/trunk/actions/PermitDeleteAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/PermitDeleteAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -33,7 +33,7 @@
*/
function _setupActionForm()
{
- // $this->mActionForm =& new Xcat_PermitDeleteForm();
+ // $this->mActionForm = new Xcat_PermitDeleteForm();
$this->mActionForm =& $this->mAsset->create('form', "delete_permit");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/actions/PermitEditAction.class.php
===================================================================
--- modules_xcat/trunk/actions/PermitEditAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/actions/PermitEditAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -46,7 +46,7 @@
*/
function _setupActionForm()
{
- // $this->mActionForm =& new Xcat_PermitEditForm();
+ // $this->mActionForm = new Xcat_PermitEditForm();
$this->mActionForm =& $this->mAsset->create('form', "edit_permit");
$this->mActionForm->prepare();
}
Modified: modules_xcat/trunk/class/AbstractFilterForm.class.php
===================================================================
--- modules_xcat/trunk/class/AbstractFilterForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/class/AbstractFilterForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -35,7 +35,7 @@
*/
function Xcat_AbstractFilterForm()
{
- $this->_mCriteria =& new CriteriaCompo();
+ $this->_mCriteria = new CriteriaCompo();
}
Modified: modules_xcat/trunk/class/AbstractListAction.class.php
===================================================================
--- modules_xcat/trunk/class/AbstractListAction.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/class/AbstractListAction.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -40,7 +40,7 @@
*/
function &_getPageNavi()
{
- $navi =& new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
+ $navi = new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
return $navi;
}
Modified: modules_xcat/trunk/class/AssetManager.class.php
===================================================================
--- modules_xcat/trunk/class/AssetManager.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/class/AssetManager.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -166,7 +166,7 @@
$instance = null;
if (class_exists($className)) {
- $instance =& new $className();
+ $instance = new $className();
return $instance;
}
@@ -177,7 +177,7 @@
require_once $filePath;
if (class_exists($className)) {
- $instance =& new $className();
+ $instance = new $className();
}
return $instance;
Modified: modules_xcat/trunk/class/Module.class.php
===================================================================
--- modules_xcat/trunk/class/Module.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/class/Module.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -99,7 +99,7 @@
require_once $fileName;
if (class_exists($className)) {
- $this->mAction =& new $className();
+ $this->mAction = new $className();
}
if (!is_object($this->mAction)) {
Modified: modules_xcat/trunk/forms/CatDeleteForm.class.php
===================================================================
--- modules_xcat/trunk/forms/CatDeleteForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/CatDeleteForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,12 +28,12 @@
//
// Set form properties
//
- $this->mFormProperties['cat_id'] =& new XCube_IntProperty('cat_id');
+ $this->mFormProperties['cat_id'] = new XCube_IntProperty('cat_id');
//
// Set field properties
//
- $this->mFieldProperties['cat_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['cat_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['cat_id']->setDependsByArray(array('required'));
$this->mFieldProperties['cat_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_CAT_ID);
}
Modified: modules_xcat/trunk/forms/CatEditForm.class.php
===================================================================
--- modules_xcat/trunk/forms/CatEditForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/CatEditForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,40 +28,40 @@
//
// Set form properties
//
- $this->mFormProperties['cat_id'] =& new XCube_IntProperty('cat_id');
- $this->mFormProperties['cat_title'] =& new XCube_StringProperty('cat_title');
- $this->mFormProperties['gr_id'] =& new XCube_IntProperty('gr_id');
- $this->mFormProperties['p_id'] =& new XCube_IntProperty('p_id');
- $this->mFormProperties['cat_desc'] =& new XCube_TextProperty('cat_desc');
- $this->mFormProperties['modules'] =& new XCube_TextProperty('modules');
- $this->mFormProperties['imageurl'] =& new XCube_TextProperty('imageurl');
- $this->mFormProperties['weight'] =& new XCube_IntProperty('weight');
- $this->mFormProperties['options'] =& new XCube_TextProperty('options');
+ $this->mFormProperties['cat_id'] = new XCube_IntProperty('cat_id');
+ $this->mFormProperties['cat_title'] = new XCube_StringProperty('cat_title');
+ $this->mFormProperties['gr_id'] = new XCube_IntProperty('gr_id');
+ $this->mFormProperties['p_id'] = new XCube_IntProperty('p_id');
+ $this->mFormProperties['cat_desc'] = new XCube_TextProperty('cat_desc');
+ $this->mFormProperties['modules'] = new XCube_TextProperty('modules');
+ $this->mFormProperties['imageurl'] = new XCube_TextProperty('imageurl');
+ $this->mFormProperties['weight'] = new XCube_IntProperty('weight');
+ $this->mFormProperties['options'] = new XCube_TextProperty('options');
//
// Set field properties
//
- $this->mFieldProperties['cat_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['cat_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['cat_id']->setDependsByArray(array('required'));
$this->mFieldProperties['cat_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_CAT_ID);
- $this->mFieldProperties['cat_title'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['cat_title'] = new XCube_FieldProperty($this);
$this->mFieldProperties['cat_title']->setDependsByArray(array('required','maxlength'));
$this->mFieldProperties['cat_title']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_CAT_TITLE, '255');
$this->mFieldProperties['cat_title']->addMessage('maxlength', _MD_XCAT_ERROR_MAXLENGTH, _MD_XCAT_LANG_CAT_TITLE, '255');
$this->mFieldProperties['cat_title']->addVar('maxlength', '255');
- $this->mFieldProperties['gr_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['gr_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['gr_id']->setDependsByArray(array('required'));
$this->mFieldProperties['gr_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_GR_ID);
- $this->mFieldProperties['p_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['p_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['p_id']->setDependsByArray(array('required'));
$this->mFieldProperties['p_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_P_ID);
- $this->mFieldProperties['cat_desc'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['cat_desc'] = new XCube_FieldProperty($this);
- $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_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_WEIGHT);
Modified: modules_xcat/trunk/forms/GrDeleteForm.class.php
===================================================================
--- modules_xcat/trunk/forms/GrDeleteForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/GrDeleteForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,12 +28,12 @@
//
// Set form properties
//
- $this->mFormProperties['gr_id'] =& new XCube_IntProperty('gr_id');
+ $this->mFormProperties['gr_id'] = new XCube_IntProperty('gr_id');
//
// Set field properties
//
- $this->mFieldProperties['gr_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['gr_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['gr_id']->setDependsByArray(array('required'));
$this->mFieldProperties['gr_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_GR_ID);
}
Modified: modules_xcat/trunk/forms/GrEditForm.class.php
===================================================================
--- modules_xcat/trunk/forms/GrEditForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/GrEditForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,25 +28,25 @@
//
// Set form properties
//
- $this->mFormProperties['gr_id'] =& new XCube_IntProperty('gr_id');
- $this->mFormProperties['gr_title'] =& new XCube_StringProperty('gr_title');
- $this->mFormProperties['level'] =& new XCube_IntProperty('level');
- $this->mFormProperties['actions'] =& new XCube_TextProperty('actions');
+ $this->mFormProperties['gr_id'] = new XCube_IntProperty('gr_id');
+ $this->mFormProperties['gr_title'] = new XCube_StringProperty('gr_title');
+ $this->mFormProperties['level'] = new XCube_IntProperty('level');
+ $this->mFormProperties['actions'] = new XCube_TextProperty('actions');
//
// Set field properties
//
- $this->mFieldProperties['gr_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['gr_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['gr_id']->setDependsByArray(array('required'));
$this->mFieldProperties['gr_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_GR_ID);
- $this->mFieldProperties['gr_title'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['gr_title'] = new XCube_FieldProperty($this);
$this->mFieldProperties['gr_title']->setDependsByArray(array('required','maxlength'));
$this->mFieldProperties['gr_title']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_GR_TITLE, '255');
$this->mFieldProperties['gr_title']->addMessage('maxlength', _MD_XCAT_ERROR_MAXLENGTH, _MD_XCAT_LANG_GR_TITLE, '255');
$this->mFieldProperties['gr_title']->addVar('maxlength', '255');
- $this->mFieldProperties['level'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['level'] = new XCube_FieldProperty($this);
$this->mFieldProperties['level']->setDependsByArray(array('required'));
$this->mFieldProperties['level']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_LEVEL);
Modified: modules_xcat/trunk/forms/ModDeleteForm.class.php
===================================================================
--- modules_xcat/trunk/forms/ModDeleteForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/ModDeleteForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,12 +28,12 @@
//
// Set form properties
//
- $this->mFormProperties['mod_id'] =& new XCube_IntProperty('mod_id');
+ $this->mFormProperties['mod_id'] = new XCube_IntProperty('mod_id');
//
// Set field properties
//
- $this->mFieldProperties['mod_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['mod_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['mod_id']->setDependsByArray(array('required'));
$this->mFieldProperties['mod_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_MOD_ID);
}
Modified: modules_xcat/trunk/forms/ModEditForm.class.php
===================================================================
--- modules_xcat/trunk/forms/ModEditForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/ModEditForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,29 +28,29 @@
//
// Set form properties
//
- $this->mFormProperties['mod_id'] =& new XCube_IntProperty('mod_id');
- $this->mFormProperties['gr_id'] =& new XCube_IntProperty('gr_id');
- $this->mFormProperties['mid'] =& new XCube_IntProperty('mid');
- $this->mFormProperties['dir_name'] =& new XCube_StringProperty('dir_name');
- $this->mFormProperties['weight'] =& new XCube_IntProperty('weight');
- $this->mFormProperties['option'] =& new XCube_TextProperty('option');
+ $this->mFormProperties['mod_id'] = new XCube_IntProperty('mod_id');
+ $this->mFormProperties['gr_id'] = new XCube_IntProperty('gr_id');
+ $this->mFormProperties['mid'] = new XCube_IntProperty('mid');
+ $this->mFormProperties['dir_name'] = new XCube_StringProperty('dir_name');
+ $this->mFormProperties['weight'] = new XCube_IntProperty('weight');
+ $this->mFormProperties['option'] = new XCube_TextProperty('option');
//
// Set field properties
//
- $this->mFieldProperties['mod_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['mod_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['mod_id']->setDependsByArray(array('required'));
$this->mFieldProperties['mod_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_MOD_ID);
- $this->mFieldProperties['gr_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['gr_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['gr_id']->setDependsByArray(array('required'));
$this->mFieldProperties['gr_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_GR_ID);
- $this->mFieldProperties['mid'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['mid'] = new XCube_FieldProperty($this);
$this->mFieldProperties['mid']->setDependsByArray(array('required'));
$this->mFieldProperties['mid']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_MID);
- $this->mFieldProperties['dir_name'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['dir_name'] = new XCube_FieldProperty($this);
$this->mFieldProperties['dir_name']->setDependsByArray(array('required','maxlength'));
$this->mFieldProperties['dir_name']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_DIR_NAME, '25');
$this->mFieldProperties['dir_name']->addMessage('maxlength', _MD_XCAT_ERROR_MAXLENGTH, _MD_XCAT_LANG_DIR_NAME, '25');
Modified: modules_xcat/trunk/forms/PermitDeleteForm.class.php
===================================================================
--- modules_xcat/trunk/forms/PermitDeleteForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/PermitDeleteForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,12 +28,12 @@
//
// Set form properties
//
- //$this->mFormProperties['cat_id'] =& new XCube_IntProperty('cat_id');
+ //$this->mFormProperties['cat_id'] = new XCube_IntProperty('cat_id');
//
// Set field properties
//
- //$this->mFieldProperties['cat_id'] =& new XCube_FieldProperty($this);
+ //$this->mFieldProperties['cat_id'] = new XCube_FieldProperty($this);
//$this->mFieldProperties['cat_id']->setDependsByArray(array('required'));
//$this->mFieldProperties['cat_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_CAT_ID);
}
Modified: modules_xcat/trunk/forms/PermitEditForm.class.php
===================================================================
--- modules_xcat/trunk/forms/PermitEditForm.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/forms/PermitEditForm.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -28,26 +28,26 @@
//
// Set form properties
//
- $this->mFormProperties['permit_id'] =& new XCube_IntProperty('permit_id');
- $this->mFormProperties['cat_id'] =& new XCube_IntProperty('cat_id');
- $this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
- $this->mFormProperties['groupid'] =& new XCube_IntProperty('groupid');
- $this->mFormProperties['permissions'] =& new XCube_TextProperty('permissions');
+ $this->mFormProperties['permit_id'] = new XCube_IntProperty('permit_id');
+ $this->mFormProperties['cat_id'] = new XCube_IntProperty('cat_id');
+ $this->mFormProperties['uid'] = new XCube_IntProperty('uid');
+ $this->mFormProperties['groupid'] = new XCube_IntProperty('groupid');
+ $this->mFormProperties['permissions'] = new XCube_TextProperty('permissions');
//
// Set field properties
//
- $this->mFieldProperties['permit_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['permit_id'] = new XCube_FieldProperty($this);
$this->mFieldProperties['permit_id']->setDependsByArray(array('required'));
$this->mFieldProperties['permit_id']->addMessage('required', _MD_XCAT_ERROR_REQUIRED, _MD_XCAT_LANG_PERMIT_ID);
- $this->mFieldProperties['cat_id'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['cat_id'] = new XCube_FieldProperty($this);
- $this->mFieldProperties['uid'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['uid'] = new XCube_FieldProperty($this);
- $this->mFieldProperties['groupid'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['groupid'] = new XCube_FieldProperty($this);
- $this->mFieldProperties['permissions'] =& new XCube_FieldProperty($this);
+ $this->mFieldProperties['permissions'] = new XCube_FieldProperty($this);
}
/**
Modified: modules_xcat/trunk/preload/AssetPreload.class.php
===================================================================
--- modules_xcat/trunk/preload/AssetPreload.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/preload/AssetPreload.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -15,7 +15,7 @@
function preBlockFilter()
{
if (!$this->mRoot->mContext->hasAttribute('module.xcat.HasSetAssetManager')) {
- $delegate =& new XCube_Delegate();
+ $delegate = new XCube_Delegate();
$delegate->register('Module.xcat.Event.GetAssetManager');
$delegate->add(array(&$this, 'getManager'));
$this->mRoot->mContext->setAttribute('module.xcat.HasSetAssetManager', true);
Modified: modules_xcat/trunk/preload/CatPreload.class.php
===================================================================
--- modules_xcat/trunk/preload/CatPreload.class.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/preload/CatPreload.class.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -1,74 +1,74 @@
-<?php
-/**
- * @file
- * @package xcat
- * @version $Id$
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/xcat/class/TreeObject.class.php";
-require_once XOOPS_MODULE_PATH . "/xcat/class/GrList.class.php";
-
-class Xcat_CatPreload extends XCube_ActionFilter
-{
- /**
- * @public
- */
- function preBlockFilter()
- {
- $root =& XCube_Root::getSingleton();
-
- require_once XOOPS_MODULE_PATH . "/xcat/service/XcatService.class.php";
- $service =& new Xcat_CatService();
- $service->prepare();
-
- $this->mRoot->mServiceManager->addService('Xcat_CatService', $service);
-
- $root->mDelegateManager->add("Module.xcat.Event.GetCatManager", "Xcat_CatPreload::getCatManager");
- $root->mDelegateManager->add("Module.xcat.Event.GetCatTree", "Xcat_CatPreload::getCatTree");
- $root->mDelegateManager->add("Module.xcat.Event.GetGrList", "Xcat_CatPreload::getGrList");
- }
-
- /**
- * @private
- * get single category's object
- */
- function getCatManager(&$obj, $catId=0)
- {
- $cat = null;
- $handler =& xoops_getmodulehandler('cat', 'xcat');
-
- if($catId>0){
- $cat =& $handler->get($catId);
- $obj = $cat;
- }
- }
-
- /**
- * @private
- * get category tree object
- */
- function getCatTree(&$obj, $grId)
- {
- //TreeObject
- $catTree = new Xcat_TreeObject($grId);
- $catTree->loadTree();
-
- $obj = $catTree;
- }
-
-
- /**
- * @private
- * Get Gr list for category group selection
- */
- function getGrList(&$obj)
- {
- $gr = null;
-
- $obj = $gr;
- }
-}
-
-?>
+<?php
+/**
+ * @file
+ * @package xcat
+ * @version $Id$
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/xcat/class/TreeObject.class.php";
+require_once XOOPS_MODULE_PATH . "/xcat/class/GrList.class.php";
+
+class Xcat_CatPreload extends XCube_ActionFilter
+{
+ /**
+ * @public
+ */
+ function preBlockFilter()
+ {
+ $root =& XCube_Root::getSingleton();
+
+ require_once XOOPS_MODULE_PATH . "/xcat/service/XcatService.class.php";
+ $service = new Xcat_CatService();
+ $service->prepare();
+
+ $this->mRoot->mServiceManager->addService('Xcat_CatService', $service);
+
+ $root->mDelegateManager->add("Module.xcat.Event.GetCatManager", "Xcat_CatPreload::getCatManager");
+ $root->mDelegateManager->add("Module.xcat.Event.GetCatTree", "Xcat_CatPreload::getCatTree");
+ $root->mDelegateManager->add("Module.xcat.Event.GetGrList", "Xcat_CatPreload::getGrList");
+ }
+
+ /**
+ * @private
+ * get single category's object
+ */
+ function getCatManager(&$obj, $catId=0)
+ {
+ $cat = null;
+ $handler =& xoops_getmodulehandler('cat', 'xcat');
+
+ if($catId>0){
+ $cat =& $handler->get($catId);
+ $obj = $cat;
+ }
+ }
+
+ /**
+ * @private
+ * get category tree object
+ */
+ function getCatTree(&$obj, $grId)
+ {
+ //TreeObject
+ $catTree = new Xcat_TreeObject($grId);
+ $catTree->loadTree();
+
+ $obj = $catTree;
+ }
+
+
+ /**
+ * @private
+ * Get Gr list for category group selection
+ */
+ function getGrList(&$obj)
+ {
+ $gr = null;
+
+ $obj = $gr;
+ }
+}
+
+?>
Modified: modules_xcat/trunk/templates/xcat_cat_list.html
===================================================================
--- modules_xcat/trunk/templates/xcat_cat_list.html 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/templates/xcat_cat_list.html 2011-02-22 15:23:28 UTC (rev 527)
@@ -7,7 +7,7 @@
<div class="xcat_group">
<h2><{$smarty.const._MD_XCAT_LANG_GR}> : <{$obj->mGr->getShow('gr_title')}></h2>
[<a href="./index.php?action=GrView&gr_id=<{$obj->mGr->getShow('gr_id')}>"><{$smarty.const._VIEW}></a>] [<a href="./index.php?action=CatEdit&gr_id=<{$obj->mGr->getShow('gr_id')}>"><{$smarty.const._MD_XCAT_LANG_ADD_A_NEW_CAT}></a>]
- <{xcat_tree tree=$obj->mTree control=true}>
+ <{legacy_tree tree=$obj->mTree dirname=xcat control=true template=xcat_inc_tree.html}>
</div>
<{/foreach}>
</div>
Modified: modules_xcat/trunk/templates/xcat_cat_view.html
===================================================================
--- modules_xcat/trunk/templates/xcat_cat_view.html 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/templates/xcat_cat_view.html 2011-02-22 15:23:28 UTC (rev 527)
@@ -24,7 +24,7 @@
</div>
<div class="catTree">
<h2><{$smarty.const._MD_XCAT_LANG_CAT}></h2>
- <{xcat_tree tree=$childrenTree url="./index.php?action=CatView&cat_id="}>
+ <{legacy_tree tree=$childrenTree template=xcat_inc_tree.html dirname=xcat}>
</div>
<hr style="clear:both;" />
<div>
Modified: modules_xcat/trunk/templates/xcat_gr_view.html
===================================================================
--- modules_xcat/trunk/templates/xcat_gr_view.html 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/templates/xcat_gr_view.html 2011-02-22 15:23:28 UTC (rev 527)
@@ -19,6 +19,6 @@
<div class="catTree">
<h2><{$smarty.const._MD_XCAT_LANG_CAT}></h2>
- <{xcat_tree tree=$childrenTree url="./index.php?action=CatView&cat_id="}>
+ <{legacy_tree tree=$childrenTree template=xcat_inc_tree.html dirname=xcat}>
</div>
</div>
Added: modules_xcat/trunk/templates/xcat_inc_tree.html
===================================================================
--- modules_xcat/trunk/templates/xcat_inc_tree.html (rev 0)
+++ modules_xcat/trunk/templates/xcat_inc_tree.html 2011-02-22 15:23:28 UTC (rev 527)
@@ -0,0 +1,25 @@
+<div class="<{$className}>">
+<{foreach item=cat from=$tree name=tree}>
+<{if $smarty.foreach.tree.first}>
+<{assign var=d value=$cat->getDepth()}>
+<{/if}>
+
+<{if $smarty.foreach.tree.first || $d < $cat->getDepth()}>
+ <ul class="catL<{$cat->getDepth()}>">
+ <li><a href="./index.php?action=CatView&cat_id=<{$cat->getShow('cat_id')}>"><{$cat->getShow('cat_title')}></a></li>
+<{elseif $d==$cat->getDepth()}>
+ <li><a href="./index.php?action=CatView&cat_id=<{$cat->getShow('cat_id')}>"><{$cat->getShow('cat_title')}></a></li>
+<{else}>
+ <{section name=i start=0 loop=$d-$cat->getDepth()}>
+ </ul>
+ <{/section}>
+ <li><a href="./index.php?action=CatView&cat_id=<{$cat->getShow('cat_id')}>"><{$cat->getShow('cat_title')}></a></li>
+<{/if}>
+<{if $smarty.foreach.tree.last}>
+ <{section name=i start=0 loop=$cat->getDepth()}>
+ </ul>
+ <{/section}>
+<{/if}>
+<{assign var=d value=$cat->getDepth()}>
+<{/foreach}>
+</div>
Modified: modules_xcat/trunk/xoops_version.php
===================================================================
--- modules_xcat/trunk/xoops_version.php 2011-02-22 14:33:03 UTC (rev 526)
+++ modules_xcat/trunk/xoops_version.php 2011-02-22 15:23:28 UTC (rev 527)
@@ -11,7 +11,7 @@
// Define a basic manifesto.
//
$modversion['name'] = _MI_XCAT_LANG_XCAT;
-$modversion['version'] = 0.43;
+$modversion['version'] = 0.44;
$modversion['description'] = _MI_XCAT_DESC_XCAT;
$modversion['author'] = "HIKAWA Kilica";
$modversion['credits'] = "";
@@ -55,6 +55,7 @@
$modversion['templates'][13]['file'] = 'xcat_mod_edit.html';
$modversion['templates'][14]['file'] = 'xcat_mod_delete.html';
$modversion['templates'][15]['file'] = 'xcat_mod_view.html';
+$modversion['templates'][16]['file'] = 'xcat_inc_tree.html';
##[/cubson:templates]
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
