|
From: <tr...@us...> - 2012-12-02 15:45:03
|
Revision: 10298
http://sourceforge.net/p/xoops/svn/10298
Author: trabis
Date: 2012-12-02 15:44:57 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Updating cache engines and moving new classes to xoops_lib
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.cache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_ads.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_ldap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/auth_xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/auth/authfactory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/apc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/file.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/memcache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/model.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/xcache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/image/scripts/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/preload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/login.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Ads.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Factory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Ldap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Provisioning.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Abstract.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Apc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/File.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Memcache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Model.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Redis.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Wincache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/Xcache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Cache.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
Property Changed:
----------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/
XoopsCore/branches/2.6.x/2.6.0/htdocs/uploads/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/data/
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-01 22:36:45 UTC (rev 10297)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-02 15:44:57 UTC (rev 10298)
@@ -1,6 +1,11 @@
XOOPS 2.6 Changelog
===============================
+2012/12: Version 2.6.0 Alpha 2
+===============================
+Updating cache engines (trabis)
+
+===============================
2012/08: Version 2.6.0 Alpha 1
===============================
@@ -46,7 +51,7 @@
9570 change userrank.html to help.html in userrank plugin (mage)
9569 Changing _SEND to _SUBMIT in Maintenance (mamba)
9567 Update insertBreak in themform.php and modification in the system module (mage)
-9566 Change in the plugin maintenance. For the part dump modules and plugins are displayed if they have a sql table. (mage)
+9566 Change in the plugin maintenance. For the part dump modules and plugins are displayed if they have a sql table. (mage)
9565 change constant language error (mage)
9562 update userrank with new form (mage)
9561 The description is no longer displayed with the title to the preferences of modules / plugins (mage)
@@ -162,7 +167,7 @@
8491 Update module logo (formuss)
8487 Smilies and userrank final (mage)
8486 Updating to jQuery 1.71 (mamba)
-8483 Adding back the modules admin template.
+8483 Adding back the modules admin template.
8482 Refactor module class (formuss)
8472 Fix an error when user log out (formuss)
8471 Updated banners (draft 1) (mage)
@@ -243,7 +248,7 @@
8235 Renaming reource from blocks to block to match tplfile type in database (trabis)
8234 adding new resources to replace db:template.html. (trabis)
You can now use module:dirname|template.html You can now use block:dirname|template.html You can now use admin:dirname|template.html (trabis)
-All resources look for override templates in theme dir
+All resources look for override templates in theme dir
You can use this new resources inside templates:
<{includeq file="module:system|system_header.html"}>
Or on any template object:
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks
___________________________________________________________________
Modified: svn:ignore
- PEAR
art
captcha
fpdf
graphs
readme.schinese.txt
textsanitizer
transfer
xoops22
xoops_version.php
+ PEAR
art
captcha
fpdf
graphs
readme.schinese.txt
textsanitizer
transfer
xoops22
xoops_version.php
moduleclasses
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.cache.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.cache.php 2012-12-01 22:36:45 UTC (rev 10297)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.cache.php 2012-12-02 15:44:57 UTC (rev 10298)
@@ -60,7 +60,7 @@
$dirname = ($dirname) ? $dirname : $xoops->moduleDirname;
$key = "{$dirname}_{$name}";
- return XoopsCache::write($key, $data);
+ return Xoops_Cache::write($key, $data);
}
/**
@@ -105,7 +105,7 @@
$dirname = ($dirname) ? $dirname : $xoops->moduleDirname;
$key = "{$dirname}_{$name}";
- return XoopsCache::read($key);
+ return Xoops_Cache::read($key);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php 2012-12-01 22:36:45 UTC (rev 10297)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.config.php 2012-12-02 15:44:57 UTC (rev 10298)
@@ -36,9 +36,9 @@
}
} else {
- if (!$moduleConfig = XoopsCache::read("{$dirname}_config")) {
+ if (!$moduleConfig = Xoops_Cache::read("{$dirname}_config")) {
$moduleConfig = mod_fetchConfig($dirname);
- XoopsCache::write("{$dirname}_config", $moduleConfig);
+ Xoops_Cache::write("{$dirname}_config", $moduleConfig);
}
}
if ($customConfig = @include XOOPS_ROOT_PATH . "/modules/{$dirname}/include/plugin.php") {
@@ -105,7 +105,7 @@
}
- return XoopsCache::delete("{$dirname}_config");
+ return Xoops_Cache::delete("{$dirname}_config");
}
function mod_clearConfg($dirname = "")
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2012-12-01 22:36:45 UTC (rev 10297)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2012-12-02 15:44:57 UTC (rev 10298)
@@ -87,7 +87,7 @@
$rssfile = 'adminnews-' . $xoops->getConfig('language');
$items = array();
- if (!$items = XoopsCache::read($rssfile)) {
+ if (!$items = Xoops_Cache::read($rssfile)) {
$snoopy = new Snoopy();
$cnt = 0;
foreach ($rssurl as $url) {
@@ -108, |
|
From: <tr...@us...> - 2012-12-02 19:11:29
|
Revision: 10305
http://sourceforge.net/p/xoops/svn/10305
Author: trabis
Date: 2012-12-02 19:11:27 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Adding Debug and Highlighter class
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Highlighter.php
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-02 18:59:19 UTC (rev 10304)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-02 19:11:27 UTC (rev 10305)
@@ -4,6 +4,8 @@
2012/12: Version 2.6.0 Alpha 2
===============================
Updating cache engines (trabis)
+Adding Xoops_Highlighter class (trabis)
+Adding Xoops_Debug class (trabis)
===============================
2012/08: Version 2.6.0 Alpha 1
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Debug.php 2012-12-02 19:11:27 UTC (rev 10305)
@@ -0,0 +1,48 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package class
+ * @since 2.6
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class Xoops_Debug
+{
+ /**
+ * Output a dump of a variable
+ *
+ * @param mixed $var variable which will be dumped
+ * @param bool $echo
+ * @param bool $exit
+ *
+ * @return string
+ */
+ static function dump($var, $echo = true, $exit = false)
+ {
+ $myts = MyText |
|
From: <tr...@us...> - 2012-12-02 23:36:26
|
Revision: 10310
http://sourceforge.net/p/xoops/svn/10310
Author: trabis
Date: 2012-12-02 23:36:20 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Adding html2pdf for testing. Xoops_Pdf class added.
See example on examples examples/pdf.php
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/examples/
XoopsCore/branches/2.6.x/2.6.0/htdocs/examples/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_LGPL.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_changelog.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/exception.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/locale.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/myPdf.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/parsingCss.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/parsingHtml.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/tcpdfConfig.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_lisez_moi.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/2dbarcodes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/CHANGELOG.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/LICENSE.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/README.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/barcodes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/cache/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/cache/chapter_demo_1.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/cache/chapter_demo_2.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/cache/table_data_demo.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/cache/utf8test.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/lang/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/lang/bra.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/lang/eng.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/lang/ger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/lang/ita.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/tcpdf_config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/config/tcpdf_config_alt.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/doc/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/doc/read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/examples/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/examples/read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/README.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/ZarBold.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/ZarBold.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/almohanad.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/almohanad.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/almohanad.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/arialunicid0.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/courier.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/AUTHORS
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/BUGS
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/LICENSE
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/NEWS
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/README
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/langcover.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/status.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/unicover.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusans.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusans.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusans.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensed.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensed.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmono.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmono.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmono.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonob.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonob.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonob.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonobi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonobi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonobi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonoi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonoi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonoi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserif.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserif.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserif.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensed.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensed.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/AUTHORS
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/COPYING
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/CREDITS
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/ChangeLog
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/INSTALL
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/README
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemono.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemono.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemono.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonob.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonob.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonob.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonobi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonobi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonobi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonoi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonoi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freemonoi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesans.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesans.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesans.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freesansi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserif.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserif.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserif.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/freeserifi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/helvetica.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/helveticab.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/helveticabi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/helveticai.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/kozgopromedium.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/kozminproregular.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/msungstdlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/stsongstdlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/symbol.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/times.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/timesb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/timesbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/timesi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_ac15.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_ag15.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_aj16.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_ak12.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/README.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1250.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1251.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1252.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1253.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1254.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1255.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1257.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1258.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp874.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-1.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-11.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-15.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-16.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-2.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-4.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-5.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-7.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-9.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/koi8-r.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/koi8-u.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/freetype6.dll
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/makefont.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/pfm2afm
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/pfm2afm.exe
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/src/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/src/pfm2afm-src.tar.gz
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/src/readme.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/src/ttf2ufm-src.tar.gz
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/ttf2ufm
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/ttf2ufm.exe
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/utils/zlib1.dll
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/zapfdingbats.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/fonts/zarbold.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/htmlcolors.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/images/read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/tcpdf.crt
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/tcpdf.fdf
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/tcpdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_tcpdf_5.0.002/unicode_data.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/about.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/bookmark.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple00.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple01.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple02.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple03.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple04.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple05.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple06.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple07.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple08.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple09.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple10.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple11.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple12.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/exemple13.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/groups.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/js1.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/js2.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/js3.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/radius.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/regle.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/about.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/bas_page.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple00.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple01.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple02.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple03.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple04.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple05.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple06.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple06.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple07a.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple07b.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple08.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple09.png.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple10.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple10a.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple10b.jpg
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple10c.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple11.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple12.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/exemple13.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/logo.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/logo.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/off.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/puce.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/puce2.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/regle.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/svg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/res/tcpdf_logo.jpg
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/svg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/svg_tiger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/svg_tree.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/ticket.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/examples/utf8.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/html2pdf.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/ca.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/cs.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/da.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/de.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/en.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/es.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/fr.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/it.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/nl.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/pt.csv
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/locale/tr.csv
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-02 21:34:50 UTC (rev 10309)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-02 23:36:20 UTC (rev 10310)
@@ -6,6 +6,7 @@
Updating cache engines (trabis)
Adding Xoops_Highlighter class (trabis)
Adding Xoops_Debug class (trabis)
+Adding Xoops_Pdf class and htm2pdf (trabis)
===============================
2012/08: Version 2.6.0 Alpha 1
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/examples/pdf.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/examples/pdf.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/examples/pdf.php 2012-12-02 23:36:20 UTC (rev 10310)
@@ -0,0 +1,31 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+include dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php';
+
+$xoops = Xoops::getInstance();
+$content = Xoops_Debug::dump($xoops->getConfigs(), false);
+
+$tpl = new XoopsTpl();
+$tpl->assign('dummy_content' , $content);
+$content2 = $tpl->fetch('module:system|system_dummy.html');
+
+$pdf = new Xoops_Pdf();
+$pdf->writeHtml($content2, false);
+$pdf->Output('example.pdf');
+
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/examples/pdf.php
___________________________________________________________________
Added: svn:executa...
[truncated message content] |
|
From: <tr...@us...> - 2012-12-14 00:09:24
|
Revision: 10386
http://sourceforge.net/p/xoops/svn/10386
Author: trabis
Date: 2012-12-14 00:09:21 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Adding tabbed preferences for modules/system
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2012-12-14 00:09:21 UTC (rev 10386)
@@ -5,8 +5,7 @@
===============================
Updating cache engines (trabis)
Adding Xoops_Highlighter class (trabis)
-Adding Xoops_Debug class (trabis)
-Adding Xoops_Pdf class and htm2pdf (trabis)
+Adding support for module tabbed preferences (trabis)
===============================
2012/08: Version 2.6.0 Alpha 1
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -29,6 +29,19 @@
class XoopsSimpleForm extends XoopsForm
{
/**
+ * Insert an empty row in the table to serve as a separator.
+ *
+ * @param string $extra not in use.
+ * @param string $class not in use
+ */
+ public function insertBreak($extra = '', $class = '')
+ {
+ $value = '</ br>';
+ $ele = new XoopsFormRaw($value);
+ $this->addElement($ele);
+ }
+
+ /**
* create HTML to output the form with minimal formatting
*
* @return string
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -30,6 +30,19 @@
class XoopsTableForm extends XoopsForm
{
/**
+ * Insert an empty row in the table to serve as a separator.
+ *
+ * @param string $extra not in use.
+ * @param string $class not in use
+ */
+ public function insertBreak($extra = '', $class = '')
+ {
+ $value = '<tr valign="top" align="left"><td></td></tr>';
+ $ele = new XoopsFormRaw($value);
+ $this->addElement($ele);
+ }
+
+ /**
* create HTML to output the form as a table
*
* @return string
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -30,7 +30,7 @@
class XoopsThemeForm extends XoopsForm
{
/**
- * Insert an empty row in the table to serve as a seperator.
+ * Insert an empty row in the table to serve as a separator.
*
* @param string $extra HTML to be displayed in the empty row.
* @param string $class CSS class name for <td> tag
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -277,10 +277,8 @@
define("_MI_PUBLISHER_CONFCAT_FORMAT", "Format");
define("_MI_PUBLISHER_CONFCAT_FORMAT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_PRINT", "Print page");
+define("_MI_PUBLISHER_CONFCAT_PRINT", "Print");
define("_MI_PUBLISHER_CONFCAT_PRINT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_OTHERS", "Others");
-define("_MI_PUBLISHER_CONFCAT_OTHERS_DSC", "");
define("_MI_PUBLISHER_CONFCAT_PERMISSIONS", "Permissions");
define("_MI_PUBLISHER_CONFCAT_PERMISSIONS_DSC", "");
@@ -300,17 +298,17 @@
define("_MI_PUBLISHER_CATEGORY_ITEMS_SEL", "Category items select");
define("_MI_PUBLISHER_CATEGORY_ITEMS_SEL_DSC", "Shows a drop down select box with items grouped by category");
-define("_MI_PUBLISHER_CONFCAT_INDEX", "Index page");
+define("_MI_PUBLISHER_CONFCAT_INDEX", "Index");
define("_MI_PUBLISHER_CONFCAT_INDEX_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_CATEGORY", "Category page");
+define("_MI_PUBLISHER_CONFCAT_CATEGORY", "Category");
define("_MI_PUBLISHER_CONFCAT_CATEGORY_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_ITEM", "Item page");
+define("_MI_PUBLISHER_CONFCAT_ITEM", "Item");
define("_MI_PUBLISHER_CONFCAT_ITEM_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_SUBMIT", "Submit page");
+define("_MI_PUBLISHER_CONFCAT_SUBMIT", "Submit");
define("_MI_PUBLISHER_CONFCAT_SUBMIT_DSC", "Submit page layout and form default values");
-define("_MI_PUBLISHER_CONFCAT_INDEXCAT", "Index and category pages");
+define("_MI_PUBLISHER_CONFCAT_INDEXCAT", "Index and category");
define("_MI_PUBLISHER_CONFCAT_INDEXCAT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_SEARCH", "Search page");
+define("_MI_PUBLISHER_CONFCAT_SEARCH", "Search");
define("_MI_PUBLISHER_CONFCAT_SEARCH_DSC", "");
define("_MI_PUBLISHER_SEO_METAKEYWORDS", "Meta Keywords");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -767,7 +767,7 @@
$i++;
$modversion['config'][$i]['name'] = 'submit_editor_cols';
$modversion['config'][$i]['title'] = '_MI_PUBLISHER_EDITOR_COLS';
-$modversion['config'][$i]['description'] = '_MI_PUBLISHER_EDITOR_COlS_DSC';
+$modversion['config'][$i]['description'] = '_MI_PUBLISHER_EDITOR_COLS_DSC';
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = '60';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -102,9 +102,9 @@
$admin_page->addBreadcrumbLink($module->getVar('name'));
$admin_page->renderBreadcrumb();
- /* @var $form SystemPreferenceForm */
- $form = $xoops->getModuleForm(null, 'preference');
- $form->getModuleForm($config, $module);
+ /* @var $form SystemModulepreferenceForm */
+ $form = $xoops->getModuleForm(null, 'modulepreference');
+ $form->getForm($config, $module);
$xoops->tpl()->assign('form', $form->render());
break;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -0,0 +1,216 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Preference Form Class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Andricq Nicolas (AKA MusS)
+ * @author trabis <lus...@gm...>
+ * @package system
+ * @subpackage preferences
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class SystemModulepreferenceForm extends XoopsSimpleForm
+{
+ /**
+ * @param null $obj
+ */
+ public function __construct($obj = null)
+ {
+ }
+
+ /**
+ * @param $obj
+ * @param XoopsModule|XoopsObject $mod
+ * @return void
+ */
+ public function getForm(&$obj, XoopsModule &$mod)
+ {
+ $xoops = Xoops::getInstance();
+ $config_handler = $xoops->getHandlerConfig();
+
+ parent::__construct('', 'pref_form', 'admin.php?fct=preferences', 'post', true);
+ if ($mod->getVar('dirname') != 'system') {
+ $xoops->loadLanguage('modinfo', $mod->getVar('dirname'));
+ }
+ $configs = $mod->getInfo('config');
+ $configNames = array();
+ foreach (array_keys($configs) as $i) {
+ $configNames[$configs[$i]['name']] =& $configs[$i];
+ }
+ $configCats = $mod->getInfo('configcat');
+ if (!$configCats) {
+ $configCats = array(
+ 'default' => array(
+ 'name' => _MD_AM_MODCONFIG,
+ 'description'=> ''
+ )
+ );
+ }
+
+ if (!in_array('default', array_keys($configCats))) {
+ $configCats['default'] = array(
+ 'name' => _MD_AM_MODCONFIG,
+ 'description'=> ''
+ );
+ }
+
+ foreach (array_keys($configNames) as $name) {
+ if (!isset($configNames[$name]['category'])) {
+ $configNames[$name]['category'] = 'default';
+ }
+ }
+
+ $tabtray = new XoopsFormTabTray('', 'pref_tabtay','redmond' );
+ $tabs = array();
+ foreach ($configCats as $name => $info) {
+ $tabs[$name] = new XoopsFormTab($info['name'], 'pref_tab_' . $name);
+ if(isset($info['description']) && $info['description'] != '') {
+ $tabs[$name]->addElement(new XoopsFormLabel('', $info['description']));
+ }
+ }
+
+ // if has comments feature, need comment lang file
+ if ($mod->getVar('hascomments') == 1) {
+ $xoops->loadLanguage('comment');
+ }
+ // RMV-NOTIFY
+ // if has notification feature, need notification lang file
+ if ($mod->getVar('hasnotification') == 1) {
+ $xoops->loadLanguage('notification');
+ }
+
+ //$modname = $module->getVar('name');
+ if (!empty($_REQUEST["redirect"])) {
+ $myts = MyTextSanitizer::getInstance();
+ $this->addElement(new XoopsFormHidden('redirect', $myts->htmlspecialchars($_REQUEST["redirect"])));
+ } elseif ($mod->getInfo('adminindex')) {
+ $this->addElement(new XoopsFormHidden('redirect', XOOPS_URL . '/modules/' . $mod->getVar('dirname') . '/' . $mod->getInfo('adminindex')));
+ }
+ $count = count($obj);
+ for ($i = 0; $i < $count; $i++) {
+ $title = constant($obj[$i]->getVar('conf_title'));
+ $desc = ($obj[$i]->getVar('conf_desc') != '') ? constant($obj[$i]->getVar('conf_desc')) : '';
+ switch ($obj[$i]->getVar('conf_formtype')) {
+
+ case 'textarea':
+ $myts = MyTextSanitizer::getInstance();
+ if ($obj[$i]->getVar('conf_valuetype') == 'array') {
+ // this is exceptional.. only when value type is arrayneed a smarter way for this
+ $ele = ($obj[$i]->getVar('conf_value') != '')
+ ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 5)
+ : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 5);
+ } else {
+ $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 5);
+ }
+ break;
+
+ case 'select':
+ $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+ $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
+ $opcount = count($options);
+ for ($j = 0; $j < $opcount; $j++) {
+ $optval = defined($options[$j]->getVar('confop_value'))
+ ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
+ $optkey = defined($options[$j]->getVar('confop_name'))
+ ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $ele->addOption($optval, $optkey);
+ }
+ break;
+
+ case 'select_multi':
+ $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), 5, true);
+ $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
+ $opcount = count($options);
+ for ($j = 0; $j < $opcount; $j++) {
+ $optval = defined($options[$j]->getVar('confop_value'))
+ ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
+ $optkey = defined($options[$j]->getVar('confop_name'))
+ ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $ele->addOption($optval, $optkey);
+ }
+ break;
+
+ case 'yesno':
+ $ele = new XoopsFormRadioYN($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), _YES, _NO);
+ break;
+
+ case 'group':
+ $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
+ break;
+
+ case 'group_multi':
+ $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
+ break;
+
+ // RMV-NOTIFY: added 'user' and 'user_multi'
+ case 'user':
+ $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
+ break;
+
+ case 'user_multi':
+ $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
+ break;
+
+ case 'password':
+ $myts = MyTextSanitizer::getInstance();
+ $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ break;
+
+ case 'color':
+ $myts = MyTextSanitizer::getInstance();
+ $ele = new XoopsFormColorPicker($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ break;
+
+ case 'hidden':
+ $myts = MyTextSanitizer::getInstance();
+ $ele = new XoopsFormHidden($obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ break;
+
+ case 'textbox':
+ default:
+ $myts = MyTextSanitizer::getInstance();
+ $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+ break;
+
+ }
+ $hidden = new XoopsFormHidden('conf_ids[]', $obj[$i]->getVar('conf_id'));
+ if (isset($ele)) {
+ $ele->setDescription($desc);
+ if ($obj[$i]->getVar('conf_formtype') != 'hidden') {
+ $name = 'default';
+ if (isset($configNames[$obj[$i]->getVar('conf_name')]['category'])) {
+ $name = $configNames[$obj[$i]->getVar('conf_name')]['category'];
+ }
+ $tabs[$name]->addElement($ele);
+ } else {
+ $this->addElement($ele);
+ }
+ $this->addElement($hidden);
+ unset($ele);
+ unset($hidden);
+ }
+ }
+ foreach (array_keys($tabs) as $name) {
+ if ($tabs[$name]->getElements()) {
+ $tabtray->addElement($tabs[$name]);
+ }
+ }
+ $this->addElement($tabtray);
+ $this->addElement(new XoopsFormHidden('op', 'save'));
+ $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
+ }
+}
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: svn:eol-style
+ native
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -228,138 +228,4 @@
$this->addElement(new XoopsFormHidden('op', 'save'));
$this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
}
-
- /**
- * @param $obj
- * @param XoopsModule|XoopsObject $mod
- * @return void
- */
- public function getModuleForm(&$obj, XoopsModule &$mod)
- {
- $xoops = Xoops::getInstance();
- $config_handler = $xoops->getHandlerConfig();
-
- parent::__construct(_MD_AM_MODCONFIG, 'pref_form', 'admin.php?fct=preferences', 'post', true);
-
- // if has comments feature, need comment lang file
- if ($mod->getVar('hascomments') == 1) {
- $xoops->loadLanguage('comment');
- }
- // RMV-NOTIFY
- // if has notification feature, need notification lang file
- if ($mod->getVar('hasnotification') == 1) {
- $xoops->loadLanguage('notification');
- }
-
- //$modname = $module->getVar('name');
- if (!empty($_REQUEST["redirect"])) {
- $myts = MyTextSanitizer::getInstance();
- $this->addElement(new XoopsFormHidden('redirect', $myts->htmlspecialchars($_REQUEST["redirect"])));
- } elseif ($mod->getInfo('adminindex')) {
- $this->addElement(new XoopsFormHidden('redirect', XOOPS_URL . '/modules/' . $mod->getVar('dirname') . '/' . $mod->getInfo('adminindex')));
- }
- $count = count($obj);
- for ($i = 0; $i < $count; $i++) {
- $title = constant($obj[$i]->getVar('conf_title'));
- $desc = ($obj[$i]->getVar('conf_desc') != '') ? constant($obj[$i]->getVar('conf_desc')) : '';
- switch ($obj[$i]->getVar('conf_formtype')) {
-
- case 'textarea':
- $myts = MyTextSanitizer::getInstance();
- if ($obj[$i]->getVar('conf_valuetype') == 'array') {
- // this is exceptional.. only when value type is arrayneed a smarter way for this
- $ele = ($obj[$i]->getVar('conf_value') != '')
- ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 5)
- : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 5);
- } else {
- $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 5);
- }
- break;
-
- case 'select':
- $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
- $opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value'))
- ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name'))
- ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
- $ele->addOption($optval, $optkey);
- }
- break;
-
- case 'select_multi':
- $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), 5, true);
- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
- $opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value'))
- ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name'))
- ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
- $ele->addOption($optval, $optkey);
- }
- break;
-
- case 'yesno':
- $ele = new XoopsFormRadioYN($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), _YES, _NO);
- break;
-
- case 'group':
- $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
- break;
-
- case 'group_multi':
- $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
- break;
-
- // RMV-NOTIFY: added 'user' and 'user_multi'
- case 'user':
- $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
- break;
-
- case 'user_multi':
- $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
- break;
-
- case 'password':
- $myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
- break;
-
- case 'color':
- $myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormColorPicker($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
- break;
-
- case 'hidden':
- $myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormHidden($obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
- break;
-
- case 'line_break':
- $myts = MyTextSanitizer::getInstance();
- $this->insertBreak($title, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
- break;
-
- case 'textbox':
- default:
- $myts = MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
- break;
-
- }
- $hidden = new XoopsFormHidden('conf_ids[]', $obj[$i]->getVar('conf_id'));
- if (isset($ele)) {
- $this->addElement($ele);
- $ele->setDescription($desc);
- $this->addElement($hidden);
- unset($ele);
- unset($hidden);
- }
- }
- $this->addElement(new XoopsFormHidden('op', 'save'));
- $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
- }
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-14 00:09:21 UTC (rev 10386)
@@ -190,21 +190,34 @@
// Menu
$modversion['hasMain'] = 0;
+// Config categories
+$i = 0;
+$modversion['configcat']['general']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_GENERAL;
+$modversion['configcat']['general']['description'] = '';
+
+$i++;
+$modversion['configcat']['active']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_ACTIVE;
+$modversion['configcat']['active']['description'] = '';
+
+$i++;
+$modversion['configcat']['pager']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_PAGER;
+$modversion['configcat']['pager']['description'] = '';
+
+$i++;
+$modversion['configcat']['editor']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_EDITOR;
+$modversion['configcat']['editor']['description'] = '';
+
+
// Préférences
$i = 0;
-$modversion['config'][$i]['name'] = 'break1';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_GENERAL';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
$modversion['config'][$i]['name'] = 'usetips';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_TIPS';
$modversion['config'][$i]['description'] = '_MI_SYSTEM_PREFERENCE_TIPS_DSC';
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'general';
+
$i++;
$icons = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/icons');
$modversion['config'][$i]['name'] = 'typeicons';
@@ -214,7 +227,8 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'default';
$modversion['config'][$i]['options'] = $icons;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'general';
+
$i++;
$breadcrumb = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/breadcrumb');
$modversion['config'][$i]['name'] = 'typebreadcrumb';
@@ -224,7 +238,7 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'default';
$modversion['config'][$i]['options'] = $breadcrumb;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'general';
$i++;
$jquery_theme = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/css/ui');
$modversion['config'][$i]['name'] = 'jquery_theme';
@@ -234,21 +248,17 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'base';
$modversion['config'][$i]['options'] = $jquery_theme;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'general';
+
$i++;
-$modversion['config'][$i]['name'] = 'break2';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
$modversion['config'][$i]['name'] = 'active_blocksadmin';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN';
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'hidden';
$modversio...
[truncated message content] |
|
From: <be...@us...> - 2012-12-14 17:19:41
|
Revision: 10390
http://sourceforge.net/p/xoops/svn/10390
Author: beckmi
Date: 2012-12-14 17:19:29 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Updating to jQuery to 1.8.3, jQueryUI to 1.9.2, Smarty to 2.6.27
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/jquery.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/plugins/jquery.ui.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/cupertino/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/jquery.ui.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/images/ui-icons_a83300_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-lightness/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/cupertino/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/redmond/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/smoothness/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_a83300_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/ui-darkness/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/ui-lightness/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/Smarty.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/plugins/function.cycle.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/plugins/function.fetch.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/plugins/function.math.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.accordion.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.autocomplete.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.base.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.button.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.core.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.datepicker.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.dialog.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.menu.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.progressbar.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.resizable.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.selectable.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.slider.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.spinner.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.tabs.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.tooltip.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_flat_75_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_glass_65_ffffff_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_glass_75_dadada_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-icons_2e83ff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-icons_454545_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-icons_888888_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery-ui.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.accordion.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.autocomplete.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.button.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.core.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.datepicker.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.dialog.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.menu.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.progressbar.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.resizable.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.selectable.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.slider.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.spinner.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.tabs.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.theme.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.tooltip.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_diagonals-thick_8_333333_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_flat_65_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_glass_40_111111_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_glass_55_1c1c1c_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_inset-hard_45_cd0a0a_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_inset-hard_55_ffeb80_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-icons_4ca300_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-icons_bbbbbb_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-icons_ededed_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-icons_ffcf29_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_flat_0_333333_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_flat_65_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_flat_75_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-icons_004276_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-icons_cc0000_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/cupertino/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/cupertino/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_flat_30_cccccc_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_highlight-hard_20_0972a5_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_highlight-soft_33_003147_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_highlight-soft_35_222222_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_highlight-soft_44_444444_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_loop_25_000000_21x21.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-icons_4b8e0b_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-icons_a83300_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-icons_cccccc_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_diagonals-thick_15_0b3e6f_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_dots-medium_30_0b58a2_4x4.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_dots-small_20_333333_2x2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_dots-small_30_a32d00_2x2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_dots-small_40_00498f_2x2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_flat_40_292929_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_gloss-wave_20_111111_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-icons_00498f_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-icons_98d2fb_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-icons_9ccdfc_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_flat_0_eeeeee_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_flat_55_994d53_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_flat_55_fafafa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_gloss-wave_30_3d3644_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_highlight-soft_100_dcd9de_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_highlight-soft_100_eae6ea_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_highlight-soft_25_30273a_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_highlight-soft_45_5f5964_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_454545_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_734d99_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_8d78a5_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_a8a3ae_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_ebccce_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_diagonals-small_25_c5ddfc_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_diagonals-thick_20_e69700_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_diagonals-thick_22_1484e6_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_diagonals-thick_26_2293f7_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_flat_0_e69700_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_flat_0_e6b900_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_highlight-soft_100_f9f9f9_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_inset-hard_100_eeeeee_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_0a82eb_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_0b54d5_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_5fa5e3_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_fcdd4a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_flat_0_eeeeee_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_flat_55_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_flat_75_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_glass_65_ffffff_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-icons_0073ea_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-icons_454545_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-icons_666666_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-icons_ff0084_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_40_db4865_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_50_93c3cd_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_50_ff3853_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_75_ccd232_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_dots-medium_80_ffff38_4x4.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_dots-small_35_35414f_2x2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_flat_75_ba9217_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_flat_75_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_white-lines_85_f7f7ba_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_454545_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_88a206_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_c02669_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_e1e463_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_ffeb33_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_flat_75_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_glass_25_cb842e_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_glass_70_ede4d4_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_c47a23_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_cb672b_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_f08000_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_f35f07_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_ff7519_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-icons_4eb305_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-icons_72b42d_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_glass_15_5f391b_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_gloss-wave_20_1c160d_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_gloss-wave_25_453326_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_gloss-wave_30_44372c_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_highlight-soft_20_201913_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_highlight-soft_20_619226_1x100.png
XoopsCore/branches/2.6.x/2.6.0/h...
[truncated message content] |
|
From: <be...@us...> - 2013-01-15 03:28:37
|
Revision: 10808
http://sourceforge.net/p/xoops/svn/10808
Author: beckmi
Date: 2013-01-15 03:28:33 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Changing version to Alpha 3
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2013-01-15 03:27:38 UTC (rev 10807)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2013-01-15 03:28:33 UTC (rev 10808)
@@ -1,6 +1,10 @@
XOOPS 2.6 Changelog
==================================
+2013/04/15: Version 2.6.0 Alpha 3
+==================================
+
+==================================
2013/01/15: Version 2.6.0 Alpha 2
==================================
Updating cache engines (trabis)
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/version.php 2013-01-15 03:27:38 UTC (rev 10807)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/version.php 2013-01-15 03:28:33 UTC (rev 10808)
@@ -19,6 +19,6 @@
/**
* Define XOOPS version
*/
-define('XOOPS_VERSION', 'XOOPS 2.6.0-Alpha 2');
+define('XOOPS_VERSION', 'XOOPS 2.6.0-Alpha 3');
?>
\ No newline at end of file
|
|
From: <be...@us...> - 2013-01-17 18:01:20
|
Revision: 10834
http://sourceforge.net/p/xoops/svn/10834
Author: beckmi
Date: 2013-01-17 18:01:15 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Updating jQuery to 1.9.0 Final
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/jquery.js
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2013-01-17 15:22:44 UTC (rev 10833)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2013-01-17 18:01:15 UTC (rev 10834)
@@ -4,6 +4,9 @@
2013/04/15: Version 2.6.0 Alpha 3
==================================
+Updated:
+ - jQuery to 1.9.0 (mamba)
+
==================================
2013/01/15: Version 2.6.0 Alpha 2
==================================
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/jquery.js
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/jquery.js 2013-01-17 15:22:44 UTC (rev 10833)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/jquery.js 2013-01-17 18:01:15 UTC (rev 10834)
@@ -1,2 +1,4 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
-(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v...
[truncated message content] |
|
From: <ma...@us...> - 2013-01-19 21:30:35
|
Revision: 10850
http://sourceforge.net/p/xoops/svn/10850
Author: mageg
Date: 2013-01-19 21:30:30 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
change $xoops->result() to $xoops->alert()
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-19 21:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-19 21:30:30 UTC (rev 10850)
@@ -322,9 +322,9 @@
case 'zip':
$archive = new PclZip($path_file);
if ($archive->extract(PCLZIP_OPT_PATH, $path) == 0) {
- xoops_error(_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
+ $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
} else {
- xoops_result(_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
+ $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
}
break;
case 'tar':
@@ -344,9 +344,9 @@
case 'filemanager_delete_file':
$file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
if (!$file->delete()) {
- $xoops->error(_AM_SYSTEM_FILEMANAGER_ERROR);
+ $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
} else {
- $xoops->result(_AM_SYSTEM_FILEMANAGER_DELETE_FILE);
+ $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
}
break;
@@ -417,9 +417,9 @@
}
if (deltree($_REQUEST['path'])) {
- $xoops->result(_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
+ $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
} else {
- $xoops->error(_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
+ $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php 2013-01-19 21:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php 2013-01-19 21:30:30 UTC (rev 10850)
@@ -247,7 +247,7 @@
}
}
$xoops->header();
- $xoops->result($msgs);
+ $xoops->alert('info',$msgs);
echo '<br /><a href="' . $redirect_page . '=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '">' . _BACK . '</a>';
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2013-01-19 21:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2013-01-19 21:30:30 UTC (rev 10850)
@@ -155,7 +155,7 @@
{
$xoops = Xoops::getInstance();
$xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- $xoops->result($msg, $title);
+ $xoops->alert('info', $msg, $title);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php 2013-01-19 21:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php 2013-01-19 21:30:30 UTC (rev 10850)
@@ -887,7 +887,7 @@
$plugin->update($itemid, $comment_count);
$xoops->header();
- $xoops->result($msgs);
+ $xoops->alert('info', $msgs);
echo '<br /><a href="' . $redirect_page . '=' . $itemid . '&com_order=' . $order . '&com_mode=' . $mode . '">' . _BACK . '</a>';
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2013-01-19 21:13:59 UTC (rev 10849)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2013-01-19 21:30:30 UTC (rev 10850)
@@ -138,7 +138,7 @@
if ($valid_dir && in_array($extension_verif, $extensions) && XoopsLoad::fileExists($old_file) && XoopsLoad::fileExists($new_file)) {
if (unlink($new_file)) {
if (rename($old_file, $new_file)) {
- $xoops->result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
+ $xoops->alert('info', _AM_SYSTEM_TEMPLATES_RESTORE_OK);
exit();
}
}
|
|
From: <ma...@us...> - 2013-01-19 21:53:08
|
Revision: 10851
http://sourceforge.net/p/xoops/svn/10851
Author: mageg
Date: 2013-01-19 21:53:02 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
change $xoops->error() to $xoops->alert()
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.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/groups/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -322,9 +322,9 @@
case 'zip':
$archive = new PclZip($path_file);
if ($archive->extract(PCLZIP_OPT_PATH, $path) == 0) {
- $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
+ echo $xoops->alert('error', _AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR);
} else {
- $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
+ echo $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_EXTRACT_FILE);
}
break;
case 'tar':
@@ -344,9 +344,9 @@
case 'filemanager_delete_file':
$file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
if (!$file->delete()) {
- $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
+ echo $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_ERROR);
} else {
- $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
+ echo $xoops->alert('info', _AM_SYSTEM_FILEMANAGER_DELETE_FILE);
}
break;
@@ -417,9 +417,9 @@
}
if (deltree($_REQUEST['path'])) {
- $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
+ echo $xoops->alert('info',_AM_SYSTEM_FILEMANAGER_DELDIR_OK);
} else {
- $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
+ echo $xoops->alert('error',_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -134,7 +134,7 @@
}
$xoops->redirect('xoops_images.php?imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
$xoopsTpl->display('module:images|images_tinymce.html');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_delete.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -104,7 +104,7 @@
$comment = $comment_handler->get($com_id);
if (!$comment_handler->delete($comment)) {
$xoops->header();
- $xoops->error(_CM_COMDELETENG . ' (ID: ' . $comment->getVar('com_id') . ')');
+ echo $xoops->alert('error', _CM_COMDELETENG . ' (ID: ' . $comment->getVar('com_id') . ')');
$xoops->footer();
}
@@ -178,7 +178,7 @@
}
if (count($errs) > 0) {
$xoops->header();
- $xoops->error($errs);
+ echo $xoops->alert('error', $errs);
$xoops->footer();
exit();
}
@@ -247,7 +247,7 @@
}
}
$xoops->header();
- $xoops->alert('info',$msgs);
+ echo $xoops->alert('info',$msgs);
echo '<br /><a href="' . $redirect_page . '=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '">' . _BACK . '</a>';
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_post.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -127,7 +127,7 @@
if ($xoops->module->getVar('dirname') != 'system') {
$xoops->header();
if (!empty($captcha_message)) {
- $xoops->error($captcha_message);
+ echo $xoops->alert('error', $captcha_message);
}
echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
<tr><td class="head">' . $com_title . '</td></tr>
@@ -293,7 +293,7 @@
if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
$comment_handler->delete($comment);
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
}
}
@@ -406,7 +406,7 @@
} else {
if (!isset($purge_comment_post_results)) {
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
} else {
$comment_post_results = $comment->getErrors();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -31,7 +31,7 @@
$denied = false;
}
if ($denied) {
- $xoops->error(_NOPERM);
+ echo $xoops->alert('error', _NOPERM);
exit();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -142,7 +142,7 @@
{
$xoops = Xoops::getInstance();
$xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- $xoops->error($msg, $title);
+ echo $xoops->alert('error', $msg, $title);
}
/**
@@ -155,7 +155,7 @@
{
$xoops = Xoops::getInstance();
$xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
- $xoops->alert('info', $msg, $title);
+ echo $xoops->alert('info', $msg, $title);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -133,7 +133,7 @@
if ($avatar_Handler->insert($obj)) {
$xoops->redirect('avatar_custom.php', 2, _AM_AVATARS_SAVE);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'avatar');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -159,7 +159,7 @@
$xoops->db()->query("UPDATE " . $xoops->db()->prefix('users') . " SET user_avatar='blank.gif' WHERE user_avatar='" . $file . "'");
$xoops->redirect("avatar_custom.php", 2, _AM_AVATARS_SAVE);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
if ($avatar_id > 0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -141,7 +141,7 @@
if ($avatar_Handler->insert($obj)) {
$xoops->redirect('avatar_system.php', 2, _AM_AVATARS_SAVE);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'avatar');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -168,7 +168,7 @@
$xoops->db()->query("UPDATE " . $xoops->db()->prefix('users') . " SET user_avatar='blank.gif' WHERE user_avatar='" . $file . "'");
$xoops->redirect("avatar_system.php", 2, _AM_AVATARS_SAVE);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
if ($avatar_id > 0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package banners
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -56,7 +56,7 @@
$admin_page->addItemButton(_AM_BANNERS_BANNERS_ADD, 'banners.php?op=new', 'add');
$admin_page->renderTips();
if ($client_Handler->getCount() == 0){
- $xoops->error(_AM_BANNERS_BANNERS_ERROR_NOCLIENT);
+ echo $xoops->alert('error', _AM_BANNERS_BANNERS_ERROR_NOCLIENT);
} else {
$admin_page->renderButton();
}
@@ -257,7 +257,7 @@
if ($banner_Handler->insert($obj)) {
$xoops->redirect("banners.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'banner');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -283,7 +283,7 @@
}
$xoops->redirect("banners.php", 2, _AM_BANNERS_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
@@ -322,7 +322,7 @@
if ($banner_Handler->insert($obj)) {
$xoops->redirect("banners.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package banners
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -150,7 +150,7 @@
if ($client_Handler->insert($obj)) {
$xoops->redirect("clients.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'bannerclient');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -180,12 +180,12 @@
unlink($urlfile);
}
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
$xoops->redirect("clients.php", 2, _AM_BANNERS_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package banners
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
@@ -314,7 +314,7 @@
if ($banner_Handler->insert($obj)) {
$xoops->redirect("index.php", 2, _AM_BANNERS_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
} else {
$xoops->redirect(XOOPS_URL, 1, _MD_BANNERS_INDEX_NO_ID);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -258,7 +258,7 @@
$xoops->header();
if (!$xoops->isAdminSide && !empty($captcha_message)) {
- $xoops->error($captcha_message);
+ echo $xoops->alert('error', $captcha_message);
}
echo $this->renderHeader($comment->getVar('title', 'p'), $comment->getVar('text', 'p'), false, time());
$this->displayCommentForm($comment);
@@ -393,7 +393,7 @@
if (!$comment_handler->updateByField($comment, 'rootid', $comment->getVar('rootid'))) {
$comment_handler->delete($comment);
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
}
}
@@ -450,7 +450,7 @@
} else {
if (!isset($purge_comment_post_results)) {
$xoops->header();
- $xoops->error($comment->getHtmlErrors());
+ echo $xoops->alert('error', $comment->getHtmlErrors());
$xoops->footer();
} else {
$comment_post_results = $comment->getErrors();
@@ -781,7 +781,7 @@
case 'delete_one':
if (!$comment_handler->delete($comment)) {
$xoops->header();
- $xoops->error(_MD_COMMENTS_COMDELETENG . ' (ID: ' . $comment->getVar('id') . ')');
+ echo $xoops->alert('error', _MD_COMMENTS_COMDELETENG . ' (ID: ' . $comment->getVar('id') . ')');
$xoops->footer();
}
@@ -837,7 +837,7 @@
}
if (count($errs) > 0) {
$xoops->header();
- $xoops->error($errs);
+ echo $xoops->alert('error', $errs);
$xoops->footer();
exit();
}
@@ -887,7 +887,7 @@
$plugin->update($itemid, $comment_count);
$xoops->header();
- $xoops->alert('info', $msgs);
+ echo $xoops->alert('info', $msgs);
echo '<br /><a href="' . $redirect_page . '=' . $itemid . '&com_order=' . $order . '&com_mode=' . $mode . '">' . _BACK . '</a>';
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -98,7 +98,7 @@
}
$xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
$form = $helper->getForm($obj, 'image');
$xoops->tpl()->assign('form', $form->render());
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/imagemanager.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -153,7 +153,7 @@
}
$xoops->redirect('imagemanager.php?target=' . $target . '&imgcat_id=' . $imgcat_id, 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
$xoopsTpl->assign('xsize', 800);
@@ -272,7 +272,7 @@
}
if (isset($err)) {
$xoops->simpleHeader(false);
- $xoops->error($err);
+ echo $xoops->alert('error', $err);
echo '</head><body><div style="text-align:center;"><input value="' . _BACK . '" type="button" onclick="javascript:history.go(-1);" /></div>';
$xoops->simpleFooter();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menu.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -119,7 +119,7 @@
$this_handler->update_weights($obj);
$xoops->redirect('admin_menu.php?op=list&menu_id=' . $obj->getVar('mid'), 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $helper->getForm($obj, 'menus_menu');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -135,7 +135,7 @@
if ($helper->getHandlerMenu()->delete($obj)) {
$xoops->redirect('admin_menu.php?menu_id=' . $menu_id, 2, _AM_MENUS_MSG_SUCCESS);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$xoops->confirm(array(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/admin/admin_menus.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -75,7 +75,7 @@
if ($helper->getHandlerMenus()->insert($obj)) {
$xoops->redirect('admin_menus.php', 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $helper->getForm($obj, 'menus_menus');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -94,7 +94,7 @@
$this_handler->deleteAll($criteria);
$xoops->redirect('admin_menus.php', 2, _AM_MENUS_MSG_SUCCESS);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$xoops->confirm(array(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -219,7 +219,7 @@
}
$xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
$form = $xoops->getModuleForm($obj, 'page_content');
$xoops->tpl()->assign('form', $form->render());
@@ -268,7 +268,7 @@
}
$xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// deleting main and secondary
@@ -356,7 +356,7 @@
}
$xoops->redirect("content.php", 2, _AM_PAGE_DBUPDATED);
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/related.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -188,7 +188,7 @@
}
$xoops->redirect("related.php", 2, _AM_PAGE_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
$form = $xoops->getModuleForm($obj, 'page_related');
$xoops->tpl()->assign('form', $form->render());
@@ -213,7 +213,7 @@
$related_Handler->deleteAll($criteria);
$xoops->redirect("related.php", 2, _AM_PAGE_DBUPDATED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$xoops->confirm(array("ok" => 1, "id" => $related_id, "op" => "delete"), 'related.php', sprintf(_AM_PAGE_SUREDEL, $obj->getvar('related_name') . '<br />'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -85,7 +85,7 @@
if ($category_Handler->insert($obj)) {
$xoops->redirect('category.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_CATEGORY));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'category');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -104,7 +104,7 @@
if ($category_Handler->delete($obj)) {
$xoops->redirect("category.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -284,7 +284,7 @@
$url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
$xoops->redirect($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'regstep');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -303,7 +303,7 @@
if ($field_handler->deleteFields($obj)) {
$xoops->redirect("field.php", 2, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY));
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
// Define Stylesheet
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -85,7 +85,7 @@
if ($regstep_Handler->insert($obj)) {
$xoops->redirect('step.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_STEP));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'regstep');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -104,7 +104,7 @@...
[truncated message content] |
|
From: <be...@us...> - 2013-01-23 03:45:54
|
Revision: 10869
http://sourceforge.net/p/xoops/svn/10869
Author: beckmi
Date: 2013-01-23 03:45:39 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Updating jQueryUI to 1.10.0
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/plugins/jquery.ui.js
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.accordion.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.autocomplete.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.base.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.button.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.core.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.datepicker.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.dialog.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.menu.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.progressbar.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.resizable.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.selectable.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.slider.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.spinner.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.tabs.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/jquery.ui.tooltip.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery-ui.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.accordion.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.autocomplete.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.button.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.core.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.datepicker.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.dialog.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.menu.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.progressbar.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.resizable.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.selectable.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.slider.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.spinner.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.tabs.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.theme.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/jquery.ui.tooltip.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_glass_40_111111_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_glass_55_1c1c1c_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/images/ui-bg_inset-hard_45_cd0a0a_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/black-tie/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-icons_004276_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/images/ui-icons_cc0000_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/blitzer/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/cupertino/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/cupertino/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_flat_50_5c5c5c_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-bg_glass_40_ffc73d_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/images/ui-icons_a83300_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dark-hive/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-bg_flat_40_292929_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/images/ui-icons_9ccdfc_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/dot-luv/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_flat_55_fafafa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-bg_highlight-soft_100_eae6ea_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_734d99_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_8d78a5_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_a8a3ae_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/images/ui-icons_ebccce_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/eggplant/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_diagonals-thick_20_e69700_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_flat_0_e69700_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-bg_flat_0_e6b900_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_0a82eb_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_0b54d5_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/images/ui-icons_fcdd4a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/excite-bike/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/images/ui-icons_ff0084_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/flick/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_50_93c3cd_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_50_ff3853_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_diagonals-small_75_ccd232_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-bg_white-lines_85_f7f7ba_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/images/ui-icons_88a206_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/hot-sneaks/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_glass_25_cb842e_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_glass_70_ede4d4_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_c47a23_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_cb672b_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_f08000_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/images/ui-icons_f35f07_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/humanity/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/images/ui-icons_72b42d_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/le-frog/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_glass_15_5f391b_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_gloss-wave_20_1c160d_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-bg_gloss-wave_25_453326_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-icons_add978_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-icons_e3ddc9_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-icons_f1fd86_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-bg_flat_55_c0402a_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-icons_999999_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-icons_fbc856_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_fine-grain_10_f8f7f6_60x60.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_fine-grain_15_eceadf_60x60.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/images/ui-icons_6da8d5_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/redmond/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/smoothness/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-icons_8DC262_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_glass_55_f8da4e_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_3d3d3d_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_bd7b00_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_d19405_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_eb990f_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_ed9f26_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_fadc7a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-icons_ffe180_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-icons_070603_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-icons_e8e2b5_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-icons_e9cd86_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-icons_ff7519_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_diagonals-small_50_262626_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_flat_0_303030_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_flat_0_4c4c4c_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_glass_40_0a0a0a_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_gloss-wave_85_9fda58_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_gloss-wave_95_f6ecd5_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-darkness/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-lightness/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/ui-lightness/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-bg_highlight-hard_15_888888_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-bg_highlight-soft_35_adadad_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-icons_c98000_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/jquery.ui.theme.css
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/images/animated-overlay.gif
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/base/minified/images/animated-overlay.gif
Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2013-01-23 03:12:32 UTC (rev 10868)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt 2013-01-23 03:45:39 UTC (rev 10869)
@@ -6,6 +6,7 @@
Updated:
- jQuery to 1.9.0 (mamba)
+ - jQueryUI to 1.10.0 (mamba)
==================================
2013/01/15: Version 2.6.0 Alpha 2
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/plugins/jquery.ui.js
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/plugins/jquery.ui.js 2013-01-23 03:12:32 UTC (rev 10868)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/plugins/jquery.ui.js 2013-01-23 03:45:39 UTC (rev 10869)
@@ -1,6 +1,5 @@
-/*! jQuery UI - v1.9.2 - 2012-11-23
+/*! jQuery UI - v1.10.0 - 2013-01-17
* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.slider.js, jquery.ui.sortable.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js
-* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
-
@@ Diff output truncated at 100000 characters. @@
|
|
From: <tr...@us...> - 2013-01-26 18:59:25
|
Revision: 10909
http://sourceforge.net/p/xoops/svn/10909
Author: trabis
Date: 2013-01-26 18:59:04 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
More language updates...
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formurl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/calendarjs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/cp_header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/site-closed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/xoopsmailerlocal.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/avatars_popup.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form-tab.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/request.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/form/comment.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/templates/admin/comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/templates/comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/form/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/form/image_imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/images_tinymce.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/render.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/mailusers/admin/send_mails.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/dump.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/class/form/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/form/menus_menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/form/menus_menus.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/templates/admin/menus_admin_menu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/templates/admin/menus_admin_menus.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/update.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/print.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/class/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/class/message.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/pmlite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/readpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/categorylist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/fieldlist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/visibility.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/form/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_center.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/clone.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/mimetypes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/pw_delete_file.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/backend.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/items_new.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/latest_news.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/form/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/utils.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/file.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/include/ajax_rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/makepdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/print.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/rate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/submit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_search_block.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/visit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/popup.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/smilies_smiley.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/smilies_tinymce.html
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/extensions/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/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/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/online.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_extensions.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_confirm.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_misc_friend.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_misc_online.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/configs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/modules.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/language.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/tinymce.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/templates/admin/xlanguage_admin_list.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale/Abstract.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Email.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Textarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Textbox.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Url.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.translate.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/login.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/upd-2.0.18-to-2.3.0/settings_db.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/upd-2.0.18-to-2.3.0/settings_path.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_mail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_misc.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/mail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/misc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/pt_BR/
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -2,35 +2,36 @@
// This script displays a login screen in a popupbox when SSL is enabled in the preferences. You should use this script only when your server supports SSL. Place this file under your SSL directory
// path to your xoops main directory
+//todo, check this file
$path = '/path/to/xoops/directory';
-include $path.'/mainfile.php';
+include $path . '/mainfile.php';
if (!defined('XOOPS_ROOT_PATH')) {
- exit();
+ exit();
}
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php';
+include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/user.php';
$op = (isset($_POST['op']) && $_POST['op'] == 'dologin') ? 'dologin' : 'login';
$username = isset($_POST['username']) ? trim($_POST['username']) : '';
$password = isset($_POST['userpass']) ? trim($_POST['userpass']) : '';
if ($username == '' || $password == '') {
- $op ='login';
+ $op = 'login';
}
echo '
<html>
<head>
- <meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />
- <meta http-equiv="content-language" content="'._LANGCODE.'" />
- <title>'.$xoopsConfig['sitename'].'</title>
- <link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/xoops.css" />
+ <meta http-equiv="content-type" content="text/html; charset=' . XoopsLocale::getCharset() . '" />
+ <meta http-equiv="content-language" content="' . _LANGCODE . '" />
+ <title>' . $xoopsConfig['sitename'] . '</title>
+ <link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />
';
$style = xoops_getcss($xoopsConfig['theme_set']);
if ($style == '') {
- $style = xoops_getcss($xoopsConfig['theme_set']);
+ $style = xoops_getcss($xoopsConfig['theme_set']);
}
if ($style != '') {
- echo '<link rel="stylesheet" type="text/css" media="all" href="'.$style.'" />';
+ echo '<link rel="stylesheet" type="text/css" media="all" href="' . $style . '" />';
}
echo '
</head>
@@ -40,58 +41,58 @@
if ($op == 'dologin') {
$member_handler = xoops_gethandler('member');
$myts = MyTextsanitizer::getInstance();
- $user = $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
+ $user = $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
if (is_object($user)) {
- if (0 == $user->getVar('level')) {
- redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);
- exit();
- }
- if ($xoopsConfig['closesite'] == 1) {
- $allowed = false;
- foreach ($user->getGroups() as $group) {
- if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
- $allowed = true;
- break;
- }
- }
- if (!$allowed) {
- redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
- exit();
- }
- }
- $user->setVar('last_login', time());
- if (!$member_handler->insertUser($user)) {
- }
- $_SESSION = array();
- $_SESSION['xoopsUserId'] = $user->getVar('uid');
- $_SESSION['xoopsUserGroups'] = $user->getGroups();
- if (!empty($xoopsConfig['use_ssl'])) {
- xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL.'/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, _LOGIN);
- } else {
- echo sprintf(_US_LOGGINGU, $user->getVar('uname'));
- echo '<div style="text-align:center;"><input value="'._CLOSE.'" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
- }
+ if (0 == $user->getVar('level')) {
+ redirect_header(XOOPS_URL . '/index.php', 5, _US_NOACTTPADM);
+ exit();
+ }
+ if ($xoopsConfig['closesite'] == 1) {
+ $allowed = false;
+ foreach ($user->getGroups() as $group) {
+ if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
+ $allowed = true;
+ break;
+ }
+ }
+ if (!$allowed) {
+ redirect_header(XOOPS_URL . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+ exit();
+ }
+ }
+ $user->setVar('last_login', time());
+ if (!$member_handler->insertUser($user)) {
+ }
+ $_SESSION = array();
+ $_SESSION['xoopsUserId'] = $user->getVar('uid');
+ $_SESSION['xoopsUserGroups'] = $user->getGroups();
+ if (!empty($xoopsConfig['use_ssl'])) {
+ xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, XoopsLocale::A_LOGIN);
+ } else {
+ echo sprintf(_US_LOGGINGU, $user->getVar('uname'));
+ echo '<div style="text-align:center;"><input value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
+ }
} else {
- xoops_error(_US_INCORRECTLOGIN.'<br /><a href="login.php">'._BACK.'</a>');
+ xoops_error(_US_INCORRECTLOGIN . '<br /><a href="login.php">' . XoopsLocale::GO_BACK . '</a>');
}
}
if ($op == 'login') {
- echo '
+ echo '
<div style="text-align: center; padding: 5; margin: 0">
<form action="login.php" method="post">
<table class="outer" width="95%">
<tr>
- <td class="head">'._USERNAME.'</td>
+ <td class="head">' . XoopsLocale::C_USERNAME . '</td>
<td class="even"><input type="text" name="username" value="" /></td>
</tr>
<tr>
- <td class="head">'._PASSWORD.'</td>
+ <td class="head">' . XoopsLocale::C_PASSWORD . '</td>
<td class="even"><input type="password" name="userpass" value="" /></td>
</tr>
<tr>
<td class="head"> </td>
- <td class="even"><input type="hidden" name="op" value="dologin" /><input type="submit" name="submit" value="'._LOGIN.'" /></td>
+ <td class="even"><input type="hidden" name="op" value="dologin" /><input type="submit" name="submit" value="' . XoopsLocale::A_LOGIN . '" /></td>
</tr>
</table>
</form>
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -363,7 +363,7 @@
$form->addElement(new XoopsFormFile(_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE, 'upload_file', 500000), false);
$form->addElement(new XoopsFormHidden('op', 'filemanager_upload_save'));
$form->addElement(new XoopsFormHidden('path', $path));
- $form->addElement(new XoopsFormButton('', 'up_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'up_button', XoopsLocale::A_SUBMIT, 'submit'));
echo $form->render();
break;
@@ -379,7 +379,7 @@
$form->addElement(new XoopsFormText(_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME, 'dir_name', 50, 255), true);
$form->addElement(new XoopsFormHidden('op', 'filemanager_add_dir_save'));
$form->addElement(new XoopsFormHidden('path', $path));
- $form->addElement(new XoopsFormButton('', 'dir_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'dir_button', XoopsLocale::A_SUBMIT, 'submit'));
echo $form->render();
break;
@@ -435,7 +435,7 @@
$form->addElement(new XoopsFormText(_AM_SYSTEM_FILEMANAGER_ADDFILE, 'file_name', 50, 255), true);
$form->addElement(new XoopsFormHidden('op', 'filemanager_add_file_save'));
$form->addElement(new XoopsFormHidden('path', $path));
- $form->addElement(new XoopsFormButton('', 'dir_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'dir_button', XoopsLocale::A_SUBMIT, 'submit'));
echo $form->render();
break;
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -28,7 +28,7 @@
// Check users rights
if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
+ exit(XoopsLocale::E_NO_ACCESS_PERMISSION);
}
// Check is active
if (!$xoops->getModuleConfig('active_filemanager', 'system')) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -70,8 +70,9 @@
$adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>')
. '<a href="' . $module_link . $adminmenu[$key]["link"] . '"><span>' . $adminmenu[$key]["title"] . '</span></a></li>';
}
+ //todo, check this dependencies
if ($xoops->module->getVar("hasconfig") || $xoops->module->getVar("hascomments") || $xoops->module->getVar("hasnotification")) {
- $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $xoops->module->getVar("mid") . '"><span>' . _PREFERENCES . '</span></a></li>';
+ $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $xoops->module->getVar("mid") . '"><span>' . XoopsLocale::PREFERENCES . '</span></a></li>';
}
$adminmenu_text .= '
</ul>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -95,7 +95,7 @@
$_items = $rss2parser->getItems();
$count = count($_items);
for ($i = 0; $i < $count; $i++) {
- $_items[$i]['title'] = XoopsLocale::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
+ $_items[$i]['title'] = XoopsLocale::convert_encoding($_items[$i]['title'], XoopsLocale::getCharset(), 'UTF-8');
$_items[$i]['description'] = XoopsLocale::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
$items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -138,7 +138,7 @@
$this->Sendmail = $xoopsMailerConfig['sendmailpath'];
$this->Host = implode(';', $xoopsMailerConfig['smtphost']);
}
- $this->CharSet = strtolower(_CHARSET);
+ $this->CharSet = strtolower(XoopsLocale::getCharset());
$xoopsLanguage = preg_replace('/[^a-zA-Z0-9_-]/', '', $xoops->getConfig('language'));
if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/language/' . $xoopsLanguage . '/phpmailer.php')) {
include XOOPS_ROOT_PATH . '/language/' . $xoopsLanguage . '/phpmailer.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -392,7 +392,7 @@
{
//look for both open and closing tags in the correct order
$pattern = "/\[quote](.*)\[\/quote\]/sU";
- $replacement = _QUOTEC . '<div class="xoopsQuote"><blockquote>\\1</blockquote></div>';
+ $replacement = XoopsLocale::C_QUOTE . '<div class="xoopsQuote"><blockquote>\\1</blockquote></div>';
$text = preg_replace($pattern, $replacement, $text, -1, $count);
//no more matches, return now
@@ -478,7 +478,7 @@
public function htmlSpecialChars($text, $quote_style = ENT_QUOTES, $charset = null, $double_encode = true)
{
if (version_compare(phpversion(), '5.2.3', '>=')) {
- $text = htmlspecialchars($text, $quote_style, $charset ? $charset : (defined('_CHARSET') ? _CHARSET : 'UTF-8'), $double_encode);
+ $text = htmlspecialchars($text, $quote_style, $charset ? $charset : XoopsLocale::getCharset(), $double_encode);
} else {
$text = htmlspecialchars($text, $quote_style);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -54,7 +54,7 @@
$this->Smarty();
$this->setCompileId();
$this->assign(
- array('xoops_url' => XOOPS_URL, 'xoops_rootpath' => XOOPS_ROOT_PATH, 'xoops_langcode' => _LANGCODE, 'xoops_charset' => _CHARSET, 'xoops_version' => XOOPS_VERSION, 'xoops_upload_url' => XOOPS_...
[truncated message content] |
|
From: <tr...@us...> - 2013-01-27 15:15:32
|
Revision: 10928
http://sourceforge.net/p/xoops/svn/10928
Author: trabis
Date: 2013-01-27 15:15:23 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Partial update of user languages...
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_userform.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale/Mailer/Abstract.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -44,7 +44,7 @@
$user = $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
if (is_object($user)) {
if (0 == $user->getVar('level')) {
- redirect_header(XOOPS_URL . '/index.php', 5, _US_NOACTTPADM);
+ redirect_header(XOOPS_URL . '/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
exit();
}
if ($xoopsConfig['closesite'] == 1) {
@@ -69,11 +69,11 @@
if (!empty($xoopsConfig['use_ssl'])) {
xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, XoopsLocale::A_LOGIN);
} else {
- echo sprintf(_US_LOGGINGU, $user->getVar('uname'));
+ echo sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname'));
echo '<div style="text-align:center;"><input value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
}
} else {
- xoops_error(_US_INCORRECTLOGIN . '<br /><a href="login.php">' . XoopsLocale::GO_BACK . '</a>');
+ xoops_error(XoopsLocale::E_INCORRECT_LOGIN . '<br /><a href="login.php">' . XoopsLocale::GO_BACK . '</a>');
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -478,7 +478,7 @@
public function htmlSpecialChars($text, $quote_style = ENT_QUOTES, $charset = null, $double_encode = true)
{
if (version_compare(phpversion(), '5.2.3', '>=')) {
- $text = htmlspecialchars($text, $quote_style, $charset ? $charset : class_exists('xoopslocale', false) ? XoopsLocale::getCharset() : 'UTF-8', $double_encode);
+ $text = htmlspecialchars($text, $quote_style, $charset ? $charset : (class_exists('xoopslocale', false) ? XoopsLocale::getCharset() : 'UTF-8'), $double_encode);
} else {
$text = htmlspecialchars($text, $quote_style);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -123,13 +123,12 @@
$xoops->header('system_edituser.html');
$xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
$xoops->tpl()->assign('editprofile', true);
- include_once $xoops->path('include/comment_constants.php');
$form = new XoopsThemeForm(_US_EDITPROFILE, 'userinfo', 'edituser.php', 'post', true);
- $uname_label = new XoopsFormLabel(_US_NICKNAME, $xoops->user->getVar('uname'));
+ $uname_label = new XoopsFormLabel(XoopsLocale::USERNAME, $xoops->user->getVar('uname'));
$form->addElement($uname_label);
$name_text = new XoopsFormText(_US_REALNAME, 'name', 30, 60, $xoops->user->getVar('name', 'E'));
$form->addElement($name_text);
- $email_tray = new XoopsFormElementTray(_US_EMAIL, '<br />');
+ $email_tray = new XoopsFormElementTray(XoopsLocale::EMAIL, '<br />');
if ($xoops->getConfig('allow_chgmail') == 1) {
$email_text = new XoopsFormText('', 'email', 30, 60, $xoops->user->getVar('email'));
} else {
@@ -138,13 +137,13 @@
$email_tray->addElement($email_text);
$email_cbox_value = $xoops->user->user_viewemail() ? 1 : 0;
$email_cbox = new XoopsFormCheckBox('', 'user_viewemail', $email_cbox_value);
- $email_cbox->addOption(1, _US_ALLOWVIEWEMAIL);
+ $email_cbox->addOption(1, XoopsLocale::ALLOW_OTHER_USERS_TO_VIEW_EMAIL);
$email_tray->addElement($email_cbox);
$form->addElement($email_tray);
- $url_text = new XoopsFormText(_US_WEBSITE, 'url', 30, 100, $xoops->user->getVar('url', 'E'));
+ $url_text = new XoopsFormText(XoopsLocale::WEBSITE, 'url', 30, 100, $xoops->user->getVar('url', 'E'));
$form->addElement($url_text);
- $timezone_select = new XoopsFormSelectTimezone(_US_TIMEZONE, 'timezone_offset', $xoops->user->getVar('timezone_offset'));
+ $timezone_select = new XoopsFormSelectTimezone(XoopsLocale::TIME_ZONE, 'timezone_offset', $xoops->user->getVar('timezone_offset'));
$icq_text = new XoopsFormText(_US_ICQ, 'user_icq', 15, 15, $xoops->user->getVar('user_icq', 'E'));
$aim_text = new XoopsFormText(_US_AIM, 'user_aim', 18, 18, $xoops->user->getVar('user_aim', 'E'));
$yim_text = new XoopsFormText(_US_YIM, 'user_yim', 25, 25, $xoops->user->getVar('user_yim', 'E'));
@@ -167,7 +166,7 @@
$pwd_tray = new XoopsFormElementTray(_US_PASSWORD . '<br />' . _US_TYPEPASSTWICE);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
- $mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $xoops->user->getVar('user_mailok'));
+ $mailok_radio = new XoopsFormRadioYN(XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, 'user_mailok', $xoops->user->getVar('user_mailok'));
$uid_hidden = new XoopsFormHidden('uid', $xoops->user->getVar('uid'));
$op_hidden = new XoopsFormHidden('op', 'saveuser');
$submit_button = new XoopsFormButton('', 'submit', _US_SAVECHANGES, 'submit');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -25,7 +25,7 @@
$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
if ($uname == '' || $pass == '') {
- $xoops->redirect(XOOPS_URL . '/user.php', 1, _US_INCORRECTLOGIN);
+ $xoops->redirect(XOOPS_URL . '/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
exit();
}
@@ -38,7 +38,7 @@
if (false != $user) {
/* @var $user XoopsUser */
if (0 == $user->getVar('level')) {
- $xoops->redirect(XOOPS_URL . '/index.php', 5, _US_NOACTTPADM);
+ $xoops->redirect(XOOPS_URL . '/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
exit();
}
if ($xoops->getConfig('closesite') == 1) {
@@ -104,7 +104,7 @@
Notifications::getInstance()->getHandlerNotification()->doLoginMaintenance($user->getVar('uid'));
}
- $xoops->redirect($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname')), false);
+ $xoops->redirect($url, 1, sprintf(XoopsLocale::E_INCORRECT_LOGIN, $user->getVar('uname')), false);
} else {
if (empty($_POST['xoops_redirect'])) {
$xoops->redirect(XOOPS_URL . '/user.php', 5, $xoopsAuth->getHtmlErrors());
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -17,37 +17,36 @@
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$email_tray = new XoopsFormElementTray(_US_EMAIL, '<br />');
+$email_tray = new XoopsFormElementTray(XoopsLocale::EMAIL, '<br />');
$email_text = new XoopsFormText('', 'email', 25, 60, $myts->htmlSpecialChars($email));
$email_option = new XoopsFormCheckBox('', 'user_viewemail', $user_viewemail);
-$email_option->addOption(1, _US_ALLOWVIEWEMAIL);
+$email_option->addOption(1, XoopsLocale::ALLOW_OTHER_USERS_TO_VIEW_EMAIL);
$email_tray->addElement($email_text, true);
$email_tray->addElement($email_option);
-$reg_form = new XoopsThemeForm(_US_USERREG, 'userinfo', 'register.php', 'post', true);
+$reg_form = new XoopsThemeForm(XoopsLocale::USER_REGISTRATION, 'userinfo', 'register.php', 'post', true);
$uname_size = $xoopsConfigUser['maxuname'] < 25 ? $xoopsConfigUser['maxuname'] : 25;
-$reg_form->addElement(new XoopsFormText(_US_NICKNAME, 'uname', $uname_size, $uname_size, $myts->htmlSpecialChars($uname)), true);
+$reg_form->addElement(new XoopsFormText(XoopsLocale::USERNAME, 'uname', $uname_size, $uname_size, $myts->htmlSpecialChars($uname)), true);
$reg_form->addElement($email_tray);
$reg_form->addElement(new XoopsFormPassword(_US_PASSWORD, 'pass', 10, 32, $myts->htmlSpecialChars($pass)), true);
-$reg_form->addElement(new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 10, 32, $myts->htmlSpecialChars($vpass)), true);
-$reg_form->addElement(new XoopsFormText(_US_WEBSITE, 'url', 25, 255, $myts->htmlSpecialChars($url)));
+$reg_form->addElement(new XoopsFormPassword(XoopsLocale::VERIFY_PASSWORD, 'vpass', 10, 32, $myts->htmlSpecialChars($vpass)), true);
+$reg_form->addElement(new XoopsFormText(XoopsLocale::WEBSITE, 'url', 25, 255, $myts->htmlSpecialChars($url)));
$tzselected = ($timezone_offset != '') ? $timezone_offset : $xoopsConfig['default_TZ'];
-$reg_form->addElement(new XoopsFormSelectTimezone(_US_TIMEZONE, 'timezone_offset', $tzselected));
+$reg_form->addElement(new XoopsFormSelectTimezone(XoopsLocale::TIME_ZONE, 'timezone_offset', $tzselected));
//$reg_form->addElement($avatar_tray);
-$reg_form->addElement(new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $user_mailok));
+$reg_form->addElement(new XoopsFormRadioYN(XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, 'user_mailok', $user_mailok));
if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
- $disc_tray = new XoopsFormElementTray(_US_DISCLAIMER, '<br />');
+ $disc_tray = new XoopsFormElementTray(XoopsLocale::DISCLAIMER, '<br />');
$disc_text = new XoopsFormTextarea('', 'disclaimer', $xoopsConfigUser['reg_disclaimer'], 15, 80);
$disc_text->setExtra('readonly="readonly"');
$disc_tray->addElement($disc_text);
$agree_chk = new XoopsFormCheckBox('', 'agree_disc', $agree_disc);
- $agree_chk->addOption(1, _US_IAGREE);
+ $agree_chk->addOption(1, XoopsLocale::I_AGREE_TO_THE_ABOVE);
$eltname = $agree_chk->getName();
- $eltmsg = str_replace('"', '\"', stripslashes(sprintf(XoopsLocale::F_ENTER, _US_IAGREE)));
+ $eltmsg = str_replace('"', '\"', stripslashes(sprintf(XoopsLocale::F_ENTER, XoopsLocale::I_AGREE_TO_THE_ABOVE)));
$agree_chk->customValidationCode[] = "if ( myform.{$eltname}.checked == false ) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }";
$disc_tray->addElement($agree_chk, true);
$reg_form->addElement($disc_tray);
}
$reg_form->addElement(new XoopsFormHidden('op', 'newuser'));
-$reg_form->addElement(new XoopsFormButton('', 'submitButton', _US_SUBMIT, 'submit'));
-?>
\ No newline at end of file
+$reg_form->addElement(new XoopsFormButton('', 'submitButton', XoopsLocale::A_SUBMIT, 'submit'));
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -4,42 +4,42 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
//%%%%%% File Name user.php %%%%%
-define('_US_NOTREGISTERED', 'Not registered? Click <a href="register.php">here</a>.');
-define('_US_LOSTPASSWORD', 'Lost your Password?');
-define('_US_NOPROBLEM', 'No problem. Simply enter the e-mail address we have on file for your account.');
-define('_US_YOUREMAIL', 'Your Email: ');
-define('_US_SENDPASSWORD', 'Send Password');
-define('_US_LOGGEDOUT', 'You are now logged out');
-define('_US_THANKYOUFORVISIT', 'Thank you for your visit to our site!');
-define('_US_INCORRECTLOGIN', 'Incorrect Login!');
-define('_US_LOGGINGU', 'Thank you for logging in, %s.');
+//define('_US_NOTREGISTERED', 'Not registered? Click <a href="register.php">here</a>.');
+//define('_US_LOSTPASSWORD', 'Lost your Password?');
+//define('_US_NOPROBLEM', 'No problem. Simply enter the e-mail address we have on file for your account.');
+//define('_US_YOUREMAIL', 'Your Email: ');
+//define('_US_SENDPASSWORD', 'Send Password');
+//define('_US_LOGGEDOUT', 'You are now logged out');
+//define('_US_THANKYOUFORVISIT', 'Thank you for your visit to our site!');
+//define('_US_INCORRECTLOGIN', 'Incorrect Login!');
+//define('_US_LOGGINGU', 'Thank you for logging in, %s.');
// 2001-11-17 ADD
-define('_US_NOACTTPADM', 'The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.');
-define('_US_ACTKEYNOT', 'Activation key not correct!');
-define('_US_ACONTACT', 'Selected account is already activated!');
-define('_US_ACTLOGIN', 'Your account has been activated. Please login with the registered password.');
-define('_US_NOPERMISS', 'Sorry, you do not have the permission to perform this action!');
-define('_US_SURETODEL', 'Are you sure to delete your account?');
-define('_US_REMOVEINFO', 'This will remove all your info from our database.');
-define('_US_BEENDELED', 'Your account has been deleted.');
-define('_US_ACTFAILD', 'Activation failed!');
+//define('_US_NOACTTPADM', 'The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.');
+//define('_US_ACTKEYNOT', 'Activation key not correct!');
+//define('_US_ACONTACT', 'Selected account is already activated!');
+//define('_US_ACTLOGIN', 'Your account has been activated. Please login with the registered password.');
+//define('_US_NOPERMISS', 'Sorry, you do not have the permission to perform this action!');
+//define('_US_SURETODEL', 'Are you sure to delete your account?');
+//define('_US_REMOVEINFO', 'This will remove all your info from our database.');
+//define('_US_BEENDELED', 'Your account has been deleted.');
+//define('_US_ACTFAILD', 'Activation failed!');
//%%%%%% File Name register.php %%%%%
-define('_US_USERREG', 'User Registration');
-define('_US_NICKNAME', 'Username');
-define('_US_EMAIL', 'Email');
-define('_US_ALLOWVIEWEMAIL', 'Allow other users to view my email address');
-define('_US_WEBSITE', 'Website');
-define('_US_TIMEZONE', 'Time Zone');
-define('_US_AVATAR', 'Avatar');
-define('_US_VERIFYPASS', 'Verify Password');
-define('_US_SUBMIT', 'Submit');
-define('_US_USERNAME', 'Username');
-define('_US_FINISH', 'Finish');
-define('_US_REGISTERNG', 'Could not register new user.');
-define('_US_MAILOK', 'Receive occasional email notices <br />from administrators and moderators?');
-define('_US_DISCLAIMER', 'Disclaimer');
-define('_US_IAGREE', 'I agree to the above');
-define('_US_UNEEDAGREE', 'Sorry, you have to agree to our disclaimer to get registered.');
+//define('_US_USERREG', 'User Registration');
+//define('_US_NICKNAME', 'Username');
+//define('_US_EMAIL', 'Email');
+//define('_US_ALLOWVIEWEMAIL', 'Allow other users to view my email address');
+//define('_US_WEBSITE', 'Website');
+//define('_US_TIMEZONE', 'Time Zone');
+//define('_US_AVATAR', 'Avatar');
+//define('_US_VERIFYPASS', 'Verify Password');
+//define('_US_SUBMIT', 'Submit');
+//define('_US_USERNAME', 'Username');
+//define('_US_FINISH', 'Finish');
+//define('_US_REGISTERNG', 'Could not register new user.');
+//define('_US_MAILOK', 'Receive occasional email notices <br />from administrators and moderators?');
+//define('_US_DISCLAIMER', 'Disclaimer');
+//define('_US_IAGREE', 'I agree to the above');
+//define('_US_UNEEDAGREE', 'Sorry, you have to agree to our disclaimer to get registered.');
define('_US_NOREGISTER', 'Sorry, we are currently closed for new user registrations');
// %s is username. This is a subject for email
define('_US_USERKEYFOR', 'User activation key for %s');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -307,7 +307,6 @@
const ENDS_WITH = "Ends with";
const ENTER_CODE = "Enter the codes that you want to add.";
const ENTER_EMAIL = "Enter the email address you want to add.";
- const ENTER_EMAIL_WE_HAVE_ON_FILE = "Simply enter the e-mail address we have on file for your account.";
const ENTER_IMAGE_POSITION = "Now, enter the position of the image.";
const ENTER_IMAGE_URL = "Enter the URL of the image you want to add";
const ENTER_LINK_URL = "Enter the URL of the link you want to add";
@@ -363,6 +362,7 @@
const E_MUST_PROVIDE_PASSWORD = "You must provide a password!";
const E_NAME_IS_RESERVED = "Name is reserved!";
const E_NO_ACCESS_PERMISSION = "Sorry, you don't have the permission to access this area!";
+ const E_NO_ACTION_PERMISSION = "Sorry, you do not have the permission to perform this action!";
const E_NO_MODULE = "Selected module does not exist!";
const E_NO_PAGE = "This page does not exist in our database";
const E_NO_RESULT_FOUND = "No result found!";
@@ -887,7 +887,8 @@
const NO_COMMENTS = "No comments";
const NO_FILE_UPLOADED = "No file uploaded";
const NO_MATCH_FOUND_FOR_QUERY = "No match found for your query";
- const NO_PROBLEM = "No problem";
+ const NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE = "No problem. Simply enter the e-mail address we have on file for your account.";
+
const NO_TITLE = "No title";
const NUMBER_OF_ITEMS_PER_PAGE_IN_ADMIN_SIDE = "Number of items to display per page in admin side";
const NUMBER_OF_ITEMS_PER_PAGE_IN_USER_SIDE = "Number of items to display per page in user side";
@@ -964,7 +965,7 @@
const READS = "Reads";
const REAL_NAME = "Real name";
const REAL_PLAYER = "Real Player";
- const RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS = "Receive occasional email notices <br />from administrators and moderators?";
+ const Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS = "Receive occasional email notices <br />from administrators and moderators?";
const RECENT_ITEMS = "Recent items";
const RECOMMEND_SITE_TO_FRIEND = "Recommend this site to a friend";
const REGISTERED = "Registered";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -153,7 +153,7 @@
case 'ssllogin':
if ($xoops->getConfig('use_ssl') && isset($_POST[$xoops->getConfig('sslpost_name')]) && $xoops->isUser()) {
$xoops->loadLanguage('user');
- echo sprintf(_US_LOGGINGU, $xoops->user->getVar('uname'));
+ echo sprintf(XoopsLocale::E_INCORRECT_LOGIN, $xoops->user->getVar('uname'));
echo '<div style="text-align:center;"><input class="formButton" value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="window.opener.location.reload();window.close();" /></div>';
$closebutton = false;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -38,10 +38,10 @@
$xoops->redirect(XOOPS_URL, 1, '');
}
if ($thisuser->getVar('actkey') != $actkey) {
- $xoops->redirect(XOOPS_URL . '/', 5, _US_ACTKEYNOT);
+ $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT);
} else {
if ($thisuser->getVar('level') > 0) {
- $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar('dirname', 'n'). '/index.php', 5, _US_ACONTACT, false);
+ $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar('dirname', 'n'). '/index.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false);
} else {
if (false != $member_handler->activateUser($thisuser)) {
$xoops->getConfigs();
@@ -65,7 +65,7 @@
}
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
} else {
- $xoops->redirect(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false);
+ $xoops->redirect(XOOPS_URL . '/user.php', 5, XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, false);
}
} else {
$xoops->redirect(XOOPS_URL . '/index.php', 5, 'Activation failed!');
@@ -83,7 +83,7 @@
/* @var XoopsUser $getuser */
$getuser = $getuser[0];
if ($getuser->isActive()) {
- $xoops->redirect(XOOPS_URL, 2, sprintf(_US_ACONTACT, $getuser->getVar('email')));
+ $xoops->redirect(XOOPS_URL, 2, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED);
}
$xoopsMailer = $xoops->getMailer();
$xoopsMailer->useMail();
@@ -102,7 +102,7 @@
}
} else {
$form = new XoopsThemeForm('', 'form', 'activate.php');
- $form->addElement(new XoopsFormText(_US_EMAIL, 'email', 25, 255) );
+ $form->addElement(new XoopsFormText(XoopsLocale::EMAIL, 'email', 25, 255) );
$form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit') );
$form->display();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -35,7 +35,7 @@
$form = new XoopsThemeForm(_PROFILE_MA_CHANGEPASSWORD, 'form', $_SERVER['REQUEST_URI'], 'post', true);
$form->addElement(new XoopsFormPassword(_PROFILE_MA_OLDPASSWORD, 'oldpass', 15, 50), true);
$form->addElement(new XoopsFormPassword(_PROFILE_MA_NEWPASSWORD, 'newpass', 15, 50), true);
- $form->addElement(new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 15, 50), true);
+ $form->addElement(new XoopsFormPassword(XoopsLocale::VERIFY_PASSWORD, 'vpass', 15, 50), true);
$form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit'));
$form->assign($xoops->tpl());
$xoops->appendConfig('profile_breadcrumbs', array('title' => _PROFILE_MA_CHANGEPASSWORD));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -47,13 +47,13 @@
//$uname_size = $GLOBALS['xoopsConfigUser']['maxuname'] < 35 ? $GLOBALS['xoopsConfigUser']['maxuname'] : 35;
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 5, $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')),
+ 'element' => new XoopsFormText(XoopsLocale::USERNAME, 'uname', 5, $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')),
'required' => true
);
$weights[0][] = 0;
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_EMAIL, 'email', 5, 255, $user->getVar('email', 'e')), 'required' => true
+ 'element' => new XoopsFormText(XoopsLocale::EMAIL, 'email', 5, 255, $user->getVar('email', 'e')), 'required' => true
);
$weights[0][] = 0;
@@ -62,7 +62,7 @@
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 5, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(XoopsLocale::VERIFY_PASSWORD, 'vpass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
}
@@ -97,11 +97,11 @@
//end of Dynamic User fields
$myts = MyTextSanitizer::getInstance();
if ($step_no == 1 && $xoops->getConfig('reg_dispdsclmr') != 0 && $xoops->getConfig('reg_disclaimer') != '') {
- $disc_tray = new XoopsFormElementTray(_US_DISCLAIMER, '<br />');
+ $disc_tray = new XoopsFormElementTray(XoopsLocale::DISCLAIMER, '<br />');
$disc_text = new XoopsFormLabel("", "<div class=\"pad5\">" . $myts->displayTarea($xoops->getConfig('reg_disclaimer'), 1) . "</div>");
$disc_tray->addElement($disc_text);
$agree_chk = new XoopsFormCheckBox('', 'agree_disc');
- $agree_chk->addOption(1, _US_IAGREE);
+ $agree_chk->addOption(1, XoopsLocale::I_AGREE_TO_THE_ABOVE);
$disc_tray->addElement($agree_chk);
$reg_form->addElement($disc_tray);
}
@@ -152,15 +152,15 @@
if ($user->isNew() || $xoops->user->isAdmin()) {
$elements[0][] = array(
- 'element' => new XoopsFormText(_US_NICKNAME, 'uname', 3, $xoops->user->isAdmin() ? 60
+ 'element' => new XoopsFormText(XoopsLocale::USERNAME, 'uname', 3, $xoops->user->isAdmin() ? 60
: $xoops->getConfig('maxuname'), $user->getVar('uname', 'e')), 'required' => 1
);
$email_text = new XoopsFormText('', 'email', 4, 60, $user->getVar('email'));
} else {
- $elements[0][] = array('element' => new XoopsFormLabel(_US_NICKNAME, $user->getVar('uname')), 'required' => 0);
+ $elements[0][] = array('element' => new XoopsFormLabel(XoopsLocale::USERNAME, $user->getVar('uname')), 'required' => 0);
$email_text = new XoopsFormLabel('', $user->getVar('email'));
}
- $email_tray = new XoopsFormElementTray(_US_EMAIL, '<br />');
+ $email_tray = new XoopsFormElementTray(XoopsLocale::EMAIL, '<br />');
$email_tray->addElement($email_text, ($user->isNew() || $xoops->user->isAdmin()) ? 1 : 0);
$weights[0][] = 0;
$elements[0][] = array('element' => $email_tray, 'required' => 0);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -44,7 +44,7 @@
profile_install_addField('name', _US_REALNAME, '', 1, 'textbox', 1, 1, 1, array(), 2, 255);
profile_install_addField('user_from', _US_LOCATION, '', 1, 'textbox', 1, 2, 1, array(), 2, 255);
- profile_install_addField('timezone_offset', _US_TIMEZONE, '', 1, 'timezone', 1, 3, 1, array(), 2, 0);
+ profile_install_addField('timezone_offset', XoopsLocale::TIME_ZONE, '', 1, 'timezone', 1, 3, 1, array(), 2, 0);
profile_install_addField('user_occ', _US_OCCUPATION, '', 1, 'textbox', 1, 4, 1, array(), 2, 255);
profile_install_addField('user_intrest', _US_INTEREST, '', 1, 'textbox', 1, 5, 1, array(), 2, 255);
profile_install_addField('bio', _US_EXTRAINFO, '', 1, 'textarea', 2, 6, 1, array(), 2, 0);
@@ -55,9 +55,9 @@
profile_install_addField('user_yim', _US_YIM, '', 2, 'textbox', 1, 3, 1, array(), 2, 255);
profile_install_addField('user_msnm', _US_MSNM, '', 2, 'textbox', 1, 4, 1, array(), 2, 255);
- ...
[truncated message content] |
|
From: <tr...@us...> - 2013-01-28 20:48:00
|
Revision: 10941
http://sourceforge.net/p/xoops/svn/10941
Author: trabis
Date: 2013-01-28 20:47:51 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
Updating user language
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_edituser.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_avatar.html
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -67,7 +67,7 @@
$_SESSION['xoopsUserId'] = $user->getVar('uid');
$_SESSION['xoopsUserGroups'] = $user->getGroups();
if (!empty($xoopsConfig['use_ssl'])) {
- xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, XoopsLocale::A_LOGIN);
+ xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', XoopsLocale::PRESS_BUTTON_BELLOW_TO_LOGIN, XoopsLocale::A_LOGIN);
} else {
echo sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname'));
echo '<div style="text-align:center;"><input value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -46,7 +46,6 @@
return false;
}
- $xoops->loadLanguage('user');
$xoopsMailer = $xoops->getMailer();
if ($xoops->getConfig('welcome_type') == 1 || $xoops->getConfig('welcome_type') == 3) {
$xoopsMailer->useMail();
@@ -55,7 +54,7 @@
$xoopsMailer->usePM();
}
$xoopsMailer->setTemplate('welcome.tpl');
- $xoopsMailer->setSubject(sprintf(_US_WELCOME_SUBJECT, $xoops->getConfig('sitename')));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_WELCOME_TO, $xoops->getConfig('sitename')));
$xoopsMailer->setToUsers($user);
if ($xoops->getConfig('reg_disclaimer')) {
$xoopsMailer->assign('TERMSOFUSE', $xoops->getConfig('reg_disclaimer'));
@@ -105,21 +104,20 @@
}
$xoops->getConfigs();
- $xoops->loadLanguage('user');
$stop = '';
// Invalid email address
if (!$xoops->checkEmail($email)) {
- $stop .= _US_INVALIDMAIL . '<br />';
+ $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />';
}
if (strrpos($email, ' ') > 0) {
- $stop .= _US_EMAILNOSPACES . '<br />';
+ $stop .= XoopsLocale::E_EMAIL_SHOULD_NOT_CONTAIN_SPACES . '<br />';
}
// Check forbidden email address if current operator is not an administrator
if (!$xoops->userIsAdmin) {
foreach ($xoops->getConfig('bad_emails') as $be) {
if (!empty($be) && preg_match('/' . $be . '/i', $email)) {
- $stop .= _US_INVALIDMAIL . '<br />';
+ $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />';
break;
}
}
@@ -141,19 +139,19 @@
break;
}
if (empty($uname) || preg_match($restriction, $uname)) {
- $stop .= _US_INVALIDNICKNAME . '<br />';
+ $stop .= XoopsLocale::E_INVALID_USERNAME . '<br />';
}
// Check uname settings if current operator is not an administrator
if (!$xoops->userIsAdmin) {
if (strlen($uname) > $xoops->getConfig('maxuname')) {
- $stop .= sprintf(_US_NICKNAMETOOLONG, $xoops->getConfig('maxuname')) . '<br />';
+ $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_LESS_THAN, $xoops->getConfig('maxuname')) . '<br />';
}
if (strlen($uname) < $xoops->getConfig('minuname')) {
- $stop .= sprintf(_US_NICKNAMETOOSHORT, $xoops->getConfig('minuname')) . '<br />';
+ $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_MORE_THAN, $xoops->getConfig('minuname')) . '<br />';
}
foreach ($xoops->getConfig('bad_unames') as $bu) {
if (!empty($bu) && preg_match('/' . $bu . '/i', $uname)) {
- $stop .= _US_NAMERESERVED . '<br />';
+ $stop .= XoopsLocale::E_NAME_IS_RESERVED . '<br />';
break;
}
}
@@ -170,7 +168,7 @@
}
$count = $user_handler->getCount($criteria);
if ($count > 0) {
- $stop .= _US_NICKNAMETAKEN . '<br />';
+ $stop .= XoopsLocale::E_USERNAME_TAKEN . '<br />';
}
$criteria = new CriteriaCompo(new Criteria('email', $myts->addSlashes($email)));
@@ -179,7 +177,7 @@
}
$count = $user_handler->getCount($criteria);
if ($count > 0) {
- $stop .= _US_EMAILTAKEN . '<br />';
+ $stop .= XoopsLocale::E_EMAIL_TAKEN . '<br />';
}
// If password is not set, skip password validation
@@ -188,13 +186,13 @@
}
if (!isset($pass) || $pass == '' || !isset($vpass) || $vpass == '') {
- $stop .= _US_ENTERPWD . '<br />';
+ $stop .= XoopsLocale::E_MUST_PROVIDE_PASSWORD . '<br />';
}
if ((isset($pass)) && ($pass != $vpass)) {
- $stop .= _US_PASSNOTSAME . '<br />';
+ $stop .= XoopsLocale::E_PASSWORDS_MUST_MATCH . '<br />';
} else {
if (($pass != '') && (strlen($pass) < $xoops->getConfig('minpass'))) {
- $stop .= sprintf(_US_PWDTOOSHORT, $xoops->getConfig('minpass')) . '<br />';
+ $stop .= sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $xoops->getConfig('minpass')) . '<br />';
}
}
return $stop;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -27,7 +27,7 @@
// If not a user, redirect
if (!$xoops->isUser()) {
- $xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
+ $xoops->redirect('index.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION);
exit();
}
@@ -38,12 +38,12 @@
$myts = MyTextSanitizer::getInstance();
if ($op == 'saveuser') {
if (!$xoops->security()->check()) {
- $xoops->redirect('index.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+ $xoops->redirect('index.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
exit();
}
$uid = $request->asInt('uid', 0);
if (empty($uid) || $xoops->user->getVar('uid') != $uid) {
- $xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
+ $xoops->redirect('index.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION);
exit();
}
$errors = array();
@@ -51,19 +51,19 @@
$email = $request->asStr('email', '');
$email = $myts->stripSlashesGPC(trim($email));;
if ($email == '' || ! $xoops->checkEmail($email)) {
- $errors[] = _US_INVALIDMAIL;
+ $errors[] = XoopsLocale::E_INVALID_EMAIL;
}
}
$password = $request->asStr('password', '');
$password = $myts->stripSlashesGPC(trim($password));
if ($password != '') {
if (strlen($password) < $xoops->getConfig('minpass')) {
- $errors[] = sprintf(_US_PWDTOOSHORT, $xoops->getConfig('minpass'));
+ $errors[] = sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $xoops->getConfig('minpass'));
}
$vpass = $request->asStr('vpass', '');
$vpass = $myts->stripSlashesGPC(trim($vpass));
if ($password != $vpass) {
- $errors[] = _US_PASSNOTSAME;
+ $errors[] = XoopsLocale::E_PASSWORDS_MUST_MATCH;
}
}
if (count($errors) > 0) {
@@ -113,7 +113,7 @@
echo $edituser->getHtmlErrors();
$xoops->footer();
} else {
- $xoops->redirect('userinfo.php?uid=' . $uid, 1, _US_PROFUPDATED);
+ $xoops->redirect('userinfo.php?uid=' . $uid, 1, XoopsLocale::S_YOUR_PROFILE_UPDATED);
}
exit();
}
@@ -123,10 +123,10 @@
$xoops->header('system_edituser.html');
$xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
$xoops->tpl()->assign('editprofile', true);
- $form = new XoopsThemeForm(_US_EDITPROFILE, 'userinfo', 'edituser.php', 'post', true);
+ $form = new XoopsThemeForm(XoopsLocale::EDIT_PROFILE, 'userinfo', 'edituser.php', 'post', true);
$uname_label = new XoopsFormLabel(XoopsLocale::USERNAME, $xoops->user->getVar('uname'));
$form->addElement($uname_label);
- $name_text = new XoopsFormText(_US_REALNAME, 'name', 30, 60, $xoops->user->getVar('name', 'E'));
+ $name_text = new XoopsFormText(XoopsLocale::REAL_NAME, 'name', 30, 60, $xoops->user->getVar('name', 'E'));
$form->addElement($name_text);
$email_tray = new XoopsFormElementTray(XoopsLocale::EMAIL, '<br />');
if ($xoops->getConfig('allow_chgmail') == 1) {
@@ -144,32 +144,32 @@
$form->addElement($url_text);
$timezone_select = new XoopsFormSelectTimezone(XoopsLocale::TIME_ZONE, 'timezone_offset', $xoops->user->getVar('timezone_offset'));
- $icq_text = new XoopsFormText(_US_ICQ, 'user_icq', 15, 15, $xoops->user->getVar('user_icq', 'E'));
- $aim_text = new XoopsFormText(_US_AIM, 'user_aim', 18, 18, $xoops->user->getVar('user_aim', 'E'));
- $yim_text = new XoopsFormText(_US_YIM, 'user_yim', 25, 25, $xoops->user->getVar('user_yim', 'E'));
- $msnm_text = new XoopsFormText(_US_MSNM, 'user_msnm', 30, 100, $xoops->user->getVar('user_msnm', 'E'));
- $location_text = new XoopsFormText(_US_LOCATION, 'user_from', 30, 100, $xoops->user->getVar('user_from', 'E'));
- $occupation_text = new XoopsFormText(_US_OCCUPATION, 'user_occ', 30, 100, $xoops->user->getVar('user_occ', 'E'));
- $interest_text = new XoopsFormText(_US_INTEREST, 'user_intrest', 30, 150, $xoops->user->getVar('user_intrest', 'E'));
- $sig_tray = new XoopsFormElementTray(_US_SIGNATURE, '<br />');
+ $icq_text = new XoopsFormText(XoopsLocale::ICQ, 'user_icq', 15, 15, $xoops->user->getVar('user_icq', 'E'));
+ $aim_text = new XoopsFormText(XoopsLocale::AIM, 'user_aim', 18, 18, $xoops->user->getVar('user_aim', 'E'));
+ $yim_text = new XoopsFormText(XoopsLocale::YIM, 'user_yim', 25, 25, $xoops->user->getVar('user_yim', 'E'));
+ $msnm_text = new XoopsFormText(XoopsLocale::MSNM, 'user_msnm', 30, 100, $xoops->user->getVar('user_msnm', 'E'));
+ $location_text = new XoopsFormText(XoopsLocale::LOCATION, 'user_from', 30, 100, $xoops->user->getVar('user_from', 'E'));
+ $occupation_text = new XoopsFormText(XoopsLocale::OCCUPATION, 'user_occ', 30, 100, $xoops->user->getVar('user_occ', 'E'));
+ $interest_text = new XoopsFormText(XoopsLocale::INTEREST, 'user_intrest', 30, 150, $xoops->user->getVar('user_intrest', 'E'));
+ $sig_tray = new XoopsFormElementTray(XoopsLocale::SIGNATURE, '<br />');
$sig_tarea = new XoopsFormDhtmlTextArea('', 'user_sig', $xoops->user->getVar('user_sig', 'E'));
$sig_tray->addElement($sig_tarea);
$sig_cbox_value = $xoops->user->getVar('attachsig') ? 1 : 0;
$sig_cbox = new XoopsFormCheckBox('', 'attachsig', $sig_cbox_value);
- $sig_cbox->addOption(1, _US_SHOWSIG);
+ $sig_cbox->addOption(1, XoopsLocale::ALWAYS_ATTACH_MY_SIGNATURE);
$sig_tray->addElement($sig_cbox);
- $bio_tarea = new XoopsFormTextArea(_US_EXTRAINFO, 'bio', $xoops->user->getVar('bio', 'E'));
+ $bio_tarea = new XoopsFormTextArea(XoopsLocale::EXTRA_INFO, 'bio', $xoops->user->getVar('bio', 'E'));
$cookie_radio_value = empty($_COOKIE[$xoops->getConfig('usercookie')]) ? 0 : 1;
- $cookie_radio = new XoopsFormRadioYN(_US_USECOOKIE, 'usecookie', $cookie_radio_value);
+ $cookie_radio = new XoopsFormRadioYN(XoopsLocale::STORE_USERNAME_IN_COOKIE_FOR_ONE_YEAR, 'usecookie', $cookie_radio_value);
$pwd_text = new XoopsFormPassword('', 'password', 10, 32);
$pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
- $pwd_tray = new XoopsFormElementTray(_US_PASSWORD . '<br />' . _US_TYPEPASSTWICE);
+ $pwd_tray = new XoopsFormElementTray(XoopsLocale::PASSWORD . '<br />' . XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
$mailok_radio = new XoopsFormRadioYN(XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, 'user_mailok', $xoops->user->getVar('user_mailok'));
$uid_hidden = new XoopsFormHidden('uid', $xoops->user->getVar('uid'));
$op_hidden = new XoopsFormHidden('op', 'saveuser');
- $submit_button = new XoopsFormButton('', 'submit', _US_SAVECHANGES, 'submit');
+ $submit_button = new XoopsFormButton('', 'submit', XoopsLocale::SAVE_CHANGES, 'submit');
$form->addElement($timezone_select);
$form->addElement($icq_text);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -20,7 +20,6 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
@@ -104,7 +103,7 @@
Notifications::getInstance()->getHandlerNotification()->doLoginMaintenance($user->getVar('uid'));
}
- $xoops->redirect($url, 1, sprintf(XoopsLocale::E_INCORRECT_LOGIN, $user->getVar('uname')), false);
+ $xoops->redirect($url, 1, sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname')), false);
} else {
if (empty($_POST['xoops_redirect'])) {
$xoops->redirect(XOOPS_URL . '/user.php', 5, $xoopsAuth->getHtmlErrors());
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -28,7 +28,7 @@
$uname_size = $xoopsConfigUser['maxuname'] < 25 ? $xoopsConfigUser['maxuname'] : 25;
$reg_form->addElement(new XoopsFormText(XoopsLocale::USERNAME, 'uname', $uname_size, $uname_size, $myts->htmlSpecialChars($uname)), true);
$reg_form->addElement($email_tray);
-$reg_form->addElement(new XoopsFormPassword(_US_PASSWORD, 'pass', 10, 32, $myts->htmlSpecialChars($pass)), true);
+$reg_form->addElement(new XoopsFormPassword(XoopsLocale::PASSWORD, 'pass', 10, 32, $myts->htmlSpecialChars($pass)), true);
$reg_form->addElement(new XoopsFormPassword(XoopsLocale::VERIFY_PASSWORD, 'vpass', 10, 32, $myts->htmlSpecialChars($vpass)), true);
$reg_form->addElement(new XoopsFormText(XoopsLocale::WEBSITE, 'url', 25, 255, $myts->htmlSpecialChars($url)));
$tzselected = ($timezone_offset != '') ? $timezone_offset : $xoopsConfig['default_TZ'];
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php (from rev 10940, XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -0,0 +1,130 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+//%%%%%% File Name user.php %%%%%
+//define('_US_NOTREGISTERED', 'Not registered? Click <a href="register.php">here</a>.');
+//define('_US_LOSTPASSWORD', 'Lost your Password?');
+//define('_US_NOPROBLEM', 'No problem. Simply enter the e-mail address we have on file for your account.');
+//define('_US_YOUREMAIL', 'Your Email: ');
+//define('_US_SENDPASSWORD', 'Send Password');
+//define('_US_LOGGEDOUT', 'You are now logged out');
+//define('_US_THANKYOUFORVISIT', 'Thank you for your visit to our site!');
+//define('_US_INCORRECTLOGIN', 'Incorrect Login!');
+//define('_US_LOGGINGU', 'Thank you for logging in, %s.');
+// 2001-11-17 ADD
+//define('_US_NOACTTPADM', 'The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.');
+//define('_US_ACTKEYNOT', 'Activation key not correct!');
+//define('_US_ACONTACT', 'Selected account is already activated!');
+//define('_US_ACTLOGIN', 'Your account has been activated. Please login with the registered password.');
+//define('_US_NOPERMISS', 'Sorry, you do not have the permission to perform this action!');
+//define('_US_SURETODEL', 'Are you sure to delete your account?');
+//define('_US_REMOVEINFO', 'This will remove all your info from our database.');
+//define('_US_BEENDELED', 'Your account has been deleted.');
+//define('_US_ACTFAILD', 'Activation failed!');
+//%%%%%% File Name register.php %%%%%
+//define('_US_USERREG', 'User Registration');
+//define('_US_NICKNAME', 'Username');
+//define('_US_EMAIL', 'Email');
+//define('_US_ALLOWVIEWEMAIL', 'Allow other users to view my email address');
+//define('_US_WEBSITE', 'Website');
+//define('_US_TIMEZONE', 'Time Zone');
+//define('_US_AVATAR', 'Avatar');
+//define('_US_VERIFYPASS', 'Verify Password');
+//define('_US_SUBMIT', 'Submit');
+//define('_US_USERNAME', 'Username');
+//define('_US_FINISH', 'Finish');
+//define('_US_REGISTERNG', 'Could not register new user.');
+//define('_US_MAILOK', 'Receive occasional email notices <br />from administrators and moderators?');
+//define('_US_DISCLAIMER', 'Disclaimer');
+//define('_US_IAGREE', 'I agree to the above');
+//define('_US_UNEEDAGREE', 'Sorry, you have to agree to our disclaimer to get registered.');
+//define('_US_NOREGISTER', 'Sorry, we are currently closed for new user registrations');
+// %s is username. This is a subject for email
+//define('_US_USERKEYFOR', 'User activation key for %s');
+//define('_US_YOURREGISTERED', 'You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the email to activate your account. ');
+//define('_US_YOURREGMAILNG', 'You are now registered. However, we were unable to send the activation email to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation.');
+//define('_US_YOURREGISTERED2', 'You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient.');
+// %s is your site name
+//define('_US_NEWUSERREGAT', 'New user registration at %s');
+// %s is a username
+//define('_US_HASJUSTREG', '%s has just registered!');
+//define('_US_INVALIDMAIL', 'ERROR: Invalid Email');
+//define('_US_EMAILNOSPACES', 'ERROR: Email addresses do not contain spaces.');
+//define('_US_INVALIDNICKNAME', 'ERROR: Invalid Username');
+//define('_US_NICKNAMETOOLONG', 'Username is too long. It must be less than %s characters.');
+//define('_US_NICKNAMETOOSHORT', 'Username is too short. It must be more than %s characters.');
+//define('_US_NAMERESERVED', 'ERROR: Name is reserved.');
+//define('_US_NICKNAMENOSPACES', 'There cannot be any spaces in the Username.');
+//define('_US_NICKNAMETAKEN', 'ERROR: Username taken.');
+//define('_US_EMAILTAKEN', 'ERROR: Email address already registered.');
+//define('_US_ENTERPWD', 'ERROR: You must provide a password.');
+//define('_US_SORRYNOTFOUND', 'Sorry, no corresponding user info was found.');
+// %s is your site name
+//define('_US_NEWPWDREQ', 'New Password Request at %s');
+//define('_US_YOURACCOUNT', 'Your account at %s');
+//define('_US_MAILPWDNG', 'mail_password: could not update user entry. Contact the Administrator');
+// %s is a username
+//define('_US_PWDMAILED', 'Password for %s mailed.');
+//define('_US_CONFMAIL', 'Confirmation email for %s mailed.');
+//define('_US_ACTVMAILNG', 'Failed sending notification email to %s');
+//define('_US_ACTVMAILOK', 'Notification email to %s sent.');
+//%%%%%% File Name userinfo.php %%%%%
+//define('_US_SELECTNG', 'No User Selected! Please go back and try again.');
+//define('_US_PM', 'PM');
+//define('_US_ICQ', 'ICQ');
+//define('_US_AIM', 'AIM');
+//define('_US_YIM', 'YIM');
+//define('_US_MSNM', 'MSNM');
+//define('_US_LOCATION', 'Location');
+//define('_US_OCCUPATION', 'Occupation');
+//define('_US_INTEREST', 'Interest');
+//define('_US_SIGNATURE', 'Signature');
+//define('_US_EXTRAINFO', 'Extra Info');
+//define('_US_EDITPROFILE', 'Edit Profile');
+//define('_US_LOGOUT', 'Logout');
+//define('_US_INBOX', 'Inbox');
+//define('_US_MEMBERSINCE', 'Member Since');
+//define('_US_RANK', 'Rank');
+//define('_US_POSTS', 'Comments/Posts');
+//define('_US_LASTLOGIN', 'Last Login');
+//define('_US_ALLABOUT', 'All about %s');
+//define('_US_STATISTICS', 'Statistics');
+//define('_US_MYINFO', 'My Info');
+//define('_US_BASICINFO', 'Basic information');
+//define('_US_MOREABOUT', 'More About Me');
+//define('_US_SHOWALL', 'Show All');
+//%%%%%% File Name edituser.php %%%%%
+//define('_US_PROFILE', 'Profile');
+//define('_US_REALNAME', 'Real Name');
+//define('_US_SHOWSIG', 'Always attach my signature');
+//define('_US_CDISPLAYMODE', 'Comments Display Mode');
+//define('_US_CSORTORDER', 'Comments Sort Order');
+//define('_US_PASSWORD', 'Password');
+//define('_US_TYPEPASSTWICE', '(type a new password twice to change it)');
+//define('_US_SAVECHANGES', 'Save Changes');
+//define('_US_NOEDITRIGHT', "Sorry, you don't have the right to edit this user's info.");
+//define('_US_PASSNOTSAME', 'Both passwords are different. They must be identical.');
+//define('_US_PWDTOOSHORT', 'Sorry, your password must be at least <strong>%s</strong> characters long.');
+//define('_US_PROFUPDATED', 'Your Profile Updated!');
+//define('_US_USECOOKIE', 'Store my user name in a cookie for 1 year');
+//define('_US_NO', 'No');
+//define('_US_DELACCOUNT', 'Delete Account');
+//define('_US_MYAVATAR', 'My Avatar');
+//define('_US_UPLOADMYAVATAR', 'Upload Avatar');
+//define('_US_MAXPIXEL', 'Max Pixels');
+//define('_US_MAXIMGSZ', 'Max Image Size (Bytes)');
+//define('_US_SELFILE', 'Select file');
+//define('_US_OLDDELETED', 'Your old avatar will be deleted!');
+//define('_US_CHOOSEAVT', 'Choose avatar from the available list');
+//define('_US_PRESSLOGIN', 'Press the button below to login');
+//define('_US_ADMINNO', 'User in the webmasters group cannot be removed');
+//define('_US_GROUPS', 'User\'s Groups');
+//define('_US_REMEMBERME', 'Remember me');
+// Welcoming emai/PM subject
+//define('_US_WELCOME_SUBJECT', 'Welcome to %s');
+
+//XOOPS 2.5.4
+//define('_US_SKYPE', 'Skype');
+//define('_US_FACEBOOK', 'Facebook');
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -1,132 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-//%%%%%% File Name user.php %%%%%
-//define('_US_NOTREGISTERED', 'Not registered? Click <a href="register.php">here</a>.');
-//define('_US_LOSTPASSWORD', 'Lost your Password?');
-//define('_US_NOPROBLEM', 'No problem. Simply enter the e-mail address we have on file for your account.');
-//define('_US_YOUREMAIL', 'Your Email: ');
-//define('_US_SENDPASSWORD', 'Send Password');
-//define('_US_LOGGEDOUT', 'You are now logged out');
-//define('_US_THANKYOUFORVISIT', 'Thank you for your visit to our site!');
-//define('_US_INCORRECTLOGIN', 'Incorrect Login!');
-//define('_US_LOGGINGU', 'Thank you for logging in, %s.');
-// 2001-11-17 ADD
-//define('_US_NOACTTPADM', 'The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.');
-//define('_US_ACTKEYNOT', 'Activation key not correct!');
-//define('_US_ACONTACT', 'Selected account is already activated!');
-//define('_US_ACTLOGIN', 'Your account has been activated. Please login with the registered password.');
-//define('_US_NOPERMISS', 'Sorry, you do not have the permission to perform this action!');
-//define('_US_SURETODEL', 'Are you sure to delete your account?');
-//define('_US_REMOVEINFO', 'This will remove all your info from our database.');
-//define('_US_BEENDELED', 'Your account has been deleted.');
-//define('_US_ACTFAILD', 'Activation failed!');
-//%%%%%% File Name register.php %%%%%
-//define('_US_USERREG', 'User Registration');
-//define('_US_NICKNAME', 'Username');
-//define('_US_EMAIL', 'Email');
-//define('_US_ALLOWVIEWEMAIL', 'Allow other users to view my email address');
-//define('_US_WEBSITE', 'Website');
-//define('_US_TIMEZONE', 'Time Zone');
-//define('_US_AVATAR', 'Avatar');
-//define('_US_VERIFYPASS', 'Verify Password');
-//define('_US_SUBMIT', 'Submit');
-//define('_US_USERNAME', 'Username');
-//define('_US_FINISH', 'Finish');
-//define('_US_REGISTERNG', 'Could not register new user.');
-//define('_US_MAILOK', 'Receive occasional email notices <br />from administrators and moderators?');
-//define('_US_DISCLAIMER', 'Disclaimer');
-//define('_US_IAGREE', 'I agree to the above');
-//define('_US_UNEEDAGREE', 'Sorry, you have to agree to our disclaimer to get registered.');
-define('_US_NOREGISTER', 'Sorry, we are currently closed for new user registrations');
-// %s is username. This is a subject for email
-define('_US_USERKEYFOR', 'User activation key for %s');
-define('_US_YOURREGISTERED', 'You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the email to activate your account. ');
-define('_US_YOURREGMAILNG', 'You are now registered. However, we were unable to send the activation email to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation.');
-define('_US_YOURREGISTERED2', 'You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient.');
-// %s is your site name
-define('_US_NEWUSERREGAT', 'New user registration at %s');
-// %s is a username
-define('_US_HASJUSTREG', '%s has just registered!');
-define('_US_INVALIDMAIL', 'ERROR: Invalid Email');
-define('_US_EMAILNOSPACES', 'ERROR: Email addresses do not contain spaces.');
-define('_US_INVALIDNICKNAME', 'ERROR: Invalid Username');
-define('_US_NICKNAMETOOLONG', 'Username is too long. It must be less than %s characters.');
-define('_US_NICKNAMETOOSHORT', 'Username is too short. It must be more than %s characters.');
-define('_US_NAMERESERVED', 'ERROR: Name is reserved.');
-define('_US_NICKNAMENOSPACES', 'There cannot be any spaces in the Username.');
-define('_US_NICKNAMETAKEN', 'ERROR: Username taken.');
-define('_US_EMAILTAKEN', 'ERROR: Email address already registered.');
-define('_US_ENTERPWD', 'ERROR: You must provide a pa...
[truncated message content] |
|
From: <tr...@us...> - 2013-02-02 21:45:50
|
Revision: 10968
http://sourceforge.net/p/xoops/svn/10968
Author: trabis
Date: 2013-02-02 21:45:44 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
Localizing system admin.php
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html
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/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/xoops_version.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/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/groups.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_tips.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_header.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/configs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/templates/admin/userrank.html
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/_preferences.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -462,7 +462,7 @@
if (file_exists($old_file)) {
if (unlink($new_file)) {
if (rename($old_file, $new_file)) {
- //$xoops->redirect("admin.php?fct=tplsets", 2, _AM_SYSTEM_DBUPDATED);
+ //$xoops->redirect("admin.php?fct=tplsets", 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
//$xoops->redirect("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_RENAME);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -32,7 +32,7 @@
}
// Check is active
if (!$xoops->getModuleConfig('active_filemanager', 'system')) {
- $xoops->redirect('admin.php', 2, _AM_SYSTEM_NOTACTIVE);
+ $xoops->redirect('admin.php', 2, XoopsLocale::E_SECTION_NOT_ACTIVE);
}
// Get Action type
@@ -189,7 +189,7 @@
}
fclose($open);
}
- $xoops->redirect("admin.php?fct=filemanager", 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect("admin.php?fct=filemanager", 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
//restore
$old_file = $_REQUEST['path_file'] . '.back';
@@ -199,7 +199,7 @@
if (file_exists($old_file)) {
if (unlink($new_file)) {
if (rename($old_file, $new_file)) {
- $xoops->redirect("admin.php?fct=filemanager", 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect("admin.php?fct=filemanager", 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
$xoops->redirect("admin.php?fct=filemanager", 2, _AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -352,7 +352,7 @@
$help = array();
$help['link'] = '../system/help.php?mid=' . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help');
$help['icon'] = $xoops->url("/media/xoops/images/icons/32/help.png");
- $help['title'] = _AM_SYSTEM_HELP;
+ $help['title'] = XoopsLocale::HELP;
$xoops->tpl()->append('xo_admin_index_menu', $help);
}
$xoops->tpl()->assign('xo_admin_box', $this->_itemInfoBox);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -64,8 +64,8 @@
$options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), 'system');
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), 'system');
$ele->addOption($optval, $optkey);
}
break;
@@ -75,8 +75,8 @@
$options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), 'system');
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), 'system');
$ele->addOption($optval, $optkey);
}
break;
@@ -119,7 +119,7 @@
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
$moduleslist =& $module_handler->getNameList($criteria, true);
- $moduleslist['--'] = _MD_AM_NONE;
+ $moduleslist['--'] = XoopsLocale::NONE;
$ele->addOptionArray($moduleslist);
break;
@@ -167,7 +167,7 @@
unset($selform);
}
} else {
- $ele = new XoopsFormLabel($title, _MD_AM_NOMODULE);
+ $ele = new XoopsFormLabel($title, SystemLocale::NO_MODULE_TO_CACHE);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -46,6 +46,7 @@
$xoops->loadLanguage('admin', 'system', $wizard->language);
$xoops->loadLanguage('admin/preferences', 'system', $wizard->language);
+$xoops->loadLocale('system', $wizard->language);//change this to locale
$config_handler = $xoops->getHandlerConfig();
$criteria = new CriteriaCompo();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -161,6 +161,7 @@
const CF_FOLLOWING_WORDS_SHORTER_THAN_NOT_INCLUDED = "The following words are shorter than allowed minimum length (%u chars) and were not included in your search:";
const CF_WROTE = "%s wrote:";
const CHANGE_LOG = "Change log";
+ const CHANGE_STATUS = "Change status";
const CHARSET = "Charset";
const CHARSETS = "Charsets";
const CHECK_ALL = "Check all";
@@ -467,6 +468,7 @@
const F_YES_DELETE_ALL = "Yes, delete all %s";
const F_YOUR_ACCOUNT_AT = "Your account at %s";
const GO_BACK = "Go back";
+ const GO_TO = "Go to";
const GO_TODAY = "Go today";
const GROUP = "Group";
const GROUPS = "Groups";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/admin/avatars_admin_system.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -26,7 +26,7 @@
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$avatar.avatar_name}></div>
- <img id="loading_avt<{$avatar.avatar_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_avt<{$avatar.avatar_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="avt<{$avatar.avatar_id}>" onclick="Xoops.changeStatus( 'avatar_system.php', { op: 'update_display', avatar_id: <{$avatar.avatar_id}> }, 'avt<{$avatar.avatar_id}>', 'avatar_system.php' )" src="<{if $avatar.avatar_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>"
alt="<{if $avatar.avatar_display}><{translate key='DISPLAY_IN_FORM'}><{else}><{translate key='DO_NOT_DISPLAY_IN_FORM'}><{/if}>" title="<{if $avatar.avatar_display}><{translate key='DISPLAY_IN_FORM'}><{else}><{translate key='DO_NOT_DISPLAY_IN_FORM'}><{/if}>" />
<img class="cursorhelp xo-tooltip" src="<{xoAdminIcons forum.png}>" alt="<{$avatar.count}> <{translate key='USERS' dirname='avatars'}>" title="<{$avatar.count}> <{translate key='USERS' dirname='avatars'}>" />
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/banners.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -211,7 +211,7 @@
$form = $xoops->getModuleForm($obj, 'banner');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('banners.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('banners.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -306,7 +306,7 @@
$xoops->confirm(array("ok" => 1, "bid" => $bid, "op" => "delete"), 'banners.php', sprintf(_AM_BANNERS_BANNERS_SUREDEL). '<br \>' . $img . '<br \>');
}
} else {
- $xoops->redirect('banners.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('banners.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/admin/clients.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -126,7 +126,7 @@
$form = $xoops->getModuleForm($obj, 'bannerclient');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('clients.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('clients.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -193,7 +193,7 @@
$xoops->confirm(array("ok" => 1, "cid" => $cid, "op" => "delete"), 'clients.php', sprintf(_AM_BANNERS_CLIENTS_SUREDEL, $obj->getVar("name")) . '<br />');
}
} else {
- $xoops->redirect('clients.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('clients.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -175,10 +175,10 @@
}
if ($verif == true) {
if ($comment_handler->deleteAll($criteria)) {
- $helper->redirect("admin/main.php", 3, _AM_SYSTEM_DBUPDATED);
+ $helper->redirect("admin/main.php", 3, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
- $helper->redirect("admin/main.php", 3, _AM_SYSTEM_DBUPDATED);
+ $helper->redirect("admin/main.php", 3, XoopsLocale::S_DATABASE_UPDATED);
}
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/categories.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -49,9 +49,9 @@
$obj->setVar('imgcat_storetype', $request->asStr('imgcat_storetype', 'file'));
$obj->setVar('imgcat_type', 'C');
- if ( $imgcat_id = $helper->getHandlerCategories()->insert($obj)) {
+ if ( $imgcat_id = $helper->getHandlerCategories()->insert($obj)) {
// delete permissions
- if (!$isnew) {
+ if (!$isnew) {
$criteria = new CriteriaCompo(new Criteria('gperm_itemid', $imgcat_id));
$criteria->add(new Criteria('gperm_modid', $xoops->module->getVar('mid')));
$criteria2 = new CriteriaCompo(new Criteria('gperm_name', 'imgcat_write'));
@@ -61,12 +61,12 @@
}
// Save permissions
$permissions = array('readgroup' => 'imgcat_read', 'writegroup' => 'imgcat_write');
- foreach ($permissions as $k => $permission) {
+ foreach ($permissions as $k => $permission) {
$groups = $request->asArray($k, array(XOOPS_GROUP_ADMIN));
- if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
array_push($groups, XOOPS_GROUP_ADMIN);
}
- foreach ($groups as $group) {
+ foreach ($groups as $group) {
$perm_obj = $xoops->getHandlerGroupperm()->create();
$perm_obj->setVar('gperm_groupid', $group);
$perm_obj->setVar('gperm_itemid', $imgcat_id);
@@ -76,7 +76,7 @@
unset($perm_obj);
}
}
- $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_SAVE);
+ $xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_SAVE);
}
$xoops->redirect('categories.php', 2, _AM_IMAGES_CAT_NOTSAVE . '<br />' . implode('<br />', $obj->getHtmlErrors()));
break;
@@ -89,7 +89,7 @@
case 'edit':
$imgcat_id = $request->asInt('imgcat_id', 0);
- if ($imgcat_id > 0) {
+ if ($imgcat_id > 0) {
$obj = $helper->getHandlerCategories()->get($imgcat_id);
$form = $helper->getForm($obj, 'category');
$xoops->tpl()->assign('form', $form->render());
@@ -98,7 +98,7 @@
case 'del':
$imgcat_id = $request->asInt('imgcat_id', 0);
- if ($imgcat_id > 0) {
+ if ($imgcat_id > 0) {
$ok = $request->asInt('ok', 0);
$obj = $helper->getHandlerCategories()->get($imgcat_id);
@@ -109,11 +109,11 @@
if ($helper->getHandlerCategories()->delete($obj)) {
// Delete image datas and files
$images = $helper->getHandlerImages()->getByCategory($obj->getVar('imgcat_id'));
- foreach ($images as $image) {
- if ($helper->getHandlerImages()->delete($image)) {
- if ($obj->getVar('imgcat_storetype') == 'db') {
- $helper->getHandlerImagesBody()->delete($helper->getHandlerImagesBody()->get($image->getVar('image_id')));
- } else {
+ foreach ($images as $image) {
+ if ($helper->getHandlerImages()->delete($image)) {
+ if ($obj->getVar('imgcat_storetype') == 'db') {
+ $helper->getHandlerImagesBody()->delete($helper->getHandlerImagesBody()->get($image->getVar('image_id')));
+ } else {
unlink(XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name'));
}
}
@@ -127,7 +127,7 @@
$criteria->add($criteria2);
$xoops->getHandlerGroupperm()->deleteAll($criteria);
- $xoops->redirect('categories.php', 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect('categories.php', 2, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
$xoops->confirm(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/images.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -138,7 +138,7 @@
} else {
unlink(XOOPS_UPLOAD_PATH . '/' . $obj->getVar('image_name'));
}
- $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect('images.php?imgcat_id=' . $imgcat_id, 2, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
$category = $helper->getHandlerCategories()->get($obj->getvar('imgcat_id'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -36,7 +36,7 @@
<td class="txtcenter width10"><{$category.imgcat_maxwidth}></td>
<td class="txtcenter width10"><{$category.imgcat_maxheight}></td>
<td class="xo-actions txtcenter width10">
- <img id="loading_cat<{$category.imgcat_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_cat<{$category.imgcat_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="cat<{$category.imgcat_id}>" onclick="Xoops.changeStatus( 'categories.php', { op: 'display', imgcat_id: <{$category.imgcat_id}> }, 'cat<{$category.imgcat_id}>', 'categories.php' )" src="<{if $category.imgcat_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="" title="<{if $category.imgcat_display}><{$smarty.const._AM_IMAGES_CAT_OFF}><{else}><{$smarty.const._AM_IMAGES_CAT_ON}><{/if}>" />
</td>
<td class="xo-actions txtcenter width10">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -36,7 +36,7 @@
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$img.image_nicename}></div>
- <img id="loading_img<{$img.image_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_img<{$img.image_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer xo-tooltip" id="img<{$img.image_id}>" onclick="Xoops.changeStatus('images.php', { op: 'display', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'images.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
<{if !$db_store}>
<a rel="external" class="lightbox xo-tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/permissions.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -69,7 +69,7 @@
$groups_ids_view = $gperm_Handler->getGroupIds('page_view_item', $content_id, $module_id);
$groups_ids_view = array_values($groups_ids_view);
foreach (array_keys($group_list) as $j) {
- $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . _AM_SYSTEM_LOADING . '" />';
+ $perms .= '<img id="loading_display' . $content_id . '_' . $j .'" src="' . $xoops->url('media/xoops/images/spinner.gif') . '" style="display:none;" alt="' . XoopsLocale::LOADING . '" />';
if (in_array($j, $groups_ids_view)) {
$perms .= "<img class=\"cursorpointer\" id=\"display" . $content_id . "_" . $j . "\" onclick=\"Xoops.changeStatus( 'permissions.php', { op: 'update_view', content_id: " . $content_id . ", group: " . $j . ", status: 'no' }, 'display" . $content_id . "_" . $j ."', 'permissions.php' )\" src=\"" . $xoops->url('modules/system/images/icons/default/success.png') . "\" alt=\"" . XoopsLocale::A_DISABLE . "\" title=\"" . XoopsLocale::A_DISABLE . "\" />";
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -65,7 +65,7 @@
$form = $xoops->getModuleForm($obj, 'category');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('category.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('category.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -113,7 +113,7 @@
$xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'category.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title')) . '<br />');
}
} else {
- $xoops->redirect('category.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('category.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -113,7 +113,7 @@
$form = $xoops->getModuleForm($obj, 'field');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('field.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('field.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
br...
[truncated message content] |
|
From: <tr...@us...> - 2013-02-10 00:51:17
|
Revision: 11012
http://sourceforge.net/p/xoops/svn/11012
Author: trabis
Date: 2013-02-10 00:51:04 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Integrating locale in xoops configs
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/altsys_functions.php
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/config.recaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslists.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/class/installwizard.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/en_US/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/en_US/support.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_langselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_siteinit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_tablesfill.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/locale.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/render.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/decorator.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/class/helper.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/class/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/gtickets.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/backend.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/configs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/api.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/language.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/xlanguage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/vars.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale/Abstract.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale/Mailer/Abstract.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectlocale.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/en_US/
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_global.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/locale/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/locale/en_US/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/locale/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/locale/en_US/
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/english/
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/locale/english/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/language/
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/locale/english/
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/altsys_functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/altsys_functions.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/altsys_functions.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -1,4 +1,5 @@
<?php
+//todo, check this file
altsys_set_module_config();
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -22,7 +22,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=' . XoopsLocale::getCharset() . '" />
- <meta http-equiv="content-language" content="' . _LANGCODE . '" />
+ <meta http-equiv="content-language" content="' . XoopsLocale::getLangCode() . '" />
<title>' . $xoopsConfig['sitename'] . '</title>
<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />
';
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -104,7 +104,7 @@
</button>';
$verif = true;
$protected = array(
- '', 'class', 'Frameworks', 'images', 'include', 'kernel', 'language', 'modules', 'themes',
+ '', 'class', 'Frameworks', 'images', 'include', 'kernel', 'language', 'locale', 'modules', 'themes',
'uploads', 'xoops_lib', 'xoops_data'
);
foreach ($protected as $folder) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -81,7 +81,7 @@
$rssurl[] = 'http://sourceforge.net/export/rss2_projnews.php?group_id=41586&rss_fulltext=1';
$rssurl[] = 'http://www.xoops.org/backend.php';
$rssurl = array_unique(array_merge($rssurl, XoopsLocale::getAdminRssUrls()));
- $rssfile = 'adminnews-' . $xoops->getConfig('language');
+ $rssfile = 'adminnews-' . $xoops->getConfig('locale');
$items = array();
if (!$items = Xoops_Cache::read($rssfile)) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -48,7 +48,7 @@
$tpl->assign('channel_editor', $xoops->checkEmail($xoops->getConfig('adminmail'), true));
$tpl->assign('channel_category', 'News');
$tpl->assign('channel_generator', 'XOOPS');
- $tpl->assign('channel_language', _LANGCODE);
+ $tpl->assign('channel_language', XoopsLocale::getLangCode());
$xoTheme = $xoops->theme();
$imgPath = $xoTheme->resourcePath('/images/logo.png');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/config.recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/config.recaptcha.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/config.recaptcha.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -27,5 +27,5 @@
'private_key' => 'YourPrivateApiKey',
'public_key' => 'YourPublicApiKey',
'theme' => 'white', // 'red' | 'white' | 'blackglass' | 'clean' | 'custom'
- 'lang' => _LANGCODE
+ 'lang' => XoopsLocale::getLangCode()
);
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -138,14 +138,6 @@
$this->Sendmail = $xoopsMailerConfig['sendmailpath'];
$this->Host = implode(';', $xoopsMailerConfig['smtphost']);
}
- $this->CharSet = strtolower(XoopsLocale::getCharset());
- $xoopsLanguage = preg_replace('/[^a-zA-Z0-9_-]/', '', $xoops->getConfig('language'));
- if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/language/' . $xoopsLanguage . '/phpmailer.php')) {
- include XOOPS_ROOT_PATH . '/language/' . $xoopsLanguage . '/phpmailer.php';
- $this->language = $PHPMAILER_LANG;
- } else {
- $this->SetLanguage('en', XOOPS_ROOT_PATH . '/class/mail/phpmailer/language/');
- }
$this->PluginDir = XOOPS_ROOT_PATH . '/class/mail/phpmailer/';
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -504,12 +504,11 @@
}
}
$changelog = '';
- $language = $xoops->getConfig('language');
- if (!is_file(XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt")) {
- $language = 'english';
+ $language = $xoops->getConfig('locale');
+ if (!is_file(XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/locale/" . $language . "/changelog.txt")) {
+ $language = 'en_US';
}
- $language = empty($language) ? $xoops->getConfig('language') : $language;
- $file = XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt";
+ $file = XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/locale/" . $language . "/changelog.txt";
if (is_readable($file)) {
$changelog = utf8_encode(implode("<br />", file($file))) . "\n";
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -54,7 +54,7 @@
$this->Smarty();
$this->setCompileId();
$this->assign(
- array('xoops_url' => XOOPS_URL, 'xoops_rootpath' => XOOPS_ROOT_PATH, 'xoops_langcode' => _LANGCODE, 'xoops_charset' => XoopsLocale::getCharset(), 'xoops_version' => XOOPS_VERSION, 'xoops_upload_url' => XOOPS_UPLOAD_URL)
+ array('xoops_url' => XOOPS_URL, 'xoops_rootpath' => XOOPS_ROOT_PATH, 'xoops_langcode' => XoopsLocale::getLangCode(), 'xoops_charset' => XoopsLocale::getCharset(), 'xoops_version' => XOOPS_VERSION, 'xoops_upload_url' => XOOPS_UPLOAD_URL)
);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -335,7 +335,7 @@
// Other assigns
$assigns = array(
- 'title', 'slogan', 'language', 'footer', 'jquery_theme', 'startpage'
+ 'title', 'slogan', 'locale', 'footer', 'jquery_theme', 'startpage'
);
foreach ($assigns as $name) {
// prefix each tag with 'xoops_'
@@ -398,7 +398,7 @@
if (empty($extraString)) {
if (empty($extra_string)) {
// Generate language section
- $extra_string = $xoops->getConfig('language');
+ $extra_string = $xoops->getConfig('locale');
// Generate group section
if (!$xoops->isUser()) {
$extra_string .= '-' . XOOPS_GROUP_ANONYMOUS;
@@ -544,18 +544,18 @@
public function loadLocalization($type = "main")
{
$xoops = Xoops::getInstance();
- $language = $xoops->getConfig('language');
+ $language = $xoops->getConfig('locale');
// Load global localization stylesheet if available
- if (XoopsLoad::fileExists($xoops->path('language/' . $language . '/style.css'))) {
- $this->addStylesheet($xoops->url('language/' . $language . '/style.css'));
+ if (XoopsLoad::fileExists($xoops->path('locale/' . $language . '/style.css'))) {
+ $this->addStylesheet($xoops->url('locale/' . $language . '/style.css'));
}
$this->addLanguage($type);
// Load theme localization stylesheet and scripts if available
- if (XoopsLoad::fileExists($this->path . '/language/' . $language . '/script.js')) {
- $this->addScript($this->url . '/language/' . $language . '/script.js');
+ if (XoopsLoad::fileExists($this->path . '/locale/' . $language . '/script.js')) {
+ $this->addScript($this->url . '/locale/' . $language . '/script.js');
}
- if (XoopsLoad::fileExists($this->path . '/language/' . $language . '/style.css')) {
- $this->addStylesheet($this->url . '/language/' . $language . '/style.css');
+ if (XoopsLoad::fileExists($this->path . '/locale/' . $language . '/style.css')) {
+ $this->addStylesheet($this->url . '/locale/' . $language . '/style.css');
}
return true;
}
@@ -571,9 +571,9 @@
public function addLanguage($type = "main", $language = null)
{
$xoops = Xoops::getInstance();
- $language = is_null($language) ? $xoops->getConfig('language') : $language;
- if (!XoopsLoad::fileExists($file = $xoops->path($this->resourcePath("/language/{$language}/{$type}.php")))) {
- if (!XoopsLoad::fileExists($file = $xoops->path($this->resourcePath("/language/english/{$type}.php")))) {
+ $language = is_null($language) ? $xoops->getConfig('locale') : $language;
+ if (!XoopsLoad::fileExists($file = $xoops->path($this->resourcePath("/locale/{$language}/{$type}.php")))) {
+ if (!XoopsLoad::fileExists($file = $xoops->path($this->resourcePath("/locale/en_US/{$type}.php")))) {
return false;
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -96,7 +96,7 @@
if (defined("_XOOPS_EDITOR_TINYMCE_LANGUAGE")) {
$this->language = strtolower(constant("_XOOPS_EDITOR_TINYMCE_LANGUAGE"));
} else {
- $this->language = str_replace('_', '-', strtolower(_LANGCODE));
+ $this->language = str_replace('_', '-', strtolower(XoopsLocale::getLangCode()));
if (strtolower(XoopsLocale::getCharset()) == "utf-8") {
$this->language .= "_utf8";
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/xoopseditor.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/xoopseditor.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/xoopseditor.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -190,7 +190,7 @@
$order = array();
$_list = XoopsLists::getDirListAsArray($this->root_path . '/');
foreach ($_list as $item) {
- if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/' . $xoops->getConfig('language') . '.php')) {
+ if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
include_once $file;
} else {
if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/english.php')) {
@@ -249,7 +249,7 @@
return $editor;
}
$editor_path = $this->root_path . '/' . $name;
- if (XoopsLoad::fileExists($file = $editor_path . '/language/' . $xoops->getConfig('language') . '.php')) {
+ if (XoopsLoad::fileExists($file = $editor_path . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
include_once $file;
} else {
if (XoopsLoad::fileExists($file = $editor_path . '/language/english.php')) {
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectlocale.php (from rev 11006, XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectlang.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectlocale.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectlocale.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -0,0 +1,45 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS form element of select locale
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage xoopsform
+ * @since 2.6.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * A select field with available locales
+ */
+class XoopsFormSelectLocale extends XoopsFormSelect
+{
+ /**
+ * Constructor
+ *
+ * @param string $caption
+ * @param string $name
+ * @param mixed $value Pre-selected value (or array of them).
+ * Legal is any name of a XOOPS_ROOT_PATH."/locale/" subdirectory.
+ * @param int $size Number of rows. "1" makes a drop-down-list.
+ */
+ public function __construct($caption, $name, $value = null, $size = 1)
+ {
+ parent::__construct($caption, $name, $value, $size);
+ $this->addOptionArray(XoopsLists::getLocaleList());
+ }
+}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslists.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslists.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslists.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -250,7 +250,7 @@
* gets list of all avatar image files inside default avatars directory
*
* @static
- * @return array|false
+ * @return array|bool
*/
static function getAllAvatarsList()
{
@@ -299,6 +299,18 @@
}
/**
+ * gets list of locale folders inside default language directory
+ *
+ * @static
+ * @return array
+ */
+ public static function getLocaleList()
+ {
+ $lang_list = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/locale/');
+ return $lang_list;
+ }
+
+ /**
* XoopsLists::getCountryList()
*
* @static
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -314,6 +314,7 @@
'xoopsformselecteditor' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecteditor.php',
'xoopsformselectgroup' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectgroup.php',
'xoopsformselectlang' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectlang.php',
+ 'xoopsformselectlocale' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectlocale.php',
'xoopsformselectmatchoption' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectmatchoption.php',
'xoopsformselecttheme' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttheme.php',
'xoopsformselecttimezone' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttimezone.php',
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -230,16 +230,16 @@
{
$xoops = Xoops::getInstance();
if (!$path = $this->templatedir) {
- $path = XOOPS_ROOT_PATH . "/language/";
+ $path = XOOPS_ROOT_PATH . "/locale/";
} elseif (false === strpos($path, '/')) {
- $path = XOOPS_ROOT_PATH . "/modules/" . $path . "/language/";
+ $path = XOOPS_ROOT_PATH . "/modules/" . $path . "/locale/";
} elseif (substr($path, -1, 1) != "/") {
$path .= "/";
}
- if (XoopsLoad::fileExists($path . $xoops->getConfig('language') . "/mail_template/" . $this->template)) {
- return $path . $xoops->getConfig('language') . "/mail_template/" . $this->template;
- } elseif (XoopsLoad::fileExists($path . "english/mail_template/" . $this->template)) {
- return $path . "english/mail_template/" . $this->template;
+ if (XoopsLoad::fileExists($path . $xoops->getConfig('locale') . "/templates/" . $this->template)) {
+ return $path . $xoops->getConfig('locale') . "/templates/" . $this->template;
+ } elseif (XoopsLoad::fileExists($path . "en_US/templates/" . $this->template)) {
+ return $path . "en_US/templates/" . $this->template;
} elseif (XoopsLoad::fileExists($path . $this->template)) {
return $path . $this->template;
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -128,8 +128,9 @@
/**
* Load Language settings and defines
*/
-$xoops->loadLanguage('global');
$xoops->loadLocale();
+//For legacy
+$xoops->setConfig('language', XoopsLocale::getLegacyLanguage());
date_default_timezone_set(XoopsLocale::getTimezone());
setlocale(LC_ALL, XoopsLocale::getLocale());
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/class/installwizard.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/class/installwizard.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/class/installwizard.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -27,7 +27,7 @@
/**
* @var string
*/
- public $language = 'english';
+ public $language = 'en_US';
/**
* @var array
@@ -61,12 +61,14 @@
}
// Load the main language file
- $this->initLanguage(!empty($_COOKIE['xo_install_lang']) ? $_COOKIE['xo_install_lang'] : 'english');
+ $this->initLanguage(!empty($_COOKIE['xo_install_lang']) ? $_COOKIE['xo_install_lang'] : 'en_US');
// Setup pages
+ $pages = array();
include_once dirname(dirname(__FILE__)) . '/include/page.php';
$this->pages = $pages;
// Load default configs
+ $configs = array();
include_once dirname(dirname(__FILE__)) . '/include/config.php';
$this->configs = $configs;
@@ -133,10 +135,10 @@
*/
public function loadLangFile($file)
{
- if (file_exists($file = XOOPS_INSTALL_PATH . "/language/{$this->language}/{$file}.php")) {
+ if (file_exists($file = XOOPS_INSTALL_PATH . "/locale/{$this->language}/{$file}.php")) {
include_once $file;
} else {
- $file = XOOPS_INSTALL_PATH . "/language/english/{$file}.php";
+ $file = XOOPS_INSTALL_PATH . "/locale/en_US/{$file}.php";
include_once $file;
}
}
@@ -149,17 +151,11 @@
public function initLanguage($language)
{
$language = preg_replace("/[^a-z0-9_\-]/i", "", $language);
- if (!file_exists(XOOPS_INSTALL_PATH . "/language/{$language}/install.php")) {
- $language = 'english';
+ if (!file_exists(XOOPS_INSTALL_PATH . "/locale/{$language}/install.php")) {
+ $language = 'en_US';
}
$this->language = $language;
$this->loadLangFile('install');
-
- if (file_exists($file = XOOPS_ROOT_PATH . "/language/{$language}/global.php")) {
- include_once $file;
- } else {
- include_once XOOPS_ROOT_PATH . "/language/english/global.php";
- }
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -34,11 +34,6 @@
'sitename', 'slogan', 'allow_register', 'meta_keywords', 'meta_description', 'meta_author', 'meta_copyright',
);
-// languages config files
-$configs['language_files'] = array(
- 'global',
-);
-
// extension_loaded
$configs['extensions'] = array(
'mbstring' => array('MBString', sprintf(PHP_EXTENSION, CHAR_ENCODING)),
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -45,7 +45,7 @@
$ret[$conf_catid] = new XoopsThemeForm('', 'configs', 'index.php', 'post');
}
- $title = constant($config[$i]->getVar('conf_title'));
+ $title = Xoops_Locale::translate($config[$i]->getVar('conf_title'), 'system');
switch ($config[$i]->getVar('conf_formtype')) {
@@ -113,6 +113,10 @@
$ele = new XoopsFormSelectLang($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
break;
+ case 'locale':
+ $ele = new XoopsFormSelectLocale($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ break;
+
case 'startpage':
$ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
$module_handler = $xoops->getHandlerModule();
@@ -210,8 +214,8 @@
break;
}
- if (defined($config[$i]->getVar('conf_desc')) && constant($config[$i]->getVar('conf_desc')) != '') {
- $ele->setDescription(constant($config[$i]->getVar('conf_desc')));
+ if ($config[$i]->getVar('conf_desc') != '') {
+ $ele->setDescription(Xoops_Locale::translate($config[$i]->getVar('conf_desc'), 'system'));
}
$ret[$conf_catid]->addElement($ele);
@@ -231,7 +235,7 @@
*/
function createThemeform(XoopsConfigItem $config)
{
- $title = (!defined($config->getVar('conf_desc')) || constant($config->getVar('conf_desc')) == ''...
[truncated message content] |
|
From: <be...@us...> - 2013-06-16 19:39:33
|
Revision: 11703
http://sourceforge.net/p/xoops/svn/11703
Author: beckmi
Date: 2013-06-16 19:39:27 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
Replacing Tabs with spaces
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/mimetypes.inc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_countries.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/barcodes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/tcpdf_config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/tcpdf_config_alt.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/almohanad.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/arialunicid0.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/kozgopromedium.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/kozminproregular.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/msungstdlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/stsongstdlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/makefont.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/zarbold.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/htmlcolors.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/tcpdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/unicode_data.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/ProtectorMysqlDatabase.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_post_deny_by_rbl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_register_insert_js_check.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck_functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/russian/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/russian/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/import/news.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/import/smartsection.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/thumb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/bindings/tcpdf/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/phpqrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrconst.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrlib.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrmask.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrspec.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrtools.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merge.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.ico.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/_preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/locale/en_US/_main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/Smarty.class.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/plugins/function.html_select_date.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.includeq.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoAppUrl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoImgUrl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoMemberInfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoPageNav.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoops_link.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/cnt-2.2.x-to-2.3.0/index.php
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-06-16 18:29:38 UTC (rev 11702)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-06-16 19:39:27 UTC (rev 11703)
@@ -97,11 +97,11 @@
</table>
</form>
</div>
- ';
+ ';
}
echo '
</body>
</html>
';
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-06-16 18:29:38 UTC (rev 11702)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-06-16 19:39:27 UTC (rev 11703)
@@ -120,8 +120,8 @@
}
if ($verif) {
echo '<button class="ui-corner-all tooltip" onclick="filemanager_confirm_delete_directory(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '">
- <img src="' . system_AdminIcons('folder_delete.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '" />
- </button>';
+ <img src="' . system_AdminIcons('folder_delete.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '" />
+ </button>';
}
echo '<button class="ui-corner-all tooltip" onclick="filemanager_add_file(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_ADDFILE . '">
<img src="' . system_AdminIcons('add.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_ADDFILE . '" />
@@ -473,4 +473,4 @@
//$xoops->redirect("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_EXISTS);
}
break;
-}
\ No newline at end of file
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-06-16 18:29:38 UTC (rev 11702)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-06-16 19:39:27 UTC (rev 11703)
@@ -123,11 +123,11 @@
}
return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
- <noscript>
- <iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
- <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
- <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
- </noscript>';
+ <noscript>
+ <iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+ <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+ <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+ </noscript>';
}
@@ -300,4 +300,4 @@
$url = recaptcha_mailhide_url($pubkey, $privkey, $email);
return htmlentities($emailparts[0]) . "<a href='" . htmlentities($url) . "' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts [1]);
-}
\ No newline at end of file
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php 2013-06-16 18:29:38 UTC (rev 11702)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php 2013-06-16 19:39:27 UTC (rev 11703)
@@ -31,1220 +31,1220 @@
class Snoopy
{
- /**** Public variables ****/
+ /**** Public variables ****/
- /* user definable vars */
+ /* user definable vars */
- var $host = "www.php.net"; // host name we are connecting to
- var $port = 80; // port we are connecting to
- var $proxy_host = ""; // proxy host to use
- var $proxy_port = ""; // proxy port to use
- var $proxy_user = ""; // proxy user to use
- var $proxy_pass = ""; // proxy password to use
+ var $host = "www.php.net"; // host name we are connecting to
+ var $port = 80; // port we are connecting to
+ var $proxy_host = ""; // proxy host to use
+ var $proxy_port = ""; // proxy port to use
+ var $proxy_user = ""; // proxy user to use
+ var $proxy_pass = ""; // proxy password to use
- var $agent = "Snoopy v1.2.4"; // agent we masquerade as
- var $referer = ""; // referer info to pass
- var $cookies = array(); // array of cookies to pass
- // $cookies["username"]="joe";
- var $rawheaders = array(); // array of raw headers to send
- // $rawheaders["Content-type"]="text/html";
+ var $agent = "Snoopy v1.2.4"; // agent we masquerade as
+ var $referer = ""; // referer info to pass
+ var $cookies = array(); // array of cookies to pass
+ // $cookies["username"]="joe";
+ var $rawheaders = array(); // array of raw headers to send
+ // $rawheaders["Content-type"]="text/html";
- var $maxredirs = 5; // http redirection depth maximum. 0 = disallow
- var $lastredirectaddr = ""; // contains address of last redirected address
- var $offsiteok = true; // allows redirection off-site
- var $maxframes = 0; // frame content depth maximum. 0 = disallow
- var $expandlinks = true; // expand links to fully qualified URLs.
- // this only applies to fetchlinks()
- // submitlinks(), and submittext()
- var $passcookies = true; // pass set cookies back through redirects
- // NOTE: this currently does not respect
- // dates, domains or paths.
+ var $maxredirs = 5; // http redirection depth maximum. 0 = disallow
+ var $lastredirectaddr = ""; // contains address of last redirected address
+ var $offsiteok = true; // allows redirection off-site
+ var $maxframes = 0; // frame content depth maximum. 0 = disallow
+ var $expandlinks = true; // expand links to fully qualified URLs.
+ // this only applies to fetchlinks()
+ // submitlinks(), and submittext()
+ var $passcookies = true; // pass set cookies back through redirects
+ // NOTE: this currently does not respect
+ // dates, domains or paths.
- var $user = ""; // user for http authentication
- var $pass = ""; // password for http authentication
+ var $user = ""; // user for http authentication
+ var $pass = ""; // password for http authentication
- // http accept types
- var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+ // http accept types
+ var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
- var $results = ""; // where the content is put
+ var $results = ""; // where the content is put
- var $error = ""; // error messages sent here
- var $response_code = ""; // response code returned from server
- var $headers = array(); // headers returned from server sent here
- var $maxlength = 500000; // max return data length (body)
- var $read_timeout = 0; // timeout on read operations, in seconds
- // supported only since PHP 4 Beta 4
- // set to 0 to disallow timeouts
- var $timed_out = false; // if a read operation timed out
- var $status = 0; // http request status
+ var $error = ""; // error messages sent here
+ var $response_code = ""; // response code returned from server
+ var $headers = array(); // headers returned from server sent here
+ var $maxlength = 500000; // max return data length (body)
+ var $read_timeout = 0; // timeout on read operations, in seconds
+ // supported only since PHP 4 Beta 4
+ // set to 0 to disallow timeouts
+ var $timed_out = false; // if a read operation timed out
+ var $status = 0; // http request status
- var $temp_dir = "/tmp"; // temporary directory that the webserver
- // has permission to write to.
- // under Windows, this should be C:\temp
+ var $temp_dir = "/tmp"; // temporary directory that the webserver
+ // has permission to write to.
+ // under Windows, this should be C:\temp
- var $curl_path = "/usr/local/bin/curl";
- // Snoopy will use cURL for fetching
- // SSL content if a full system path to
- // the cURL binary is supplied here.
- // set to false if you do not have
- // cURL installed. See http://curl.haxx.se
- // for details on installing cURL.
- // Snoopy does *not* use the cURL
- // library functions built into php,
- // as these functions are not stable
- // as of this Snoopy release.
+ var $curl_path = "/usr/local/bin/curl";
+ // Snoopy will use cURL for fetching
+ // SSL content if a full system path to
+ // the cURL binary is supplied here.
+ // set to false if you do not have
+ // cURL installed. See http://curl.haxx.se
+ // for details on installing cURL.
+ // Snoopy does *not* use the cURL
+ // library functions built into php,
+ // as these functions are not stable
+ // as of this Snoopy release.
- /**** Private variables ****/
+ /**** Private variables ****/
- var $_maxlinelen = 4096; // max line length (headers)
+ var $_maxlinelen = 4096; // max line length (headers)
- var $_httpmethod = "GET"; // default http request method
- var $_httpversion = "HTTP/1.0"; // default http request version
- var $_submit_method = "POST"; // default submit method
- var $_submit_type = "application/x-www-form-urlencoded"; // default submit type
- var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type
- var $_redirectaddr = false; // will be set if page fetched is a redirect
- var $_redirectdepth = 0; // increments on an http redirect
- var $_frameurls = array(); // frame src urls
- var $_framedepth = 0; // increments on frame depth
+ var $_httpmethod = "GET"; // default http request method
+ var $_httpversion = "HTTP/1.0"; // default http request version
+ var $_submit_method = "POST"; // default submit method
+ var $_submit_type = "application/x-www-form-urlencoded"; // default submit type
+ var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type
+ var $_redirectaddr = false; // will be set if page fetched is a redirect
+ var $_redirectdepth = 0; // increments on an http redirect
+ var $_frameurls = array(); // frame src urls
+ var $_framedepth = 0; // increments on frame depth
- var $_isproxy = false; // set if using a proxy server
- var $_fp_timeout = 30; // timeout for socket connection
+ var $_isproxy = false; // set if using a proxy server
+ var $_fp_timeout = 30; // timeout for socket connection
/*======================================================================*\
- Function: fetch
- Purpose: fetch the contents of a web page
- (and possibly other protocols in the
- future like ftp, nntp, gopher, etc.)
- Input: $URI the location of the page to fetch
- Output: $this->results the output text from the fetch
+ Function: fetch
+ Purpose: fetch the contents of a web page
+ (and possibly other protocols in the
+ future like ftp, nntp, gopher, etc.)
+ Input: $URI the location of the page to fetch
+ Output: $this->results the output text from the fetch
\*======================================================================*/
- function fetch($URI)
- {
+ function fetch($URI)
+ {
- //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
- $URI_PARTS = parse_url($URI);
- if (!empty($URI_PARTS["user"]))
- $this->user = $URI_PARTS["user"];
- if (!empty($URI_PARTS["pass"]))
- $this->pass = $URI_PARTS["pass"];
- if (empty($URI_PARTS["query"]))
- $URI_PARTS["query"] = '';
- if (empty($URI_PARTS["path"]))
- $URI_PARTS["path"] = '';
+ //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
+ $URI_PARTS = parse_url($URI);
+ if (!empty($URI_PARTS["user"]))
+ $this->user = $URI_PARTS["user"];
+ if (!empty($URI_PARTS["pass"]))
+ $this->pass = $URI_PARTS["pass"];
+ if (empty($URI_PARTS["query"]))
+ $URI_PARTS["query"] = '';
+ if (empty($URI_PARTS["path"]))
+ $URI_PARTS["path"] = '';
- switch(strtolower($URI_PARTS["scheme"]))
- {
- case "http":
- $this->host = $URI_PARTS["host"];
- if(!empty($URI_PARTS["port"]))
- $this->port = $URI_PARTS["port"];
- if($this->_connect($fp))
- {
- if($this->_isproxy)
- {
- // using proxy, send entire URI
- $this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
- }
- else
- {
- $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
- // no proxy, send only the path
- $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
- }
+ switch(strtolower($URI_PARTS["scheme"]))
+ {
+ case "http":
+ $this->host = $URI_PARTS["host"];
+ if(!empty($URI_PARTS["port"]))
+ $this->port = $URI_PARTS["port"];
+ if($this->_connect($fp))
+ {
+ if($this->_isproxy)
+ {
+ // using proxy, send entire URI
+ $this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+ }
+ else
+ {
+ $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+ // no proxy, send only the path
+ $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+ }
- $this->_disconnect($fp);
+ $this->_disconnect($fp);
- if($this->_redirectaddr)
- {
- /* url was redirected, check if we've hit the max depth */
- if($this->maxredirs > $this->_redirectdepth)
- {
- // only follow redirect if it's on this site, or offsiteok is true
- if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
- {
- /* follow the redirect */
- $this->_redirectdepth++;
- $this->lastredirectaddr=$this->_redirectaddr;
- $this->fetch($this->_redirectaddr);
- }
- }
- }
+ if($this->_redirectaddr)
+ {
+ /* url was redirected, check if we've hit the max depth */
+ if($this->maxredirs > $this->_redirectdepth)
+ {
+ // only follow redirect if it's on this site, or offsiteok is true
+ if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+ {
+ /* follow the redirect */
+ $this->_redirectdepth++;
+ $this->lastredirectaddr=$this->_redirectaddr;
+ $this->fetch($this->_redirectaddr);
+ }
+ }
+ }
- if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
- {
- $frameurls = $this->_frameurls;
- $this->_frameurls = array();
+ if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+ {
+ $frameurls = $this->_frameurls;
+ $this->_frameurls = array();
- while(list(,$frameurl) = each($frameurls))
- {
- if($this->_framedepth < $this->maxframes)
- {
- $this->fetch($frameurl);
- $this->_framedepth++;
- }
- else
- break;
- }
- }
- }
- else
- {
- return false;
- }
- return true;
- break;
- case "https":
- if(!$this->curl_path)
- return false;
- if(function_exists("is_executable"))
- if (!is_executable($this->curl_path))
- return false;
- $this->host = $URI_PARTS["host"];
- if(!empty($URI_PARTS["port"]))
- $this->port = $URI_PARTS["port"];
- if($this->_isproxy)
- {
- // using proxy, send entire URI
- $this->_httpsrequest($URI,$URI,$this->_httpmethod);
- }
- else
- {
- $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
- // no proxy, send only the path
- $this->_httpsrequest($path, $URI, $this->_httpmethod);
- }
+ while(list(,$frameurl) = each($frameurls))
+ {
+ if($this->_framedepth < $this->maxframes)
+ {
+ $this->fetch($frameurl);
+ $this->_framedepth++;
+ }
+ else
+ break;
+ }
+ }
+ }
+ else
+ {
+ return false;
+ }
+ return true;
+ break;
+ case "https":
+ if(!$this->curl_path)
+ return false;
+ if(function_exists("is_executable"))
+ if (!is_executable($this->curl_path))
+ return false;
+ $this->host = $URI_PARTS["host"];
+ if(!empty($URI_PARTS["port"]))
+ $this->port = $URI_PARTS["port"];
+ if($this->_isproxy)
+ {
+ // using proxy, send entire URI
+ $this->_httpsrequest($URI,$URI,$this->_httpmethod);
+ }
+ else
+ {
+ $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+ // no proxy, send only the path
+ $this->_httpsrequest($path, $URI, $this->_httpmethod);
+ }
- if($this->_redirectaddr)
- {
- /* url was redirected, check if we've hit the max depth */
- if($this->maxredirs > $this->_redirectdepth)
- {
- // only follow redirect if it's on this site, or offsiteok is true
- if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
- {
- /* follow the redirect */
- $this->_redirectdepth++;
- $this->lastredirectaddr=$this->_redirectaddr;
- $this->fetch($this->_redirectaddr);
- }
- }
- }
+ if($this->_redirectaddr)
+ {
+ /* url was redirected, check if we've hit the max depth */
+ if($this->maxredirs > $this->_redirectdepth)
+ {
+ // only follow redirect if it's on this site, or offsiteok is true
+ if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+ {
+ /* follow the redirect */
+ $this->_redirectdepth++;
+ $this->lastredirectaddr=$this->_redirectaddr;
+ $this->fetch($this->_redirectaddr);
+ }
+ }
+ }
- if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
- {
- $frameurls = $this->_frameurls;
- $this->_frameurls = array();
+ if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+ {
+ $frameurls = $this->_frameurls;
+ $this->_frameurls = array();
- while(list(,$frameurl) = each($frameurls))
- {
- if($this->_framedepth < $this->maxframes)
- {
- $this->fetch($frameurl);
- $this->_framedepth++;
- }
- else
- break;
- }
- }
- return true;
- break;
- default:
- // not a valid protocol
- $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
- return false;
- break;
- }
- return true;
- }
+ while(list(,$frameurl) = each($frameurls))
+ {
+ if($this->_framedepth < $this->maxframes)
+ {
+ $this->fetch($frameurl);
+ $this->_framedepth++;
+ }
+ else
+ break;
+ }
+ }
+ return true;
+ break;
+ default:
+ // not a valid protocol
+ $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+ return false;
+ break;
+ }
+ return true;
+ }
/*======================================================================*\
- Function: submit
- Purpose: submit an http form
- Input: $URI the location to post the data
- $formvars the formvars to use.
- format: $formvars["var"] = "val";
- $formfiles an array of files to submit
- format: $formfiles["var"] = "/dir/filename.ext";
- Output: $this->results the text output from the post
+ Function: submit
+ Purpose: submit an http form
+ Input: $URI the location to post the data
+ $formvars the formvars to use.
+ format: $formvars["var"] = "val";
+ $formfiles an array of files to submit
+ format: $formfiles["var"] = "/dir/filename.ext";
+ Output: $this->results the text output from the post
\*=============================...
[truncated message content] |
|
From: <rgr...@us...> - 2013-08-28 02:02:26
|
Revision: 11988
http://sourceforge.net/p/xoops/svn/11988
Author: rgriffith
Date: 2013-08-28 02:02:20 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
Drop of Doctrine Branch
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.ini.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/object.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/database.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/databasefactory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/manager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/write.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/utility/xoopsutility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/rpc/xoopsapi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopslists.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/blockmodulelink.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/cachemodel.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/configcategory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/configitem.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/configoption.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/groupperm.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/membership.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/online.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/privmessage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/session.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/tplfile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/tplset.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_custom.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/admin/avatar_system.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/userlink.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/editavatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/banner.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/bannerrender.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/comment.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/imagebody.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/firephp/logger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/render.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/pqp/logger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/dump.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/class/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/menus.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/class/notification.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page_related_link.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/plugin/notifications.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/plugin/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/class/message.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/include/update.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/profile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/regstep.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/visibility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/update.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/advisory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/form/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/postcheck.inc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/postcheck_functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/archive.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/file.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/mimetype.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/permission.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/notifications.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/smiley.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/module.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/update.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/option.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/pda.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Ads.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Factory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Ldap.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Abstract.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Registry.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/UnitTestXoops/
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/connection.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/mysqldatabaseproxy.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/mysqldatabasesafe.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/querybuilder.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/composer.json
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/vendor/
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.ini.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.ini.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.ini.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -152,7 +152,7 @@
if ($isRel) {
return $relative_name;
}
- return $xoops->db()->prefix($relative_name);
+ return $xoopsDB->prefix($relative_name);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/object.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/object.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -62,7 +62,7 @@
/**
* Constructor
*
- * @param object $db reference to the {@link XoopsDatabase} object
+ * @param object $db reference to the {@link XoopsConnection} object
**/
function __construct($db, $table, $className, $keyName, $identifierName)
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -45,11 +45,12 @@
require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php';
$form = "<script type=\"text/javascript\">
var RecaptchaOptions = {
- theme : '" . $this->config['theme'] . "',
- lang : '" . $this->config['lang'] . "'
+ theme : '" . (empty($this->config['theme']) ? '' : $this->config['theme']) . "',
+ lang : '" . (empty($this->config['lang']) ? '' : $this->config['lang']) . "'
};
</script>";
- $form .= recaptcha_get_html($this->config['public_key']);
+ $public_key = empty($this->config['public_key']) ? '' : $this->config['public_key'];
+ $form .= recaptcha_get_html($public_key);
return $form;
}
@@ -59,7 +60,7 @@
* @param $sessionName
* @return bool
*/
- public function verify($sessionName)
+ public function verify($sessionName = null)
{
$is_valid = false;
require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/xoopscaptcha.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/xoopscaptcha.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -475,9 +475,12 @@
*/
public function loadConfig($name = '')
{
- $this->config = empty($name) ? $this->handler->config
- : array_merge($this->handler->config, $this->handler->loadConfig($name));
-
+ if (!is_object($this->handler))
+ $this->config = array();
+ else
+ $this->config = empty($name)
+ ? $this->handler->config
+ : array_merge($this->handler->config, $this->handler->loadConfig($name));
}
/**
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/connection.php (from rev 11987, XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/connection.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/connection.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/connection.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -0,0 +1,233 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * Connection wrapper for Doctrine DBAL Connection
+ *
+ * PHP version 5.3
+ *
+ * @category Xoops\Database\Connection
+ * @package Connection
+ * @author readheadedrod <red...@ho...>
+ * @author Richard Griffith <ri...@ge...>
+ * @copyright 2013 The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version Release: 2.6
+ * @link http://xoops.org
+ * @since 2.6.0
+ */
+class XoopsConnection extends \Doctrine\DBAL\Connection
+{
+ /**
+ * @var bool $safe true means it is safe to update pages or write to database
+ * removed allowedWebChanges as unnecessary. Using this instead.
+ */
+ private $safe = true;
+
+
+ /**
+ * @var bool $force true means force SQL even if safe is not true.
+ */
+ private $force = false;
+
+
+ /**
+ * Initializes a new instance of the Connection class.
+ *
+ * This sets up necessary variables before calling parent constructor
+ *
+ * @param array $params Parameters for the driver
+ * @param Driver $driver The driver to use
+ * @param Configuration $config The connection configuration
+ * @param EventManager $eventManager Event manager to use
+ */
+ public function __construct(
+ array $params,
+ \Doctrine\DBAL\Driver\PDOMySql\Driver $driver,
+ \Doctrine\DBAL\Configuration $config = null,
+ \Doctrine\Common\EventManager $eventManager = null
+ ) {
+ if (!defined('XOOPS_DB_PROXY') || ($_SERVER['REQUEST_METHOD'] != 'GET')) {
+ $this->safe = true;
+ } else {
+ $this->safe = false;
+ }
+ parent::__construct($params, $driver, $config, $eventManager);
+ }
+
+ /**
+ * Prepend the prefix.'_' to the given tablename
+ * If tablename is empty, just return the prefix.
+ *
+ * @param string $tablename tablename
+ *
+ * @return string prefixed tablename, or prefix if tablename is empty
+ */
+ public static function prefix($tablename = '')
+ {
+ static $prefix = XOOPS_DB_PREFIX;
+ if ($tablename != '') {
+ return $prefix . '_' . $tablename;
+ } else {
+ return $prefix;
+ }
+ }
+
+ /**
+ * Inserts a table row with specified data.
+ *
+ * Adds prefix to the name of the table then passes to normal function.
+ *
+ * @param string $tableName The name of the table to insert data into.
+ * @param array $data An associative array containing column-value pairs.
+ * @param array $types Types of the inserted data.
+ *
+ * @return integer The number of affected rows.
+ */
+ public function insertPrefix($tableName, array $data, array $types = array())
+ {
+ $tableName = $this->prefix($tableName);
+ return $this->insert($tableName, $data, $types);
+ }
+
+
+ /**
+ * Executes an SQL UPDATE statement on a table.
+ *
+ * Adds prefix to the name of the table then passes to normal function.
+ *
+ * @param string $tableName The name of the table to update.
+ * @param array $data The data to update
+ * @param array $identifier The update criteria.
+ * An associative array containing column-value pairs.
+ * @param array $types Types of the merged $data and
+ * $identifier arrays in that order.
+ *
+ * @return integer The number of affected rows.
+ */
+ public function updatePrefix($tableName, array $data, array $identifier, array $types = array())
+ {
+ $tableName = $this->prefix($tableName);
+ return $this->update($tableName, $data, $identifier, $types);
+ }
+
+
+ /**
+ * Executes an SQL DELETE statement on a table.
+ *
+ * Adds prefix to the name of the table then passes to normal function.
+ *
+ * @param string $tableName The name of the table on which to delete.
+ * @param array $identifier The deletion criteria.
+ * An associative array containing column-value pairs.
+ *
+ * @return integer The number of affected rows.
+ */
+ public function deletePrefix($tableName, array $identifier)
+ {
+ $tableName = $this->prefix($tableName);
+ return $this->delete($tableName, $identifier);
+ }
+
+
+
+ /**
+ * perform a query on the database
+ * Always performs query and triggers timer to time it
+ *
+ * @return bool|resource query result or FALSE if not successful
+ * or TRUE if successful and no result
+ */
+ public function queryForce()
+ {
+ $sql = func_get_arg(0);
+ $xoopsPreload = XoopsPreload::getInstance();
+ $xoopsPreload->triggerEvent('core.database.query.start');
+ try {
+ $result = call_user_func_array(array('parent', 'query'), func_get_args());
+ } catch (Exception $e) {
+ $result=false;
+ }
+ /* if(is_object($result)) {
+ $this->_lastResult = clone $result;
+ } */ // Remove if not using getAffectedRows
+ $xoopsPreload->triggerEvent('core.database.query.end');
+
+ if ($result) {
+ $xoopsPreload->triggerEvent('core.database.query.success', (array($sql)));
+ return $result;
+ } else {
+ $xoopsPreload->triggerEvent('core.database.query.failure', (array($sql, $this)));
+ return false;
+ }
+ }
+
+ /**
+ * perform a safe query if allowed
+ * can receive variable number of arguments
+ *
+ * @return returns the value received from queryForce
+ */
+ public function query()
+ {
+ if ($this->safe) {
+ return call_user_func_array(array($this, "queryForce"), func_get_args());
+ } else {
+ $sql = ltrim(func_get_arg(0));
+ if (!$this->safe && strtolower(substr($sql, 0, 6))!= 'select') {
+ //trigger_error('Database updates are not allowed
+ //during processing of a GET request', E_USER_WARNING);
+ //needs to be replaced with standard error
+ return false;
+ }
+ return call_user_func_array(array($this, "queryForce"), func_get_args());
+ }
+ }
+
+ /**
+ * perform queries from SQL dump file in a batch
+ *
+ * @param string $file file path to an SQL dump file
+ *
+ * @return bool FALSE if failed reading SQL file or
+ * TRUE if the file has been read and queries executed
+ */
+ public function queryFromFile($file)
+ {
+ if (false !== ($fp = fopen($file, 'r'))) {
+ $sql_queries = trim(fread($fp, filesize($file)));
+ SqlUtility::splitMySqlFile($pieces, $sql_queries);
+ foreach ($pieces as $query) {
+ // [0] contains the prefixed query
+ // [4] contains unprefixed table name
+ $prefixed_query = SqlUtility::prefixQuery(
+ trim($query),
+ $this->prefix()
+ );
+ if ($prefixed_query != false) {
+ $this->query($prefixed_query[0]);
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Create a new instance of a SQL query builder.
+ *
+ * @return \Doctrine\DBAL\Query\QueryBuilder
+ */
+ public function createXoopsQueryBuilder()
+ {
+ return new XoopsQueryBuilder($this);
+ }
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/database.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/database.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/database.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -1,35 +1,29 @@
<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
+/**
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Abstract base class for XOOPS Database access classes
- *
- * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package class
- * @subpackage database
- * @since 1.0.0
- * @author Kazumi Ono <on...@xo...>
- * @version $Id$
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
/**
* Abstract base class for Database access classes
*
+ * PHP version 5.3
+ *
+ * @category Xoops\Class\Database\Database
+ * @package Database
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright 2013 The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @version Release:2.6
+ * @link http://xoops.org
+ * @since 2.6.0
* @abstract
- * @author Kazumi Ono <on...@xo...>
- * @package kernel
- * @subpackage database
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
*/
abstract class XoopsDatabase
{
@@ -59,6 +53,9 @@
* set the prefix for tables in the database
*
* @param string $value table prefix
+ *
+ * @return this does not return a value
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
*/
public function setPrefix($value)
{
@@ -66,15 +63,19 @@
}
/**
+ * public function prefix($tablename = '')
+ *
* attach the prefix.'_' to a given tablename
* if tablename is empty, only prefix will be returned
*
* @param string $tablename tablename
*
* @return string prefixed tablename, just prefix if tablename is empty
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
*/
public function prefix($tablename = '')
{
+
if ($tablename != '') {
return $this->prefix . '_' . $tablename;
} else {
@@ -83,148 +84,242 @@
}
/**
+ * connect to the database
+ *
+ * @param bool $selectdb select the database now?
+ *
+ * @return bool successful?
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*
- * @param bool $selectdb
- *
- * @return void
*/
- abstract function connect($selectdb = true);
+ abstract public function connect($selectdb = true);
/**
- * @param $sequence
+ * generate an ID for a new row
*
+ * This is for compatibility only. Will always return 0, because MySQL supports
+ * autoincrement for primary keys.
+ *
+ * @param string $sequence name of the sequence from which to get the next ID
+ *
+ * @return int always 0, because mysql has support for autoincrement
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function genId($sequence);
+ abstract public function genId($sequence);
/**
- * @param $result
+ * Get a result row as an enumerated array
*
+ * @param resource $result resource to get result from
+ *
+ * @return array
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function fetchRow($result);
+ abstract public function fetchRow($result);
/**
- * @param $result
+ * Fetch a result row as an associative array
*
+ * @param resource $result resource to get result from
+ *
* @return array
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function fetchArray($result);
+ abstract public function fetchArray($result);
/**
- * @param $result
+ * Fetch a result row as an associative array
*
+ * @param resource $result resource to get result from
+ *
+ * @return array
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function fetchBoth($result);
+ abstract public function fetchBoth($result);
/**
- * @param $result
+ * Fetch a result row as an object
*
+ * @param resource $result resource to get result from
+ *
+ * @return object|stdClass
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function fetchObject($result);
+ abstract public function fetchObject($result);
/**
+ * Get the ID generated from the previous INSERT operation
+ *
+ * @return int
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function getInsertId();
+ abstract public function getInsertId();
/**
- * @param $result
+ * Get number of rows in result
*
+ * @param resource $result the resource containing the number of rows
+ *
+ * @return int the number of rows to return
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function getRowsNum($result);
+ abstract public function getRowsNum($result);
/**
+ * Get number of affected rows
+ *
+ * @return int
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function getAffectedRows();
+ abstract public function getAffectedRows();
/**
+ * Close MySQL connection
+ *
+ * @return void
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function close();
+ abstract public function close();
/**
- * @param $result
+ * Free all memory associated with the result identifier result.
*
+ * @param resource $result query result
+ *
+ * @return bool TRUE on success or FALSE on failure.
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function freeRecordSet($result);
+ abstract public function freeRecordSet($result);
/**
+ * Returns the text of the error message from previous MySQL operation
+ *
+ * @return bool Returns the error text from the last MySQL function,
+ * or '' (the empty string) if no error occurred.
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function error();
+ abstract public function error();
/**
+ * Returns the numerical value of the error message from previous
+ * MySQL operation
+ *
+ * @return int Returns the error number from the last MySQL function
+ * , or 0 (zero) if no error occurred.
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function errno();
+ abstract public function errno();
/**
- * @param $str
+ * Returns escaped string text with single
+ * quotes around it to be safely stored in database
*
+ * @param string $str unescaped string text
+ *
+ * @return string escaped string text with single quotes around
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function quoteString($str);
+ abstract public function quoteString($str);
/**
- * @param $string
+ * Quotes a string for use in a query.
*
+ * @param string $string string to quote
+ *
+ * @return string
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function quote($string);
+ abstract public function quote($string);
/**
- * @param $sql
- * @param int $limit
- * @param int ...
[truncated message content] |