Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11394] XoopsModules/userlog/trunk/userlog
|
From: <ir...@us...> - 2013-04-17 10:55:06
|
Revision: 11394
http://sourceforge.net/p/xoops/svn/11394
Author: irmtfan
Date: 2013-04-17 10:55:03 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
- improve: remove all get() functions in userlog classes to be more compatible with xoops26 in class/setting.php and class/log.php and class/stats.php (2013/04/17)
- improve: use "XoopsLocale" instead of "XoopsLocal" in xoops26 in class/userlog.php (2013/04/17)
- improve: add "static" to functions to be more compatible with xoops26 in preloads/core.php (2013/04/17)
- improve: make getGroupby() function compatible with xoops26 in class/log.php (2013/04/17)
Modified Paths:
--------------
XoopsModules/userlog/trunk/userlog/class/log.php
XoopsModules/userlog/trunk/userlog/class/setting.php
XoopsModules/userlog/trunk/userlog/class/stats.php
XoopsModules/userlog/trunk/userlog/class/userlog.php
XoopsModules/userlog/trunk/userlog/docs/changelog.txt
XoopsModules/userlog/trunk/userlog/preloads/core.php
Modified: XoopsModules/userlog/trunk/userlog/class/log.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/log.php 2013-04-17 09:26:16 UTC (rev 11393)
+++ XoopsModules/userlog/trunk/userlog/class/log.php 2013-04-17 10:55:03 UTC (rev 11394)
@@ -754,7 +754,7 @@
if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
$sql .= " " . $criteria->renderWhere();
if ($groupby = $criteria->getGroupby()) {
- $sql .= $groupby;
+ $sql .= !strpos($groupby,"GROUP BY") ? " GROUP BY {$groupby}" : $groupby;
}
if ($sort = $criteria->getSort()) {
$sql .= " ORDER BY {$sort} " . $criteria->getOrder();
@@ -833,14 +833,4 @@
}
return $ret;
}
- public function &get($id)
- {
- static $logs;
- if (isset($logs[$id])) {
- return $logs[$id];
- }
- $obj = parent::get($id);
- $logs[$id] = $obj;
- return $obj;
- }
}
\ No newline at end of file
Modified: XoopsModules/userlog/trunk/userlog/class/setting.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/setting.php 2013-04-17 09:26:16 UTC (rev 11393)
+++ XoopsModules/userlog/trunk/userlog/class/setting.php 2013-04-17 10:55:03 UTC (rev 11394)
@@ -407,15 +407,4 @@
$ret = $this->getAll($criteria, $fields, $asObject, $id_as_key);
return $ret;
}
-
- public function &get($id)
- {
- static $sets;
- if (isset($sets[$id])) {
- return $sets[$id];
- }
- $obj = parent::get($id);
- $sets[$id] = $obj;
- return $obj;
- }
}
\ No newline at end of file
Modified: XoopsModules/userlog/trunk/userlog/class/stats.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/stats.php 2013-04-17 09:26:16 UTC (rev 11393)
+++ XoopsModules/userlog/trunk/userlog/class/stats.php 2013-04-17 10:55:03 UTC (rev 11394)
@@ -202,16 +202,4 @@
$this->userlog = Userlog::getInstance();
parent::__construct($db, "mod_userlog_stats", 'UserlogStats', "stats_id", "stats_type");
}
- public function &get($id)
- {
- static $stats;
- if (isset($stats[$id])) {
- return $stats[$id];
- }
- $obj = parent::get($id);
- $stats[$id] = $obj;
- return $obj;
-
- }
-
}
\ No newline at end of file
Modified: XoopsModules/userlog/trunk/userlog/class/userlog.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/userlog.php 2013-04-17 09:26:16 UTC (rev 11393)
+++ XoopsModules/userlog/trunk/userlog/class/userlog.php 2013-04-17 10:55:03 UTC (rev 11394)
@@ -185,7 +185,7 @@
$dateFormat = $this->getConfig('format_date');
}
xoops_load('XoopsLocal');
- return XoopsLocal::formatTimestamp($intTime, $dateFormat, $timeoffset);
+ return class_exists("XoopsLocal") ? XoopsLocal::formatTimestamp($intTime, $dateFormat, $timeoffset) : XoopsLocale::formatTimestamp($intTime, $dateFormat, $timeoffset); // use XoopsLocale in xoops26
}
public function getCookie($name = "TOGGLE")
{
Modified: XoopsModules/userlog/trunk/userlog/docs/changelog.txt
===================================================================
--- XoopsModules/userlog/trunk/userlog/docs/changelog.txt 2013-04-17 09:26:16 UTC (rev 11393)
+++ XoopsModules/userlog/trunk/userlog/docs/changelog.txt 2013-04-17 10:55:03 UTC (rev 11394)
@@ -2,6 +2,10 @@
Changelog:
VERSION 1.01:
+- improve: remove all get() functions in userlog classes to be more compatible with xoops26 in class/setting.php and class/log.php and class/stats.php (2013/04/17)
+- improve: use "XoopsLocale" instead of "XoopsLocal" in xoops26 in class/userlog.php (2013/04/17)
+- improve: add "static" to functions to be more compatible with xoops26 in preloads/core.php (2013/04/17)
+- improve: make getGroupby() function compatible with xoops26 in class/log.php (2013/04/17)
- improve: add missing configcat in xoops_version.php to be more compatible with xoops26 in xoops_version.php and language/LANG/modinfo.php (2013/04/17)
- improve: replace all '->XoopsFileHandler' with '->__construct' to be more compatible with xoops26 in class/log.php(2013/04/17)
- change version to 1.01 Final (2013/04/17)
Modified: XoopsModules/userlog/trunk/userlog/preloads/core.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/preloads/core.php 2013-04-17 09:26:16 UTC (rev 11393)
+++ XoopsModules/userlog/trunk/userlog/preloads/core.php 2013-04-17 10:55:03 UTC (rev 11394)
@@ -24,13 +24,13 @@
class UserlogCorePreload extends XoopsPreloadItem
{
// to log main part of modules
- function eventCoreFooterStart($args)
+ static function eventCoreFooterStart($args)
{
include dirname(dirname(__FILE__)) . '/include/log.php';
}
// to log redirects because usually prorammers use exit() after redirect_header function.
- function eventCoreIncludeFunctionsRedirectheader($args)
+ static function eventCoreIncludeFunctionsRedirectheader($args)
{
include dirname(dirname(__FILE__)) . '/include/log.php';
}
@@ -43,7 +43,7 @@
} */
// to log admin part of modules (must use moduleadmin class)
- function eventSystemClassGuiHeader($args)
+ static function eventSystemClassGuiHeader($args)
{
include dirname(dirname(__FILE__)) . '/include/log.php';
}
|
