Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[7980] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2011-10-26 20:11:59
|
Revision: 7980
http://xoops.svn.sourceforge.net/xoops/?rev=7980&view=rev
Author: trabis
Date: 2011-10-26 20:11:53 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
changing some block and privmessage methods names
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/privmessage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -588,7 +588,7 @@
* @param bool $force
* @return mixed
*/
- public function insert(XoopsBlock &$obj, $force = false)
+ public function insertBlock(XoopsBlock &$obj, $force = false)
{
$obj->setVar('last_modified', time());
return parent::insert($obj, $force);
@@ -600,7 +600,7 @@
* @param XoopsBlock $obj
* @return bool
*/
- public function delete(XoopsBlock &$obj)
+ public function deleteBlock(XoopsBlock &$obj)
{
if (!parent::delete($obj)) {
return false;
@@ -618,7 +618,7 @@
* @param bool $id_as_key should the blocks' bid be the key for the returned array?
* @return array {@link XoopsBlock}s matching the conditions
**/
- public function getObjects(CriteriaElement $criteria = null, $id_as_key = false)
+ public function getDistinctObjects(CriteriaElement $criteria = null, $id_as_key = false)
{
$ret = array();
$limit = $start = 0;
@@ -651,7 +651,7 @@
* @param CriteriaElement|null $criteria conditions to match
* @return array array of blocks matching the conditions
**/
- public function getList(CriteriaElement $criteria = null)
+ public function getNameList(CriteriaElement $criteria = null)
{
$blocks = $this->getObjects($criteria, true);
$ret = array();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/privmessage.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/privmessage.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/privmessage.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -153,45 +153,6 @@
}
/**
- * Load messages from the database
- *
- * @param CriteriaElement|null $criteria {@link CriteriaElement} object
- * @param bool $id_as_key use ID as key into the array?
- * @return array Array of {@link XoopsPrivmessage} objects
- **/
- public function getObjects(CriteriaElement $criteria = null, $id_as_key = false)
- {
- $ret = array();
- $limit = $start = 0;
- $sql = 'SELECT * FROM ' . $this->db->prefix('priv_msgs');
- if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
- $sql .= ' ' . $criteria->renderWhere();
- $sort = !in_array($criteria->getSort(), array(
- 'msg_id',
- 'msg_time',
- 'from_userid')) ? 'msg_id' : $criteria->getSort();
- $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder();
- $limit = $criteria->getLimit();
- $start = $criteria->getStart();
- }
- $result = $this->db->query($sql, $limit, $start);
- if (!$result) {
- return $ret;
- }
- while ($myrow = $this->db->fetchArray($result)) {
- $pm = new XoopsPrivmessage();
- $pm->assignVars($myrow);
- if (!$id_as_key) {
- $ret[] = $pm;
- } else {
- $ret[$myrow['msg_id']] = $pm;
- }
- unset($pm);
- }
- return $ret;
- }
-
- /**
* Mark a message as read
*
* @param XoopsPrivmessage $pm {@link XoopsPrivmessage} object
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/preloads/core.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -28,17 +28,17 @@
*/
class ProtectorCorePreload extends XoopsPreloadItem
{
- function eventCoreIncludeCommonStart($args)
+ static function eventCoreIncludeCommonStart($args)
{
include XOOPS_TRUST_PATH . '/modules/protector/include/precheck.inc.php';
}
- function eventCoreIncludeCommonEnd($args)
+ static function eventCoreIncludeCommonEnd($args)
{
include XOOPS_TRUST_PATH . '/modules/protector/include/postcheck.inc.php';
}
- function eventCoreClassDatabaseDatabasefactoryConnection($args)
+ static function eventCoreClassDatabaseDatabasefactoryConnection($args)
{
if (defined('XOOPS_DB_ALTERNATIVE') && class_exists(XOOPS_DB_ALTERNATIVE)) {
$args[0] = XOOPS_DB_ALTERNATIVE;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -203,6 +203,7 @@
case 'display':
// Initialize blocks handler
+ /* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler('block');
// Get variable
$block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
@@ -210,7 +211,7 @@
if ( $block_id > 0 ) {
$block = $block_handler->get( $block_id );
$block->setVar('visible', $visible);
- if (!$block_handler->insert( $block )) {
+ if (!$block_handler->insertBlock( $block )) {
$error=true;
}
}
@@ -218,6 +219,7 @@
case 'drag':
// Initialize blocks handler
+ /* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler('block');
// Get variable
$block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
@@ -225,7 +227,7 @@
if ( $block_id > 0 ) {
$block = $block_handler->get( $block_id );
$block->setVar('side', $side);
- if (!$block_handler->insert( $block )) {
+ if (!$block_handler->insertBlock( $block )) {
$error=true;
}
}
@@ -233,6 +235,7 @@
case 'order':
// Initialize blocks handler
+ /* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler('block');
if ( isset($_POST['blk'] ) ) {
$i=0;
@@ -240,7 +243,7 @@
if( $order > 0 ) {
$block = $block_handler->get($order);
$block->setVar('weight', $i);
- if (!$block_handler->insert($block)) {
+ if (!$block_handler->insertBlock($block)) {
$error=true;
}
$i++;
@@ -323,7 +326,7 @@
$content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
$block->setVar('content', $content);
- if (!$newid = $block_handler->insert( $block )) {
+ if (!$newid = $block_handler->insertBlock( $block )) {
xoops_cp_header();
xoops_error( $block->getHtmlErrors() );
xoops_cp_footer();
@@ -443,12 +446,13 @@
exit();
}
// Initialize blocks handler
+ /* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler('block');
// Get avatar id
$block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
if ( $block_id > 0 ) {
$block = $block_handler->get( $block_id );
- if ($block_handler->delete($block)) {
+ if ($block_handler->deleteBlock($block)) {
// Delete Group link
$blocklinkmodule_handler = xoops_getmodulehandler('blocklinkmodule');
$blocklinkmodule = $blocklinkmodule_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id )));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -250,6 +250,7 @@
// Get module handler
/* @var $module_handler XoopsModuleHandler */
$module_handler = xoops_gethandler('module');
+ /* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler('block');
$module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
if ( $module_id > 0 ) {
@@ -264,7 +265,7 @@
$bcount = count($blocks);
for ($i = 0; $i < $bcount; $i++) {
$blocks[$i]->setVar('isactive', !$old);
- $block_handler->insert($blocks[$i]);
+ $block_handler->insertBlock($blocks[$i]);
}
//Set active modules in cache folder
xoops_setActiveModules();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -544,7 +544,7 @@
$bcount = count($block_arr);
$msgs[] = _AM_SYSTEM_MODULES_BLOCKS_DELETE;
for ($i = 0; $i < $bcount; $i++) {
- if (false === $block_handler->delete($block_arr[$i])) {
+ if (false === $block_handler->deleteBlock($block_arr[$i])) {
$msgs[] = ' <span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, "<strong>" . $block_arr[$i]->getVar('name') . "</strong>") . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>" . $block_arr[$i]->getVar('bid') . "</strong>") . '</span>';
} else {
$msgs[] = ' ' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE,"<strong>" . $block_arr[$i]->getVar('name') . "</strong>") . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>" . $block_arr[$i]->getVar('bid') . "</strong>");
@@ -671,7 +671,7 @@
$bcount = count($blocks);
for ($i = 0; $i < $bcount; $i++) {
$blocks[$i]->setVar('isactive', 1);
- $block_handler->insert($blocks[$i]);
+ $block_handler->insertBlock($blocks[$i]);
}
$msgs[] = '<p>' . sprintf( _AM_SYSTEM_MODULES_OKACT, '<strong>' . $module->getVar('name', 's') . '</strong>') . '</p></div>';
}
@@ -687,6 +687,8 @@
// Get module handler
/* @var $module_handler XoopsModuleHandler */
$module_handler = xoops_gethandler('module');
+ /* @var $block_handler XoopsBlockHandler */
+ $block_handler = xoops_getHandler('block');
$module = $module_handler->getById($mid);
xoops_template_clear_module_cache($mid);
// Display header
@@ -706,7 +708,7 @@
$bcount = count($blocks);
for ($i = 0; $i < $bcount; $i++) {
$blocks[$i]->setVar('isactive', 0);
- $block_handler->insert($blocks[$i]);
+ $block_handler->insertBlock($blocks[$i]);
}
$msgs[] = '<p>' . sprintf(_AM_SYSTEM_MODULES_OKDEACT, '<strong>' . $module->getVar('name') . '</strong>') . '</p>';
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php 2011-10-26 19:45:09 UTC (rev 7979)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php 2011-10-26 20:11:53 UTC (rev 7980)
@@ -32,7 +32,7 @@
class SystemGroup extends XoopsGroup
{
- function __constrcut()
+ function __construct()
{
parent::__construct();
}
@@ -132,8 +132,9 @@
$module_list = $module_handler->getNameList($criteria);
$module_list[0] = _AM_SYSTEM_GROUPS_CUSTOMBLOCK;
+ /* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler("block");
- $blocks_obj = $block_handler->getObjects(new Criteria("mid", "('" . implode("', '", array_keys($module_list)) . "')", "IN"), true);
+ $blocks_obj = $block_handler->getDistinctObjects(new Criteria("mid", "('" . implode("', '", array_keys($module_list)) . "')", "IN"), true);
$blocks_module = array();
foreach (array_keys($blocks_obj) as $bid) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
