|
From: <ph...@us...> - 2008-07-27 12:56:32
|
Revision: 1919
http://xoops.svn.sourceforge.net/xoops/?rev=1919&view=rev
Author: phppp
Date: 2008-07-27 12:56:39 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Merged from ThirdParty
Modified Paths:
--------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
Added Paths:
-----------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php
Removed Paths:
-------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/compat/include/Thumbs.db
Property Changed:
----------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
Copied: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt (from rev 1901, ThirdParty/Frameworks/art/trunk/art/changelog.txt)
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt (rev 0)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt 2008-07-27 12:56:39 UTC (rev 1919)
@@ -0,0 +1,8 @@
+Frameworks::art changelogs
+
+Version 1.0.0 July 26th
+==========================================================
+1 Cleaned for XOOPS 2.3.0 (phppp)
+2 Added xoops_version file (phppp)
+3 Added changelog file (phppp)
+4 Fixed bug #2027143: $uid was not passed to function mod_getUnameFromId() (phppp/tm255e)
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -71,12 +71,6 @@
xoops_load("cache");
$key = "{$dirname}_{$name}";
return XoopsCache::read($key);
-
- $file_name = $dirname."_".$name.".php";
- $file = $root_path."/".$file_name;
-
- $data = @include $file;
- return $data;
}
function mod_loadCacheFile($name, $dirname = null)
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -35,10 +35,10 @@
return null;
}
} else {
- load_functions("cache");
- if (!$moduleConfig = mod_loadCacheFile("config", $dirname)) {
+ xoops_load("cache");
+ if (!$moduleConfig = XoopsCache::read("{$dirname}_config")) {
$moduleConfig = mod_fetchConfig($dirname);
- mod_createCacheFile($moduleConfig, "config", $dirname);
+ XoopsCache::write("{$dirname}_config", $moduleConfig);
}
}
if ($customConfig = @include(XOOPS_ROOT_PATH."/modules/{$dirname}/include/plugin.php")){
@@ -100,8 +100,8 @@
return false;
}
- load_functions("cache");
- return mod_clearCacheFile("config", $dirname);
+ xoops_load("cache");
+ return XoopsCache::delete("{$dirname}_config");
}
function mod_clearConfg($dirname = "")
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -29,8 +29,8 @@
*/
function mod_loadFilters(&$object, $method)
{
- load_functions("cache");
- if (!$modules_active = mod_loadCacheFile("modules_active", "system")) {
+ xoops_load("cache");
+ if (!$modules_active = XoopsCache::read("system_modules_active")) {
$module_handler =& xoops_gethandler('module');
$modules_obj = $module_handler->getObjects(new Criteria('isactive', 1));
$modules_active = array();
@@ -38,7 +38,7 @@
$modules_active[] = $modules_obj[$key]->getVar("dirname");
}
unset($modules_obj);
- mod_createCacheFile($modules_active, "modules_active", "system");
+ XoopsCache::write("system_modules_active", $modules_active);
}
$class = is_object($object) ? get_class($object) : $object;
foreach ($modules_active as $f) {
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -16,7 +16,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,38 +6,31 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
if (!defined("FRAMEWORKS_ART_FUNCTIONS_USER")):
define("FRAMEWORKS_ART_FUNCTIONS_USER", true);
-defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once (dirname(__FILE__)."/functions.ini.php");
-
xoops_load("userUtility");
-/**
- * Get client IP
- *
- * Adapted from PMA_getIp() [phpmyadmin project]
- *
- * @param bool $asString requiring integer or dotted string
- * @return mixed string or integer value for the IP
- */
function mod_getIP($asString = false)
{
+ trigger_error("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.", E_USER_NOTICE);
return XoopsUserUtility::getIP($asString);
}
function &mod_getUnameFromIds( $uid, $usereal = false, $linked = false )
{
+ trigger_error("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.", E_USER_NOTICE);
$ids = XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
return $ids;
}
-function mod_getUnameFromId( $userid, $usereal = 0, $linked = false)
+function mod_getUnameFromId( $uid, $usereal = 0, $linked = false)
{
+ trigger_error("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.", E_USER_NOTICE);
return XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
}
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -2,11 +2,13 @@
/**
* Extended object handlers
*
+ * For backward compat
+ *
* @copyright The XOOPS project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -20,12 +22,11 @@
* @copyright copyright © 2005 XoopsForge.com
* @package module::article
*
- * {@link _XoopsPersistableObject}
+ * {@link XoopsObject}
**/
class ArtObject extends XoopsObject
{
-
/**
* @var string
*/
@@ -113,7 +114,7 @@
* @author D.J. (phppp)
* @copyright copyright © 2000 The XOOPS Project
*
-* {@link _XoopsPersistableObjectHandler}
+* {@link XoopsPersistableObjectHandler}
*
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
___________________________________________________________________
Added: svn:keywords
+ Id
Copied: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php (from rev 1901, ThirdParty/Frameworks/art/trunk/art/xoops_version.php)
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php (rev 0)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Xoops Frameworks addon: art
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ * @package Frameworks
+ */
+
+define("XOOPS_FRAMEWORKS_ART_VERSION", "1.0.0")
+?>
\ No newline at end of file
Copied: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php (from rev 1901, ThirdParty/Frameworks/art/trunk/art/xoopsart.php)
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php (rev 0)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Xoops Frameworks addon: art
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ * @package Frameworks
+ */
+
+class XoopsArt
+{
+ function __construct()
+ {
+ }
+
+ function XoopsArt()
+ {
+ $this->__construct();
+ }
+
+ /**
+ * Load a collective functions of Frameworks
+ *
+ * @param string $group name of the collective functions, empty for functions.php
+ * @return bool
+ */
+ function loadFunctions($group = "")
+ {
+ return include_once FRAMEWORKS_ROOT_PATH . "/art/functions.{$group}" . (empty($group) ? "" : "." ) . "php";
+ }
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|