- <{$config->getTitle()|escape}>
+ <{$config->getTitle()}>
<{if $config->get('conf_desc') != null}>
<{$config->getDesc()}>
<{/if}>
Index: xoops2jp/html/modules/base/admin/templates/imagecategory_list.html
diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.13 xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.13.2.1
--- xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.13 Wed Sep 20 11:55:58 2006
+++ xoops2jp/html/modules/base/admin/templates/imagecategory_list.html Sat Oct 7 15:51:23 2006
@@ -53,13 +53,18 @@
<{$obj->get('imgcat_maxwidth')|number_format}> |
<{$obj->get('imgcat_maxheight')|number_format}> |
- <{if $obj->getShow('imgcat_display') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._YES}><{/if}>
+ <{if $obj->get('imgcat_display') == 1}>
+ <{$smarty.const._YES}>
+ <{else}>
+ <{$smarty.const._NO}>
+ <{/if}>
|
<{$obj->getShow('imgcat_weight')}> |
<{$obj->getShow('imgcat_storetype')}> |
<{$obj->getImageCount()|escape}> |
 " alt="<{$smarty.const._AD_BASE_LANG_LIST}>" title="<{$smarty.const._AD_BASE_LANG_LIST}>" />
+ " alt="<{$smarty.const._AD_BASE_LANG_IMAGE_NEW}>" title="<{$smarty.const._AD_BASE_LANG_IMAGE_NEW}>" />
" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" />
" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" />
|
From minahito ＠ users.sourceforge.jp Sat Oct 7 15:51:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 15:51:32 +0900
Subject: [xoops-cvslog 4869] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061007065132.2A7BA2AC073@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/ImageCreateAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ImageCreateAction.class.php:1.1.4.1
--- /dev/null Sat Oct 7 15:51:32 2006
+++ xoops2jp/html/modules/base/admin/actions/ImageCreateAction.class.php Sat Oct 7 15:51:32 2006
@@ -0,0 +1,116 @@
+mActionForm =& new Legacy_ImageAdminCreateForm();
+ $this->mActionForm->prepare();
+ }
+
+ function getDefaultView(&$controller, &$xoopsUser)
+ {
+ $flag = parent::getDefaultView($controller, $xoopsUser);
+
+ if ($flag == LEGACY_FRAME_VIEW_INPUT && $this->_enableCatchImgcat()) {
+ $this->mActionForm->set('imgcat_id', xoops_getrequest('imgcat_id'));
+ }
+
+ return $flag;
+ }
+
+ function _enableCatchImgcat()
+ {
+ return true;
+ }
+
+ function _doExecute()
+ {
+ $handler =& xoops_getmodulehandler('imagecategory', 'base');
+ $category =& $handler->get($this->mActionForm->get('imgcat_id'));
+
+ //
+ // [TODO]
+ // Should the following procedure be after parent::_doExecute()?
+ //
+ if ($category->get('imgcat_storetype') == 'file') {
+ $this->_storeFile();
+ }
+ else {
+ $this->_storeDB();
+ }
+
+ return parent::_doExecute();
+ }
+
+ function _storeFile()
+ {
+ if ($this->mActionForm->mFormFile != null) {
+ if (!$this->mActionForm->mFormFile->saveAs(XOOPS_UPLOAD_PATH)) {
+ return false;
+ }
+ }
+
+ //
+ // If there is a old file, delete it
+ //
+ if ($this->mActionForm->mOldFilename != null) {
+ @unlink(XOOPS_UPLOAD_PATH . "/" . $this->mActionForm->mOldFilename);
+ }
+ }
+
+ function _storeDB()
+ {
+
+ }
+
+ function executeViewInput(&$controller, &$xoopsUser, &$render)
+ {
+ $this->mObject->loadImagecategory();
+
+ $render->setTemplateName("image_edit.html");
+ $render->setAttribute('actionForm', $this->mActionForm);
+ $render->setAttribute('object', $this->mObject);
+
+ $handler =& xoops_getmodulehandler('imagecategory', 'base');
+ $categoryArr =& $handler->getObjects();
+ $render->setAttribute('categoryArr', $categoryArr);
+ }
+
+ function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+ {
+ $controller->executeForward("./index.php?action=ImageList&imgcat_id=" . $this->mActionForm->get('imgcat_id'));
+ }
+
+ function executeViewError(&$controller, &$xoopsUser, &$render)
+ {
+ $controller->executeRedirect("./index.php?action=ImagecategoryList", 1, _MD_BASE_ERROR_DBUPDATE_FAILED);
+ }
+
+ function executeViewCancel(&$controller, &$xoopsUser, &$render)
+ {
+ $controller->executeForward("./index.php?action=ImagecategoryList");
+ }
+}
+
+?>
From minahito ＠ users.sourceforge.jp Sat Oct 7 15:51:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 15:51:47 +0900
Subject: [xoops-cvslog 4870] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061007065147.580C02AC073@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php:1.1.2.9.2.1
--- xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php:1.1.2.9 Thu Sep 28 10:45:42 2006
+++ xoops2jp/html/modules/base/admin/actions/ImageEditAction.class.php Sat Oct 7 15:51:47 2006
@@ -1,84 +1,37 @@
mActionForm =& new Legacy_ImageAdminEditForm();
$this->mActionForm->prepare();
}
- function getDefaultView(&$controller, &$xoopsUser)
- {
- $flag = parent::getDefaultView($controller, $xoopsUser);
-
- if ($flag == LEGACY_FRAME_VIEW_INPUT) {
- $this->mActionForm->set('imgcat_id', xoops_getrequest('imgcat_id'));
- }
-
- return $flag;
- }
-
- function _doExecute()
+ function isEnableCreate()
{
- $handler =& xoops_getmodulehandler('imagecategory', 'base');
- $category =& $handler->get($this->mActionForm->get('imgcat_id'));
-
- //
- // [TODO]
- // Should the following procedure be after parent::_doExecute()?
- //
- if ($category->get('imgcat_storetype') == 'file') {
- $this->_storeFile();
- }
- else {
- $this->_storeDB();
- }
-
- return parent::_doExecute();
+ return false;
}
- function _storeFile()
+ function _enableCatchImgcat()
{
- if ($this->mActionForm->mFormFile != null) {
- if (!$this->mActionForm->mFormFile->saveAs(XOOPS_UPLOAD_PATH)) {
- return false;
- }
- }
-
- //
- // If there is a old file, delete it
- //
- if ($this->mActionForm->mOldFilename != null) {
- @unlink(XOOPS_UPLOAD_PATH . "/" . $this->mActionForm->mOldFilename);
- }
+ return false;
}
- function _storeDB()
- {
-
- }
-
function executeViewInput(&$controller, &$xoopsUser, &$render)
{
$this->mObject->loadImagecategory();
@@ -88,23 +41,15 @@
$render->setAttribute('object', $this->mObject);
$handler =& xoops_getmodulehandler('imagecategory', 'base');
- $categoryArr =& $handler->getObjects();
+ $t_category = $handler->get($this->mObject->get('imgcat_id'));
+
+ $categoryArr =& $handler->getObjects(new Criteria('imgcat_storetype', $t_category->get('imgcat_storetype')));
$render->setAttribute('categoryArr', $categoryArr);
}
-
- function executeViewSuccess(&$controller, &$xoopsUser, &$render)
- {
- $controller->executeForward("./index.php?action=ImageList&imgcat_id=" . $this->mActionForm->get('imgcat_id'));
- }
-
- function executeViewError(&$controller, &$xoopsUser, &$render)
- {
- $controller->executeRedirect("./index.php?action=ImagecategoryList", 1, _MD_BASE_ERROR_DBUPDATE_FAILED);
- }
function executeViewCancel(&$controller, &$xoopsUser, &$render)
{
- $controller->executeForward("./index.php?action=ImageList&imgcat_id=" . $this->mActionForm->get('imgcat_id'));
+ $controller->executeForward('./index.php?action=ImageList&imgcat_id=' . $this->mObject->get('imgcat_id'));
}
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:11:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:11:59 +0900
Subject: [xoops-cvslog 4871] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20061007071159.0B8E52AC03B@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php:1.1.2.8.2.2 xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php:1.1.2.8.2.3
--- xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php:1.1.2.8.2.2 Fri Sep 29 17:13:50 2006
+++ xoops2jp/html/modules/base/admin/forms/ImageAdminEditForm.class.php Sat Oct 7 16:11:58 2006
@@ -1,7 +1,7 @@
_mImgcatId = $obj->get('imgcat_id');
}
- function getImgcatId()
- {
- return $this->_mIsNew ? $this->get('imgcat_id') : $this->_mImgcatId;
- }
-
function update(&$obj)
{
parent::update($obj);
@@ -66,4 +61,20 @@
}
}
+class Legacy_ImageAdminEditForm extends Legacy_ImageAdminCreateForm
+{
+ function validateImgcat_id()
+ {
+ parent::validateImgcat_id();
+
+ $handler =& xoops_getmodulehandler('imagecategory', 'base');
+ $currentCategory =& $handler->get($this->_mImgcatId);
+
+ $specificCategory =& $handler->get($this->get('imgcat_id'));
+ if ($currentCategory->get('imgcat_storetype') != $specificCategory->get('imgcat_storetype')) {
+ $this->set('imgcat_id', $this->_mImgcatId);
+ }
+ }
+}
+
?>
Index: xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php:1.1.2.4.2.2 xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php:1.1.2.4.2.3
--- xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php:1.1.2.4.2.2 Fri Sep 29 17:13:50 2006
+++ xoops2jp/html/modules/base/admin/forms/SmilesAdminEditForm.class.php Sat Oct 7 16:11:58 2006
@@ -1,7 +1,7 @@
_mIsNew && $this->get('smile_url') == null) {
- $this->addErrorMessage(_AD_BASE_ERROR_SMILE_URL_REQUIED);
+ $this->addErrorMessage(XCube_Utils::formatMessage(_MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_SMILE_URL));
}
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:28:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:28:36 +0900
Subject: [xoops-cvslog 4872] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20061007072836.880E02AC01E@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/css.php
diff -u xoops2jp/html/modules/base/admin/css.php:1.1.2.8.2.1 xoops2jp/html/modules/base/admin/css.php:1.1.2.8.2.2
--- xoops2jp/html/modules/base/admin/css.php:1.1.2.8.2.1 Sat Oct 7 15:44:38 2006
+++ xoops2jp/html/modules/base/admin/css.php Sat Oct 7 16:28:36 2006
@@ -2,6 +2,11 @@
require_once "../../../mainfile.php";
+//
+// @todo Why does this file know Legacy_RenderSystem?
+//
+require_once XOOPS_ROOT_PATH . "/header.php";
+
function Legacy_modifier_css_theme($string)
{
$infoArr = Legacy_get_ovveride_file($string, null, true);
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:33:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:33:22 +0900
Subject: [xoops-cvslog 4873] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20061007073322.1F8202AC03B@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.9.2.2 xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.9.2.3
--- xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.9.2.2 Thu Oct 5 19:18:14 2006
+++ xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php Sat Oct 7 16:33:21 2006
@@ -2,12 +2,7 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
-require_once XOOPS_ROOT_PATH."/core/XCube_Module.class.php";
-
-/**
- * This is adapter for XCube_Module by XoopsModule.
- */
-class Legacy_ModuleAdapter extends XCube_Module
+class Legacy_ModuleAdapter
{
var $mAdaptee;
From ryuji_amano ＠ users.sourceforge.jp Sat Oct 7 16:34:54 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat, 7 Oct 2006 16:34:54 +0900
Subject: [xoops-cvslog 4874] CVS update: xoops2jp/html/core
Message-ID: <20061007073454.DE3BA2AC044@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_Validator.class.php
diff -u xoops2jp/html/core/XCube_Validator.class.php:1.1.2.1 xoops2jp/html/core/XCube_Validator.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Validator.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Validator.class.php Sat Oct 7 16:34:54 2006
@@ -1,7 +1,7 @@
mValue->getExtension()) == strtolower($ext)) {
+ if (strtolower($form->mValue->getExtension()) == strtolower($ext)) {
return true;
}
}
@@ -158,7 +158,7 @@
return true;
}
else {
- if (!is_a($form, "XCube_XCube_FileProperty")) {
+ if (!is_a($form, "XCube_FileProperty")) {
return true;
}
From ryuji_amano ＠ users.sourceforge.jp Sat Oct 7 16:44:15 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat, 7 Oct 2006 16:44:15 +0900
Subject: [xoops-cvslog 4875] CVS update: xoops2jp/html/core
Message-ID: <20061007074415.5F3D02AC03B@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_Utils.class.php
diff -u xoops2jp/html/core/XCube_Utils.class.php:1.1.2.1 xoops2jp/html/core/XCube_Utils.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Utils.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Utils.class.php Sat Oct 7 16:44:15 2006
@@ -1,7 +1,7 @@
mController->executeRedirect($url, $time, $messages);
+ }
+
function formatMessage()
{
$arr = func_get_args();
- if (count($arr) == 0) {
+ if(count($arr)==0)
return null;
- }
$message = $arr[0];
for($i = 1; $i < count($arr); $i++) {
@@ -27,6 +40,41 @@
return $message;
}
+
+ function formatMessageByMap($subject,$arr)
+ {
+ $searches=array();
+ $replaces=array();
+ foreach($arr as $key=>$value) {
+ $searches[]="{".$key."}";
+ $replaces[]=$value;
+ }
+
+ return str_replace($searches,$replaces,$subject);
+ }
+
+ function checkSystemModules() {
+ $root=&XCube_Root::getSingleton();
+ $systemModules = array_map('trim', explode(',',$root->getSiteConfig('Cube','SystemModules')));
+ $recommendedModules = array_map('trim', explode(',',$root->getSiteConfig('Cube','RecommendedModules')));
+ $moduleHandler =& xoops_gethandler('module');
+ $uninstalledModules = array();
+ $disabledModules = array();
+ foreach($systemModules as $systemModule) {
+ if(!empty($systemModule)) {
+ if(!($moduleObject =& $moduleHandler->getByDirname($systemModule))) {
+ $uninstalledModules[] = $systemModule;
+ } else if(!$moduleObject->getVar('isactive')) {
+ $disabledModules[] = $systemModule;
+ }
+ }
+ }
+ if ((count($uninstalledModules)==0)&&(count($disabledModules)==0)) {
+ return true;
+ } else {
+ return array('uninstalled' =>$uninstalledModules, 'disabled'=>$disabledModules, 'recommended'=>$recommendedModules);
+ }
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:45:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:45:15 +0900
Subject: [xoops-cvslog 4876] CVS update: xoops2jp/html/core
Message-ID: <20061007074515.0525E2AC03B@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_ActionForm.class.php
diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.1 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_ActionForm.class.php Sat Oct 7 16:45:15 2006
@@ -1,7 +1,7 @@
Index: xoops2jp/html/core/XCube_UserAccount.class.php
diff -u xoops2jp/html/core/XCube_UserAccount.class.php:1.1.2.1 xoops2jp/html/core/XCube_UserAccount.class.php:removed
--- xoops2jp/html/core/XCube_UserAccount.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_UserAccount.class.php Sat Oct 7 16:45:24 2006
@@ -1,83 +0,0 @@
-loadGroup();
- return $this->mGroups;
- }
-
- function loadGroup()
- {
- }
-
- function getId()
- {
- return $this->mId;
- }
-
- /**
- * @return bool
- */
- function isGuest()
- {
- return $this->_mIsGuest;
- }
-
- /**
- * param bool $flag
- */
- function setGuest($flag)
- {
- $this->_mIsGuest = $flag;
- }
-
- /**
- * @return bool
- */
- function isService()
- {
- return $this->_mIsService;
- }
-
- /**
- * param bool $flag
- */
- function setService($flag)
- {
- $this->_mIsService = $flag;
- }
-}
-
-?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:46:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:46:28 +0900
Subject: [xoops-cvslog 4878] CVS update: xoops2jp/html/modules/base/include
Message-ID: <20061007074628.411FE2AC03B@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/include/Legacy_EventFunctions.class.php
diff -u xoops2jp/html/modules/base/include/Legacy_EventFunctions.class.php:1.1.2.1 xoops2jp/html/modules/base/include/Legacy_EventFunctions.class.php:removed
--- xoops2jp/html/modules/base/include/Legacy_EventFunctions.class.php:1.1.2.1 Thu Oct 5 18:07:49 2006
+++ xoops2jp/html/modules/base/include/Legacy_EventFunctions.class.php Sat Oct 7 16:46:28 2006
@@ -1,203 +0,0 @@
-mController->setupModuleContext('base');
-
- $moduleRunner =& new Legacy_ActionFrame(false);
-
- $action = isset($_REQUEST['op']) ? ucfirst(xoops_getrequest('op')) : "List";
- $moduleRunner->setMode(LEGACY_FRAME_MODE_IMAGE);
- $moduleRunner->setActionName($action);
-
- $root->mController->setActionStrategy($moduleRunner);
-
- $root->mController->executeAction();
-
- $root->mController->executeView();
- }
-
- function backend()
- {
- require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
-
- $root =& XCube_Root::getSingleton();
- $root->mController->setupModuleContext('base');
-
- $moduleRunner =& new Legacy_ActionFrame(false);
- $moduleRunner->setActionName('Backend');
-
- $root->mController->setActionStrategy($moduleRunner);
-
- $root->mController->executeAction();
-
- $root->mController->executeView();
- }
-
- function search()
- {
- require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
-
- $root =& XCube_Root::getSingleton();
- $root->mController->setupModuleContext('base');
-
- $moduleRunner =& new Legacy_ActionFrame(false);
- $moduleRunner->setMode(LEGACY_FRAME_MODE_SEARCH);
- $moduleRunner->setActionName(ucfirst(xoops_getrequest('action')));
-
- $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-
- $root->mController->execute();
-
- $root->mController->executeView();
-
- }
-
- function misc()
- {
- require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
-
- $root =& XCube_Root::getSingleton();
- $root->mController->setupModuleContext('base');
-
- $actionName = isset($_REQUEST['type']) ? ucfirst(xoops_getrequest('type')) : "Smilies";
-
- $moduleRunner = new Legacy_ActionFrame(false);
- $moduleRunner->setMode(LEGACY_FRAME_MODE_MISC);
- $moduleRunner->setActionName($actionName);
-
- $root->mController->setActionStrategy($moduleRunner);
-
- $root->mController->setDialogMode(true);
-
- $root->mController->executeAction();
-
- $root->mController->executeView();
- }
-
- function notifications()
- {
- require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
-
- $root =& XCube_Root::getSingleton();
- $root->mController->setupModuleContext('base');
-
- //
- // 'Notify' is prefix to guard accessing from misc.php.
- //
- $actionName = isset($_REQUEST['op']) ? trim(xoops_getrequest('op')) : "List";
- if (isset($_REQUEST['delete'])) {
- $actionName = "Delete";
- }
- if (isset($_REQUEST['delete_cancel'])) {
- $actionName = "Cancel";
- }
-
- $moduleRunner = new Legacy_ActionFrame(false);
- $moduleRunner->setMode(LEGACY_FRAME_MODE_NOTIFY);
- $moduleRunner->setActionName($actionName);
-
- $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-
- $root->mController->execute();
-
- $root->mController->executeView();
- }
-
- /**
- * This functions is add to 'Legacyfunction.Notifications.Select'.
- *
- * @param XCube_RenderBuffer $render
- */
- function notifications_select(&$render)
- {
- require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
- require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-
- $root =& XCube_Root::getSingleton();
- $xoopsModule =& $root->mContext->mXoopsModule;
- $moduleConfig =& $root->mContext->mModuleConfig;
- $xoopsUser =& $root->mContext->mXoopsUser;
-
- $xoops_notification = array();
- $xoops_notification['show'] = is_object($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0;
-
- if ($xoops_notification['show']) {
- $root->mLanguageManager->loadPageTypeMessageCatalog('notification');
- $categories =& notificationSubscribableCategoryInfo();
- $event_count = 0;
- if (!empty($categories)) {
- $notification_handler =& xoops_gethandler('notification');
- foreach ($categories as $category) {
- $section['name'] = $category['name'];
- $section['title'] = $category['title'];
- $section['description'] = $category['description'];
- $section['itemid'] = $category['item_id'];
- $section['events'] = array();
- $subscribed_events =& $notification_handler->getSubscribedEvents($category['name'], $category['item_id'], $xoopsModule->get('mid'), $xoopsUser->get('uid'));
- foreach (notificationEvents($category['name'], true) as $event) {
- if (!empty($event['admin_only']) && !$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
- continue;
- }
- if (!empty($event['invisible'])) {
- continue;
- }
- $subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
- $section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed);
- $event_count ++;
- }
- $xoops_notification['categories'][$category['name']] = $section;
- }
- $xoops_notification['target_page'] = "notification_update.php";
- $xoops_notification['redirect_script'] = xoops_getenv('PHP_SELF');
-
- $render->setAttribute('editprofile_url', $urlXOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid'));
-
- switch ($xoopsUser->getVar('notify_method')) {
- case XOOPS_NOTIFICATION_METHOD_DISABLE:
- $render->setAttribute('user_method', _NOT_DISABLE);
- break;
- case XOOPS_NOTIFICATION_METHOD_PM:
- $render->setAttribute('user_method', _NOT_PM);
- break;
- case XOOPS_NOTIFICATION_METHOD_EMAIL:
- $render->setAttribute('user_method', _NOT_EMAIL);
- break;
- }
- } else {
- $xoops_notification['show'] = 0;
- }
- if ($event_count == 0) {
- $xoops_notification['show'] = 0;
- }
- }
-
- $render->setAttribute('xoops_notification', $xoops_notification);
- }
-
- /**
- * This member function is added to 'User_UserViewAction.GetUserPosts'.
- * Recount posts of $xoopsUser in the comment system.
- *
- * @static
- */
- function recountPost(&$posts, $xoopsUser)
- {
- $handler =& xoops_gethandler('comment');
- $criteria =& new Criteria('com_uid', $xoopsUser->get('uid'));
- $posts += $handler->getCount($criteria);
- }
-}
-
-?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:46:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:46:38 +0900
Subject: [xoops-cvslog 4879] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061007074638.613062AC044@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php
diff -u /dev/null xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.3
--- /dev/null Sat Oct 7 16:46:38 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php Sat Oct 7 16:46:38 2006
@@ -0,0 +1,203 @@
+mController->setupModuleContext('base');
+
+ $moduleRunner =& new Legacy_ActionFrame(false);
+
+ $action = isset($_REQUEST['op']) ? ucfirst(xoops_getrequest('op')) : "List";
+ $moduleRunner->setMode(LEGACY_FRAME_MODE_IMAGE);
+ $moduleRunner->setActionName($action);
+
+ $root->mController->setActionStrategy($moduleRunner);
+
+ $root->mController->executeAction();
+
+ $root->mController->executeView();
+ }
+
+ function backend()
+ {
+ require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
+
+ $root =& XCube_Root::getSingleton();
+ $root->mController->setupModuleContext('base');
+
+ $moduleRunner =& new Legacy_ActionFrame(false);
+ $moduleRunner->setActionName('Backend');
+
+ $root->mController->setActionStrategy($moduleRunner);
+
+ $root->mController->executeAction();
+
+ $root->mController->executeView();
+ }
+
+ function search()
+ {
+ require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
+
+ $root =& XCube_Root::getSingleton();
+ $root->mController->setupModuleContext('base');
+
+ $moduleRunner =& new Legacy_ActionFrame(false);
+ $moduleRunner->setMode(LEGACY_FRAME_MODE_SEARCH);
+ $moduleRunner->setActionName(ucfirst(xoops_getrequest('action')));
+
+ $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+ $root->mController->execute();
+
+ $root->mController->executeView();
+
+ }
+
+ function misc()
+ {
+ require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
+
+ $root =& XCube_Root::getSingleton();
+ $root->mController->setupModuleContext('base');
+
+ $actionName = isset($_REQUEST['type']) ? ucfirst(xoops_getrequest('type')) : "Smilies";
+
+ $moduleRunner = new Legacy_ActionFrame(false);
+ $moduleRunner->setMode(LEGACY_FRAME_MODE_MISC);
+ $moduleRunner->setActionName($actionName);
+
+ $root->mController->setActionStrategy($moduleRunner);
+
+ $root->mController->setDialogMode(true);
+
+ $root->mController->executeAction();
+
+ $root->mController->executeView();
+ }
+
+ function notifications()
+ {
+ require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
+
+ $root =& XCube_Root::getSingleton();
+ $root->mController->setupModuleContext('base');
+
+ //
+ // 'Notify' is prefix to guard accessing from misc.php.
+ //
+ $actionName = isset($_REQUEST['op']) ? trim(xoops_getrequest('op')) : "List";
+ if (isset($_REQUEST['delete'])) {
+ $actionName = "Delete";
+ }
+ if (isset($_REQUEST['delete_cancel'])) {
+ $actionName = "Cancel";
+ }
+
+ $moduleRunner = new Legacy_ActionFrame(false);
+ $moduleRunner->setMode(LEGACY_FRAME_MODE_NOTIFY);
+ $moduleRunner->setActionName($actionName);
+
+ $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+ $root->mController->execute();
+
+ $root->mController->executeView();
+ }
+
+ /**
+ * This functions is add to 'Legacyfunction.Notifications.Select'.
+ *
+ * @param XCube_RenderBuffer $render
+ */
+ function notifications_select(&$render)
+ {
+ require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+ require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+
+ $root =& XCube_Root::getSingleton();
+ $xoopsModule =& $root->mContext->mXoopsModule;
+ $moduleConfig =& $root->mContext->mModuleConfig;
+ $xoopsUser =& $root->mContext->mXoopsUser;
+
+ $xoops_notification = array();
+ $xoops_notification['show'] = is_object($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0;
+
+ if ($xoops_notification['show']) {
+ $root->mLanguageManager->loadPageTypeMessageCatalog('notification');
+ $categories =& notificationSubscribableCategoryInfo();
+ $event_count = 0;
+ if (!empty($categories)) {
+ $notification_handler =& xoops_gethandler('notification');
+ foreach ($categories as $category) {
+ $section['name'] = $category['name'];
+ $section['title'] = $category['title'];
+ $section['description'] = $category['description'];
+ $section['itemid'] = $category['item_id'];
+ $section['events'] = array();
+ $subscribed_events =& $notification_handler->getSubscribedEvents($category['name'], $category['item_id'], $xoopsModule->get('mid'), $xoopsUser->get('uid'));
+ foreach (notificationEvents($category['name'], true) as $event) {
+ if (!empty($event['admin_only']) && !$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+ continue;
+ }
+ if (!empty($event['invisible'])) {
+ continue;
+ }
+ $subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
+ $section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed);
+ $event_count ++;
+ }
+ $xoops_notification['categories'][$category['name']] = $section;
+ }
+ $xoops_notification['target_page'] = "notification_update.php";
+ $xoops_notification['redirect_script'] = xoops_getenv('PHP_SELF');
+
+ $render->setAttribute('editprofile_url', $urlXOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid'));
+
+ switch ($xoopsUser->getVar('notify_method')) {
+ case XOOPS_NOTIFICATION_METHOD_DISABLE:
+ $render->setAttribute('user_method', _NOT_DISABLE);
+ break;
+ case XOOPS_NOTIFICATION_METHOD_PM:
+ $render->setAttribute('user_method', _NOT_PM);
+ break;
+ case XOOPS_NOTIFICATION_METHOD_EMAIL:
+ $render->setAttribute('user_method', _NOT_EMAIL);
+ break;
+ }
+ } else {
+ $xoops_notification['show'] = 0;
+ }
+ if ($event_count == 0) {
+ $xoops_notification['show'] = 0;
+ }
+ }
+
+ $render->setAttribute('xoops_notification', $xoops_notification);
+ }
+
+ /**
+ * This member function is added to 'User_UserViewAction.GetUserPosts'.
+ * Recount posts of $xoopsUser in the comment system.
+ *
+ * @static
+ */
+ function recountPost(&$posts, $xoopsUser)
+ {
+ $handler =& xoops_gethandler('comment');
+ $criteria =& new Criteria('com_uid', $xoopsUser->get('uid'));
+ $posts += $handler->getCount($criteria);
+ }
+}
+
+?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:46:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:46:47 +0900
Subject: [xoops-cvslog 4880] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061007074647.A58B42AC044@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_UserAccountAdapter.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_UserAccountAdapter.class.php:1.1.2.2.2.1 xoops2jp/html/modules/base/kernel/Legacy_UserAccountAdapter.class.php:removed
--- xoops2jp/html/modules/base/kernel/Legacy_UserAccountAdapter.class.php:1.1.2.2.2.1 Fri Sep 29 17:14:20 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_UserAccountAdapter.class.php Sat Oct 7 16:46:47 2006
@@ -1,27 +0,0 @@
-mAdaptee=&$xoopsUser;
- }
-
- function getId()
- {
- return is_object($this->mAdaptee) ? $this->mAdaptee->uid() : 0;
- }
-
- function isAnonymous()
- {
- return is_object($this->mAdaptee) ? false : true;
- }
-}
-
-?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Sat Oct 7 16:46:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 16:46:57 +0900
Subject: [xoops-cvslog 4881] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061007074657.96CB92AC044@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.8 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.9
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.8 Fri Oct 6 18:47:59 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Sat Oct 7 16:46:57 2006
@@ -1,7 +1,7 @@
add('Legacypage.Notifications.Access', 'Legacy_EventFunction::notifications', $file);
$delegateManager->add('Legacyfunction.Notifications.Select', 'Legacy_EventFunction::notifications_select', $file);
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:18:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:18:46 +0900
Subject: [xoops-cvslog 4882] CVS update: xoops2jp/html/core
Message-ID: <20061007081846.5A12E2AC075@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_HttpContext.class.php
diff -u xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.2 xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.2 Fri Oct 6 17:28:50 2006
+++ xoops2jp/html/core/XCube_HttpContext.class.php Sat Oct 7 17:18:46 2006
@@ -1,7 +1,7 @@
_getArrayRequest($_REQUEST[$key]);
}
@@ -178,12 +179,12 @@
*/
function _getArrayRequest($arr)
{
- foreach (array_keys($arr) as $t_key => $t_value) {
- if (is_array($t_value)) {
- $arr[$t_key] = $this->_getArrayRequest($t_value);
+ foreach (array_keys($arr) as $t_key) {
+ if (is_array($arr[$t_key])) {
+ $arr[$t_key] = $this->_getArrayRequest($arr[$t_key]);
}
else {
- $arr[$t_key] = stripslashes($t_value);
+ $arr[$t_key] = stripslashes($arr[$t_key]);
}
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:19:40 +0900
Subject: [xoops-cvslog 4883] CVS update: xoops2jp/html/core
Message-ID: <20061007081940.09CF42AC01E@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_HttpContext.class.php
diff -u xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.3 xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.3 Sat Oct 7 17:18:46 2006
+++ xoops2jp/html/core/XCube_HttpContext.class.php Sat Oct 7 17:19:39 2006
@@ -1,7 +1,7 @@
_getArrayRequest($_REQUEST[$key]);
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:26:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:26:33 +0900
Subject: [xoops-cvslog 4884] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061007082633.7AEA02AC075@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.9 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.10
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.9 Sat Oct 7 16:46:57 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Sat Oct 7 17:26:33 2006
@@ -1,7 +1,7 @@
mRoot->mContext->mModule != null) {
if (!$this->mRoot->mContext->mModule->isActive()) {
- die('NOT ACTIVE'); ///< @todo
+ /**
+ * Notify that the current user accesses none-activate module
+ * controller.
+ */
+ XCube_DelegateUtils::call('Legacy.Event.ModuleNotActive');
+ $this->executeForward(XOOPS_URL);
+ die();
}
if (!$this->_mStrategy->enableAccess()) {
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:32:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:32:48 +0900
Subject: [xoops-cvslog 4885] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20061007083248.EB49D2AC01E@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/class/priv_msgs.php
diff -u xoops2jp/html/modules/pm/class/priv_msgs.php:1.1.4.1 xoops2jp/html/modules/pm/class/priv_msgs.php:1.1.4.2
--- xoops2jp/html/modules/pm/class/priv_msgs.php:1.1.4.1 Sat Oct 7 15:36:26 2006
+++ xoops2jp/html/modules/pm/class/priv_msgs.php Sat Oct 7 17:32:48 2006
@@ -1,7 +1,7 @@
initVar('subject', XOBJ_DTYPE_STRING, '', true, 255);
$this->initVar('from_userid', XOBJ_DTYPE_INT, '0', true);
$this->initVar('to_userid', XOBJ_DTYPE_INT, '0', true);
- $this->initVar('msg_time', XOBJ_DTYPE_INT, '0', true);
+ $this->initVar('msg_time', XOBJ_DTYPE_INT, time(), true);
$this->initVar('msg_text', XOBJ_DTYPE_TEXT, '', true);
$this->initVar('read_msg', XOBJ_DTYPE_BOOL, '0', true);
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:34:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:34:02 +0900
Subject: [xoops-cvslog 4886] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20061007083402.C16542AC01E@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/class/priv_msgs.php
diff -u xoops2jp/html/modules/pm/class/priv_msgs.php:1.1.4.2 xoops2jp/html/modules/pm/class/priv_msgs.php:1.1.4.3
--- xoops2jp/html/modules/pm/class/priv_msgs.php:1.1.4.2 Sat Oct 7 17:32:48 2006
+++ xoops2jp/html/modules/pm/class/priv_msgs.php Sat Oct 7 17:34:02 2006
@@ -1,7 +1,7 @@
initVar('msg_id', XOBJ_DTYPE_INT, '', true);
- $this->initVar('msg_image', XOBJ_DTYPE_STRING, '', false, 100);
+ $this->initVar('msg_image', XOBJ_DTYPE_STRING, 'icon1.gif', false, 100);
$this->initVar('subject', XOBJ_DTYPE_STRING, '', true, 255);
$this->initVar('from_userid', XOBJ_DTYPE_INT, '0', true);
$this->initVar('to_userid', XOBJ_DTYPE_INT, '0', true);
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:39:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:39:52 +0900
Subject: [xoops-cvslog 4887] CVS update: xoops2jp/html/core
Message-ID: <20061007083952.73ABD2AC075@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_Property.class.php
diff -u xoops2jp/html/core/XCube_Property.class.php:1.1.2.1 xoops2jp/html/core/XCube_Property.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Property.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Property.class.php Sat Oct 7 17:39:52 2006
@@ -1,7 +1,7 @@
mValue)) {
return false;
}
- $this->mValue->mKey = $key;
-
$this->mValue->fetch();
+
if (!$this->mValue->hasUploadFile()) {
$this->mValue = null;
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 17:43:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 17:43:13 +0900
Subject: [xoops-cvslog 4888] CVS update: xoops2jp/html/core
Message-ID: <20061007084313.07C4C2AC059@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_Property.class.php
diff -u xoops2jp/html/core/XCube_Property.class.php:1.1.2.2 xoops2jp/html/core/XCube_Property.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_Property.class.php:1.1.2.2 Sat Oct 7 17:39:52 2006
+++ xoops2jp/html/core/XCube_Property.class.php Sat Oct 7 17:43:12 2006
@@ -1,7 +1,7 @@
mIndex !== null) {
+ $this->mValue->mKey = $this->mIndex;
+ }
+
$this->mValue->fetch();
if (!$this->mValue->hasUploadFile()) {
@@ -453,14 +459,15 @@
return true;
}
- function fetch()
+ function fetch(&$form)
{
unset($this->mProperties);
$this->mProperties = array();
if (isset($_FILES[$this->mName]) && is_array($_FILES[$this->mName]['name'])) {
foreach ($_FILES[$this->mName]['name'] as $_key => $_val) {
$this->mProperties[$_key] =& new $this->mPropertyClassName($this->mName);
- $this->mProperties[$_key]->fetch($_key);
+ $this->mProperties[$_key]->mIndex = $_key;
+ $this->mProperties[$_key]->fetch($form);
}
}
}
From ryuji_amano ＠ users.sourceforge.jp Sat Oct 7 17:54:31 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat, 7 Oct 2006 17:54:31 +0900
Subject: [xoops-cvslog 4889] CVS update: xoops2jp/html/core
Message-ID: <20061007085431.7158B2AC03A@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_Theme.class.php
diff -u xoops2jp/html/core/XCube_Theme.class.php:1.1.2.1 xoops2jp/html/core/XCube_Theme.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Theme.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Theme.class.php Sat Oct 7 17:54:31 2006
@@ -1,7 +1,7 @@
_mManifesto = parse_ini_file($file, true);
- $this->mName = $this->_mManifesto['Manifesto']['Name'];
- $this->mDepends = $this->_mManifesto['Manifesto']['Depends'];
- $this->mVersion = $this->_mManifesto['Manifesto']['Version'];
- $this->mUrl = $this->_mManifesto['Manifesto']['Url'];
+ $this->mName = isset($this->_mManifesto['Manifesto']['Name']) ? $this->_mManifesto['Manifesto']['Name'] : "";
+ $this->mDepends = isset($this->_mManifesto['Manifesto']['Depends']) ? $this->_mManifesto['Manifesto']['Depends'] : "";
+ $this->mVersion = isset($this->_mManifesto['Manifesto']['Version']) ? $this->_mManifesto['Manifesto']['Version'] : "";
+ $this->mUrl = isset($this->_mManifesto['Manifesto']['Url']) ? $this->_mManifesto['Manifesto']['Url'] : "";
- $this->mRenderSystemName = $this->_mManifesto['Theme']['RenderSystem'];
- $this->mAuthor = $this->_mManifesto['Theme']['Author'];
+ $this->mRenderSystemName = isset($this->_mManifesto['Theme']['RenderSystem']) ? $this->_mManifesto['Theme']['RenderSystem'] : "";
+ $this->mAuthor = isset($this->_mManifesto['Theme']['Author']) ? $this->_mManifesto['Theme']['Author'] : "";
if (isset($this->_mManifesto['Theme']['ScreenShot'])) {
$this->mScreenShot = $this->_mManifesto['Theme']['ScreenShot'];
@@ -88,7 +88,7 @@
$this->mDescription = $this->_mManifesto['Theme']['Description'];
}
- $this->mFormat = $this->_mManifesto['Theme']['Format'];
+ $this->mFormat = isset($this->_mManifesto['Theme']['Format']) ? $this->_mManifesto['Theme']['Format'] : "";
return true;
}
Index: xoops2jp/html/core/XCube_Delegate.class.php
diff -u xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.1 xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Delegate.class.php Sat Oct 7 17:54:31 2006
@@ -1,7 +1,6 @@
0) {
$this->_setSignatures(func_get_args());
}
+ $this->_mUniqueID = md5(uniqid(rand(), true));
}
/**
@@ -288,6 +289,11 @@
}
}
}
+
+ function getID()
+ {
+ return $this->_mUniqueID;
+ }
}
/**
@@ -329,15 +335,13 @@
*/
function register($name, &$delegate)
{
- if (!isset($this->_mDelegates[$name])) {
- $this->_mDelegates[$name] =& $delegate;
+ if (!isset($this->_mDelegates[$name][$delegate->getID()])) {
+ $this->_mDelegates[$name][$delegate->getID()] =& $delegate;
if (isset($this->_mCallbacks[$name]) && count($this->_mCallbacks[$name]) > 0) {
foreach (array_keys($this->_mCallbacks[$name]) as $key) {
$delegate->add($this->_mCallbacks[$name][$key], $this->_mCallbackParameters[$name][$key][0], $this->_mCallbackParameters[$name][$key][1]);
}
- unset($this->_mCallbacks[$name]);
- unset($this->_mCallbackParameters[$name]);
}
return true;
@@ -362,12 +366,12 @@
function add($name, $callback, $param3 = null, $param4 = null)
{
if (isset($this->_mDelegates[$name])) {
- $this->_mDelegates[$name]->add($callback, $param3, $param4);
- }
- else {
- $this->_mCallbacks[$name][] = $callback;
- $this->_mCallbackParameters[$name][] = array('0' => $param3, '1' => $param4);
+ foreach(array_keys($this->_mDelegates[$name]) as $key) {
+ $this->_mDelegates[$name][$key]->add($callback, $param3, $param4);
+ }
}
+ $this->_mCallbacks[$name][] = $callback;
+ $this->_mCallbackParameters[$name][] = array('0' => $param3, '1' => $param4);
}
/**
@@ -381,18 +385,19 @@
function delete($name, $delcallback)
{
if (isset($this->_mDelegates[$name])) {
- $this->_mDelegates[$name]->delete($delcallback);
- } else {
- if (isset($this->_mCallbacks[$name])) {
- foreach(array_keys($this->_mCallbacks[$name]) as $key) {
- $callback = $this->_mCallbacks[$name][$key];
- if (XCube_DelegateUtils::_compareCallback($callback, $delcallback)) {
- unset($this->_mCallbacks[$name][$key]);
- unset($this->_mCallbackParameters[$name][$key]);
- }
- }
- }
- }
+ foreach(array_keys($this->_mDelegates[$name]) as $key) {
+ $this->_mDelegates[$name][$key]->delete($delcallback);
+ }
+ }
+ if (isset($this->_mCallbacks[$name])) {
+ foreach(array_keys($this->_mCallbacks[$name]) as $key) {
+ $callback = $this->_mCallbacks[$name][$key];
+ if (XCube_DelegateUtils::_compareCallback($callback, $delcallback)) {
+ unset($this->_mCallbacks[$name][$key]);
+ unset($this->_mCallbackParameters[$name][$key]);
+ }
+ }
+ }
}
/**
@@ -405,13 +410,14 @@
function reset($name)
{
if (isset($this->_mDelegates[$name])) {
- $this->_mDelegates[$name]->reset();
- } else {
- if (isset($this->_mCallbacks[$name])) {
- unset($this->_mCallbacks[$name]);
- unset($this->_mCallbackParameters[$name]);
- }
- }
+ foreach(array_keys($this->_mDelegates[$name]) as $key) {
+ $this->_mDelegates[$name][$key]->reset();
+ }
+ }
+ if (isset($this->_mCallbacks[$name])) {
+ unset($this->_mCallbacks[$name]);
+ unset($this->_mCallbackParameters[$name]);
+ }
}
@@ -459,7 +465,8 @@
if ($root->mDelegateManager != null) {
$delegates = $root->mDelegateManager->getDelegates();
if (isset($delegates[$delegateName])) {
- $delegate =& $delegates[$delegateName];
+ $keys = array_keys($delegates[$delegateName]);
+ $delegate =& $delegates[$delegateName][$keys[0]];
} else {
$delegate =& new XCube_Delegate;
$root->mDelegateManager->register($delegateName, $delegate);
From ryuji_amano ＠ users.sourceforge.jp Sat Oct 7 17:58:28 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Sat, 7 Oct 2006 17:58:28 +0900
Subject: [xoops-cvslog 4890] CVS update: xoops2jp/html/class
Message-ID: <20061007085828.9016D2AC03A@users.sourceforge.jp>
Index: xoops2jp/html/class/XCube_RenderSystem.class.php
diff -u xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.18 xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.19
--- xoops2jp/html/class/XCube_RenderSystem.class.php:1.1.2.18 Thu Aug 10 18:41:34 2006
+++ xoops2jp/html/class/XCube_RenderSystem.class.php Sat Oct 7 17:58:28 2006
@@ -1,7 +1,7 @@
mAttributes;
}
- function setRenderBuffer()
+ function setRenderBuffer($buf)
{
$this->mRenderBuffer = $buf;
}
- function getRenderBuffer($buf)
+ function getRenderBuffer()
{
return $this->mRenderBuffer;
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:01:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:01:56 +0900
Subject: [xoops-cvslog 4891] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061007090156.ED3692AC03A@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.3 xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.4
--- xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.3 Sat Oct 7 16:46:38 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php Sat Oct 7 18:01:56 2006
@@ -20,10 +20,10 @@
$action = isset($_REQUEST['op']) ? ucfirst(xoops_getrequest('op')) : "List";
$moduleRunner->setMode(LEGACY_FRAME_MODE_IMAGE);
$moduleRunner->setActionName($action);
+
+ $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
- $root->mController->setActionStrategy($moduleRunner);
-
- $root->mController->executeAction();
+ $root->mController->execute();
$root->mController->executeView();
}
@@ -38,9 +38,9 @@
$moduleRunner =& new Legacy_ActionFrame(false);
$moduleRunner->setActionName('Backend');
- $root->mController->setActionStrategy($moduleRunner);
+ $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
- $root->mController->executeAction();
+ $root->mController->execute();
$root->mController->executeView();
}
@@ -77,11 +77,11 @@
$moduleRunner->setMode(LEGACY_FRAME_MODE_MISC);
$moduleRunner->setActionName($actionName);
- $root->mController->setActionStrategy($moduleRunner);
+ $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
$root->mController->setDialogMode(true);
- $root->mController->executeAction();
+ $root->mController->execute();
$root->mController->executeView();
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:04:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:04:53 +0900
Subject: [xoops-cvslog 4892] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20061007090453.7C47C2AC03A@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.2 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.3
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.2 Thu Oct 5 19:18:14 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php Sat Oct 7 18:04:53 2006
@@ -1,7 +1,7 @@
setActionName($actionName);
- $root->mController->setActionStrategy($moduleRunner);
+ $root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
$root->mController->setDialogMode(true);
- $root->mController->executeAction();
+ $root->mController->execute();
$root->mController->executeView();
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:25:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:25:08 +0900
Subject: [xoops-cvslog 4893] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20061007092508.1EFDC2AC016@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/module_list_confirm.html
diff -u xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.13 xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.13.2.1
--- xoops2jp/html/modules/base/admin/templates/module_list_confirm.html:1.1.2.13 Fri Sep 15 18:37:22 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list_confirm.html Sat Oct 7 18:25:07 2006
@@ -21,24 +21,24 @@
| <{$mid}> |
- <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->getProperty('name')}>
+ <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->get('name')}>
<{$actionForm->get('name',$mid)|escape}>
<{else}>
(<{$moduleObjects[$mid]->getShow('name')}>) » <{$actionForm->get('name',$mid)|escape}>
<{/if}>
|
- <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->getProperty('weight')}>
+ <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->get('weight')}>
<{$actionForm->get('weight',$mid)|escape}>
<{else}>
(<{$moduleObjects[$mid]->getShow('weight')}>) » <{$actionForm->get('weight',$mid)|escape}>
<{/if}>
|
- <{if $actionForm->get('isactive',$mid)|intval == $moduleObjects[$mid]->getProperty('isactive')}>
+ <{if $actionForm->get('isactive',$mid)|intval == $moduleObjects[$mid]->get('isactive')}>
<{$smarty.const._AD_BASE_LANG_NO_CHANGE}>
<{else}>
- (<{if $moduleObjects[$mid]->getProperty('isactive') == 1 }>
+ (<{if $moduleObjects[$mid]->get('isactive') == 1 }>
<{$smarty.const._AD_BASE_LANG_ISACTIVE}>
<{else}>
<{$smarty.const._AD_BASE_LANG_DEACTIVATE}>
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:25:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:25:40 +0900
Subject: [xoops-cvslog 4894] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061007092540.4CC002AC016@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10.2.1
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10 Wed Aug 23 10:31:24 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php Sat Oct 7 18:25:40 2006
@@ -1,7 +1,7 @@
mObject->loadGroup();
- $this->mObject->loadBmodule();
- }
-
function _setupActionForm()
{
$this->mActionForm =& new Legacy_BlockEditForm();
@@ -67,6 +60,9 @@
return LEGACY_FRAME_VIEW_ERROR;
}
+ $this->mObject->loadGroup();
+ $this->mObject->loadBmodule();
+
return parent::getDefaultView($controller, $xoopsUser);
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:26:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:26:15 +0900
Subject: [xoops-cvslog 4895] CVS update: xoops2jp/html/core
Message-ID: <20061007092615.9BFBE2AC022@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_Property.class.php
diff -u xoops2jp/html/core/XCube_Property.class.php:1.1.2.3 xoops2jp/html/core/XCube_Property.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_Property.class.php:1.1.2.3 Sat Oct 7 17:43:12 2006
+++ xoops2jp/html/core/XCube_Property.class.php Sat Oct 7 18:26:15 2006
@@ -1,7 +1,7 @@
_set($t_key, $t_value);
}
}
- else {
+ elseif ($arg1 !== null && $arg2 !== null) {
$this->_set($arg1, $arg2);
}
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:26:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:26:31 +0900
Subject: [xoops-cvslog 4896] CVS update: xoops2jp/html/core
Message-ID: <20061007092631.6E5F32AC016@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_ActionForm.class.php
diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.2 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.2 Sat Oct 7 16:45:15 2006
+++ xoops2jp/html/core/XCube_ActionForm.class.php Sat Oct 7 18:26:31 2006
@@ -1,7 +1,7 @@
mContext->mRequest->getRequest($name);
- if (!$this->mFormProperties[$name]->isArray() && !is_array($value)) {
- $this->mFormProperties[$name]->set($value);
- }
- elseif ($this->mFormProperties[$name]->isArray() && is_array($value)) {
- $this->mFormProperties[$name]->set($value);
- }
+ $this->mFormProperties[$name]->set($value);
}
-
$methodName = "fetch" . ucfirst($name);
if (method_exists($this, $methodName)) {
// call_user_func(array($this,$methodName));
From minahito ＠ users.sourceforge.jp Sat Oct 7 18:52:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 18:52:22 +0900
Subject: [xoops-cvslog 4897] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061007095222.ADFB22AC016@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.1 xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.2
--- xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.1 Fri Oct 6 18:48:22 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Module.class.php Sat Oct 7 18:52:22 2006
@@ -1,7 +1,7 @@
mXoopsModule)) { //< FIXME
+ return false;
+ }
+
return $this->mXoopsModule->get('isactive') ? true : false;
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 19:03:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 19:03:17 +0900
Subject: [xoops-cvslog 4898] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20061007100317.4B94E2AC016@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/blocks/legacy_themes.php
diff -u xoops2jp/html/modules/base/blocks/legacy_themes.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_themes.php:1.1.2.1.2.1
--- xoops2jp/html/modules/base/blocks/legacy_themes.php:1.1.2.1 Wed Aug 2 18:37:38 2006
+++ xoops2jp/html/modules/base/blocks/legacy_themes.php Sat Oct 7 19:03:17 2006
@@ -2,6 +2,11 @@
function b_legacy_themes_show($options)
{
global $xoopsConfig;
+
+ if (count($xoopsConfig['theme_set_allowed']) == 0) {
+ return null;
+ }
+
$theme_options = array();
foreach ($xoopsConfig['theme_set_allowed'] as $theme) {
$theme_option['name'] = $theme;
@@ -12,6 +17,7 @@
}
$theme_options[] = $theme_option;
}
+
$block = array();
$block['count'] = count($xoopsConfig['theme_set_allowed']);
$block['mode'] = $options[0];
From minahito ＠ users.sourceforge.jp Sat Oct 7 23:15:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 23:15:34 +0900
Subject: [xoops-cvslog 4899] CVS update:
xoops2jp/html/modules/user/admin/templates
Message-ID: <20061007141534.0E3592AC073@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/admin/templates/user_view.html
diff -u xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.1
--- xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7 Sat Sep 23 12:11:15 2006
+++ xoops2jp/html/modules/user/admin/templates/user_view.html Sat Oct 7 23:15:33 2006
@@ -122,7 +122,11 @@
|
| <{$smarty.const._MD_USER_LANG_ATTACHSIG}> |
- <{$object->getShow('attachsig')}>
+ <{if $object->get('attachesig')}>
+ <{$smarty.const._YES}>
+ <{else}>
+ <{$smarty.const._NO}>
+ <{/if}>
|
From minahito ＠ users.sourceforge.jp Sat Oct 7 23:50:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 23:50:44 +0900
Subject: [xoops-cvslog 4900] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20061007145044.67D242AC073@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.7.2.2 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.7.2.3
--- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.7.2.2 Fri Sep 29 17:14:44 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php Sat Oct 7 23:50:44 2006
@@ -1,7 +1,7 @@
get('rank_max') < $this->get('rank_min')) {
- $this->addErrorMessage(_MD_USER_ERROR_INJURY_MIN_MAX);
+ $this->addErrorMessage(_AD_USER_ERROR_INJURY_MIN_MAX);
}
}
From minahito ＠ users.sourceforge.jp Sat Oct 7 23:50:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 23:50:57 +0900
Subject: [xoops-cvslog 4901] CVS update:
xoops2jp/html/modules/user/language/english
Message-ID: <20061007145057.7939B2AC073@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/language/english/admin.php
diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.1
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30 Tue Sep 19 16:41:53 2006
+++ xoops2jp/html/modules/user/language/english/admin.php Sat Oct 7 23:50:57 2006
@@ -4,6 +4,7 @@
define('_AD_USER_ERROR_EMAIL', "{0} is an invalid email address");
define('_AD_USER_ERROR_GROUP_VALUE', "Specified group value is wrong.");
define('_AD_USER_ERROR_IMAGE_REQUIRED', "You must select an image file.");
+define('_AD_USER_ERROR_INJURY_MIN_MAX', "Relationship between minimum value and maximum value is wrong.");
define('_AD_USER_ERROR_INTRANGE', "Incorrect input on {0}.");
define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "Failed sending mail or private message.");
define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "You must choose one or more mail delivery method(s).");
From minahito ＠ users.sourceforge.jp Sat Oct 7 23:50:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 7 Oct 2006 23:50:57 +0900
Subject: [xoops-cvslog 4902] CVS update:
xoops2jp/html/modules/user/language/japanese
Message-ID: <20061007145057.9F01D2AC0AF@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.1
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37 Tue Sep 19 16:41:54 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php Sat Oct 7 23:50:57 2006
@@ -4,6 +4,7 @@
define('_AD_USER_ERROR_EMAIL', "{0}は不正なメールアドレスです");
define('_AD_USER_ERROR_GROUP_VALUE', "指定されたグループの値が不正です");
define('_AD_USER_ERROR_IMAGE_REQUIRED', "イメージ画像を必ず指定して下さい");
+define('_AD_USER_ERROR_INJURY_MIN_MAX', "最小値と最大値の関係が不正です");
define('_AD_USER_ERROR_INTRANGE', "{0}に対して不正な入力です");
define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "メール・プライベートメッセージの送信に失敗しました");
define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "最低ひとつの送信方法を指定してください");
From tom_g3x ＠ users.sourceforge.jp Sun Oct 8 00:36:15 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 8 Oct 2006 00:36:15 +0900
Subject: [xoops-cvslog 4903] CVS update:
xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20061007153615.7D5422AC090@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.25 xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.25.2.1
--- xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.25 Wed Sep 20 18:48:54 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/admin.php Sun Oct 8 00:36:15 2006
@@ -48,7 +48,7 @@
define('_AD_LEGACYRENDER_LANG_HTMLCODE', "HTMLコード");
define('_AD_LEGACYRENDER_LANG_IMAGEURL', "画像URL");
define('_AD_LEGACYRENDER_LANG_IMPMADE', "表示回数");
-define('_AD_LEGACYRENDER_LANG_IMPRESSIONS', "インプレッション数");
+define('_AD_LEGACYRENDER_LANG_IMPRESSIONS', "表示回数");
define('_AD_LEGACYRENDER_LANG_IMPTOTAL', "残り表示回数");
define('_AD_LEGACYRENDER_LANG_LOGIN', "ログイン名");
define('_AD_LEGACYRENDER_LANG_MORE', "もっと");
From onokazu ＠ users.sourceforge.jp Sun Oct 8 15:13:46 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun, 8 Oct 2006 15:13:46 +0900
Subject: [xoops-cvslog 4904] CVS update: xoops2jp/html/install/class
Message-ID: <20061008061346.E50522AC119@users.sourceforge.jp>
Index: xoops2jp/html/install/class/textsanitizer.php
diff -u xoops2jp/html/install/class/textsanitizer.php:1.2 xoops2jp/html/install/class/textsanitizer.php:1.2.20.1
--- xoops2jp/html/install/class/textsanitizer.php:1.2 Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/textsanitizer.php Sun Oct 8 15:13:46 2006
@@ -1,5 +1,5 @@
should not be allowed since nl2br will be used
- * when storing data
- */
- function TextSanitizer()
- {
-
- }
-
- function &getInstance()
- {
- static $instance;
- if (!isset($instance)) {
- $instance = new TextSanitizer();
- }
- return $instance;
- }
-
- function &makeClickable(&$text)
- {
- $patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i");
- $replacements = array("\\1\\2://\\3", "\\1www.\\2.\\3", "\\1\\2@\\3");
- return preg_replace($patterns, $replacements, $text);
- }
-
- function &nl2Br($text)
- {
- return preg_replace("/(\015\012)|(\015)|(\012)/","
",$text);
- }
-
- function &addSlashes($text, $force=false)
- {
- if ($force) {
- return addslashes($text);
- }
- if (!get_magic_quotes_gpc()) {
- $text =& addslashes($text);
- }
- return $text;
- }
-
- /*
- * if magic_quotes_gpc is on, stirip back slashes
- */
- function &stripSlashesGPC($text)
- {
- if (get_magic_quotes_gpc()) {
- $text =& stripslashes($text);
- }
- return $text;
- }
-
- /*
- * for displaying data in html textbox forms
- */
- function &htmlSpecialChars($text)
- {
- return preg_replace("/&/i", '&', htmlspecialchars($text, ENT_QUOTES));
- }
-
- function &undoHtmlSpecialChars(&$text)
- {
- return preg_replace(array("/>/i", "/</i", "/"/i", "/'/i"), array(">", "<", "\"", "'"), $text);
- }
-
- /*
- * Filters textarea form data in DB for display
- */
- function &displayText($text, $html=false)
- {
- if (! $html) {
- // html not allowed
- $text =& $this->htmlSpecialChars($text);
- }
- $text =& $this->makeClickable($text);
- $text =& $this->nl2Br($text);
- return $text;
- }
-
- /*
- * Filters textarea form data submitted for preview
- */
- function &previewText($text, $html=false)
- {
- $text =& $this->stripSlashesGPC($text);
- return $this->displayText($text, $html);
- }
+ /*
+ * Constructor of this class
+ * Gets allowed html tags from admin config settings
+ *
should not be allowed since nl2br will be used
+ * when storing data
+ */
+ function TextSanitizer()
+ {
+
+ }
+
+ function &getInstance()
+ {
+ static $instance;
+ if (!isset($instance)) {
+ $instance = new TextSanitizer();
+ }
+ return $instance;
+ }
+
+ function &makeClickable(&$text)
+ {
+ $patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i");
+ $replacements = array("\\1\\2://\\3", "\\1www.\\2.\\3", "\\1\\2@\\3");
+ return preg_replace($patterns, $replacements, $text);
+ }
+
+ function &nl2Br($text)
+ {
+ return preg_replace("/(\015\012)|(\015)|(\012)/","
",$text);
+ }
+
+ function &addSlashes($text, $force=false)
+ {
+ if ($force) {
+ return addslashes($text);
+ }
+ if (!get_magic_quotes_gpc()) {
+ $text =& addslashes($text);
+ }
+ return $text;
+ }
+
+ /*
+ * if magic_quotes_gpc is on, stirip back slashes
+ */
+ function &stripSlashesGPC($text)
+ {
+ if (get_magic_quotes_gpc()) {
+ $text =& stripslashes($text);
+ }
+ return $text;
+ }
+
+ /*
+ * for displaying data in html textbox forms
+ */
+ function &htmlSpecialChars($text)
+ {
+ $text = preg_replace("/&/i", '&', htmlspecialchars($text, ENT_QUOTES));
+ return $text;
+ }
+
+ function &undoHtmlSpecialChars(&$text)
+ {
+ return preg_replace(array("/>/i", "/</i", "/"/i", "/'/i"), array(">", "<", "\"", "'"), $text);
+ }
+
+ /*
+ * Filters textarea form data in DB for display
+ */
+ function &displayText($text, $html=false)
+ {
+ if (! $html) {
+ // html not allowed
+ $text =& $this->htmlSpecialChars($text);
+ }
+ $text =& $this->makeClickable($text);
+ $text =& $this->nl2Br($text);
+ return $text;
+ }
+
+ /*
+ * Filters textarea form data submitted for preview
+ */
+ function &previewText($text, $html=false)
+ {
+ $text =& $this->stripSlashesGPC($text);
+ return $this->displayText($text, $html);
+ }
##################### Deprecated Methods ######################
- function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
- {
- if ( $allowhtml == 0 ) {
- $text = $this->htmlSpecialChars($text);
- } else {
- //$config =& $GLOBALS['xoopsConfig'];
- //$allowed = $config['allowed_html'];
- //$text = strip_tags($text, $allowed);
- $text = $this->makeClickable($text);
- }
- if ( $smiley == 1 ) {
- $text = $this->smiley($text);
- }
- if ( $bbcode == 1 ) {
- $text = $this->xoopsCodeDecode($text);
- }
- $text = $this->nl2Br($text);
- return $text;
- }
-
- function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
- {
- $text = $this->oopsStripSlashesGPC($text);
- if ( $allowhtml == 0 ) {
- $text = $this->htmlSpecialChars($text);
- } else {
- //$config =& $GLOBALS['xoopsConfig'];
- //$allowed = $config['allowed_html'];
- //$text = strip_tags($text, $allowed);
- $text = $this->makeClickable($text);
- }
- if ( $smiley == 1 ) {
- $text = $this->smiley($text);
- }
- if ( $bbcode == 1 ) {
- $text = $this->xoopsCodeDecode($text);
- }
- $text = $this->nl2Br($text);
- return $text;
- }
-
- function makeTboxData4Save($text)
- {
- //$text = $this->undoHtmlSpecialChars($text);
- return $this->addSlashes($text);
- }
-
- function makeTboxData4Show($text, $smiley=0)
- {
- $text = $this->htmlSpecialChars($text);
- return $text;
- }
-
- function makeTboxData4Edit($text)
- {
- return $this->htmlSpecialChars($text);
- }
-
- function makeTboxData4Preview($text, $smiley=0)
- {
- $text = $this->stripSlashesGPC($text);
- $text = $this->htmlSpecialChars($text);
- return $text;
- }
-
- function makeTboxData4PreviewInForm($text)
- {
- $text = $this->stripSlashesGPC($text);
- return $this->htmlSpecialChars($text);
- }
-
- function makeTareaData4Save($text)
- {
- return $this->addSlashes($text);
- }
-
- function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
- {
- return $this->displayTarea($text, $html, $smiley, $xcode);
- }
-
- function makeTareaData4Edit($text)
- {
- return htmlSpecialChars($text, ENT_QUOTES);
- }
-
- function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
- {
- return $this->previewTarea($text, $html, $smiley, $xcode);
- }
-
- function makeTareaData4PreviewInForm($text)
- {
- //if magic_quotes_gpc is on, do stipslashes
- $text = $this->stripSlashesGPC($text);
- return htmlSpecialChars($text, ENT_QUOTES);
- }
-
- function makeTareaData4InsideQuotes($text)
- {
- return $this->htmlSpecialChars($text);
- }
-
- function &oopsStripSlashesGPC($text)
- {
- return $this->stripSlashesGPC($text);
- }
-
- function &oopsStripSlashesRT($text)
- {
- if (get_magic_quotes_runtime()) {
- $text =& stripslashes($text);
- }
- return $text;
- }
-
- function &oopsAddSlashes($text)
- {
- return $this->addSlashes($text);
- }
-
- function &oopsHtmlSpecialChars($text)
- {
- return $this->htmlSpecialChars($text);
- }
-
- function &oopsNl2Br($text)
- {
- return $this->nl2br($text);
- }
+ function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+ {
+ if ( $allowhtml == 0 ) {
+ $text = $this->htmlSpecialChars($text);
+ } else {
+ //$config =& $GLOBALS['xoopsConfig'];
+ //$allowed = $config['allowed_html'];
+ //$text = strip_tags($text, $allowed);
+ $text = $this->makeClickable($text);
+ }
+ if ( $smiley == 1 ) {
+ $text = $this->smiley($text);
+ }
+ if ( $bbcode == 1 ) {
+ $text = $this->xoopsCodeDecode($text);
+ }
+ $text = $this->nl2Br($text);
+ return $text;
+ }
+
+ function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+ {
+ $text = $this->oopsStripSlashesGPC($text);
+ if ( $allowhtml == 0 ) {
+ $text = $this->htmlSpecialChars($text);
+ } else {
+ //$config =& $GLOBALS['xoopsConfig'];
+ //$allowed = $config['allowed_html'];
+ //$text = strip_tags($text, $allowed);
+ $text = $this->makeClickable($text);
+ }
+ if ( $smiley == 1 ) {
+ $text = $this->smiley($text);
+ }
+ if ( $bbcode == 1 ) {
+ $text = $this->xoopsCodeDecode($text);
+ }
+ $text = $this->nl2Br($text);
+ return $text;
+ }
+
+ function makeTboxData4Save($text)
+ {
+ //$text = $this->undoHtmlSpecialChars($text);
+ return $this->addSlashes($text);
+ }
+
+ function makeTboxData4Show($text, $smiley=0)
+ {
+ $text = $this->htmlSpecialChars($text);
+ return $text;
+ }
+
+ function makeTboxData4Edit($text)
+ {
+ return $this->htmlSpecialChars($text);
+ }
+
+ function makeTboxData4Preview($text, $smiley=0)
+ {
+ $text = $this->stripSlashesGPC($text);
+ $text = $this->htmlSpecialChars($text);
+ return $text;
+ }
+
+ function makeTboxData4PreviewInForm($text)
+ {
+ $text = $this->stripSlashesGPC($text);
+ return $this->htmlSpecialChars($text);
+ }
+
+ function makeTareaData4Save($text)
+ {
+ return $this->addSlashes($text);
+ }
+
+ function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
+ {
+ return $this->displayTarea($text, $html, $smiley, $xcode);
+ }
+
+ function makeTareaData4Edit($text)
+ {
+ return htmlSpecialChars($text, ENT_QUOTES);
+ }
+
+ function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
+ {
+ return $this->previewTarea($text, $html, $smiley, $xcode);
+ }
+
+ function makeTareaData4PreviewInForm($text)
+ {
+ //if magic_quotes_gpc is on, do stipslashes
+ $text = $this->stripSlashesGPC($text);
+ return htmlSpecialChars($text, ENT_QUOTES);
+ }
+
+ function makeTareaData4InsideQuotes($text)
+ {
+ return $this->htmlSpecialChars($text);
+ }
+
+ function &oopsStripSlashesGPC($text)
+ {
+ return $this->stripSlashesGPC($text);
+ }
+
+ function &oopsStripSlashesRT($text)
+ {
+ if (get_magic_quotes_runtime()) {
+ $text =& stripslashes($text);
+ }
+ return $text;
+ }
+
+ function &oopsAddSlashes($text)
+ {
+ return $this->addSlashes($text);
+ }
+
+ function &oopsHtmlSpecialChars($text)
+ {
+ return $this->htmlSpecialChars($text);
+ }
+
+ function &oopsNl2Br($text)
+ {
+ return $this->nl2br($text);
+ }
}
?>
\ No newline at end of file
From nobunobu ＠ users.sourceforge.jp Sun Oct 8 21:15:23 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 8 Oct 2006 21:15:23 +0900
Subject: [xoops-cvslog 4905] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061008121523.BDB452AC13C@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.10 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.11
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.10 Sat Oct 7 17:26:33 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Sun Oct 8 21:15:23 2006
@@ -1,7 +1,7 @@
mConfig=&$configHandler->getConfigsByCat(XOOPS_CONF);
- $this->mRoot->mContext->mXoopsConfig =& $this->mConfig;
+
+ $config =& $configHandler->getConfigsByCat(XOOPS_CONF);
+
+ $this->setTheme($config['theme_set']);
+ $config['language'] = $this->mRoot->mLanguageManager->getLanguage();
+
+ $this->mRoot->mContext->mXoopsConfig =& $config;
+ $this->mConfig =& $config; // Compatiblity for 2.1Alpha
+ $GLOBALS['xoopsConfig'] =& $config; // Compatiblity for 2.0.x
- $this->setTheme($this->mConfig['theme_set']);
- $this->mConfig['language'] = $this->mRoot->mLanguageManager->getLanguage();
-
- $GLOBALS['xoopsConfig'] =& $this->mRoot->mContext->mXoopsConfig;
$GLOBALS['config_handler'] =& $configHandler;
}
@@ -598,7 +601,7 @@
require_once XOOPS_BASE_PATH . "/class/DebuggerManager.class.php";
- $debug_mode = $this->mConfig['debug_mode'];
+ $debug_mode = $this->mRoot->mContext->mXoopsConfig['debug_mode'];
if (defined("OH_MY_GOD_HELP_ME")) {
$debug_mode = XOOPS_DEBUG_PHP;
}
@@ -698,7 +701,7 @@
//
$xoopsModule =& $this->mRoot->mContext->mXoopsModule;
- $cachetime = $this->mConfig['module_cache'][$xoopsModule->get('mid')];
+ $cachetime = $this->mRoot->mContext->mXoopsConfig['module_cache'][$xoopsModule->get('mid')];
$filepath = $this->getModuleCacheFilePath($cacheInfo);
//
@@ -726,7 +729,7 @@
function setTheme($theme)
{
$this->mTheme = $theme;
- $this->mConfig['theme_set'] = $theme;
+ $this->mRoot->mContext->mXoopsConfig['theme_set'] = $theme;
}
function executeView()
@@ -1238,7 +1241,8 @@
}
function _setupFilterChain()
- {
$primaryPreloads = $this->mController->mRoot->getSiteConfig('Legacy.PrimaryPreloads');
+ {
+ $primaryPreloads = $this->mController->mRoot->getSiteConfig('Legacy.PrimaryPreloads');
foreach ($primaryPreloads as $className => $classPath) {
if (file_exists(XOOPS_ROOT_PATH . $classPath)) {
require_once XOOPS_ROOT_PATH . $classPath;
From nobunobu ＠ users.sourceforge.jp Sun Oct 8 21:15:23 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 8 Oct 2006 21:15:23 +0900
Subject: [xoops-cvslog 4906] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20061008121523.E41402AC143@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/preload/IPbanningFilter.class.php
diff -u xoops2jp/html/modules/base/preload/IPbanningFilter.class.php:1.1.2.2 xoops2jp/html/modules/base/preload/IPbanningFilter.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/preload/IPbanningFilter.class.php:1.1.2.2 Thu Sep 14 15:06:13 2006
+++ xoops2jp/html/modules/base/preload/IPbanningFilter.class.php Sun Oct 8 21:15:23 2006
@@ -1,7 +1,7 @@
mController->mConfig['enable_badips']) {
+ if ($this->mRoot->mContext->getXoopsConfig('enable_badips')) {
if (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR']) {
foreach ($this->mController->mConfig['bad_ips'] as $bi) {
if(!empty($bi) && strstr($_SERVER['REMOTE_ADDR'], $bi)!==false) {
From nobunobu ＠ users.sourceforge.jp Sun Oct 8 21:15:24 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 8 Oct 2006 21:15:24 +0900
Subject: [xoops-cvslog 4907] CVS update:
xoops2jp/html/modules/base/preload/Primary
Message-ID: <20061008121524.1463C2AC13C@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.3 xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.4
--- xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.3 Thu Oct 5 19:18:14 2006
+++ xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php Sun Oct 8 21:15:23 2006
@@ -1,7 +1,7 @@
mController->mConfig['closesite'] == 1) || is_array(Legacy_Utils::checkSystemModules())) {
+ if (($this->mRoot->mContext->getXoopsConfig('closesite') == 1) || is_array(Legacy_Utils::checkSystemModules())) {
$this->mController->mSetupUser->add("Legacy_SiteClose::callbackSetupUser", XCUBE_DELEGATE_PRIORITY_FINAL);
$this->mRoot->mDelegateManager->add("Site.CheckLogin.Success", array(&$this, "callbackCheckLoginSuccess"));
}
@@ -29,6 +29,7 @@
{
$retArray = Legacy_Utils::checkSystemModules();
$accessAllowFlag = false;
+ $xoopsConfig = $controller->mRoot->mContext->getXoopsConfig();
if (!empty($_POST['xoops_login'])) {
if (is_array($retArray)) {
@@ -39,7 +40,7 @@
return;
} elseif (is_object($context->mXoopsUser)) {
foreach ($context->mXoopsUser->getGroups() as $group) {
- if (in_array($group, $controller->mConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
+ if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
$accessAllowFlag = true;
break;
}
@@ -97,9 +98,9 @@
$xoopsTpl =& new XoopsTpl();
$xoopsTpl->assign('cube_module_uninstall', htmlspecialchars($_GET['cube_module_uninstall'],ENT_QUOTES));
$xoopsTpl->assign( array(
- 'xoops_sitename' => htmlspecialchars($controller->mConfig['sitename']),
+ 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
'xoops_themecss' => xoops_getcss(),
- 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $controller->mConfig['theme_set'] . '/',
+ 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
));
///< @todo filebase template with absolute file path
$xoopsTpl->compile_check = true;
@@ -139,9 +140,9 @@
$xoopsTpl->assign('disabled',$retArray['disabled']);
$xoopsTpl->assign('option',$optionModules);
$xoopsTpl->assign(array(
- 'xoops_sitename' => htmlspecialchars($controller->mConfig['sitename']),
+ 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
'xoops_themecss' => xoops_getcss(),
- 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $controller->mConfig['theme_set'] . '/'
+ 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/'
));
///< @todo filebase template with absolute file path
$xoopsTpl->compile_check = true;
@@ -156,13 +157,13 @@
if (!$accessAllowFlag) {
require_once XOOPS_ROOT_PATH . '/class/template.php';
$xoopsTpl =& new XoopsTpl();
- $xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($controller->mConfig['sitename']),
+ $xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
'xoops_themecss' => xoops_getcss(),
- 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $controller->mConfig['theme_set'] . '/',
+ 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
'lang_login' => _LOGIN,
'lang_username' => _USERNAME,
'lang_password' => _PASSWORD,
- 'lang_siteclosemsg' => $controller->mConfig['closesite_text']
+ 'lang_siteclosemsg' => $xoopsConfig['closesite_text']
));
$xoopsTpl->compile_check = true;
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:12:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:12:08 +0900
Subject: [xoops-cvslog 4908] CVS update: xoops2jp/html/modules/base
Message-ID: <20061010061208.D57F02AC1E0@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/index.php
diff -u xoops2jp/html/modules/base/index.php:1.1.2.1.2.1 xoops2jp/html/modules/base/index.php:1.1.2.1.2.2
--- xoops2jp/html/modules/base/index.php:1.1.2.1.2.1 Thu Sep 28 14:01:14 2006
+++ xoops2jp/html/modules/base/index.php Tue Oct 10 15:12:08 2006
@@ -8,12 +8,12 @@
$actionName = isset($_GET['action']) ? trim($_GET['action']) : "Default";
-$moduleRunner = new Legacy_ActionFrame(false);
+$moduleRunner =& new Legacy_ActionFrame(false);
$moduleRunner->setActionName($actionName);
$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-$root->mController->executeAction();
+$root->mController->execute();
require_once XOOPS_ROOT_PATH . "/footer.php";
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:12:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:12:23 +0900
Subject: [xoops-cvslog 4909] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20061010061223.839422AC1E0@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/index.php
diff -u xoops2jp/html/modules/base/admin/index.php:1.1.2.2.2.1 xoops2jp/html/modules/base/admin/index.php:1.1.2.2.2.2
--- xoops2jp/html/modules/base/admin/index.php:1.1.2.2.2.1 Thu Sep 28 14:01:14 2006
+++ xoops2jp/html/modules/base/admin/index.php Tue Oct 10 15:12:23 2006
@@ -8,7 +8,7 @@
$actionName = isset($_GET['action']) ? trim($_GET['action']) : "ModuleList";
-$moduleRunner = new Legacy_ActionFrame(true);
+$moduleRunner =& new Legacy_ActionFrame(true);
$moduleRunner->setActionName($actionName);
$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:12:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:12:38 +0900
Subject: [xoops-cvslog 4910] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20061010061238.76BA92AC1E0@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.3 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.4
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.3 Fri Oct 6 18:47:18 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php Tue Oct 10 15:12:38 2006
@@ -44,6 +44,13 @@
function setActionName($name)
{
$this->mActionName = $name;
+
+ //
+ // Temp FIXME!
+ //
+ $root =& XCube_Root::getSingleton();
+ $root->mContext->setAttribute('actionName', $name);
+ $root->mContext->mModule->setAttribute('actionName', $name);
}
/**
@@ -73,7 +80,7 @@
//
// Add mode.
//
- $this->mActionName = $this->mMode . $this->mActionName;
+ $this->setActionName($this->mMode . $this->mActionName);
//
// Create action object by mActionName
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:13:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:13:00 +0900
Subject: [xoops-cvslog 4911] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061010061300.BDDC62AC1E7@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.2 xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.3
--- xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.2 Sat Oct 7 18:52:22 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Module.class.php Tue Oct 10 15:13:00 2006
@@ -1,12 +1,18 @@
mAttributes[$key] = $value;
+ }
+
+ /**
+ * Gets a value indicating whether the value specified by $key exists.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ function hasAttribute($key)
+ {
+ return isset($this->mAttributes[$key]);
+ }
+
+ /**
+ * Gets a value of attributes with $key. If the value specified by $key
+ * doesn't exist in attributes, gets null.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ function getAttribute($key)
+ {
+ return isset($this->mAttributes[$key]) ? $this->mAttributes[$key] : null;
+ }
+
function &getCacheInfo()
{
if (!is_object($this->mCacheInfo)) {
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:13:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:13:12 +0900
Subject: [xoops-cvslog 4912] CVS update:
xoops2jp/html/modules/legacyRender/class
Message-ID: <20061010061312.EF5512AC1E0@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6.2.2 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6.2.3
--- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6.2.2 Thu Oct 5 18:10:12 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php Tue Oct 10 15:13:12 2006
@@ -28,6 +28,13 @@
function setActionName($name)
{
$this->mActionName = $name;
+
+ //
+ // Temp FIXME!
+ //
+ $root =& XCube_Root::getSingleton();
+ $root->mContext->setAttribute('actionName', $name);
+ $root->mContext->mModule->setAttribute('actionName', $name);
}
function execute(&$controller)
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:13:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:13:20 +0900
Subject: [xoops-cvslog 4913] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20061010061320.BA44C2AC1E0@users.sourceforge.jp>
Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.2 xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.3
--- xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.2 Thu Oct 5 18:10:30 2006
+++ xoops2jp/html/modules/pm/class/ActionFrame.class.php Tue Oct 10 15:13:20 2006
@@ -1,7 +1,7 @@
mActionName = $name;
+
+ //
+ // Temp FIXME!
+ //
+ $root =& XCube_Root::getSingleton();
+ $root->mContext->setAttribute('actionName', $name);
+ $root->mContext->mModule->setAttribute('actionName', $name);
}
function &execute(&$controller)
From minahito ＠ users.sourceforge.jp Tue Oct 10 15:13:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 15:13:33 +0900
Subject: [xoops-cvslog 4914] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061010061333.DB4E62AC1E0@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.2 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.3
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.2 Thu Oct 5 18:11:11 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php Tue Oct 10 15:13:33 2006
@@ -28,6 +28,13 @@
function setActionName($name)
{
$this->mActionName = $name;
+
+ //
+ // Temp FIXME!
+ //
+ $root =& XCube_Root::getSingleton();
+ $root->mContext->setAttribute('actionName', $name);
+ $root->mContext->mModule->setAttribute('actionName', $name);
}
function execute(&$controller)
From minahito ＠ users.sourceforge.jp Tue Oct 10 17:10:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 17:10:50 +0900
Subject: [xoops-cvslog 4915] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061010081050.1F0B92AC083@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.4
--- xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.3 Fri Oct 6 18:48:45 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php Tue Oct 10 17:10:49 2006
@@ -1,7 +1,7 @@
mController->mRoot->mContext->mXoopsUser) ? $this->mController->mRoot->mContext->mXoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
- $blockObjects=&$blockHandler->getBlocks($groups, $mid, $showFlag);
+ $blockObjects =& $blockHandler->getBlocks($groups, $mid, $showFlag);
foreach($blockObjects as $blockObject) {
- $block =& new Legacy_BlockProcedureAdapter($blockObject);
+ //
+ // IMPORTANT CONVENTION
+ //
+ $block = null;
+ $func = $blockObject->get('show_func');
+ if (substr($func, 0, 4) == 'cl::') {
+ $className = substr($func, 4);
+ if (!class_exists($className)) {
+ $filePath = XOOPS_ROOT_PATH . '/modules/' . $blockObject->get('dirname') . '/blocks/' . $blockObject->get('func_file');
+ if (!file_exists($filePath)) {
+ continue;
+ }
+
+ require_once $filePath;
+
+ if (!class_exists($className)) {
+ continue;
+ }
+ }
+
+ $block =& new $className($blockObject);
+ }
+ else {
+ $block =& new Legacy_BlockProcedureAdapter($blockObject);
+ }
+
if ($block->prepare() !== false) {
$this->mController->_mBlockChain[] =& $block;
}
From minahito ＠ users.sourceforge.jp Tue Oct 10 17:55:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 17:55:13 +0900
Subject: [xoops-cvslog 4916] CVS update:
xoops2jp/html/modules/base/language/japanese
Message-ID: <20061010085513.1CD1F2AC03E@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/language/japanese/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.59 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.59.2.1
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.59 Fri Sep 22 19:37:24 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php Tue Oct 10 17:55:12 2006
@@ -234,6 +234,7 @@
define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのインストールに成功しました");
define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "テンプレート {0} をインストールしました");
define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのアンインストールに成功しました");
+define('_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL', "{0} ブロックのアンインストールに成功しました");
define('_AD_BASE_MESSAGE_UPDATE_STARTED', "アップデートを開始します");
define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "{0} モジュールのアップデートに成功しました");
define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "新しいブロックをインストールして、サイトをカスタマイズしましょう。
モジュール付属のブロック以外にも、カスタムブロックを追加して、自由なメッセージをブロックカラムに追加できます。");
From minahito ＠ users.sourceforge.jp Tue Oct 10 17:55:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 17:55:13 +0900
Subject: [xoops-cvslog 4917] CVS update:
xoops2jp/html/modules/base/language/english
Message-ID: <20061010085513.42A732AC083@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.52 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.52.2.1
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.52 Fri Sep 22 19:37:24 2006
+++ xoops2jp/html/modules/base/language/english/admin.php Tue Oct 10 17:55:13 2006
@@ -233,6 +233,7 @@
define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{0}' module has been successful.");
define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{0}' has been installed.");
define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{0}' module has been successful.");
+define('_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL', "Uninstallation of '{0}' block has been successful.");
define('_AD_BASE_MESSAGE_UPDATE_STARTED', "Update started.");
define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{0}' module has been successful.");
define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Install new blocks, and set your site just the way you want it!
If you want to have a block with free content that is not part of a module, simply create a custom block and write your message in it.");
From minahito ＠ users.sourceforge.jp Tue Oct 10 17:55:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 17:55:43 +0900
Subject: [xoops-cvslog 4918] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20061010085543.342322AC03E@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.1 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.2
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.1 Thu Oct 5 18:07:09 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php Tue Oct 10 17:55:43 2006
@@ -195,20 +195,32 @@
$blockHandler =& xoops_gethandler('block');
$blockObj =& $blockHandler->create();
- $blockObj->setVar('mid', $module->getVar('mid'));
- $blockObj->setVar('options', $options);
- $blockObj->setVar('name', $block['name']);
- $blockObj->setVar('title', $block['name']);
- $blockObj->setVar('block_type', 'M');
- $blockObj->setVar('c_type', 1);
- $blockObj->setVar('isactive', 1);
- $blockObj->setVar('dirname', $module->getVar('dirname'));
- $blockObj->setVar('func_file', $block['file']);
- $blockObj->setVar('show_func', $block['show_func']);
- $blockObj->setVar('edit_func', $edit_func);
- $blockObj->setVar('template', $template);
- $blockObj->setVar('last_modified', time());
- $blockObj->setVar('visible', $visible);
+ $blockObj->set('mid', $module->getVar('mid'));
+ $blockObj->set('options', $options);
+ $blockObj->set('name', $block['name']);
+ $blockObj->set('title', $block['name']);
+ $blockObj->set('block_type', 'M');
+ $blockObj->set('c_type', 1);
+ $blockObj->set('isactive', 1);
+ $blockObj->set('dirname', $module->getVar('dirname'));
+ $blockObj->set('func_file', $block['file']);
+
+ //
+ // IMPORTANT CONVENTION
+ //
+ $show_func = "";
+ if (isset($block['class'])) {
+ $show_func = "cl::" . $block['class'];
+ }
+ else {
+ $show_func = $block['show_func'];
+ }
+
+ $blockObj->set('show_func', $show_func);
+ $blockObj->set('edit_func', $edit_func);
+ $blockObj->set('template', $template);
+ $blockObj->set('last_modified', time());
+ $blockObj->set('visible', $visible);
return $blockObj;
}
@@ -327,7 +339,7 @@
function unInstallBlock(&$block, &$log) {
$blockHandler =& xoops_gethandler('block');
$blockHandler->delete($block);
- $log->addReport("Uninstall block '".$block->getVar('name'));
+ $log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name'));
//
// delete permission
//
From minahito ＠ users.sourceforge.jp Tue Oct 10 18:00:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 18:00:10 +0900
Subject: [xoops-cvslog 4919] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20061010090010.610752AC0A9@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.2 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.3
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.2 Tue Oct 10 17:55:43 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php Tue Oct 10 18:00:10 2006
@@ -339,7 +339,7 @@
function unInstallBlock(&$block, &$log) {
$blockHandler =& xoops_gethandler('block');
$blockHandler->delete($block);
- $log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name'));
+ $log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name')));
//
// delete permission
//
From minahito ＠ users.sourceforge.jp Tue Oct 10 19:39:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 19:39:34 +0900
Subject: [xoops-cvslog 4920] CVS update:
xoops2jp/html/modules/user/admin/actions
Message-ID: <20061010103934.902802AC024@users.sourceforge.jp>
Index: xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.2 Mon Aug 7 20:32:00 2006
+++ xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php Tue Oct 10 19:39:34 2006
@@ -77,7 +77,7 @@
// Do 'recount'
//
$posts = 0;
- $this->mGetUserPosts->call(new XCube_Ref($posts), $xoopsUser);
+ $this->mGetUserPosts->call(new XCube_Ref($posts), $this->mObject);
$this->mObject->set('posts', $posts);
From minahito ＠ users.sourceforge.jp Tue Oct 10 19:55:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 19:55:22 +0900
Subject: [xoops-cvslog 4921] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061010105522.6313E2AC0D6@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php:1.1.2.1.2.2 xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php:1.1.2.1.2.3
--- xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php:1.1.2.1.2.2 Thu Oct 5 18:08:50 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_BlockProcedure.class.php Tue Oct 10 19:55:22 2006
@@ -1,7 +1,7 @@
mRender;
}
+ /**
+ * Gets a number as ID.
+ * @return int
+ */
function getId()
{
}
-
+
+ /**
+ * Gets a name of this block.
+ * @return string
+ */
function getName()
{
}
@@ -86,21 +98,34 @@
{
}
+ /**
+ * Gets a title of this block.
+ * @return string
+ */
function getTitle()
{
return $this->_mBlock->get('title');
}
+ /**
+ * Gets a column index of this block.
+ * @return int
+ */
function getEntryIndex()
{
}
+ /**
+ * Gets a weight of this block.
+ * @return int
+ */
function getWeight()
{
}
/**
* Gets a value indicating whether this block nees to display its content.
+ * @return bool
*/
function isDisplay()
{
@@ -108,6 +133,11 @@
}
}
+/**
+ * This class extends the base class to exchange of information with the
+ * controller. And, it has a XoopsBlock instance, and some public methods for
+ * the public side and the control panel side.
+ */
class Legacy_BlockProcedure extends Legacy_AbstractBlockProcedure
{
/**
@@ -164,6 +194,14 @@
{
return $this->_mBlock->get('weight');
}
+
+ /**
+ * Gets rendered HTML buffer for the option form of the control panel.
+ * @return string
+ */
+ function getOptionForm()
+ {
+ }
}
/**
@@ -205,6 +243,75 @@
{
return $this->_mDisplayFlag;
}
+
+ function getOptionForm()
+ {
+ if ($this->_mBlock->get('func_file') && $this->_mBlock->get('edit_func')) {
+ $func_file = XOOPS_MODULE_PATH . "/" . $this->_mBlock->get('dirname') . "/blocks/" . $this->_mBlock->get('func_file');
+ if (file_exists($func_file)) {
+ require $func_file;
+ $edit_func = $this->_mBlock->get('edit_func');
+
+ $options = explode('|', $this->_mBlock->get('options'));
+
+ if (function_exists($edit_func)) {
+ //
+ // load language file.
+ //
+ $root =& XCube_Root::getSingleton();
+ $langManager =& $root->getLanguageManager();
+ $langManager->loadBlockMessageCatalog($this->_mBlock->get('dirname'));
+
+ return call_user_func($edit_func, $options);
+ }
+ }
+ }
+
+ return null;
+ }
+}
+
+/**
+ * Static method collection for blocks in the public side.
+ */
+class Legacy_BlockUtils
+{
+ /**
+ * Creates a instance of the block procedure with the generating convention.
+ * And, returns it.
+ * @static
+ * @return Legacy_BlockProcedure
+ */
+ function createBlockProcedure(&$block)
+ {
+ //
+ // IMPORTANT CONVENTION
+ //
+ $retBlock = null;
+ $func = $block->get('show_func');
+ if (substr($func, 0, 4) == 'cl::') {
+ $className = substr($func, 4);
+ if (!class_exists($className)) {
+ $filePath = XOOPS_ROOT_PATH . '/modules/' . $block->get('dirname') . '/blocks/' . $block->get('func_file');
+ if (!file_exists($filePath)) {
+ continue;
+ }
+
+ require_once $filePath;
+
+ if (!class_exists($className)) {
+ continue;
+ }
+ }
+
+ $retBlock =& new $className($block);
+ }
+ else {
+ $retBlock =& new Legacy_BlockProcedureAdapter($block);
+ }
+
+ return $retBlock;
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Tue Oct 10 19:55:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 19:55:36 +0900
Subject: [xoops-cvslog 4922] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061010105536.4FF042AC0EE@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.4 xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.5
--- xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.4 Tue Oct 10 17:10:49 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php Tue Oct 10 19:55:36 2006
@@ -1,7 +1,7 @@
getBlocks($groups, $mid, $showFlag);
foreach($blockObjects as $blockObject) {
- //
- // IMPORTANT CONVENTION
- //
- $block = null;
- $func = $blockObject->get('show_func');
- if (substr($func, 0, 4) == 'cl::') {
- $className = substr($func, 4);
- if (!class_exists($className)) {
- $filePath = XOOPS_ROOT_PATH . '/modules/' . $blockObject->get('dirname') . '/blocks/' . $blockObject->get('func_file');
- if (!file_exists($filePath)) {
- continue;
- }
-
- require_once $filePath;
-
- if (!class_exists($className)) {
- continue;
- }
- }
-
- $block =& new $className($blockObject);
- }
- else {
- $block =& new Legacy_BlockProcedureAdapter($blockObject);
- }
+ $block =& Legacy_BlockUtils::createBlockProcedure($blockObject);
if ($block->prepare() !== false) {
$this->mController->_mBlockChain[] =& $block;
From minahito ＠ users.sourceforge.jp Tue Oct 10 19:55:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 10 Oct 2006 19:55:47 +0900
Subject: [xoops-cvslog 4923] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061010105547.C70AD2AC0EE@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10.2.1 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10.2.2
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.10.2.1 Sat Oct 7 18:25:40 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php Tue Oct 10 19:55:47 2006
@@ -1,7 +1,7 @@
mObject->get('func_file') && $this->mObject->get('edit_func')) {
- $func_file = XOOPS_MODULE_PATH . "/" . $this->mObject->get('dirname') . "/blocks/" . $this->mObject->get('func_file');
- if (file_exists($func_file)) {
- require $func_file;
- $edit_func = $this->mObject->get('edit_func');
-
- $options = explode('|', $this->mObject->get('options'));
-
- if (function_exists($edit_func)) {
- //
- // load language file.
- //
- $root =& XCube_Root::getSingleton();
- $langManager =& $root->getLanguageManager();
- $langManager->loadBlockMessageCatalog($this->mObject->get('dirname'));
-
- $this->_mOptionForm = call_user_func($edit_func, $options);
- }
- }
- }
+ $this->_mOptionForm = $this->_getOptionForm();
$render->setAttribute('optionForm', $this->_mOptionForm);
}
+
+ /**
+ * Gets rendered HTML buffer of the block optional edit form.
+ */
+ function _getOptionForm()
+ {
+ $block =& Legacy_BlockUtils::createBlockProcedure($this->mObject);
+ return $block->getOptionForm();
+ }
function executeViewSuccess(&$controller, &$xoopsUser, &$render)
{
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:10:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:10:19 +0900
Subject: [xoops-cvslog 4924] CVS update:
xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061011081019.E12D42AC01D@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.3 Thu Oct 5 19:18:13 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php Wed Oct 11 17:10:19 2006
@@ -175,7 +175,7 @@
// Theme rendering
//
$blocks = array();
- foreach($this->mController->mBlockContents[0] as $key => $result) {
+ foreach($this->mController->mRoot->mContext->mAttributes['legacy_BlockContents'][0] as $key => $result) {
// $this->mSmarty->append('xoops_lblocks', $result);
$blocks[$result['name']] = $result;
}
@@ -212,9 +212,9 @@
$result = null;
if ($target->getTemplateName()) {
- if ($target->getModuleName()) {
- $this->mSmarty->setModulePrefix($target->getModuleName());
- $this->mSmarty->template_dir = XOOPS_MODULE_PATH . "/" . $target->getModuleName() . "/admin/". LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME;
+ if ($target->getAttribute('legacy_module') != null) {
+ $this->mSmarty->setModulePrefix($target->getAttribute('legacy_module'));
+ $this->mSmarty->template_dir = XOOPS_MODULE_PATH . "/" . $target->getAttribute('legacy_module') . "/admin/". LEGACY_ADMIN_RENDER_TEMPLATE_DIRNAME;
}
$result=$this->mSmarty->fetch("file:".$target->getTemplateName());
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:10:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:10:32 +0900
Subject: [xoops-cvslog 4925] CVS update:
xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061011081032.6EB982AC01D@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderTarget.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderTarget.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderTarget.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderTarget.class.php:1.1.2.3 Tue Mar 28 22:30:50 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderTarget.class.php Wed Oct 11 17:10:32 2006
@@ -1,10 +1,15 @@
setType(XCUBE_RENDER_TARGET_TYPE_THEME);
+ $this->setAttribute('legacy_buffertype', LEGACY_RENDER_TARGET_TYPE_THEME);
}
function sendHeader()
@@ -66,7 +71,7 @@
function Legacy_RenderTargetMain()
{
parent::XCube_RenderTarget();
- $this->setType(XCUBE_RENDER_TARGET_TYPE_MAIN);
+ $this->setAttribute('legacy_buffertype', LEGACY_RENDER_TARGET_TYPE_MAIN);
}
}
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:11:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:11:19 +0900
Subject: [xoops-cvslog 4926] CVS update:
xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061011081119.AA11E2AC02F@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.2 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.3
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.2 Thu Oct 5 18:09:58 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php Wed Oct 11 17:11:19 2006
@@ -1,6 +1,6 @@
mBlockContents = array();
}
function prepare(&$controller)
@@ -197,7 +193,7 @@
//
// The following lines are temporary until we will finish changing the style!
//
- switch ($target->getType()) {
+ switch ($target->getAttribute('legacy_buffertype')) {
case XCUBE_RENDER_TARGET_TYPE_BLOCK:
$this->renderBlock($target);
break;
@@ -285,8 +281,8 @@
foreach($assignNameMap as $key=>$val) {
$this->mXoopsTpl->assign($val['showflag'],$this->_getBlockShowFlag($val['showflag']));
- if(isset($this->mController->mBlockContents[$key])) {
- foreach($this->mController->mBlockContents[$key] as $result) {
+ if(isset($this->mController->mRoot->mContext->mAttributes['legacy_BlockContents'][$key])) {
+ foreach($this->mController->mRoot->mContext->mAttributes['legacy_BlockContents'][$key] as $result) {
$this->mXoopsTpl->append($val['block'], $result);
}
}
@@ -312,17 +308,17 @@
switch($area) {
case 'xoops_showrblock' :
if (isset($GLOBALS['show_rblock']) && empty($GLOBALS['show_rblock'])) return 0;
- return (!empty($this->mController->mBlockShowFlags[XOOPS_SIDEBLOCK_RIGHT])) ? 1 : 0;
+ return (!empty($this->mController->mRoot->mContext->mAttributes['legacy_BlockShowFlags'][XOOPS_SIDEBLOCK_RIGHT])) ? 1 : 0;
break;
case 'xoops_showlblock' :
if (isset($GLOBALS['show_lblock']) && empty($GLOBALS['show_lblock'])) return 0;
- return (!empty($this->mController->mBlockShowFlags[XOOPS_SIDEBLOCK_LEFT])) ? 1 : 0;
+ return (!empty($this->mController->mRoot->mContext->mAttributes['legacy_BlockShowFlags'][XOOPS_SIDEBLOCK_LEFT])) ? 1 : 0;
break;
case 'xoops_showcblock' :
if (isset($GLOBALS['show_cblock']) && empty($GLOBALS['show_cblock'])) return 0;
- return (!empty($this->mController->mBlockShowFlags[XOOPS_CENTERBLOCK_LEFT])||
- !empty($this->mController->mBlockShowFlags[XOOPS_CENTERBLOCK_RIGHT])||
- !empty($this->mController->mBlockShowFlags[XOOPS_CENTERBLOCK_CENTER])) ? 1 : 0;
+ return (!empty($this->mController->mRoot->mContext->mAttributes['legacy_BlockShowFlags'][XOOPS_CENTERBLOCK_LEFT])||
+ !empty($this->mController->mRoot->mContext->mAttributes['legacy_BlockShowFlags'][XOOPS_CENTERBLOCK_RIGHT])||
+ !empty($this->mController->mRoot->mContext->mAttributes['legacy_BlockShowFlags'][XOOPS_CENTERBLOCK_CENTER])) ? 1 : 0;
break;
default :
return 0;
@@ -415,7 +411,7 @@
$this->_renderFooter();
}
- function &createRenderTarget($type = XCUBE_RENDER_TARGET_TYPE_MAIN)
+ function &createRenderTarget($type = LEGACY_RENDER_TARGET_TYPE_MAIN, $option = null)
{
$renderTarget = null;
switch ($type) {
@@ -423,9 +419,13 @@
$renderTarget =& new Legacy_RenderTargetMain();
break;
+ case LEGACY_RENDER_TARGET_TYPE_BLOCK:
+ $renderTarget =& new XCube_RenderTarget();
+ $renderTarget->setAttribute('legacy_buffertype', LEGACY_RENDER_TARGET_TYPE_BLOCK);
+ break;
+
default:
$renderTarget =& new XCube_RenderTarget();
- $renderTarget->setType($type);
break;
}
@@ -444,14 +444,14 @@
function LegacyRender_smartyfunction_notifications_select($params, &$smarty)
{
- $renderTarget =& new XCube_RenderTarget();
- $renderTarget->setType(XCUBE_RENDER_TARGET_TYPE_MAIN);
+ $root =& XCube_Root::getSingleton();
+ $renderSystem =& $root->getRenderSystem('Legacy_RenderSystem');
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
$renderTarget->setTemplateName("legacy_notification_select_form.html");
XCube_DelegateUtils::call('Legacyfunction.Notifications.Select', new XCube_Ref($renderTarget));
- $root =& XCube_Root::getSingleton();
- $renderSystem =& $root->getRenderSystem('Legacy_RenderSystem');
$renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:12:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:12:58 +0900
Subject: [xoops-cvslog 4927] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061011081258.0D6CD2AC01D@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.4 xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.5
--- xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.11.2.4 Sat Oct 7 18:01:56 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php Wed Oct 11 17:12:57 2006
@@ -162,7 +162,7 @@
$xoops_notification['target_page'] = "notification_update.php";
$xoops_notification['redirect_script'] = xoops_getenv('PHP_SELF');
- $render->setAttribute('editprofile_url', $urlXOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid'));
+ $render->setAttribute('editprofile_url', XOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid'));
switch ($xoopsUser->getVar('notify_method')) {
case XOOPS_NOTIFICATION_METHOD_DISABLE:
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:13:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:13:17 +0900
Subject: [xoops-cvslog 4928] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061011081317.A02E52AC01D@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.4
--- xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.3 Tue Oct 10 15:13:00 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Module.class.php Wed Oct 11 17:13:17 2006
@@ -1,7 +1,7 @@
mRender =& new XCube_RenderTarget();
- $this->mRender->setType(XCUBE_RENDER_TARGET_TYPE_MAIN);
+ $root =& XCube_Root::getSingleton();
+ $renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
+
+ $this->mRender =& $renderSystem->createRenderTarget('main');
if ($this->mXoopsModule != null) {
- $this->mRender->setModuleName($this->mXoopsModule->get('dirname'));
+ $this->mRender->setAttribute('legacy_module', $this->mXoopsModule->get('dirname'));
}
}
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:13:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:13:40 +0900
Subject: [xoops-cvslog 4929] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061011081340.ED64B2AC01D@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.11 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.12
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.11 Sun Oct 8 21:15:23 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Wed Oct 11 17:13:40 2006
@@ -1,7 +1,7 @@
setType(XCUBE_RENDER_TARGET_TYPE_BLOCK);
-
+ $context =& $this->mRoot->mContext;
$cacheInfo =& new Legacy_BlockCacheInformation();
foreach ($this->_mBlockChain as $blockProcedure) {
- $renderTarget->reset();
-
//
// This is a flag indicating whether the controller needs to call
// the logic of the block.
@@ -307,8 +296,8 @@
if ($cacheInfo->isEnableCache() && $this->existActiveCacheFile($filepath, $blockProcedure->getCacheTime())) {
$content = $this->loadCache($filepath);
if ($content != null) {
- $this->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
- $this->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
+ $context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
+ $context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
'name' => $blockProcedure->getName(),
'title' => $blockProcedure->getTitle(),
'content' => $content,
@@ -329,8 +318,8 @@
$renderBuffer =& $blockProcedure->getRenderBuffer();
- $this->mBlockShowFlags[$blockProcedure->getEntryIndex()] = true;
- $this->mBlockContents[$blockProcedure->getEntryIndex()][] = array(
+ $context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
+ $context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
'name' => $blockProcedure->getName(),
'title'=>$blockProcedure->getTitle(),
'content'=>$renderBuffer->getResult(),
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:13:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:13:54 +0900
Subject: [xoops-cvslog 4930] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20061011081354.A28272AC01D@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/actions/BackendAction.class.php
diff -u xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.7.2.1 xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.7.2.2
--- xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.7.2.1 Thu Oct 5 19:17:25 2006
+++ xoops2jp/html/modules/base/actions/BackendAction.class.php Wed Oct 11 17:13:54 2006
@@ -54,9 +54,10 @@
//
// Set up the render buffer.
//
- $renderTarget =& new XCube_RenderTarget();
- $renderTarget->setType(XCUBE_RENDER_TARGET_TYPE_MAIN);
+ $renderSystem =& $controller->mRoot->getRenderSystem('Legacy_RenderSystem');
+ $renderTarget =& $renderSystem->createRenderTarget('main');
+
$renderTarget->setTemplateName("legacy_rss.html");
$renderTarget->setAttribute('channel_title', $xoopsConfig['sitename']);
@@ -93,7 +94,6 @@
//
// Rendering
//
- $renderSystem =& $controller->mRoot->getRenderSystem('Legacy_RenderSystem');
$renderSystem->renderWithTarget($renderTarget);
if (function_exists('mb_http_output')) {
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:14:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:14:01 +0900
Subject: [xoops-cvslog 4931] CVS update: xoops2jp/html/include
Message-ID: <20061011081401.C43332AC01D@users.sourceforge.jp>
Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19 xoops2jp/html/include/functions.php:1.2.8.19.2.1
--- xoops2jp/html/include/functions.php:1.2.8.19 Mon Sep 25 23:50:56 2006
+++ xoops2jp/html/include/functions.php Wed Oct 11 17:14:01 2006
@@ -1,5 +1,5 @@
getRenderSystem($root->mContext->mBaseRenderSystemName);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoops_error.html");
+
$renderTarget->setAttribute("style", $style);
$renderTarget->setAttribute("title", $title);
$renderTarget->setAttribute("message", $message);
- $renderer =& $root->getRenderSystem(LEGACY_DEPENDENCE_RENDERER);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
print $renderTarget->getResult();
}
@@ -94,15 +96,17 @@
function xoops_result($message, $title='')
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoops_result.html");
+
$renderTarget->setAttribute("title", $title);
$renderTarget->setAttribute("message", $message);
- $renderer =& $root->getRenderSystem(LEGACY_DEPENDENCE_RENDERER);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
print $renderTarget->getResult();
}
@@ -121,9 +125,11 @@
$tokenHandler->register($token);
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoops_confirm.html");
$renderTarget->setAttribute("action", $action);
@@ -133,8 +139,7 @@
$renderTarget->setAttribute("tokenName", $token->getTokenName());
$renderTarget->setAttribute("tokenValue", $token->getTokenValue());
- $renderer =& $root->getRenderSystem(LEGACY_DEPENDENCE_RENDERER);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
print $renderTarget->getResult();
}
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:14:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:14:11 +0900
Subject: [xoops-cvslog 4932] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061011081411.597632AC01D@users.sourceforge.jp>
Index: xoops2jp/html/class/xoopsform/formtextdateselect.php
diff -u xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4 xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4.2.1
--- xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formtextdateselect.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_textdateselect.html");
$renderTarget->setAttribute("element", $this);
$renderTarget->setAttribute("date", date("Y-m-d", $this->getValue()));
$jstime = formatTimestamp($this->getValue(), '"F j, Y H:i:s"');
- include_once XOOPS_ROOT_PATH.'/include/calendarjs.php';
+ include_once XOOPS_ROOT_PATH.'/include/calendarjs.php'; //< FIXME
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formselect.php
diff -u xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3 xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3.2.1
--- xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formselect.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_select.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formfile.php
diff -u xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2 xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formfile.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_file.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
$renderer->renderWithTarget($renderTarget);
return $renderTarget->getResult();
Index: xoops2jp/html/class/xoopsform/formtextarea.php
diff -u xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2 xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formtextarea.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget();
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_textarea.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formtext.php
diff -u xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2 xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formtext.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_text.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/themeform.php
diff -u xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3 xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3.2.1
--- xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3 Sat Sep 23 15:57:46 2006
+++ xoops2jp/html/class/xoopsform/themeform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_themeform.html");
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
$ret = $renderTarget->getResult();
$ret .= $this->renderValidationJS( true );
Index: xoops2jp/html/class/xoopsform/formcheckbox.php
diff -u xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2 xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formcheckbox.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
if ( count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) != "[]" ) {
$newname = $this->getName()."[]";
$this->setName($newname);
}
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_checkbox.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formlabel.php
diff -u xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2 xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formlabel.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_label.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formhidden.php
diff -u xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2 xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formhidden.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_hidden.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/simpleform.php
diff -u xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2 xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/simpleform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_simpleform.html");
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/grouppermform.php
diff -u xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3 xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.1
--- xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/grouppermform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
addElement($tray);
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_grouppermform.html");
+
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/form.php
diff -u xoops2jp/html/class/xoopsform/form.php:1.2.8.4 xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.1
--- xoops2jp/html/class/xoopsform/form.php:1.2.8.4 Sat Sep 23 11:03:09 2006
+++ xoops2jp/html/class/xoopsform/form.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget();
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_opt_validationjs.html");
$renderTarget->setAttribute('form', $this);
$renderTarget->setAttribute('withtags', $withtags);
@@ -392,8 +394,7 @@
$renderTarget->setAttribute('required', $required);
$renderTarget->setAttribute('required_count', $reqcount);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
Index: xoops2jp/html/class/xoopsform/formpassword.php
diff -u xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2 xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formpassword.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_password.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formelementtray.php
diff -u xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2 xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formelementtray.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_elementtray.html");
$renderTarget->setAttribute("tray", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formbutton.php
diff -u xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2 xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formbutton.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_button.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/tableform.php
diff -u xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2 xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/tableform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_tableform.html");
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formdhtmltextarea.php
diff -u xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6 xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6.2.1
--- xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6 Tue Sep 26 13:33:57 2006
+++ xoops2jp/html/class/xoopsform/formdhtmltextarea.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_dhtmltextarea.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
$ret = $renderTarget->getResult();
$ret .= $this->_renderSmileys();
@@ -112,15 +113,15 @@
$smilesArr =& $handler->getObjects(new Criteria('display', 1));
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_opt_smileys.html");
$renderTarget->setAttribute("element", $this);
$renderTarget->setAttribute("smilesArr", $smilesArr);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formradio.php
diff -u xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2 xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formradio.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget();
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_radio.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
From minahito ＠ users.sourceforge.jp Wed Oct 11 17:17:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 11 Oct 2006 17:17:43 +0900
Subject: [xoops-cvslog 4933] CVS update: xoops2jp/html/core
Message-ID: <20061011081743.3DC6A2AC01D@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_RenderSystem.class.php
diff -u xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.1 xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.1 Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_RenderSystem.class.php Wed Oct 11 17:17:43 2006
@@ -1,7 +1,7 @@
mName;
}
- function setModuleName($name)
- {
- $this->mModuleName = $name;
- }
-
- function getModuleName()
- {
- return $this->mModuleName;
- }
-
function setTemplateName($name)
{
$this->mTemplateName = $name;
@@ -121,19 +114,23 @@
/**
* Set render-target type.
* @param $type int Use constants that are defined by us.
+ * @deprecated
*/
function setType($type)
{
$this->mType = $type;
+ $this->setAttribute('legacy_buffertype', $type);
}
/**
* Return render-target type.
* @return int
+ * @deprecated
*/
function getType()
{
- return $this->mType;
+ return $this->getAttribute('legacy_buffertype', $type);
+ //return $this->mType;
}
/**
@@ -142,7 +139,6 @@
function reset()
{
$this->setTemplateName(null);
- $this->setModuleName(null);
unset($this->mAttributes);
$this->mAttributes = array();
$this->mRenderBuffer = null;
@@ -181,14 +177,11 @@
/**
* Create an object of the render-target, and return it.
*
- * @param int $type The number which shows the type of the render-target. Use constants.
* @return XCube_RenderTarget
*/
- function &createRenderTarget($type = XCUBE_RENDER_TARGET_TYPE_MAIN)
+ function &createRenderTarget()
{
$renderTarget =& new XCube_RenderTarget();
- $renderTarget->setType($type);
-
return $renderTarget;
}
From nobunobu ＠ users.sourceforge.jp Thu Oct 12 00:18:37 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 12 Oct 2006 00:18:37 +0900
Subject: [xoops-cvslog 4934] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061011151837.623F52AC0F4@users.sourceforge.jp>
Index: xoops2jp/html/class/xoopsform/formfile.php
diff -u xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.1 xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.2
--- xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.1 Wed Oct 11 17:14:11 2006
+++ xoops2jp/html/class/xoopsform/formfile.php Thu Oct 12 00:18:37 2006
@@ -1,5 +1,5 @@
setTemplateName("legacy_xoopsform_file.html");
$renderTarget->setAttribute("element", $this);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
From nobunobu ＠ users.sourceforge.jp Thu Oct 12 00:19:02 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 12 Oct 2006 00:19:02 +0900
Subject: [xoops-cvslog 4935] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20061011151902.342702AC0F4@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/templates/legacy_xoopsform_elementtray.html
diff -u xoops2jp/html/modules/base/templates/legacy_xoopsform_elementtray.html:1.1.2.2 xoops2jp/html/modules/base/templates/legacy_xoopsform_elementtray.html:1.1.2.2.2.1
--- xoops2jp/html/modules/base/templates/legacy_xoopsform_elementtray.html:1.1.2.2 Sat Sep 23 17:42:21 2006
+++ xoops2jp/html/modules/base/templates/legacy_xoopsform_elementtray.html Thu Oct 12 00:19:02 2006
@@ -3,7 +3,7 @@
<{$tray->getDelimeter()}>
<{/if}>
<{if is_object($element) }>
- <{if $element->getCaption != ''}>
+ <{if $element->getCaption() != ''}>
<{$element->getCaption()}>
<{/if}>
<{$element->render()}>
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:00:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:00:26 +0900
Subject: [xoops-cvslog 4936] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061012110026.3927D2AC220@users.sourceforge.jp>
Index: xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php
diff -u /dev/null xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php:1.1.2.1
--- /dev/null Thu Oct 12 20:00:26 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php Thu Oct 12 20:00:26 2006
@@ -0,0 +1,32 @@
+
+ * -------------------------------------------------------------
+ */
+function smarty_function_xoops_explaceholder($params, &$smarty)
+{
+ $buf = null;
+
+ if (isset($params['control'])) {
+ XCube_DelegateUtils::call('Legacy.Event.Explaceholder.Get.' . $params['control'], new XCube_Ref($buf), $params);
+
+ if ($buf === null) {
+ XCube_DelegateUtils::call('Legacy.Event.Explaceholder.Get', new XCube_Ref($buf), $params['control'], $params);
+ }
+ }
+
+ return $buf;
+}
+
+?>
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:00:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:00:35 +0900
Subject: [xoops-cvslog 4937] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061012110035.EDE552AC220@users.sourceforge.jp>
Index: xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3 xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.1
--- xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3 Fri Jan 27 17:23:38 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php Thu Oct 12 20:00:35 2006
@@ -10,84 +10,70 @@
* Author: minahito
* Purpose: the place holder for xoops pagenavi.
* Input: pagenavi =
- * total =
- * current =
- * perpage =
- * url =
* offset =
*
- * Examples: {xoops_pagenavi total=20 current=3 url="list.php?start="}
+ * Examples: {xoops_pagenavi pagenavi=$pagenavi}
* -------------------------------------------------------------
*/
function smarty_function_xoops_pagenavi($params, &$smarty)
{
- $ret="";
+ $ret = "";
- if(isset($params['pagenavi'])&&is_object($params['pagenavi'])) {
- $perPage =$params['pagenavi']->getPerpage();
- if ($perPage == 0) {
+ if (isset($params['pagenavi']) && is_object($params['pagenavi'])) {
+
+ $navi =& $params['pagenavi'];
+
+ $perPage = $navi->getPerpage();
+
+ $total = $navi->getTotalItems();
+ $totalPages = $navi->getTotalPages();
+
+ if ($totalPages == 0) {
return;
}
-
- $total=$params['pagenavi']->getTotal();
- $totalPages = ceil($params['pagenavi']->getTotal() / $perPage);
- $url=$params['pagenavi']->getRenderUrl();
- $current=$params['pagenavi']->getStart();
- }
- else {
- $perPage=isset($params['perpage']) ? intval($params['perpage']) : 20;
- if ($perPage == 0) {
- return;
+
+ $url = $navi->renderURLForPage();
+ $current = $navi->getStart();
+
+ $offset = isset($params['offset']) ? intval($params['offset']) : 4;
+
+ //
+ // check prev
+ //
+ if($navi->hasPrivPage()) {
+ $ret .= @sprintf("«", $navi->renderURLForPage($navi->getPrivStart()));
}
- $total=$params['total'];
- $totalPages = ceil($total / $perPage);
- $url=$params['url'];
- $current=$params['current'];
- }
-
- $offset=isset($params['offset']) ? intval($params['offset']) : 4;
-
- if($totalPages==0)
- return;
-
- //
- // check prev
- //
- $prev=$current-$perPage;
- if($prev>=0)
- $ret.=@sprintf("«",$url,$prev);
-
-
- //
- // counting
- //
- $counter=1;
- $currentPage=intval(floor(($current+$perPage)/$perPage));
- while($counter<=$totalPages) {
- if($counter==$currentPage) {
- $ret.=@sprintf("(%d) ",$counter);
- }
- elseif(($counter>$currentPage-$offset && $counter<$currentPage+$offset) || $counter==1 || $counter==$totalPages) {
- if($counter==$totalPages && $currentPage<$totalPages-$offset) {
- $ret.="... ";
+ //
+ // counting
+ //
+ $counter=1;
+ $currentPage = $navi->getCurrentPage();
+ while($counter<=$totalPages) {
+ if($counter==$currentPage) {
+ $ret.=@sprintf("(%d) ",$counter);
}
- $ret .= @sprintf("%d ",$url,($counter-1)*$perPage,$counter);
- if($counter==1 && $currentPage>1 + $offset) {
- $ret.="... ";
+ elseif(($counter>$currentPage-$offset && $counter<$currentPage+$offset) || $counter==1 || $counter==$totalPages) {
+ if($counter==$totalPages && $currentPage<$totalPages-$offset) {
+ $ret.="... ";
+ }
+ $ret .= @sprintf("%d ",$navi->renderURLForPage(($counter-1)*$perPage),$counter);
+ if($counter==1 && $currentPage>1 + $offset) {
+ $ret.="... ";
+ }
}
+ $counter++;
+ }
+
+ //
+ // check next
+ //
+ $next=$current + $perPage;
+ if($navi->hasNextPage()) {
+ $ret.=@sprintf("»",$navi->renderURLForPage($navi->getNextStart()));
}
- $counter++;
}
- //
- // check next
- //
- $next=$current + $perPage;
- if($total>$next)
- $ret.=@sprintf("»",$url,$next);
-
-
print $ret;
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:00:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:00:45 +0900
Subject: [xoops-cvslog 4938] CVS update: xoops2jp/html/core
Message-ID: <20061012110045.2BB112AC221@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_PageNavigator.class.php
diff -u xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.2 xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.2 Fri Oct 6 20:14:36 2006
+++ xoops2jp/html/core/XCube_PageNavigator.class.php Thu Oct 12 20:00:45 2006
@@ -1,7 +1,7 @@
mUrl = $url;
- $this->setTotal($total);
$this->mFlags = $flags;
- $this->mExtraFetch =& new XCube_Delegate();
+ $this->mFetch =& new XCube_Delegate();
+ $this->mFetch->add(array(&$this, 'fetchNaviControl'));
+
+ $this->mGetTotalItems =& new XCube_Delegate();
}
/**
@@ -119,6 +122,11 @@
*/
function fetch()
{
+ $this->mFetch->call(new XCube_Ref($this));
+ }
+
+ function fetchNaviControl()
+ {
$root =& XCube_Root::getSingleton();
$startKey = $this->getStartKey();
@@ -137,8 +145,6 @@
$this->mPerpage = intval($t_perpage);
}
}
-
- $this->mExtraFetch->call(new XCube_Ref($this));
}
function addExtra($key, $value)
@@ -208,6 +214,56 @@
return $url . $demiliter . $this->getStartKey() . "=";
}
+ function renderUrlForSort()
+ {
+ if(count($this->mExtra) > 0) {
+ $tarr=array();
+
+ foreach($this->mExtra as $key=>$value) {
+ $tarr[]=$key."=".urlencode($value);
+ }
+
+ $tarr[] = $this->getPerpageKey() . "=" . $this->mPerpage;
+
+ if(strpos($this->mUrl,"?")!==false) {
+ return $this->mUrl."&".implode("&",$tarr);
+ }
+ else {
+ return $this->mUrl."?".implode("&",$tarr);
+ }
+ }
+
+ return $this->mUrl;
+ }
+
+ function renderUrlForPage($page = null)
+ {
+ $tarr=array();
+
+ foreach($this->mExtra as $key=>$value) {
+ $tarr[]=$key."=".urlencode($value);
+ }
+
+ foreach($this->mSort as $key=>$value) {
+ $tarr[]=$key."=".urlencode($value);
+ }
+
+ $tarr[] = $this->getPerpageKey() . "=" . $this->getPerpage();
+
+ if ($page !== null) {
+ $tarr[] = $this->getStartKey() . '=' . intval($page);
+ }
+
+ if(strpos($this->mUrl,"?")!==false) {
+ return $this->mUrl."&".implode("&",$tarr);
+ }
+ else {
+ return $this->mUrl."?".implode("&",$tarr);
+ }
+
+ return $this->mUrl;
+ }
+
/**
* Return url string for sort. The return value is complete style.
*/
@@ -226,21 +282,30 @@
return $this->mStart;
}
- function setTotal($total)
+ function setTotalItems($total)
{
$this->mTotal = intval($total);
$this->_mIsSpecifiedTotal = true;
}
- function getTotal()
+ function getTotalItems()
{
- if (!$this->_mIsSpecifiedTotal) {
- $this->mGetTotal->call(new XCube_Ref($this->mTotal), $this);
+ if ($this->_mIsSpecifedTotalItems == false) {
+ $total = 0;
+ $this->mGetTotalItems->call(new XCube_Ref($total));
+ $this->setTotalItems($total);
+
+ $this->_mIsSpecifedTotalItems = true;
}
return $this->mTotal;
}
+ function getTotalPages()
+ {
+ return ceil($this->getTotalItems() / $this->getPerpage());
+ }
+
function setPerpage($perpage)
{
$this->mPerpage = intval($perpage);
@@ -275,6 +340,35 @@
{
return $this->mPrefix . "perpage";
}
+
+ function getCurrentPage()
+ {
+ return intval(floor(($this->getStart() + $this->getPerpage()) / $this->getPerpage()));
+ }
+
+ function hasPrivPage()
+ {
+ return ($this->getStart() - $this->getPerpage()) >= 0;
+ }
+
+ function getPrivStart()
+ {
+ $prev = $this->getStart() - $this->getPerpage();
+
+ return ($prev > 0) ? $prev : 0;
+ }
+
+ function hasNextPage()
+ {
+ return $this->getTotalItems() > ($this->getStart() + $this->getPerpage());
+ }
+
+ function getNextStart()
+ {
+ $next = $this->getStart() + $this->getPerpage();
+
+ return ($this->getTotalItems() > $next) ? $next : 0;
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:01:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:01:07 +0900
Subject: [xoops-cvslog 4939] CVS update: xoops2jp/html/include
Message-ID: <20061012110107.DB0F42AC222@users.sourceforge.jp>
Index: xoops2jp/html/include/cp_header.php
diff -u xoops2jp/html/include/cp_header.php:1.2.8.5.2.1 xoops2jp/html/include/cp_header.php:1.2.8.5.2.2
--- xoops2jp/html/include/cp_header.php:1.2.8.5.2.1 Thu Oct 5 18:06:10 2006
+++ xoops2jp/html/include/cp_header.php Thu Oct 12 20:01:07 2006
@@ -1,7 +1,7 @@
mController->setStrategy($strategy);
$root->mController->setupModuleContext();
+$root->mController->_mStrategy->setupModuleLanguage(); //< Umm...
//
// TODO
Index: xoops2jp/html/include/cp_functions.php
diff -u xoops2jp/html/include/cp_functions.php:1.2.8.4.2.1 xoops2jp/html/include/cp_functions.php:1.2.8.4.2.2
--- xoops2jp/html/include/cp_functions.php:1.2.8.4.2.1 Thu Oct 5 18:06:10 2006
+++ xoops2jp/html/include/cp_functions.php Thu Oct 12 20:01:07 2006
@@ -1,5 +1,5 @@
mController->setStrategy($strategy);
$root->mController->setupModuleContext();
+ $root->mController->_mStrategy->setupModuleLanguage(); //< Umm...
require_once XOOPS_ROOT_PATH."/header.php";
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:01:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:01:30 +0900
Subject: [xoops-cvslog 4940] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20061012110130.2F3D52AC221@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.3 Thu Jul 20 17:19:34 2006
+++ xoops2jp/html/modules/base/actions/ImageListAction.class.php Thu Oct 12 20:01:30 2006
@@ -24,9 +24,9 @@
return $handler;
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
- $filter =& new Legacy_ImageFilterForm($navi);
+ $filter =& new Legacy_ImageFilterForm($this->_getNavi(), $this->_getHandler());
return $filter;
}
@@ -56,7 +56,7 @@
}
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
$render->setAttribute('imgcatId', $this->mImgcatId);
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:01:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:01:45 +0900
Subject: [xoops-cvslog 4941] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061012110145.17E732AC220@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.10.2.1 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.10.2.2
--- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.10.2.1 Thu Sep 28 14:01:28 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php Thu Oct 12 20:01:44 2006
@@ -2,7 +2,6 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
-require_once XOOPS_BASE_PATH."/class/Legacy_ModuleAdapter.class.php";
require_once XOOPS_BASE_PATH."/admin/forms/ActionSearchForm.class.php";
class Legacy_ActionSearchArgs
@@ -89,6 +88,7 @@
parent::Legacy_Action($flag);
$this->mSearchAction =& new XCube_Delegate();
+ $this->mSearchAction->add(array(&$this, 'defaultSearch'));
$this->mSearchAction->register('Legacy_ActSearchAction.SearchAction');
}
@@ -105,21 +105,24 @@
$perm = $db->prefix("group_permission");
$groups = implode(",", $xoopsUser->getGroups());
- $sql = "SELECT ${mod}.* FROM ${mod},${perm} " .
- "WHERE ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
- "ORDER BY ${mod}.weight";
-
- $result = $db->query($sql);
- while ($row = $db->fetchArray($result)) {
- $xoopsModule =& new XoopsModule();
- $xoopsModule->assignVars($row);
-
- $adapter =& new Legacy_ModuleAdapter($xoopsModule);
- $adapter->prepareAdmin($controller);
+ //
+ // FIXME ActiveCheck
+ //
+// $sql = "SELECT ${mod}.* FROM ${mod},${perm} " .
+// "WHERE ${perm}.gperm_modid=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
+// "ORDER BY ${mod}.weight";
+
+ $handler =& xoops_gethandler('groupperm');
+ $midArr = $handler->getItemIds('module_admin', $xoopsUser->getGroups());
+
+ $handler =& xoops_gethandler('module');
+ foreach ($midArr as $mid) {
+ $module =& $handler->get($mid);
+ $adapter =& new Legacy_ModuleAdapter($module); // FIXMED
$this->mModules[] =& $adapter;
-
- unset($xoopsModule);
+
+ unset($module);
unset($adapter);
}
}
@@ -153,6 +156,13 @@
}
}
+ function defaultSearch(&$searchArgs)
+ {
+ foreach (array_keys($this->mModules) as $key) {
+ $this->mModules[$key]->searchAction($searchArgs);
+ }
+ }
+
function execute(&$controller, &$xoopsUser)
{
return $this->getDefaultView($controller, $xoopsUser);
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:02:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:02:00 +0900
Subject: [xoops-cvslog 4942] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061012110200.0FB0A2AC220@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.2 Mon Aug 7 20:27:34 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php Thu Oct 12 20:01:59 2006
@@ -1,7 +1,7 @@
_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -41,7 +41,7 @@
}
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
}
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:02:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:02:11 +0900
Subject: [xoops-cvslog 4943] CVS update:
xoops2jp/html/modules/base/admin/actions
Message-ID: <20061012110211.0D83B2AC220@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4 Tue Aug 8 18:47:17 2006
+++ xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -54,7 +54,7 @@
}
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
$render->setAttribute("category", $this->mCategory);
}
Index: xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8.2.1
--- xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8 Tue Aug 8 18:47:04 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -59,7 +59,7 @@
$render->setTemplateName("comment_list.html");
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
$render->setAttribute("moduleArr", $moduleArr);
$render->setAttribute("statusArr", $statusArr);
}
Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.7.2.1
--- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.7 Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -76,7 +76,7 @@
}
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
//
// Load cache-time pattern objects and set.
Index: xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3 Tue Aug 8 18:47:25 2006
+++ xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -33,7 +33,7 @@
{
$render->setTemplateName("smiles_list.html");
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
}
}
Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10.2.1
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10 Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
mFilter =& new Legacy_ModuleListFilterForm($this->mNavi);
+ $this->mFilter =& new Legacy_ModuleListFilterForm();
$this->mFilter->fetch();
-
- $moduleHandler =& xoops_gethandler('module');
// dmy
$criteria =& new Criteria('mid', 0, '>');
$criteria->setSort($this->mFilter->getSort());
$criteria->setOrder($this->mFilter->getOrder());
+ $moduleHandler =& xoops_gethandler('module');
$this->mModuleObjects =& $moduleHandler->getObjects($criteria);
return LEGACY_FRAME_VIEW_INDEX;
Index: xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2 Tue Aug 1 19:32:01 2006
+++ xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -33,7 +33,7 @@
{
$render->setTemplateName("imagecategory_list.html");
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
}
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:02:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:02:52 +0900
Subject: [xoops-cvslog 4944] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20061012110252.670982AC219@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.6 Sat Aug 5 15:18:18 2006
+++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -22,32 +22,33 @@
SMILES_SORT_KEY_EMOTION => 'emotion',
SMILES_SORT_KEY_DISPLAY => 'display'
);
+
+ function getDefaultSortKey()
+ {
+ return SMILES_SORT_KEY_DEFAULT;
+ }
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : SMILES_SORT_KEY_DEFAULT;
-
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = SMILES_SORT_KEY_DEFAULT;
- }
+ parent::fetch();
if (isset($_REQUEST['code'])) {
- $this->_mNavi->addExtra('code', xoops_getrequest('code'));
+ $this->mNavi->addExtra('code', xoops_getrequest('code'));
$this->_mCriteria->add(new Criteria('code', xoops_getrequest('code')));
}
if (isset($_REQUEST['smile_url'])) {
- $this->_mNavi->addExtra('smile_url', xoops_getrequest('smile_url'));
+ $this->mNavi->addExtra('smile_url', xoops_getrequest('smile_url'));
$this->_mCriteria->add(new Criteria('smile_url', xoops_getrequest('smile_url')));
}
if (isset($_REQUEST['emotion'])) {
- $this->_mNavi->addExtra('emotion', xoops_getrequest('emotion'));
+ $this->mNavi->addExtra('emotion', xoops_getrequest('emotion'));
$this->_mCriteria->add(new Criteria('emotion', xoops_getrequest('emotion')));
}
if (isset($_REQUEST['display'])) {
- $this->_mNavi->addExtra('display', xoops_getrequest('display'));
+ $this->mNavi->addExtra('display', xoops_getrequest('display'));
$this->_mCriteria->add(new Criteria('display', xoops_getrequest('display')));
}
Index: xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2 Tue Aug 1 19:40:05 2006
+++ xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
'imgcat_storetype'
);
- function fetch()
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : IMAGECATEGORY_SORT_KEY_DEFAULT;
-
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = IMAGECATEGORY_SORT_KEY_DEFAULT;
- }
+ return IMAGECATEGORY_SORT_KEY_DEFAULT;
+ }
+ function fetch()
+ {
+ parent::fetch();
+
if (isset($_REQUEST['imgcat_name'])) {
- $this->_mNavi->addExtra('imgcat_name', xoops_getrequest('imgcat_name'));
+ $this->mNavi->addExtra('imgcat_name', xoops_getrequest('imgcat_name'));
$this->_mCriteria->add(new Criteria('imgcat_name', xoops_getrequest('imgcat_name')));
}
if (isset($_REQUEST['imgcat_display'])) {
- $this->_mNavi->addExtra('imgcat_display', xoops_getrequest('imgcat_display'));
+ $this->mNavi->addExtra('imgcat_display', xoops_getrequest('imgcat_display'));
$this->_mCriteria->add(new Criteria('imgcat_display', xoops_getrequest('imgcat_display')));
}
if (isset($_REQUEST['imgcat_type'])) {
- $this->_mNavi->addExtra('imgcat_type', xoops_getrequest('imgcat_type'));
+ $this->mNavi->addExtra('imgcat_type', xoops_getrequest('imgcat_type'));
$this->_mCriteria->add(new Criteria('imgcat_type', xoops_getrequest('imgcat_type')));
}
if (isset($_REQUEST['imgcat_storetype'])) {
- $this->_mNavi->addExtra('imgcat_storetype', xoops_getrequest('imgcat_storetype'));
+ $this->mNavi->addExtra('imgcat_storetype', xoops_getrequest('imgcat_storetype'));
$this->_mCriteria->add(new Criteria('imgcat_storetype', xoops_getrequest('imgcat_storetype')));
}
Index: xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7.2.1
--- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7 Tue Aug 1 19:39:11 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
'dobr'
);
- function fetch()
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : COMMENT_SORT_KEY_DEFAULT;
+ return COMMENT_SORT_KEY_DEFAULT;
+ }
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = COMMENT_SORT_KEY_DEFAULT;
- }
+ function fetch()
+ {
+ parent::fetch();
if (isset($_REQUEST['com_modid']) && intval(xoops_getrequest('com_modid')) > 0) {
- $this->_mNavi->addExtra('com_modid', xoops_getrequest('com_modid'));
+ $this->mNavi->addExtra('com_modid', xoops_getrequest('com_modid'));
$this->_mCriteria->add(new Criteria('com_modid', xoops_getrequest('com_modid')));
}
elseif (isset($_REQUEST['dirname'])) {
- $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname'));
+ $this->mNavi->addExtra('dirname', xoops_getrequest('dirname'));
$handler =& xoops_gethandler('module');
$module =& $handler->getByDirname(xoops_getrequest('dirname'));
@@ -80,22 +81,22 @@
}
if (isset($_REQUEST['com_icon'])) {
- $this->_mNavi->addExtra('com_icon', xoops_getrequest('com_icon'));
+ $this->mNavi->addExtra('com_icon', xoops_getrequest('com_icon'));
$this->_mCriteria->add(new Criteria('com_icon', xoops_getrequest('com_icon')));
}
if (isset($_REQUEST['com_uid'])) {
- $this->_mNavi->addExtra('com_uid', xoops_getrequest('com_uid'));
+ $this->mNavi->addExtra('com_uid', xoops_getrequest('com_uid'));
$this->_mCriteria->add(new Criteria('com_uid', xoops_getrequest('com_uid')));
}
if (isset($_REQUEST['com_ip'])) {
- $this->_mNavi->addExtra('com_ip', xoops_getrequest('com_ip'));
+ $this->mNavi->addExtra('com_ip', xoops_getrequest('com_ip'));
$this->_mCriteria->add(new Criteria('com_ip', xoops_getrequest('com_ip')));
}
if (xoops_getrequest('com_status') > 0) {
- $this->_mNavi->addExtra('com_status', xoops_getrequest('com_status'));
+ $this->mNavi->addExtra('com_status', xoops_getrequest('com_status'));
$this->_mCriteria->add(new Criteria('com_status', xoops_getrequest('com_status')));
}
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7.2.1
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7 Tue Aug 1 19:37:25 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
'last_modified'
);
- function fetch()
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT;
-
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;
- }
+ return NEWBLOCKS_SORT_KEY_DEFAULT;
+ }
+ function fetch()
+ {
+ parent::fetch();
+
if (isset($_REQUEST['mid'])) {
- $this->_mNavi->addExtra('mid', xoops_getrequest('mid'));
+ $this->mNavi->addExtra('mid', xoops_getrequest('mid'));
$this->_mCriteria->add(new Criteria('mid', xoops_getrequest('mid')));
}
if (isset($_REQUEST['side'])) {
- $this->_mNavi->addExtra('side', xoops_getrequest('side'));
+ $this->mNavi->addExtra('side', xoops_getrequest('side'));
$this->_mCriteria->add(new Criteria('side', xoops_getrequest('side')));
}
if (isset($_REQUEST['weight'])) {
- $this->_mNavi->addExtra('weight', xoops_getrequest('weight'));
+ $this->mNavi->addExtra('weight', xoops_getrequest('weight'));
$this->_mCriteria->add(new Criteria('weight', xoops_getrequest('weight')));
}
if (isset($_REQUEST['block_type'])) {
- $this->_mNavi->addExtra('block_type', xoops_getrequest('block_type'));
+ $this->mNavi->addExtra('block_type', xoops_getrequest('block_type'));
$this->_mCriteria->add(new Criteria('block_type', xoops_getrequest('block_type')));
}
if (isset($_REQUEST['c_type'])) {
- $this->_mNavi->addExtra('c_type', xoops_getrequest('c_type'));
+ $this->mNavi->addExtra('c_type', xoops_getrequest('c_type'));
$this->_mCriteria->add(new Criteria('c_type', xoops_getrequest('c_type')));
}
if (isset($_REQUEST['dirname'])) {
- $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname'));
+ $this->mNavi->addExtra('dirname', xoops_getrequest('dirname'));
$this->_mCriteria->add(new Criteria('dirname', xoops_getrequest('dirname')));
}
Index: xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.6 Sun Sep 3 01:20:48 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
"hascomments"
);
- function fetch()
+ function Legacy_ModuleListFilterForm()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : MODULE_SORT_KEY_DEFAULT;
+ $this->_mCriteria =& new CriteriaCompo();
+ }
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = MODULE_SORT_KEY_DEFAULT;
- }
+ function getDefaultSortKey()
+ {
+ return MODULE_SORT_KEY_DEFAULT;
+ }
+
+ function fetch()
+ {
+ $this->fetchSort();
if (isset($_REQUEST['special'])) {
$this->mSpecial = intval(xoops_getreqeust('special'));
Index: xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2 Tue Aug 1 19:40:18 2006
+++ xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -28,21 +28,23 @@
IMAGE_SORT_KEY_IMAGE_WEIGHT => 'image_weight',
IMAGE_SORT_KEY_IMGCAT_ID => 'imgcat_id'
);
- function fetch()
+
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : IMAGE_SORT_KEY_DEFAULT;
+ return IMAGE_SORT_KEY_DEFAULT;
+ }
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = IMAGE_SORT_KEY_DEFAULT;
- }
+ function fetch()
+ {
+ parent::fetch();
if (isset($_REQUEST['image_display'])) {
- $this->_mNavi->addExtra('image_display', xoops_getrequest('image_display'));
+ $this->mNavi->addExtra('image_display', xoops_getrequest('image_display'));
$this->_mCriteria->add(new Criteria('image_display', xoops_getrequest('image_display')));
}
if (isset($_REQUEST['imgcat_id'])) {
- $this->_mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
+ $this->mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
$this->_mCriteria->add(new Criteria('imgcat_id', xoops_getrequest('imgcat_id')));
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:03:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:03:01 +0900
Subject: [xoops-cvslog 4945] CVS update:
xoops2jp/html/modules/base/admin/templates
Message-ID: <20061012110301.31EC62AC219@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.25 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.25.2.1
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.25 Wed Sep 6 17:26:41 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html Thu Oct 12 20:03:00 2006
@@ -29,27 +29,27 @@
<{$smarty.const._AD_BASE_LANG_BID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_BLOCK_MOD}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_TITLE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_SIDE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_LCR}> |
<{$smarty.const._AD_BASE_LANG_WEIGHT}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_BCACHETIME}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_CONTROL}> |
<{foreach item=obj from=$objects}>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.18 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.18.2.1
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.18 Mon Sep 4 17:36:16 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html Thu Oct 12 20:03:01 2006
@@ -17,17 +17,17 @@
<{$smarty.const._AD_BASE_LANG_BID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_BLOCK_MOD}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_TITLE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_TEMPLATE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_CONTROL}> |
<{foreach item=obj from=$objects}>
Index: xoops2jp/html/modules/base/admin/templates/image_list.html
diff -u xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.16.2.1 xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.16.2.2
--- xoops2jp/html/modules/base/admin/templates/image_list.html:1.1.2.16.2.1 Sat Oct 7 15:51:23 2006
+++ xoops2jp/html/modules/base/admin/templates/image_list.html Thu Oct 12 20:03:01 2006
@@ -13,24 +13,24 @@
<{$smarty.const._AD_BASE_LANG_IMAGE_ID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMAGE_NAME}>
<{$smarty.const._MD_BASE_LANG_IMAGE_NICENAME}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_BASE_LANG_IMAGE_MIMETYPE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMAGE_CREATED}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMAGE_DISPLAY}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMAGE_WEIGHT}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_CONTROL}> |
<{foreach item=obj from=$objects}>
Index: xoops2jp/html/modules/base/admin/templates/comment_list.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.21 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.21.2.1
--- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.21 Fri Aug 25 20:46:45 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_list.html Thu Oct 12 20:03:01 2006
@@ -36,29 +36,29 @@
<{$smarty.const._MD_BASE_LANG_COM_ID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_BASE_LANG_COM_MODID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_BASE_LANG_COM_TITLE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_COM_CREATED}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_COM_MODIFIED}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_COM_UID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_BASE_LANG_COM_IP}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_COM_STATUS}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_CONTROL}> |
<{foreach item=obj from=$objects}>
Index: xoops2jp/html/modules/base/admin/templates/imagecategory_list.html
diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.13.2.1 xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.13.2.2
--- xoops2jp/html/modules/base/admin/templates/imagecategory_list.html:1.1.2.13.2.1 Sat Oct 7 15:51:23 2006
+++ xoops2jp/html/modules/base/admin/templates/imagecategory_list.html Thu Oct 12 20:03:01 2006
@@ -13,29 +13,29 @@
<{$smarty.const._AD_BASE_LANG_IMGCAT_ID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_NAME}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_MAXSIZE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_MAXWIDTH}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_MAXHEIGHT}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_DISPLAY}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_WEIGHT}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMGCAT_STORETYPE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_IMAGE_COUNT}> |
<{$smarty.const._AD_BASE_LANG_CONTROL}> |
Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.13 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.13.2.1
--- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.13 Fri Aug 25 17:26:10 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_list.html Thu Oct 12 20:03:01 2006
@@ -12,20 +12,20 @@
<{$smarty.const._AD_BASE_LANG_ID}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_BASE_LANG_CODE}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_SMILE_URL}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._MD_BASE_LANG_EMOTION}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_DISPLAY}>
- " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
- " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /> |
+ " alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" />
+ " alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" />
<{$smarty.const._AD_BASE_LANG_CONTROL}> |
<{foreach item=obj from=$objects}>
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:03:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:03:16 +0900
Subject: [xoops-cvslog 4946] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20061012110317.37E722AC221@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.6 Wed Aug 2 18:46:08 2006
+++ xoops2jp/html/modules/base/class/AbstractFilterForm.class.php Thu Oct 12 20:03:16 2006
@@ -7,21 +7,50 @@
var $mSort = 0;
var $mSortKeys = array();
var $_mCriteria = null;
- var $_mNavi = null;
-
- function Legacy_AbstractFilterForm(&$navi)
+ var $mNavi = null;
+
+ var $_mHandler = null;
+
+ function Legacy_AbstractFilterForm(&$navi, &$handler)
{
- $this->_mNavi =& $navi;
+ $this->mNavi =& $navi;
+ $this->_mHandler =& $handler;
+
$this->_mCriteria =& new CriteriaCompo();
+
+ $this->mNavi->mGetTotalItems->add(array(&$this, 'getTotalItems'));
+ }
+
+ function getDefaultSortKey()
+ {
+ }
+
+ function getTotalItems(&$total)
+ {
+ $total = $this->_mHandler->getCount($this->getCriteria());
+ }
+
+ function fetchSort()
+ {
+ $root =& XCube_Root::getSingleton();
+ $this->mSort = intval($root->mContext->mRequest->getRequest('sort'));
+
+ if (!isset($this->mSortKeys[abs($this->mSort)])) {
+ $this->mSort = $this->getDefaultSortKey();
+ }
+
+ $this->mNavi->mSort['sort'] = $this->mSort;
}
function fetch()
{
+ $this->mNavi->fetch();
+ $this->fetchSort();
}
-
+
function getSort()
{
- $sortkey = abs($this->mSort);
+ $sortkey = abs($this->mNavi->mSort['sort']);
return isset($this->mSortKeys[$sortkey]) ? $this->mSortKeys[$sortkey] : null;
}
@@ -30,12 +59,15 @@
return ($this->mSort < 0) ? "DESC" : "ASC";
}
- function getCriteria($start = 0, $limit = 0)
+ function getCriteria($start = null, $limit = null)
{
+ $t_start = ($start === null) ? $this->mNavi->getStart() : intval($start);
+ $t_limit = ($limit === null) ? $this->mNavi->getPerpage() : intval($limit);
+
$criteria = $this->_mCriteria;
- $criteria->setStart($start);
- $criteria->setLimit($limit);
+ $criteria->setStart($t_start);
+ $criteria->setLimit($t_limit);
return $criteria;
}
Index: xoops2jp/html/modules/base/class/AbstractListAction.class.php
diff -u xoops2jp/html/modules/base/class/AbstractListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/class/AbstractListAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/class/AbstractListAction.class.php:1.1.2.2 Tue Mar 28 22:29:21 2006
+++ xoops2jp/html/modules/base/class/AbstractListAction.class.php Thu Oct 12 20:03:16 2006
@@ -7,36 +7,34 @@
class Legacy_AbstractListAction extends Legacy_Action
{
var $mObjects = array();
+
var $mFilter = null;
- var $mNavi = null;
function &_getHandler()
{
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
}
function _getBaseUrl()
{
}
+
+ function &_getPageNavi()
+ {
+ $navi =& new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
+ return $navi;
+ }
function getDefaultView(&$controller, &$xoopsUser)
{
- $this->mNavi =& new Legacy_PageNavigator($this->_getBaseUrl(), 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
-
- $this->mFilter =& $this->_getFilterForm($this->mNavi);
+ $this->mFilter =& $this->_getFilterForm();
$this->mFilter->fetch();
- $handler =& $this->_getHandler();
- $total = $handler->getCount($this->mFilter->getCriteria());
-
- $this->mNavi->setTotal($total);
- $this->mNavi->fetch();
-
- $criteria = $this->mFilter->getCriteria($this->mNavi->getStart(), $this->mNavi->getPerpage());
- $this->mObjects =& $handler->getObjects($criteria);
+ $handler =& $this->_getHandler();
+ $this->mObjects =& $handler->getObjects($this->mFilter->getCriteria());
return LEGACY_FRAME_VIEW_INDEX;
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:03:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:03:40 +0900
Subject: [xoops-cvslog 4947] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20061012110340.BCFC92AC01E@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.3 Tue Apr 11 15:12:54 2006
+++ xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php Thu Oct 12 20:03:40 2006
@@ -15,7 +15,6 @@
class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm
{
- var $mSort = 0;
var $mSortKeys = array(
SMILES_SORT_KEY_ID => 'id',
SMILES_SORT_KEY_CODE => 'code',
@@ -23,15 +22,15 @@
SMILES_SORT_KEY_EMOTION => 'emotion',
SMILES_SORT_KEY_DISPLAY => 'display'
);
- var $_mCriteria = null;
+
+ function getDefaultSortKey()
+ {
+ return SMILES_SORT_KEY_ID;
+ }
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
-
- if ($this->mSort > SMILES_SORT_KEY_MAXVALUE) {
- $this->mSort = SMILES_SORT_KEY_DEFAULT;
- }
+ parent::fetch();
if (isset($_REQUEST['id'])) {
$this->_mCriteria->add(new Criteria('id', array(XOBJ_DTYPE_INT, xoops_getrequest('id'))));
Index: xoops2jp/html/modules/base/forms/ImageFilterForm.class.php
diff -u xoops2jp/html/modules/base/forms/ImageFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/base/forms/ImageFilterForm.class.php:1.1.2.1.2.1
--- xoops2jp/html/modules/base/forms/ImageFilterForm.class.php:1.1.2.1 Thu May 25 18:31:49 2006
+++ xoops2jp/html/modules/base/forms/ImageFilterForm.class.php Thu Oct 12 20:03:40 2006
@@ -18,7 +18,6 @@
class Legacy_ImageFilterForm extends Legacy_AbstractFilterForm
{
- var $mSort = 0;
var $_mSortKeys = array(
IMAGE_SORT_KEY_IMAGE_ID => 'image_id',
IMAGE_SORT_KEY_IMAGE_NAME => 'image_name',
@@ -29,20 +28,20 @@
IMAGE_SORT_KEY_IMAGE_WEIGHT => 'image_weight',
IMAGE_SORT_KEY_IMGCAT_ID => 'imgcat_id'
);
- var $_mCriteria = null;
+
+ function getDefaultSortKey()
+ {
+ return IMAGE_SORT_KEY_DEFAULT;
+ }
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : IMAGE_SORT_KEY_DEFAULT;
-
- if ($this->mSort > IMAGE_SORT_KEY_MAXVALUE) {
- $this->mSort = IMAGE_SORT_KEY_DEFAULT;
- }
-
- $this->_mNavi->addExtra('target', xoops_getrequest('target'));
+ parent::fetch();
+
+ $this->mNavi->addExtra('target', xoops_getrequest('target'));
if (isset($_REQUEST['imgcat_id'])) {
- $this->_mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
+ $this->mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
$this->_mCriteria->add(new Criteria('imgcat_id', array(XOBJ_DTYPE_INT, xoops_getrequest('imgcat_id'))));
}
else {
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:03:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:03:56 +0900
Subject: [xoops-cvslog 4948] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20061012110356.CF7A62AC01E@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.5 xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.6
--- xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php:1.1.2.5 Tue Oct 10 19:55:36 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_PublicControllerStrategy.class.php Thu Oct 12 20:03:56 2006
@@ -1,7 +1,7 @@
mModule =& $this->_createModule();
- $context->mModule->mXoopsModule =& $handler->getByDirname($dirname);
- $context->mXoopsModule =& $context->mModule->mXoopsModule;
-
- if ($context->mXoopsModule == null) {
+ $module =& $handler->getByDirname($dirname);
+
+ if (!is_object($module)) {
return;
}
+ $context->mModule =& $this->_createModule($module);
+ $context->mXoopsModule =& $context->mModule->getXoopsModule();
+
if ($context->mXoopsModule->get('hasconfig') == 1 || $context->mXoopsModule->get('hascomments') == 1) {
$handler =& xoops_gethandler('config');
- $context->mModule->mModuleConfig =& $handler->getConfigsByCat(0, $context->mXoopsModule->get('mid'));
- $context->mModuleConfig =& $context->mModule->mModuleConfig;
+
+ $context->mModule->setModuleConfig($handler->getConfigsByCat(0, $context->mXoopsModule->get('mid')));
+ $context->mModuleConfig = $context->mModule->getModuleConfig();
}
//
@@ -44,10 +46,36 @@
Legacy_RoleManager::loadRolesByMid($context->mXoopsModule->get('mid'));
}
- function &_createModule()
+ /**
+ * Creates a instance of the module with the generating convention. And,
+ * returns it.
+ * @static
+ * @return Legacy_Module
+ */
+ function &_createModule($module)
{
- $module =& new Legacy_Module();
- return $module;
+ $instance = null;
+ $dirname = $module->get('dirname');
+
+ //
+ // IMPORTANT CONVENTION
+ //
+ $className = ucfirst($dirname) . "_Module";
+ if (!class_exists($className)) {
+ $filePath = XOOPS_ROOT_PATH . "/modules/${dirname}/class/Module.class.php";
+ if (file_exists($filePath)) {
+ require_once $filePath;
+ }
+ }
+
+ if (class_exists($className)) {
+ $instance =& new $className($module);
+ }
+ else {
+ $instance =& new Legacy_ModuleAdapter($module);
+ }
+
+ return $instance;
}
function setupBlock()
@@ -111,6 +139,12 @@
return true;
}
+
+ function setupModuleLanguage()
+ {
+ $root =& XCube_Root::getSingleton();
+ $root->mLanguageManager->loadModuleMessageCatalog($root->mContext->mXoopsModule->get('dirname'));
+ }
}
?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/kernel/Legacy_AdminControllerStrategy.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.4
--- xoops2jp/html/modules/base/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.3 Fri Oct 6 18:47:36 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminControllerStrategy.class.php Thu Oct 12 20:03:56 2006
@@ -1,7 +1,7 @@
get('dirname');
+
+ //
+ // IMPORTANT CONVENTION
+ //
+ $className = ucfirst($dirname) . "_AdminModule";
+ if (!class_exists($className)) {
+ $filePath = XOOPS_ROOT_PATH . "/modules/${dirname}/admin/class/Module.class.php";
+ if (file_exists($filePath)) {
+ require_once $filePath;
+ }
+ }
+
+ if (class_exists($className)) {
+ $instance =& new $className($module);
+ }
+ else {
+ $instance =& new Legacy_ModuleAdapter($module);
+ }
+
+ return $instance;
}
function setupBlock()
@@ -157,6 +183,19 @@
return false;
}
+
+ function setupModuleLanguage()
+ {
+ $root =& XCube_Root::getSingleton();
+
+ $root->mContext->mXoopsModule->loadInfo($root->mContext->mXoopsModule->get('dirname'));
+
+ if (isset($root->mContext->mXoopsModule->modinfo['cube_style']) && $root->mContext->mXoopsModule->modinfo['cube_style'] != false) {
+ $root->mLanguageManager->loadModuleMessageCatalog($root->mContext->mXoopsModule->get('dirname'));
+ }
+ $root->mLanguageManager->loadModuleAdminMessageCatalog($root->mContext->mXoopsModule->get('dirname'));
+ $root->mLanguageManager->loadModinfoMessageCatalog($root->mContext->mXoopsModule->get('dirname'));
+ }
}
?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.4 xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.5
--- xoops2jp/html/modules/base/kernel/Legacy_Module.class.php:1.1.2.4 Wed Oct 11 17:13:17 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Module.class.php Thu Oct 12 20:03:56 2006
@@ -1,10 +1,10 @@
setXoopsModule($module);
}
/**
@@ -67,6 +68,48 @@
{
return isset($this->mAttributes[$key]) ? $this->mAttributes[$key] : null;
}
+
+ /**
+ * Sets a instance of XoopsModule to the property.
+ * @param XoopsModule $xoopsModule
+ */
+ function setXoopsModule(&$xoopsModule)
+ {
+ $this->mXoopsModule =& $xoopsModule;
+ }
+
+ /**
+ * Gets a instance of XoopsModule.
+ * @return XoopsModule
+ */
+ function &getXoopsModule()
+ {
+ return $this->mXoopsModule;
+ }
+
+ /**
+ * Sets array of xoops module config to the property.
+ * @param Array $config
+ */
+ function setModuleConfig($config)
+ {
+ $this->mModuleConfig = $config;
+ }
+
+ /**
+ * Gets a value form xoops module config with $key. If $key is specified
+ * null, returns array.
+ * @param string $key
+ * @return mixed
+ */
+ function getModuleConfig($key = null)
+ {
+ if ($key == null) {
+ return $this->mModuleConfig;
+ }
+
+ return isset($this->mModuleConfig[$key]) ? $this->mModuleConfig[$key] : null;
+ }
function &getCacheInfo()
{
@@ -119,12 +162,6 @@
return $this->mXoopsModule->get('isactive') ? true : false;
}
- function setupLanguage()
- {
- $root =& XCube_Root::getSingleton();
- $root->mLanguageManager->loadModuleMessageCatalog($this->mXoopsModule->getVar('dirname'));
- }
-
/**
* Gets a value indicating whether the current module has a option of
* configurations to use the cache system.
@@ -153,26 +190,119 @@
return $this->mCacheInfo;
}
+
+ function searchAction(&$searchArgs)
+ {
+ }
}
-class Legacy_AdminModule extends Legacy_Module
+class Legacy_ModuleAdapter extends Legacy_AbstractModule
{
- function setupLanguage()
+ function searchAction(&$searchArgs)
{
- $root =& XCube_Root::getSingleton();
+ if(!is_object($searchArgs)) {
+ return;
+ }
+
+ $this->mXoopsModule->loadAdminMenu();
+ if(count($this->mXoopsModule->adminmenu) == 0 && !isset($this->mXoopsModule->modinfo['config']) ) {
+ return;
+ }
+
+ //
+ // Search preference
+ //
+ if(isset($this->mXoopsModule->modinfo['config'])&&count($this->mXoopsModule->modinfo['config'])>0) {
+ $configInfos=array();
+ foreach($this->mXoopsModule->modinfo['config'] as $config) {
+ if(isset($config['title']))
+ $configInfos[]=@constant($config['title']);
+ if(isset($config['description']))
+ $configInfos[]=@constant($config['description']);
+ if(isset($config['options'])&&count($config['options'])>0) {
+ foreach($config['options'] as $key=>$val) {
+ $configInfos[]=$key;
+ }
+ }
+ }
+
+ $findFlag=true;
+ foreach($searchArgs->getKeywords() as $word) {
+ $findFlag&=(stristr(implode(" ",$configInfos),$word)!==false);
+ }
+
+ if($findFlag) {
+ $searchArgs->addRecord($this->mXoopsModule->getVar('name'),
+ XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&confmod_id='.$this->mXoopsModule->getVar('mid'),
+ _PREFERENCES );
+ }
+ }
- $this->mXoopsModule->loadInfo($this->mXoopsModule->get('dirname'));
+ //
+ // Search AdminMenu
+ //
+ if(count($this->mXoopsModule->adminmenu)>0) {
+ foreach($this->mXoopsModule->adminmenu as $menu) {
+ $findFlag=true;
+ foreach($searchArgs->getKeywords() as $word) {
+ $tmpFlag=false;
+ $tmpFlag|=(stristr($menu['title'],$word)!==false);
+
+ // Search keyword
+ if(isset($menu['keywords'])) {
+ $keyword=is_array($menu['keywords']) ? implode(" ",$menu['keywords']) : $menu['keywords'];
+ $tmpFlag|=(stristr($keyword,$word)!==false);
+ }
+
+ $findFlag&=$tmpFlag;
+ }
+
+ if($findFlag) {
+ //
+ // Create url string with absolute information.
+ //
+ $url="";
+ if(isset($menu['absolute'])&&$menu['absolute']) {
+ $url=$menu['link'];
+ }
+ else {
+ $url=XOOPS_URL."/modules/".$this->mXoopsModule->getVar('dirname')."/".$menu['link'];
+ }
+
+ //
+ // Add record
+ //
+ $searchArgs->addRecord($this->mXoopsModule->getVar('name'),$url,$menu['title']);
+ }
+ }
+ }
- if (isset($this->mXoopsModule->modinfo['cube_style']) && $this->mXoopsModule->modinfo['cube_style'] != false) {
- $root->mLanguageManager->loadModuleMessageCatalog($this->mXoopsModule->get('dirname'));
+ //
+ // Search help
+ //
+ if ($this->mXoopsModule->hasHelp()) {
+ $root =& XCube_Root::getSingleton();
+ $language = $root->mContext->getXoopsConfig('language');
+ $helpfile = $this->mXoopsModule->getHelp();
+ $dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language;
+
+ if (!file_exists($dir . "/" . $helpfile)) {
+ $dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language;
+ if (!file_exists($dir . "/" . $helpfile)) {
+ return;
+ }
+ }
+ $lines = file($dir . "/" . $helpfile);
+ foreach ($lines as $line) {
+ foreach($searchArgs->getKeywords() as $word) {
+ if (stristr($line, $word) !== false) {
+ $url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&dirname=" . $this->mXoopsModule->getVar('dirname');
+ $searchArgs->addRecord($this->mXoopsModule->getVar('name'), $url, _HELP);
+ return;
+ }
+ }
+ }
}
- $root->mLanguageManager->loadModuleAdminMessageCatalog($this->mXoopsModule->get('dirname'));
- $root->mLanguageManager->loadModinfoMessageCatalog($this->mXoopsModule->get('dirname'));
- }
-
- function hasCacheConfig()
- {
- return false;
}
}
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.12 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.13
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.79.2.12 Wed Oct 11 17:13:40 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Thu Oct 12 20:03:56 2006
@@ -1,7 +1,7 @@
executeRedirect(XOOPS_URL . '/',1,_NOPERM); // TODO Depens on const message catalog.
}
- $this->mRoot->mContext->mModule->setupLanguage();
+ $this->_mStrategy->setupModuleLanguage();
$GLOBALS['xoopsModule'] =& $this->mRoot->mContext->mXoopsModule;
$GLOBALS['xoopsModuleConfig'] =& $this->mRoot->mContext->mModuleConfig;
@@ -1304,6 +1304,10 @@
function enableAccess()
{
}
+
+ function setupModuleLanguage()
+ {
+ }
}
?>
\ No newline at end of file
From minahito ＠ users.sourceforge.jp Thu Oct 12 20:07:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 20:07:02 +0900
Subject: [xoops-cvslog 4949] CVS update: xoops2jp/html/core
Message-ID: <20061012110702.C8C0E2AC01E@users.sourceforge.jp>
Index: xoops2jp/html/core/XCube_PageNavigator.class.php
diff -u xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.3 xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.3 Thu Oct 12 20:00:45 2006
+++ xoops2jp/html/core/XCube_PageNavigator.class.php Thu Oct 12 20:07:02 2006
@@ -1,7 +1,7 @@
getRenderUrl($mask) . $this->mStart;
+ return $this->renderUrlForSort();
}
function setStart($start)
From minahito ＠ users.sourceforge.jp Thu Oct 12 21:53:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 21:53:14 +0900
Subject: [xoops-cvslog 4950] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20061012125314.C27AD2AC064@users.sourceforge.jp>
Index: xoops2jp/html/modules/base/preload/Wating.class.php
diff -u xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.2 xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.2 Thu Aug 24 10:54:33 2006
+++ xoops2jp/html/modules/base/preload/Wating.class.php Thu Oct 12 21:53:14 2006
@@ -80,7 +80,7 @@
$result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
if ( $result ) {
$blockVal = array();
- $blockVal['adminlink'] = XOOPS_URL."/modules/system/admin.php?module=0&status=1&fct=comments";
+ $blockVal['adminlink'] = XOOPS_URL."/modules/base/admin/index.php?action=CommentList&com_modid=0&com_status=1";
list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
$blockVal['lang_linkname'] =_MB_BASE_COMPEND;
$modules[] = $blockVal;
From minahito ＠ users.sourceforge.jp Thu Oct 12 22:56:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 22:56:31 +0900
Subject: [xoops-cvslog 4951] CVS update:
xoops2jp/html/modules/legacyRender/class
Message-ID: <20061012135631.2FE062AC059@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php:1.1.2.1.2.1
--- xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php:1.1.2.1 Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php Thu Oct 12 22:56:31 2006
@@ -2,41 +2,38 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
-require_once XOOPS_MODULE_PATH . "/legacyRender/class/PageNavigator.class.php";
+require_once XOOPS_ROOT_PATH . "/core/XCube_PageNavigator.class.php";
class LegacyRender_AbstractListAction extends LegacyRender_Action
{
var $mObjects = array();
var $mFilter = null;
- var $mNavi = null;
function &_getHandler()
{
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
}
function _getBaseUrl()
{
}
+
+ function &_getPageNavi()
+ {
+ $navi =& new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
+ return $navi;
+ }
function getDefaultView(&$controller, &$xoopsUser)
{
- $this->mNavi =& new LegacyRender_PageNavigator($this->_getBaseUrl(), 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
-
- $this->mFilter =& $this->_getFilterForm($this->mNavi);
+ $this->mFilter =& $this->_getFilterForm();
$this->mFilter->fetch();
- $handler =& $this->_getHandler();
- $total = $handler->getCount($this->mFilter->getCriteria());
-
- $this->mNavi->setTotal($total);
- $this->mNavi->fetch();
-
- $criteria = $this->mFilter->getCriteria($this->mNavi->getStart(), $this->mNavi->getPerpage());
- $this->mObjects =& $handler->getObjects($criteria);
+ $handler =& $this->_getHandler();
+ $this->mObjects =& $handler->getObjects($this->mFilter->getCriteria());
return LEGACYRENDER_FRAME_VIEW_INDEX;
}
Index: xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.2 Mon Jul 10 15:08:31 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php Thu Oct 12 22:56:31 2006
@@ -7,21 +7,50 @@
var $mSort = 0;
var $mSortKeys = array();
var $_mCriteria = null;
- var $_mNavi = null;
-
- function LegacyRender_AbstractFilterForm(&$navi)
+ var $mNavi = null;
+
+ var $_mHandler = null;
+
+ function LegacyRender_AbstractFilterForm(&$navi, &$handler)
{
- $this->_mNavi =& $navi;
+ $this->mNavi =& $navi;
+ $this->_mHandler =& $handler;
+
$this->_mCriteria =& new CriteriaCompo();
+
+ $this->mNavi->mGetTotalItems->add(array(&$this, 'getTotalItems'));
+ }
+
+ function getDefaultSortKey()
+ {
+ }
+
+ function getTotalItems(&$total)
+ {
+ $total = $this->_mHandler->getCount($this->getCriteria());
+ }
+
+ function fetchSort()
+ {
+ $root =& XCube_Root::getSingleton();
+ $this->mSort = intval($root->mContext->mRequest->getRequest('sort'));
+
+ if (!isset($this->mSortKeys[abs($this->mSort)])) {
+ $this->mSort = $this->getDefaultSortKey();
+ }
+
+ $this->mNavi->mSort['sort'] = $this->mSort;
}
function fetch()
{
+ $this->mNavi->fetch();
+ $this->fetchSort();
}
-
+
function getSort()
{
- $sortkey = abs($this->mSort);
+ $sortkey = abs($this->mNavi->mSort['sort']);
return isset($this->mSortKeys[$sortkey]) ? $this->mSortKeys[$sortkey] : null;
}
@@ -30,12 +59,15 @@
return ($this->mSort < 0) ? "DESC" : "ASC";
}
- function getCriteria($start = 0, $limit = 0)
+ function getCriteria($start = null, $limit = null)
{
+ $t_start = ($start === null) ? $this->mNavi->getStart() : intval($start);
+ $t_limit = ($limit === null) ? $this->mNavi->getPerpage() : intval($limit);
+
$criteria = $this->_mCriteria;
- $criteria->setStart($start);
- $criteria->setLimit($limit);
+ $criteria->setStart($t_start);
+ $criteria->setLimit($t_limit);
return $criteria;
}
From minahito ＠ users.sourceforge.jp Thu Oct 12 22:56:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 22:56:37 +0900
Subject: [xoops-cvslog 4952] CVS update:
xoops2jp/html/modules/legacyRender/class
Message-ID: <20061012135637.5DF9F2AC059@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php
diff -u xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php:1.1.2.1.2.2 xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php:removed
--- xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php:1.1.2.1.2.2 Fri Sep 29 17:14:34 2006
+++ xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php Thu Oct 12 22:56:37 2006
@@ -1,37 +0,0 @@
-mExtra as $key => $value) {
- }
-
- if (!isset($mask[$key])) {
- $value = htmlspecialchars($value, ENT_QUOTES);
- $ret .= "";
- }
-
- return $ret;
- }
-}
-
-?>
From minahito ＠ users.sourceforge.jp Thu Oct 12 22:56:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 12 Oct 2006 22:56:44 +0900
Subject: [xoops-cvslog 4953] CVS update:
xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20061012135644.B9FB42AC03A@users.sourceforge.jp>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.9 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.9.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.9 Sat Aug 19 17:27:51 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html Thu Oct 12 22:56:44 2006
@@ -18,23 +18,23 @@
|