Menu
▾
▴
xoops-svn
|
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:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: 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/Xoops/Pdf.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php 2012-12-02 23:36:20 UTC (rev 10310)
@@ -0,0 +1,59 @@
+<?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.
+*/
+
+/**
+ * Pdf
+ *
+ * @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
+ * @since 2.6.0
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+include_once dirname(dirname(__FILE__)) . '/html2pdf/html2pdf.class.php';
+
+class Xoops_Pdf extends HTML2PDF
+{
+ /**
+ * class constructor
+ *
+ * @access public
+ *
+ * @param string $orientation page orientation, same as TCPDF
+ * @param mixed $format The format used for pages, same as TCPDF
+ * @param string $langue Langue : fr, en, it...
+ * @param boolean $unicode TRUE means that the input text is unicode (default = true)
+ * @param string $encoding charset encoding; default is UTF-8
+ * @param array $marges Default marges (left, top, right, bottom)
+ */
+ public function __construct($orientation = 'P', $format = 'A4', $langue = _LANGCODE, $unicode = true, $encoding = _CHARSET, $marges = array(
+ 5, 5, 5, 8
+ ))
+ {
+ $xoops = Xoops::getInstance();
+ error_reporting(0);
+ $xoops->logger->activated = false;
+
+ parent::__construct($orientation, $format, $langue, $unicode, $encoding, $marges = array(5, 5, 5, 8));
+ }
+
+ /**
+ * Destructor
+ */
+ public function __destruct()
+ {
+ parent::__destruct();
+ }
+}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: 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/_LGPL.txt (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_LGPL.txt 2012-12-02 23:36:20 UTC (rev 10310)
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
Added: 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/_changelog.txt (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_changelog.txt 2012-12-02 23:36:20 UTC (rev 10310)
@@ -0,0 +1,314 @@
+4.03 (2011-05-27)
+ correction de l'exemple "form.php" : vulnérabilité cross-site scripting corrigée
+ correction sur la gestion des retours à la ligne automatique
+ correction sur le calcul de la hauteur des balises H1->H6
+ amélioration de la gestion des exceptions
+
+4.02 (2011-04-29)
+ ATTENTION : beaucoup de changements dans la structure du projet. version 3.xx abandonnée
+ uniformisation des fichiers du projet (standard Zend)
+ conversion des fichiers de langue en CSV, déplacement dans le répertoire "locale". création d'une classe spécifique à la gestion des locales
+ amélioration de la gestion de certaines erreurs
+ modification du nom de toutes les sous classes
+ déplacement de toutes les sous classes
+ modification du nom de toutes les méthodes protected
+ correction sur la gestion des tables
+ correction sur la lecture des path des SVG
+ premiere version de text-align:justify
+ correction sur la gestion de la balise BLOCKQUOTE
+ correction sur la gestion de la balise P
+ gestion des styles CSS pour les balises TEXTAREA, SELECT, INPUT
+ ajout de la propriété pagegroup="new" sur la balise PAGE
+ correction pour la balise INPUT de type radio : checked au lieu de selected
+
+3.30 / 4.01 (2010-05-07)
+ correction sur la gestion des textes
+ correction sur le parseur HTML
+ correction sur la gestion de border-collapse
+ correction sur la gestion des TDs, H1->H6
+ ajout des balises fieldset et legend (cf exemple 4)
+ ajout de la langue CS
+ nombreuses améliorations
+ v4.01 uniquement : Utilisation de TCPDF 5.0.002
+ v4.01 uniquement : Utilisation des QR-code de TCPDF, il n'y a plus besoin d'une librairie externe
+ v4.01 uniquement : Utilisation des exceptions PHP pour les erreurs. Tous les exemples ont été mis à jour en consequence
+ (merci à Pavel Kochman pour ses sugestions et ses ajouts)
+
+3.29 / 4.00 (2010-03-17)
+ modification des barcodes. ATTENTION : bar_w et bar_h n'existent plus !
+ correction sur la gestion de page_footer
+ correction sur la gestion des html entities
+ correction sur le positionnement des textes
+ correction sur le positionnement des tableaux
+ nombreuses corrections sur les positionnements, les couleurs, ...
+ amélioration de la partie SVG (balise G, ...)
+ amélioration sur createIndex
+ harmonisation des noms des méthodes
+ correction sur la gestion des textes
+ v4.00 uniquement : HTML2PDF est maintenant écrit en PHP5 et basé sur TCPDF (=> unicode, utf8, ...)
+ v4.00 uniquement : utilisation de TCPDF pour les formulaires et les barcodes
+ v4.00 uniquement : amélioration de la partie SVG (alpha)
+
+3.28 (2010-01-18)
+ ajout de la gestion de la balise label
+ correction pour compatibilité PHP4
+
+3.27 (2010-01-11)
+ correction sur page_header et page_footer
+ ajout de la possibilité de pouvoir mettre l'index automatique dans la page que l'on veut
+ correction sur la gestion du canal alpha pour les PNGs
+ correction sur la gestion des border-radius (cf exemple radius) conforme au CSS3
+ correction sur la gestion du background-color
+ correction sur la gestion de thead, tfoot, et tbody
+ ajout du dessin verctoriel (cf exemples draw, tigre, sapin)
+ ajout de la propriété label="none/label" pour la balise <barcode>
+ nombreux petits correctifs
+
+3.26 (2009-11-16)
+ correction pour support des images générés en CGI
+ ajout de la gestion du canal alpha pour les PNGs (nécessite GD2)
+ ajout de la méthode setDefaultFont permettant de spécifier une fonte par défaut
+ ajout de la propriété format pour la balise <page> (cf exemple 4)
+ amélioration de la gestion des couleurs css RGB (cf exemple 2)
+ ajout de la gestion des couleurs css CMYK (cf exemple 2)
+ ajout de la propriété css overflow:hidden pour la balise <div> (cf exemple 2)
+ correction sur page_header et page_footer
+ ajout de la possibilité de pouvoir directement convertir le résultat d'une vraie page HTML
+ nombreux petits correctifs sur les styles
+
+3.25 (2009-10-07)
+ correctif sur le calcul des tableaux dans le page_footer
+ correctif sur l'interprétation des espaces entre certaines balises
+ correction sur la gestion des balises H1, H2, H3, H4, H5, H6
+ correction sur la gestion de la balise table
+ support des balises xhtml du type <span />
+ ajout des balises COL (cf exemple 5), DEL, INS, et QRCODE (cf exemple 13)
+ ajout de la propriété css text-transform
+ ajout de la propriété css rotate (uniquement sur les DIV, cf exemple 8)
+ ne plus rendre obligatoire l'existence d'une image (nouvelle méthode setTestIsImage)
+ ajout d'un mode DEBUG - les anciennes fonction d'analyse des ressources ont été supprimées
+ ajout de la méthode setEncoding
+ ajout de la langue danoise DA (merci à Daniel K.)
+
+3.24 (2009-08-05)
+ correction sur le calcul de la largeur des divs
+ modification pour compatibilité avec la localisation PHP
+ modification pour compatibilité avec PHP 5.3.0
+
+3.23 (2009-07-30)
+ correction sur le calcul des DIVs
+ correction sur l'interpretation de certains styles CSS
+ correction de la fonction de creation d'index automatique CreateIndex
+ ATTENTION : la methode d'appel de CreateIndex a changé. Regardez l'exemple About !!!!
+
+3.22a (2009-06-16)
+ redistribution de HTML2PDF sous la licence LGPL !!! (au lieu de GPL)
+
+3.22 (2009-06-08)
+ correction sur le background-color
+ refonte totale de la gestion de text-align. les valeurs center et right marchent maintenant meme en cas de contenu riche
+
+3.21 (2009-05-05)
+ ajout de la propriété css FLOAT pour la balise IMG
+ correction sur la gestion des TFOOT
+ correction sur le positionnement des images
+
+3.20 (2009-04-06)
+ ajout de la gestion des margins pour la balise DIV
+ ajout de la gestion de la propriete css LINE-HEIGHT
+ correction sur l'interpretation de la valeur de certains styles CSS (background-image, background-position, ...)
+ correction sur la reconnaissance des balises thead et tfoot
+ correction sur la balise select
+ correction sur les fichiers de langue (merci à Sinan)
+
+3.19 (2009-03-11)
+ optimisation du parseur HTML - merci à Jezelinside
+ ajout de la balise TFOOT
+ amélioration de la gestion des tableaux : les contenus des balises THEAD et TFOOT sont maintenant répétés sur chaque page.
+ ajout de la balise spécifique BOOKMARK afin de créer des "marques-page"
+ possibilité de rajouter un index automatique en fin de fichier
+ ajout de la langue turque TR (merci à Hidayet)
+ amélioration de la méthode Output. Elle est maintenant également utilisable comme celle de FPDF
+
+3.18 (2009-02-22)
+ correction sur les sauts de page automatique pour les balises TABLE, UL, OL
+ correction sur l'interpretation des styles pour la balise HR
+ correction sur l'interpretation du style border-collapse pour la balise TABLE
+ prise en compte de margin:auto pour les tables et les divs
+ les commentaires dans les CSS sont acceptés
+
+3.17 (2008-12-30)
+ ajout de la gestion des balises INPUT (text, radio, checkbox, button, hidden, ...), SELECT, OPTION, TEXTAREA (cf exemple 14)
+ ajout de la possibilité de mettre des scripts dans le pdf, via $html2pdf->pdf->IncludeJS(...); (cf exemples JS)
+ correction sur le saut de page automatique pour les images
+ correction sur les sauts de lignes automatiques pour certaines balises (UL, P, ...)
+ ajout de la langue NL (merci à Roland)
+
+3.16 (2008-12-09)
+ ajout de la gestion de list-style: none (cf exemple 13)
+ correction dans la gestion des fontes ajoutées à fpdf (via la méthode AddFont)
+ nombreuses corrections sur le calcul des largeurs des éléments table, div, hr, td, th
+ ajout de l'exemple about.php
+ (pour info, les PDF générés à partir des exemples sont maintenant dans le répertoire /exemples/pdf/, et sont supprimables)
+
+3.15 (2008-12-01)
+ correction sur l'identification des styles en cas de valeurs multiples dans la propriete class
+ prise en compte de border-radius pour la limite des backgrounds (color et image)
+ ajout des proprietes CSS border-top-*, border-right-*, border-bottom-*, border-left-*
+ ajout de la propriété CSS list-style-image (cf exemple 12)
+ pour la balise table, ajout de l'interprétation de align="center" et align="right" (cf exemple 1)
+ correction dans le positionnement des images
+ correction de quelques bugs
+ ajout d'une fonction d'analyse des ressources HTML2PDFgetTimerDebug (cf début du fichier html2pdf.class.php)
+
+3.14 (2008-11-17)
+ ajout d'une langue (pt : Brazilian Portuguese language) et amelioration de la methode vueHTML (merci à Rodrigo)
+ correction du positionnement du contenu des DIVs. gestion des proprietes valign et align
+ ajout de la propriete CSS border-collapse (cf exemple 0)
+ ajout de la propriete CSS border-radius (cf exemple 1)
+ correction de quelques bugs
+
+3.13 (2008-09-24)
+ reecriture de la balise hr, avec prise en compte des styles (cf exemple 0)
+ ajout de la propriete backcolor pour la balise page (cf exemple 9)
+ ajout des proprietes backleft et backright pour la balise page afin de pouvoir changer les marges des pages (cf exemple 8)
+ nombreuses corrections sur les balises et les styles
+
+3.12 (2008-09-16)
+ ajout des balises ol, ul, li (cf exemple 12)
+ correction sur le calcul de la taille des td en cas de colspan et rowspan
+ ajout de la méthode setTestTdInOnePage afin de pouvoir desactiver le test sur la taille des TD (cf exemple 11)
+ correction de quelques bugs
+
+3.11 (2008-08-29)
+ ajout des balises div, p, pre, s
+ gestion des styles CSS position (relative, absolute), left, top, right, bottom (cf exemple 10)
+ meilleur gestion des border : border-style, border-color, border-width (cf exemple 10)
+ possibilité d'indiquer les marges par défault, via le constructeur (cf exemple 2)
+
+3.10a (2008-08-26)
+ correction pour compatibilité php4 / php5
+
+3.10 (2008-08-25)
+ ajout des liens internes (cf exemple 7)
+ gestion complete des background : image, repeat, position, color (cf exemple 1)
+ gestion de underline, overline, linethrough (cf exemple 2)
+ correction de quelques bugs
+
+3.09
+ mise à jour vers fpdf version 1.6, ajout de barcode, correction de l'affichage de certains caractères spéciaux
+ correction du calcul de la hauteur de ligne de la balise br
+ detection en cas de contenu trop grand dans un TD
+ amélioration de la balise page (ajout de l'attribue pageset, avec les valeurs new et old)
+ ajout de FPDF_PROTECTION, accesible via $pdf->pdf->SetProtection(...)
+
+3.08
+ version opérationnelle de page_header
+ ajout de page_footer
+ correction des borders des tableaux
+
+3.07
+ correction de l'interpretation de cellspacing,
+ amélioration de la balise page_header
+
+3.06
+ première gestion de la balise page_header
+ correction des dimensions des tableaux
+
+3.05
+ ajout de la propriété vertical-align
+ ajout de la gestion des fichiers de langue
+
+3.04
+ correction du saut de page automatique pour les tableaux
+ Ajout de propriétés à la balise PAGE
+
+3.03
+ correction de bugs au niveau de la gestion des images PHP par FPDF
+ meilleure gestion des erreurs
+
+3.02
+ ajout de la gestion des noms des couleurs
+ correction de la gestion des images générées par php
+ correction de quelques bugs
+
+3.01
+ correction de quelques bugs
+ ajout d'une protection pour les balises non existantes
+
+3.00
+ refonte totale du calcul des tableaux
+ Prise en compte des colspan et rowspan
+
+2.85
+ ajout de la propriété cellspacing
+ nouvelle gestion des padding des tableaux
+
+2.80
+ ajout des types de border dotted et dasheds
+
+2.75
+ ajout des top, left, right, bottom pour padding et border
+
+2.70
+ correction de la balise HR, ajout de la propriété padding pour les table, th, td
+ correction des dimensions, les unités px, mm, in, pt sont enfin réellement reproduites, correction de font-size, border, ...
+ ajout d'une propriété à la balise page : footer
+ correction dans l'affichage et le calcul des tables
+
+2.55
+ vérification de la validité du code (ouverture / fermeture)
+ ajout des unités mm, in, pt
+
+2.50
+ correction de nobreak
+ correction des marges
+ ajout de nombreuses balises
+
+2.40
+ refonte totale de l'identification des styles CSS (Les héritages marchent)
+
+2.39
+ corrections diverses
+ ajout de certaines propriétés (bgcolor, ...)
+
+2.38
+ meilleur identification des propriétés border et color
+
+2.37
+ nombreuses corrections :
+ balise A
+ couleur de fond
+ retour à la ligne
+ gestion des images dans un texte
+
+2.36
+ ajout de la balises STRONG
+ ajout de la balise EM
+
+2.35
+ amélioration de la gestion des feuilles de style
+
+2.31
+ correction de quelques bugs
+
+2.30
+ première version opérationnel des feuilles de style
+
+2.25
+ ajout de la balise LINK pour le type text/css
+
+2.20
+ premier jet de la gestion des feuilles de style, ajout de la balise STYLE
+
+2.15
+ n'interpréte plus l'HTML en commentaire <!-- -->
+
+2.10
+ ajout des balises H1 -> H6
+
+2.01
+ correction de quelques bugs
+
+2.00
+ première version diffusée
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: 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/exception.class.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/html2pdf/_class/exception.class.php 2012-12-02 23:36:20 UTC (rev 10310)
@@ -0,0 +1,168 @@
+<?php
+/**
+ * HTML2PDF Librairy - HTML2PDF Exception
+ *
+ * HTML => PDF convertor
+ * distributed under the LGPL License
+ *
+ * @author Laurent MINGUET <web...@ht...>
+ * @version 4.03
+ */
+
+class HTML2PDF_exception extends exception
+{
+ protected $_tag = null;
+ protected $_html = null;
+ protected $_other = null;
+ protected $_image = null;
+ protected $_messageHtml = '';
+
+ /**
+ * generate a HTML2PDF exception
+ *
+ * @param int $err error number
+ * @param mixed $other additionnal informations
+ * @return string $html optionnal code HTML associated to the error
+ */
+ final public function __construct($err = 0, $other = null, $html = '')
+ {
+ // read the error
+ switch($err)
+ {
+ case 1: // Unsupported tag
+ $msg = (HTML2PDF_locale::get('err01'));
+ $msg = str_replace('[[OTHER]]', $other, $msg);
+ $this->_tag = $other;
+ break;
+
+ case 2: // too long sentence
+ $msg = (HTML2PDF_locale::get('err02'));
+ $msg = str_replace('[[OTHER_0]]', $other[0], $msg);
+ $msg = str_replace('[[OTHER_1]]', $other[1], $msg);
+ $msg = str_replace('[[OTHER_2]]', $other[2], $msg);
+ break;
+
+ case 3: // closing tag in excess
+ $msg = (HTML2PDF_locale::get('err03'));
+ $msg = str_replace('[[OTHER]]', $other, $msg);
+ $this->_tag = $other;
+ break;
+
+ case 4: // tags closed in the wrong order
+ $msg = (HTML2PDF_locale::get('err04'));
+ $msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
+ break;
+
+ case 5: // unclosed tag
+ $msg = (HTML2PDF_locale::get('err05'));
+ $msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
+ break;
+
+ case 6: // image can not be loaded
+ $msg = (HTML2PDF_locale::get('err06'));
+ $msg = str_replace('[[OTHER]]', $other, $msg);
+ $this->_image = $other;
+ break;
+
+ case 7: // too big TD content
+ $msg = (HTML2PDF_locale::get('err07'));
+ break;
+
+ case 8: // SVG tag not in DRAW tag
+ $msg = (HTML2PDF_locale::get('err08'));
+ $msg = str_replace('[[OTHER]]', $other, $msg);
+ $this->_tag = $other;
+ break;
+
+ case 9: // deprecated
+ $msg = (HTML2PDF_locale::get('err09'));
+ $msg = str_replace('[[OTHER_0]]', $other[0], $msg);
+ $msg = str_replace('[[OTHER_1]]', $other[1], $msg);
+ $this->_tag = $other[0];
+ break;
+
+ case 0: // specific error
+ default:
+ $msg = $other;
+ break;
+ }
+
+ // create the HTML message
+ $this->_messageHtml = '<span style="color: #AA0000; font-weight: bold;">'.HTML2PDF_locale::get('txt01', 'error: ').$err.'</span><br>';
+ $this->_messageHtml.= HTML2PDF_locale::get('txt02', 'file:').' '.$this->file.'<br>';
+ $this->_messageHtml.= HTML2PDF_locale::get('txt03', 'line:').' '.$this->line.'<br>';
+ $this->_messageHtml.= '<br>';
+ $this->_messageHtml.= $msg;
+
+ // create the text message
+ $msg = HTML2PDF_locale::get('txt01', 'error: ').$err.' : '.strip_tags($msg);
+
+ // add the optionnal html content
+ if ($html) {
+ $this->_messageHtml.= "<br><br>HTML : ...".trim(htmlentities($html)).'...';
+ $this->_html = $html;
+ $msg.= ' HTML : ...'.trim($html).'...';
+ }
+
+ // save the other informations
+ $this->_other = $other;
+
+ // construct the exception
+ parent::__construct($msg, $err);
+ }
+
+ /**
+ * get the message as string
+ *
+ * @access public
+ * @return string $messageHtml
+ */
+ public function __toString()
+ {
+ return $this->_messageHtml;
+ }
+
+ /**
+ * get the html tag name
+ *
+ * @access public
+ * @return string $tagName
+ */
+ public function getTAG()
+ {
+ return $this->_tag;
+ }
+
+ /**
+ * get the optional html code
+ *
+ * @access public
+ * @return string $html
+ */
+ public function getHTML()
+ {
+ return $this->_html;
+ }
+
+ /**
+ * get the optional other informations
+ *
+ * @access public
+ ...
[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';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_comments';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_COMMENTS';
@@ -256,6 +266,8 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_filemanager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER';
@@ -263,6 +275,8 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_groups';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS';
@@ -270,6 +284,8 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_images';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES';
@@ -277,6 +293,8 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_modulesadmin';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN';
@@ -284,6 +302,8 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_preferences';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES';
@@ -291,6 +311,8 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_tplsets';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS';
@@ -298,6 +320,8 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_users';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_USERS';
@@ -305,6 +329,8 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_extensions';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_EXTENSIONS';
@@ -312,6 +338,8 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
$i++;
$modversion['config'][$i]['name'] = 'active_themes';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_THEMES';
@@ -319,20 +347,18 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
+
$i++;
-$modversion['config'][$i]['name'] = 'break3';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_PAGER';
-$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'] = 'comments_pager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_PAGER';
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 20;
+$modversion['config'][$i]['category'] = 'pager';
+
$i++;
$modversion['config'][$i]['name'] = 'groups_pager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GROUPS_PAGER';
@@ -340,6 +366,8 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 15;
+$modversion['config'][$i]['category'] = 'pager';
+
$i++;
$modversion['config'][$i]['name'] = 'images_pager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_IMAGES_PAGER';
@@ -347,6 +375,8 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 15;
+$modversion['config'][$i]['category'] = 'pager';
+
$i++;
$modversion['config'][$i]['name'] = 'users_pager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_USERS_PAGER';
@@ -354,14 +384,9 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 20;
+$modversion['config'][$i]['category'] = 'pager';
+
$i++;
-$modversion['config'][$i]['name'] = 'break4';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_EDITOR';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
$editors = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor');
$modversion['config'][$i]['name'] = 'blocks_editor';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR';
@@ -370,7 +395,8 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'dhtmltextarea';
$modversion['config'][$i]['options'] = $editors;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'editor';
+
$i++;
$modversion['config'][$i]['name'] = 'comments_editor';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR';
@@ -379,7 +405,8 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'dhtmltextarea';
$modversion['config'][$i]['options'] = $editors;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'editor';
+
$i++;
$modversion['config'][$i]['name'] = 'general_editor';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR';
@@ -388,7 +415,8 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = 'dhtmltextarea';
$modversion['config'][$i]['options'] = $editors;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'editor';
+
$i++;
$modversion['config'][$i]['name'] = 'redirect';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_REDIRECT';
@@ -396,6 +424,7 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'textbox';
$modversion['config'][$i]['default'] = 'admin.php?fct=preferences';
+
$i++;
$modversion['config'][$i]['name'] = 'com_anonpost';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ANONPOST';
|
|
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/htdocs/media/jquery/ui/mint-choc/images/ui-bg_inset-soft_10_201913_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/images/ui-icons_9bcc60_256x240.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/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/mint-choc/index.html
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/mint-choc/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
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_flat_55_eeeeee_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_glass_35_dddddd_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-bg_glass_60_eeeeee_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-bg_inset-soft_50_c9c9c9_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-icons_3383bb_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-icons_454545_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/overcast/images/ui-icons_70b2e1_256x240.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/index.html
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/overcast/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_diagonal-maze_20_6e4f1c_10x10.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_diagonal-maze_40_000000_10x10.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_fine-grain_10_eceadf_60x60.png
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/images/ui-bg_fine-grain_15_f7f3de_60x60.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_fine-grain_15_ffffff_60x60.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_fine-grain_65_654b24_60x60.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-bg_fine-grain_68_b83400_60x60.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-icons_3572ac_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-icons_8c291d_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-icons_b83400_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-icons_fbdb93_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/pepper-grinder/index.html
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/pepper-grinder/ui.all.css
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/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/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/index.html
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_f5f3e5_1x100.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-hard_95_cccccc_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-bg_highlight-soft_25_67b021_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_808080_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-icons_847e71_256x240.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/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-icons_eeeeee_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/south-street/index.html
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/south-street/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_flat_55_999999_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_flat_75_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_glass_45_0078ae_1x400.png
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_glass_75_79c9ec_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_gloss-wave_50_6eac2c_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-bg_gloss-wave_75_2191c0_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/images/ui-icons_0078ae_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-icons_056b93_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-icons_d8e7f3_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-icons_e0fdff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-icons_f5e175_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-icons_f7a50d_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/images/ui-icons_fcd113_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/start/index.html
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/start/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/index.html
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_flat_30_cccccc_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-bg_flat_50_5c5c5c_40x100.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_gloss-wave_70_ffdd57_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/images/ui-bg_gloss-wave_90_fff9e5_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-bg_inset-soft_30_ffffff_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/index.html
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/sunny/south-street/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_highlight-hard_95_cccccc_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_highlight-soft_25_67b021_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-icons_808080_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-icons_847e71_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-icons_8DC262_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-icons_eeeeee_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/south-street/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/sunny/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/index.html
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_261803_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-bg_flat_75_ddd4b0_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.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_efec9f_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-icons_f2ec64_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/swanky-purse/images/ui-icons_f9f2bd_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/index.html
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/swanky-purse/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/index.html
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_glass_55_f1fbe5_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_glass_60_000000_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-bg_gloss-wave_55_000000_500x100.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_000000_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-icons_1f1f1f_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-icons_9fda58_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/images/ui-icons_b8ec79_256x240.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/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/trontastic/index.html
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/trontastic/ui.all.css
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/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/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-bg_glass_95_fef1ec_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-bg_gloss-wave_16_121212_500x100.png
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-hard_55_555555_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-bg_highlight-soft_60_dddddd_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-bg_inset-soft_15_121212_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-icons_666666_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-icons_aaaaaa_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-icons_bbbbbb_256x240.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/images/ui-icons_cccccc_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/images/ui-icons_f29a00_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/index.html
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
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/jquery/ui/vader/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.base.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.button.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.core.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.datepicker.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.dialog.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.menu.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.progressbar.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.resizable.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.selectable.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.slider.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.spinner.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.tabs.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/jquery.ui.tooltip.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_75_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_65_ffffff_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_dadada_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-icons_2e83ff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-icons_454545_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-icons_888888_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/images/ui-icons_cd0a0a_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.accordion.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.autocomplete.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.button.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.core.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.datepicker.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.dialog.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.menu.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.progressbar.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.resizable.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.selectable.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.slider.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.spinner.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.tabs.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.theme.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/jquery.ui.tooltip.min.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/base/minified/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_diagonals-thick_8_333333_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_flat_65_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_glass_40_111111_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_glass_55_1c1c1c_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_inset-hard_45_cd0a0a_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-bg_inset-hard_55_ffeb80_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-icons_222222_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-icons_4ca300_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-icons_bbbbbb_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-icons_ededed_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-icons_ffcf29_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/images/ui-icons_ffffff_256x240.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/jquery-ui.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/jquery.ui.theme.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/black-tie/ui.all.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_flat_0_333333_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_flat_65_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_flat_75_ffffff_40x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/ui/blitzer/images/ui-icons_004276_256x240...
[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.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var...
[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 @@
if ($regstep_Handler->deleteRegstep($obj)) {
$xoops->redirect("step.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/smilies/admin/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/admin/smilies.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -105,13 +105,13 @@
if ($_FILES[$xoops_upload_file[0]]['error'] === 0) {
$uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/smilies', $mimetypes, $upload_size, null, null);
- if ($uploader->fetchMedia($xoops_upload_file[0])) {
+ if ($uploader->fetchMedia($xoops_upload_file[0])) {
$uploader->setPrefix('smil');
- if (!$uploader->upload()) {
- $msg[] = $uploader->getErrors();
+ if (!$uploader->upload()) {
+ $msg[] = $uploader->getErrors();
$obj->setVar('smiley_url', 'blank.gif');
- } else {
- $obj->setVar('smiley_url', 'smilies/' . $uploader->getSavedFileName());
+ } else {
+ $obj->setVar('smiley_url', 'smilies/' . $uploader->getSavedFileName());
}
}
}
@@ -119,7 +119,7 @@
if ($helper->getHandlerSmilies()->insert($obj)) {
$xoops->redirect('smilies.php', 2, implode('<br />', $msg));
}
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
$form = $helper->getForm($obj, 'smilies');
$xoops->tpl()->assign('form', $form->render());
break;
@@ -142,7 +142,7 @@
}
$xoops->redirect('smilies.php', 2, _AM_SMILIES_DELETED);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$smilies_img = ($obj->getVar('smiley_url')) ? $obj->getVar('smiley_url') : 'blank.gif';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -325,7 +325,7 @@
if (!$newid = $block_handler->insertBlock($block)) {
$xoops->header();
- $xoops->error($block->getHtmlErrors());
+ echo $xoops->alert('error', $block->getHtmlErrors());
$xoops->footer();
exit();
}
@@ -342,7 +342,7 @@
$blockmodulelink->setVar('module_id', $mid);
if (!$blockmodulelink_handler->insert($blockmodulelink)) {
$xoops->header();
- $xoops->error($blockmodulelink->getHtmlErrors());
+ echo $xoops->alert('error', $blockmodulelink->getHtmlErrors());
$xoops->footer();
exit();
}
Modified: 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/main.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -171,7 +171,7 @@
}
if (!$member_handler->insertGroup($group)) {
$xoops->header();
- $xoops->error($group->getHtmlErrors());
+ echo $xoops->alert('error', $group->getHtmlErrors());
$xoops->footer();
} else {
$groupid = $group->getVar('groupid');
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:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -138,12 +138,12 @@
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->alert('info', _AM_SYSTEM_TEMPLATES_RESTORE_OK);
+ echo $xoops->alert('info', _AM_SYSTEM_TEMPLATES_RESTORE_OK);
exit();
}
}
}
- $xoops->error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
+ echo $xoops->alert('error', _AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
break;
}
\ No newline at end of file
Modified: 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/main.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -103,9 +103,9 @@
$groups = $user->getGroups();
if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
- $xoops->error(sprintf(_AM_SYSTEM_USERS_NO_ADMINSUPP, $user->getVar("uname")));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_NO_ADMINSUPP, $user->getVar("uname")));
} elseif (!$member_handler->deleteUser($user)) {
- $xoops->error(sprintf(_AM_SYSTEM_USERS_NO_SUPP, $user->getVar("uname")));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_NO_SUPP, $user->getVar("uname")));
} else {
$xoops->getHandlerOnline()->destroy($uid);
// RMV-NOTIFY
@@ -169,11 +169,11 @@
$edituser = $member_handler->getUser($uid);
if ($edituser->getVar('uname', 'n') != $_REQUEST['username'] && $member_handler->getUserCount(new Criteria('uname', $myts->addSlashes($_REQUEST['username']))) > 0) {
$xoops->header();
- $xoops->error(sprintf(_AM_SYSTEM_USERS_PSEUDO_ERROR, htmlspecialchars($_REQUEST['username'])));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_PSEUDO_ERROR, htmlspecialchars($_REQUEST['username'])));
$xoops->footer();
} elseif ($edituser->getVar('email', 'n') != $_REQUEST['email'] && $member_handler->getUserCount(new Criteria('email', $myts->addSlashes($_REQUEST['email']))) > 0) {
$xoops->header();
- $xoops->error(sprintf(_AM_SYSTEM_USERS_MAIL_ERROR, htmlspecialchars($_REQUEST['email'])));
+ echo $xoops->alert('error', sprintf(_AM_SYSTEM_USERS_MAIL_ERROR, htmlspecialchars($_REQUEST['email'])));
$xoops->footer();
} else {
$edituser->setVar("name", $_REQUEST['name']);
@@ -310,7 +310,7 @@
}
}
}
- $xoops->error($adduser_errormsg);
+ echo $xoops->alert('error', $adduser_errormsg);
}
break;
Modified: 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/include/install.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -30,7 +30,7 @@
$obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_WEBMASTERD));
$obj->setVar("group_type", 'Admin');
if (!$group_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create registered users group
$obj = $group_handler->create();
@@ -38,7 +38,7 @@
$obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_REGUSERSD));
$obj->setVar("group_type", 'User');
if (!$group_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create anonymous users group
$obj = $group_handler->create();
@@ -46,7 +46,7 @@
$obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_ANONUSERSD));
$obj->setVar("group_type", 'Anonymous');
if (!$group_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// data for table 'groups_users_link'
@@ -59,7 +59,7 @@
$obj->setVar("gperm_modid", '1');
$obj->setVar("gperm_name", 'module_read');
if (!$groupperm_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
for ($i = 1; $i <= 17; $i++) {
@@ -69,7 +69,7 @@
$obj->setVar("gperm_modid", '1');
$obj->setVar("gperm_name", 'module_read');
if (!$groupperm_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
// Make system block visible
@@ -98,7 +98,7 @@
$obj->setVar("gperm_modid", '1');
$obj->setVar("gperm_name", 'block_read');
if (!$groupperm_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
}
}
@@ -111,7 +111,7 @@
$obj->setVar("tplset_credits", '');
$obj->setVar("tplset_created", time());
if (!$tplset_handler->insert($obj)) {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
// user admin
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php 2013-01-19 21:30:30 UTC (rev 10850)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/admin/userrank.php 2013-01-19 21:53:02 UTC (rev 10851)
@@ -166,7 +166,7 @@
}
$xoops->redirect("userrank.php", 2, _AM_USERRANK_SAVE);
} else {
- $xoops->error($obj->getHtmlErrors());
+ echo $xoops->alert('error', $obj->getHtmlErrors());
}
} else {
$rank_img = ($obj->getVar("rank_image")) ? $obj->getVar("rank_image") : 'blank.gif';
|
|
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_UPLOAD_URL)
+ 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)
);
}
Modified: 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/image/image.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/image/image.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -34,7 +34,6 @@
static $jsLoaded;
$xoops = Xoops::getInstance();
- $xoops->loadLanguage('misc');
$config = $this->loadConfig(dirname(__FILE__));
$ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 width=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
$ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
@@ -61,11 +60,12 @@
'type' => 'text/javascript'
));
}
- $ts->replacements[] = "<img src='\\5' class='\\2' alt='" . _MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' alt='" . _MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize']
+ $resizedStr = XoopsLocale::RESIZED_IMAGE;
+ $ts->replacements[] = "<img src='\\5' class='\\2' alt='" . $resizedStr . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" />";
+ $ts->replacements[] = "<img src='\\3' class='\\2' alt='" . $resizedStr . "' border='0'" . ($config['resize']
? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
- $ts->replacements[] = "<img src='\\3' alt='" . _MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /><br />";
- $ts->replacements[] = "<img src='\\1' alt='" . _MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize']
+ $ts->replacements[] = "<img src='\\3' alt='" . $resizedStr . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /><br />";
+ $ts->replacements[] = "<img src='\\1' alt='" . $resizedStr . "' border='0'" . ($config['resize']
? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
} else {
@@ -76,18 +76,20 @@
'type' => 'text/javascript'
));
}
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\5\");'><img src='\\5' class='\\2' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' class='\\2' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' " . ($config['resize']
+ $openImageStr = XoopsLocale::CLICK_TO_SEE_ORIGINAL_IMAGE_IN_NEW_WINDOW;
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\5\");'><img src='\\5' class='\\2' alt='" . $openImageStr . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' class='\\2' alt='" . $openImageStr . "' border='0' " . ($config['resize']
? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\1\");'><img src='\\1' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' title='" . _MSC_CLICK_TO_OPEN_IMAGE . "'" . ($config['resize']
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' alt='" . $openImageStr . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\1\");'><img src='\\1' alt='" . $openImageStr . "' border='0' title='" . $openImageStr . "'" . ($config['resize']
? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
} else {
- $ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' " . ($config['resize']
+ $originalStr = XoopsLocale::ORIGINAL_IMAGE;
+ $ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='" . $originalStr . "' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
+ $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='" . $originalStr . "' " . ($config['resize']
? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
- $ts->replacements[] = "<img src='\\3' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
- $ts->replacements[] = "<img src='\\1' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' " . ($config['resize']
+ $ts->replacements[] = "<img src='\\3' border='0' alt='" . $originalStr . "' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
+ $ts->replacements[] = "<img src='\\1' border='0' alt='" . $originalStr . "' " . ($config['resize']
? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -118,7 +118,7 @@
$geshi->set_header_type(GESHI_HEADER_NONE);
// Sets the proper encoding charset other than "ISO-8859-1"
- $geshi->set_encoding(_CHARSET);
+ $geshi->set_encoding(XoopsLocale::getCharset());
$geshi->set_link_target("_blank");
Modified: 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/sampleform.inc.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/sampleform.inc.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -58,6 +58,6 @@
// If dohtml is disabled, set $noHtml to true
$sample_form->addElement(new XoopsFormEditor('Your message', $options['name'], $options, $nohtml = false, $onfailure = 'textarea'), true);
$sample_form->addElement(new XoopsFormText('SOME REQUIRED ELEMENTS', 'required_element2', 50, 255, $required_element2), true);
- $sample_form->addElement(new XoopsFormButton('', 'save', _SUBMIT, 'submit'));
+ $sample_form->addElement(new XoopsFormButton('', 'save', XoopsLocale::A_SUBMIT, 'submit'));
$sample_form->display();
}
\ No newline at end of file
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-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -28,8 +28,8 @@
var $language;
var $width = "100%";
var $height = "500px";
+ var $editor;
- var $editor;
/**
* Constructor
*
@@ -38,8 +38,8 @@
function __construct($configs)
{
$current_path = __FILE__;
- if ( DIRECTORY_SEPARATOR != "/" ) {
- $current_path = str_replace( strpos( $current_path, "\\\\", 2 ) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $current_path);
+ if (DIRECTORY_SEPARATOR != "/") {
+ $current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $current_path);
}
$this->rootPath = "/class/xoopseditor/tinymce";
@@ -63,7 +63,6 @@
/**
* Renders the Javascript function needed for client-side for validation
- *
* I'VE USED THIS EXAMPLE TO WRITE VALIDATION CODE
* http://tinymce.moxiecode.com/punbb/viewtopic.php?id=12616
*
@@ -74,11 +73,11 @@
if ($this->isRequired() && $eltname = $this->getName()) {
//$eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf( _FORM_ENTER, $eltname ) : sprintf( _FORM_ENTER, $eltcaption );
- $eltmsg = str_replace('"', '\"', stripslashes( $eltmsg ) );
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
+ $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
$ret = "\n";
- $ret.= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
- $ret.= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
+ $ret .= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
+ $ret .= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
return $ret;
}
return '';
@@ -98,7 +97,7 @@
$this->language = strtolower(constant("_XOOPS_EDITOR_TINYMCE_LANGUAGE"));
} else {
$this->language = str_replace('_', '-', strtolower(_LANGCODE));
- if(strtolower(_CHARSET) == "utf-8") {
+ if (strtolower(XoopsLocale::getCharset()) == "utf-8") {
$this->language .= "_utf8";
}
}
@@ -109,7 +108,7 @@
function getFonts()
{
if (empty($this->config["fonts"]) && defined("_XOOPS_EDITOR_TINYMCE_FONTS")) {
- $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE_FONTS");
+ $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE_FONTS");
}
return @$this->config["fonts"];
Modified: 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_code/xoops_code.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -17,28 +17,27 @@
$xoops = Xoops::getInstance();
$xoops->disableErrorReporting();
-$xoops->loadLanguage('misc');
$xoops->simpleHeader(true);
$form = new XoopsThemeForm('', 'imagecat_form', '#', false, 'vertical');
-$form->addElement( new XoopsFormTextArea(_MSC_TINYMCE_CODE_TITLE, 'text_id', '', 9, 7) );
+$form->addElement( new XoopsFormTextArea(XoopsLocale::PASTE_THE_CODE_YOU_WANT_TO_INSERT, 'text_id', '', 9, 7) );
/**
* Buttons
*/
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
-$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+$button = new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit');
$button->setExtra('onclick="Xoops_codeDialog.insert();"');
$button->setClass('btn btn-success');
$button_tray->addElement($button);
-$button_2 = new XoopsFormButton('', 'reset', _RESET, 'reset');
+$button_2 = new XoopsFormButton('', 'reset', XoopsLocale::A_RESET, 'reset');
$button_2->setClass('btn btn-warning');
$button_tray->addElement($button_2);
-$button_3 = new XoopsFormButton('', 'button', _CLOSE, 'button');
+$button_3 = new XoopsFormButton('', 'button', XoopsLocale::A_CLOSE, 'button');
$button_3->setExtra('onclick="tinyMCEPopup.close();"');
$button_3->setClass('btn btn-danger');
$button_tray->addElement($button_3);
Modified: 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/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -17,28 +17,27 @@
$xoops = Xoops::getInstance();
$xoops->disableErrorReporting();
-$xoops->loadLanguage('misc');
$xoops->simpleHeader(true);
$form = new XoopsThemeForm('', 'imagecat_form', '#', false, 'vertical');
-$form->addElement( new XoopsFormTextArea(_MSC_TINYMCE_QUOTE_TITLE, 'text_id', '', 9, 7) );
+$form->addElement( new XoopsFormTextArea(XoopsLocale::PASTE_THE_QUOTE_YOU_WANT_TO_INSERT, 'text_id', '', 9, 7) );
/**
* Buttons
*/
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
-$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+$button = new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit');
$button->setExtra('onclick="Xoops_quoteDialog.insert();"');
$button->setClass('btn btn-success');
$button_tray->addElement($button);
-$button_2 = new XoopsFormButton('', 'reset', _RESET, 'reset');
+$button_2 = new XoopsFormButton('', 'reset', XoopsLocale::A_RESET, 'reset');
$button_2->setClass('btn btn-warning');
$button_tray->addElement($button_2);
-$button_3 = new XoopsFormButton('', 'button', _CLOSE, 'button');
+$button_3 = new XoopsFormButton('', 'button', XoopsLocale::A_CLOSE, 'button');
$button_3->setExtra('onclick="tinyMCEPopup.close();"');
$button_3->setClass('btn btn-danger');
$button_tray->addElement($button_3);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -474,7 +474,7 @@
$i = -1;
$elements = array();
if (count($this->getRequired()) > 0) {
- $this->_elements[] = new XoopsFormRaw("<tr class='foot'><td colspan='2'>* = " . _REQUIRED . "</td></tr>");
+ $this->_elements[] = new XoopsFormRaw("<tr class='foot'><td colspan='2'>* = " . XoopsLocale::REQUIRED . "</td></tr>");
}
foreach ($this->getElements() as $ele) {
++$i;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -72,9 +72,9 @@
$class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : " class='btn'");
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
if ($this->_showDelete) {
- $ret .= '<input type="submit"' . $class . ' name="delete" id="delete" value="' . _DELETE . '" onclick="this.form.elements.op.value=\'delete\'"> ';
+ $ret .= '<input type="submit"' . $class . ' name="delete" id="delete" value="' . XoopsLocale::A_DELETE . '" onclick="this.form.elements.op.value=\'delete\'"> ';
}
- $ret .= '<input type="button" ' . $class . ' value="' . _CANCEL . '" onClick="history.go(-1);return true;" /> <input type="reset"' . $class . ' name="reset" id="reset" value="' . _RESET . '" /> <input type="' . $this->getType() . '"' . $class . ' name="' . $this->getName() . '" id="' . $this->getName() . '" value="' . $this->getValue() . '"' . $extra . '/>';
+ $ret .= '<input type="button" ' . $class . ' value="' . XoopsLocale::A_CANCEL . '" onClick="history.go(-1);return true;" /> <input type="reset"' . $class . ' name="reset" id="reset" value="' . XoopsLocale::A_RESET . '" /> <input type="' . $this->getType() . '"' . $class . ' name="' . $this->getName() . '" id="' . $this->getName() . '" value="' . $this->getValue() . '"' . $extra . '/>';
return $ret;
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -183,7 +183,7 @@
} elseif ($this->isRequired()) {
$eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
return NWLINE . "var hasChecked = false; var checkBox = myform.elements['{$eltname}']; if (checkBox.length) {for (var i = 0; i < checkBox.length; i++) {if (checkBox[i].checked == true) {hasChecked = true; break;}}}else{if (checkBox.checked == true) {hasChecked = true;}}if (!hasChecked) {window.alert(\"{$eltmsg}\");if (checkBox.length) {checkBox[0].focus();}else{checkBox.focus();}return false;}";
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -61,7 +61,7 @@
{
$eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
return "if ( !(new RegExp(\"^#[0-9a-fA-F]{6}\",\"i\").test(myform.{$eltname}.value)) ) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }";
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -191,7 +191,7 @@
} else {
$xoops->theme()->addScript('/class/textsanitizer/image/image.js', array('type' => 'text/javascript'));
}
- $button = "<input id='" . $this->getName() . "_preview_button' " . "type='button' " . "class='btn' value='" . _PREVIEW . "' " . "onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . intval($this->doHtml) . ", '" . $xoops->security()->createToken() . "')\"" . " />";
+ $button = "<input id='" . $this->getName() . "_preview_button' " . "type='button' " . "class='btn' value='" . XoopsLocale::A_PREVIEW . "' " . "onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . intval($this->doHtml) . ", '" . $xoops->security()->createToken() . "')\"" . " />";
$ret .= "<br />" . "<div id='" . $this->getName() . "_hidden' style='display: block;'> " . "<fieldset>" . "<legend>" . $button . "</legend>" . "<div id='" . $this->getName() . "_hidden_data'>" . XoopsLocale::CLICK_PREVIEW_TO_SEE_CONTENT . "</div>" . "</fieldset>" . "</div>";
}
// Load javascript
@@ -214,9 +214,9 @@
{
$textarea_id = $this->getName();
$code = "<a name='moresmiley'></a>";
- $code .= "<img src='" . XOOPS_URL . "/images/url.gif' alt='" . XoopsLocale::URL . "' title='" . XoopsLocale::URL . "' onclick='xoopsCodeUrl(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERURL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
- $code .= "<img src='" . XOOPS_URL . "/images/email.gif' alt='" . XoopsLocale::EMAIL . "' title='" . XoopsLocale::EMAIL . "' onclick='xoopsCodeEmail(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTEREMAIL, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
- $code .= "<img src='" . XOOPS_URL . "/images/imgsrc.gif' alt='" . XoopsLocale::IMAGES . "' title='" . XoopsLocale::IMAGES . "' onclick='xoopsCodeImg(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERIMGURL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERIMGPOS, ENT_QUOTES) . "\", \"" . htmlspecialchars(_IMGPOSRORL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ERRORIMGPOS, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::WIDTH, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/url.gif' alt='" . XoopsLocale::URL . "' title='" . XoopsLocale::URL . "' onclick='xoopsCodeUrl(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_LINK_URL, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::ENTER_WEBSITE_TITLE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/email.gif' alt='" . XoopsLocale::EMAIL . "' title='" . XoopsLocale::EMAIL . "' onclick='xoopsCodeEmail(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_EMAIL, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/imgsrc.gif' alt='" . XoopsLocale::IMAGES . "' title='" . XoopsLocale::IMAGES . "' onclick='xoopsCodeImg(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_IMAGE_URL, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::ENTER_IMAGE_POSITION, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::IMAGE_POSITION_DESCRIPTION, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::E_ENTER_IMAGE_POSITION, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::WIDTH, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
$myts = MyTextSanitizer::getInstance();
$extensions = array_filter($myts->config['extensions']);
@@ -231,8 +231,8 @@
$this->js .= $js;
}
}
- $code .= "<img src='" . XOOPS_URL . "/images/code.gif' alt='" . XoopsLocale::SOURCE_CODE . "' title='" . XoopsLocale::SOURCE_CODE . "' onclick='xoopsCodeCode(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERCODE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
- $code .= "<img src='" . XOOPS_URL . "/images/quote.gif' alt='" . XoopsLocale::QUOTE . "' title='" . XoopsLocale::QUOTE . "' onclick='xoopsCodeQuote(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERQUOTE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/code.gif' alt='" . XoopsLocale::SOURCE_CODE . "' title='" . XoopsLocale::SOURCE_CODE . "' onclick='xoopsCodeCode(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_CODE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/quote.gif' alt='" . XoopsLocale::QUOTE . "' title='" . XoopsLocale::QUOTE . "' onclick='xoopsCodeQuote(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_QUOTE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
XoopsPreload::getInstance()->triggerEvent('core.class.xoopsform.formdhtmltextarea.codeicon', array(&$code, $this));
return $code;
@@ -248,14 +248,14 @@
$fontStr = "<script type=\"text/javascript\" language=\"JavaScript\">";
$fontStr .= "var _editor_dialog = ''" . "+ '<select class=\"span2\" id=\'{$textarea_id}Size\' onchange=\'xoopsSetElementAttribute(\"size\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
- $fontStr .= "+ '<option value=\'SIZE\'>" . _SIZE . "</option>'";
+ $fontStr .= "+ '<option value=\'SIZE\'>" . XoopsLocale::SIZE . "</option>'";
$localeFontSizes = XoopsLocale::getFontSizes();
foreach ($localeFontSizes as $_val => $_name) {
$fontStr .= " + '<option value=\'{$_val}\'>{$_name}</option>'";
}
$fontStr .= " + '</select> '";
$fontStr .= "+ '<select class=\"span2\" id=\'{$textarea_id}Font\' onchange=\'xoopsSetElementAttribute(\"font\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
- $fontStr .= "+ '<option value=\'FONT\'>" . _FONT . "</option>'";
+ $fontStr .= "+ '<option value=\'FONT\'>" . XoopsLocale::FONT . "</option>'";
$localeFonts = XoopsLocale::getFonts();
$fontarray = !empty($localeFonts) ? $localeFonts :
array("Arial", "Courier", "Georgia", "Helvetica", "Impact", "Verdana", "Haettenschweiler");
@@ -264,7 +264,7 @@
}
$fontStr .= " + '</select> '";
$fontStr .= "+ '<select class=\"span2\" id=\'{$textarea_id}Color\' onchange=\'xoopsSetElementAttribute(\"color\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
- $fontStr .= "+ '<option value=\'COLOR\'>" . _COLOR . "</option>';";
+ $fontStr .= "+ '<option value=\'COLOR\'>" . XoopsLocale::COLOR . "</option>';";
$fontStr .= "var _color_array = new Array('00', '33', '66', '99', 'CC', 'FF');
for(var i = 0; i < _color_array.length; i ++) {
for(var j = 0; j < _color_array.length; j ++) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -516,7 +516,7 @@
if ($this->isRequired() && $eltname = $this->getName()) {
// $eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
$eltmsg = str_replace(array(':', '?', '%'), '', $eltmsg);
$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
$eltmsg = strip_tags($eltmsg);
@@ -525,7 +525,7 @@
}
return false;
}
-
+
/**
* get the maximum columns for a field
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -39,9 +39,9 @@
* @param string $placeholder placeholder for this element.
*/
public function __construct($caption, $name, $size, $maxlength, $value = '', $placeholder = '')
- {
+ {
parent::__construct($caption, $name, $size, $maxlength, $value, $placeholder);
- $this->setPattern('[^@]+@[^@]+\.[a-zA-Z]{2,6}', _FORM_VALID_MAIL);
+ $this->setPattern('[^@]+@[^@]+\.[a-zA-Z]{2,6}', XoopsLocale::ENTER_VALID_EMAIL);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -35,11 +35,11 @@
*
* @param string $caption
* @param string $name
- * @param string $value Pre-selected value, can be "0" (No) or "1" (Yes)
+ * @param string|null $value Pre-selected value, can be "0" (No) or "1" (Yes)
* @param string $yes String for "Yes"
* @param string $no String for "No"
*/
- public function __construct($caption, $name, $value = null, $yes = _YES, $no = _NO)
+ public function __construct($caption, $name, $value = null, $yes = XoopsLocale::YES, $no = XoopsLocale::NO)
{
parent::__construct($caption, $name, $value, true);
$this->addOption(1, $yes);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselect.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoo...
[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);
- profile_install_addField('user_viewemail', _US_ALLOWVIEWEMAIL, '', 3, 'yesno', 3, 1, 1, array(), 2, 1, false);
+ profile_install_addField('user_viewemail', XoopsLocale::ALLOW_OTHER_USERS_TO_VIEW_EMAIL, '', 3, 'yesno', 3, 1, 1, array(), 2, 1, false);
profile_install_addField('attachsig', _US_SHOWSIG, '', 3, 'yesno', 3, 2, 1, array(), 0, 1, false);
- profile_install_addField('user_mailok', _US_MAILOK, '', 3, 'yesno', 3, 3, 1, array(), 2, 1, false);
+ profile_install_addField('user_mailok', XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, '', 3, 'yesno', 3, 3, 1, array(), 2, 1, false);
profile_install_addField('theme', _PROFILE_MA_THEME, '', 3, 'theme', 1, 4, 1, array(), 0, 0, false);
profile_install_addField('url', _PROFILE_MI_URL_TITLE, '', 4, 'textbox', 1, 1, 1, array(), 2, 255);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -45,11 +45,10 @@
$xoops->tpl()->assign('lang_rememberme', _US_REMEMBERME);
}
$xoops->tpl()->assign('lang_password', XoopsLocale::C_PASSWORD);
- $xoops->tpl()->assign('lang_notregister', _US_NOTREGISTERED);
- $xoops->tpl()->assign('lang_lostpassword', _US_LOSTPASSWORD);
- $xoops->tpl()->assign('lang_noproblem', _US_NOPROBLEM);
- $xoops->tpl()->assign('lang_youremail', _US_YOUREMAIL);
- $xoops->tpl()->assign('lang_sendpassword', _US_SENDPASSWORD);
+ $xoops->tpl()->assign('lang_lostpassword', XoopsLocale::Q_LOST_YOUR_PASSWORD);
+ $xoops->tpl()->assign('lang_noproblem', XoopsLocale::NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE);
+ $xoops->tpl()->assign('lang_youremail', XoopsLocale::C_YOUR_EMAIL);
+ $xoops->tpl()->assign('lang_sendpassword', XoopsLocale::SEND_PASSWORD);
$xoops->tpl()->assign('mailpasswd_token', $xoops->security()->createToken());
include dirname(__FILE__) . '/footer.php';
}
@@ -86,7 +85,7 @@
if ($xoops->isUser()) {
$xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
}
- $message = _US_LOGGEDOUT . '<br />' . _US_THANKYOUFORVISIT;
+ $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
$xoops->redirect(XOOPS_URL . '/', 1, $message);
}
@@ -98,7 +97,7 @@
if ($op == 'delete') {
if (!$xoops->isUser() || $xoops->getConfig('self_delete') != 1) {
- $xoops->redirect(XOOPS_URL . '/', 5, _US_NOPERMISS);
+ $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
} else {
$groups = $xoops->user->getGroups();
if (in_array(XOOPS_GROUP_ADMIN, $groups)){
@@ -108,16 +107,20 @@
$ok = !isset($_POST['ok']) ? 0 : intval($_POST['ok']);
if ($ok != 1) {
$xoops->header();
- $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL . '<br/>' . _US_REMOVEINFO);
+ $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
} else {
$del_uid = $xoops->user->getVar("uid");
if (false != $xoops->getHandlerMember()->deleteUser($xoops->user)) {
$xoops->getHandlerOnline()->destroy($del_uid);
- $xoops->getHandlerNotification()->unsubscribeByUser($del_uid);
- $xoops->redirect(XOOPS_URL . '/', 5, _US_BEENDELED);
+
+ //todo, use preload here?
+ if ($xoops->isActiveModule('notifications')) {
+ Notifications::getInstance()->getHandlerNotification()->unsubscribeByUser($del_uid);
+ }
+ $xoops->redirect('index.php', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
}
- $xoops->redirect(XOOPS_URL . '/', 5, _US_NOPERMISS);
+ $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
}
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -38,7 +38,7 @@
$myts = MyTextSanitizer::getInstance();
$xoops->getConfigs();
if (!$xoops->getConfig('allow_register')) {
- $xoops->redirect('index.php', 6, _US_NOREGISTER);
+ $xoops->redirect('index.php', 6, XoopsLocale::E_WE_ARE_CLOSED_FOR_REGISTRATION);
}
$op = !isset($_POST['op']) ? 'register' : $_POST['op'];
@@ -173,7 +173,7 @@
if ($xoops->getConfig('reg_dispdsclmr') != 0 && $xoops->getConfig('reg_disclaimer') != '') {
if (empty($agree_disc)) {
- $stop .= _US_UNEEDAGREE . '<br />';
+ $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />';
}
}
@@ -218,7 +218,7 @@
// Insert/update user and check if we have succeded
if (!$member_handler->insertUser($newuser)) {
- $stop .= _US_REGISTERNG . "<br />";
+ $stop .= XoopsLocale::E_USER_NOT_REGISTERED . "<br />";
$stop .= implode('<br />', $newuser->getErrors());
} else {
// User inserted! Now insert custom profile fields
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -50,12 +50,12 @@
$searchform = new XoopsThemeForm("", "searchform", "search.php", "post");
- $name_tray = new XoopsFormElementTray(_US_NICKNAME);
+ $name_tray = new XoopsFormElementTray(XoopsLocale::USERNAME);
$name_tray->addElement(new XoopsFormSelectMatchOption('', 'uname_match'));
$name_tray->addElement(new XoopsFormText('', 'uname', 35, 255));
$searchform->addElement($name_tray);
- $email_tray = new XoopsFormElementTray(_US_EMAIL);
+ $email_tray = new XoopsFormElementTray(XoopsLocale::EMAIL);
$email_tray->addElement(new XoopsFormSelectMatchOption('', 'email_match'));
$email_tray->addElement(new XoopsFormText('', 'email', 35, 255));
$searchform->addElement($email_tray);
@@ -126,7 +126,7 @@
}
}
asort($sortby_arr);
- $sortby_arr = array_merge(array("" => XoopsLocale::NONE, "uname" => _US_NICKNAME, "email" => _US_EMAIL), $sortby_arr);
+ $sortby_arr = array_merge(array("" => XoopsLocale::NONE, "uname" => XoopsLocale::USERNAME, "email" => XoopsLocale::EMAIL), $sortby_arr);
$sortby_select = new XoopsFormSelect(_PROFILE_MA_SORTBY, 'sortby');
$sortby_select->addOptionArray($sortby_arr);
$searchform->addElement($sortby_select);
@@ -396,8 +396,8 @@
}
//Get captions
- $captions[] = _US_NICKNAME;
- $captions[] = _US_EMAIL;
+ $captions[] = XoopsLocale::USERNAME;
+ $captions[] = XoopsLocale::EMAIL;
foreach (array_keys($fields) as $i) {
if (in_array($fields[$i]->getVar('field_id'), $searchable_fields) && in_array($fields[$i]->getVar('field_type'), $searchable_types) && in_array($fields[$i]->getVar('field_name'), $searchvars)) {
$captions[] = $fields[$i]->getVar('field_title');
Modified: 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/templates/profile_userform.html 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_userform.html 2013-01-27 15:15:23 UTC (rev 10928)
@@ -6,14 +6,14 @@
<{if isset($lang_rememberme)}>
<input type="checkbox" name="rememberme" value="On" checked /> <{$lang_rememberme}><br /><br />
<{/if}>
-
+
<input type="hidden" name="op" value="login" />
<input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" />
<input type="submit" value="<{$lang_login}>" />
</form>
<br />
<a name="lost"></a>
- <div><{$lang_notregister}><br /></div>
+ <div><{translate key='Q_NOT_REGISTERED'}> <{translate key='CLICK_HERE_TO_REGISTER'}><br /></div>
</fieldset>
<br />
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -47,11 +47,10 @@
$xoops->tpl()->assign('lang_rememberme', _US_REMEMBERME);
}
$xoops->tpl()->assign('lang_password', XoopsLocale::C_PASSWORD);
- $xoops->tpl()->assign('lang_notregister', _US_NOTREGISTERED);
- $xoops->tpl()->assign('lang_lostpassword', _US_LOSTPASSWORD);
- $xoops->tpl()->assign('lang_noproblem', _US_NOPROBLEM);
- $xoops->tpl()->assign('lang_youremail', _US_YOUREMAIL);
- $xoops->tpl()->assign('lang_sendpassword', _US_SENDPASSWORD);
+ $xoops->tpl()->assign('lang_lostpassword', XoopsLocale::Q_LOST_YOUR_PASSWORD);
+ $xoops->tpl()->assign('lang_noproblem', XoopsLocale::NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE);
+ $xoops->tpl()->assign('lang_youremail', XoopsLocale::C_YOUR_EMAIL);
+ $xoops->tpl()->assign('lang_sendpassword', XoopsLocale::SEND_PASSWORD);
$xoops->tpl()->assign('mailpasswd_token', $xoops->security()->createToken());
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
}
@@ -89,7 +88,7 @@
if ($xoops->isUser()) {
$xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
}
- $message = _US_LOGGEDOUT . '<br />' . _US_THANKYOUFORVISIT;
+ $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
$xoops->redirect(XOOPS_URL . '/', 1, $message);
}
@@ -102,7 +101,7 @@
if ($op == 'delete') {
$xoops->getConfigs();
if (!$xoops->isUser() || $xoops->getConfig('self_delete') != 1) {
- $xoops->redirect(XOOPS_URL . '/', 5, _US_NOPERMISS);
+ $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
} else {
$groups = $xoops->user->getGroups();
if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
@@ -112,16 +111,19 @@
$ok = !isset($_POST['ok']) ? 0 : intval($_POST['ok']);
if ($ok != 1) {
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
- $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL . '<br/>' . _US_REMOVEINFO);
+ $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
} else {
$del_uid = $xoops->user->getVar("uid");
if (false != $xoops->getHandlerMember()->deleteUser($xoops->user)) {
$xoops->getHandlerOnline()->destroy($del_uid);
- $xoops->getHandlerNotification()->unsubscribeByUser($del_uid);
- $xoops->redirect(XOOPS_URL . '/', 5, _US_BEENDELED);
+ //todo, use preload here?
+ if ($xoops->isActiveModule('notifications')) {
+ Notifications::getInstance()->getHandlerNotification()->unsubscribeByUser($del_uid);
+ }
+ $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
}
- $xoops->redirect(XOOPS_URL . '/', 5, _US_NOPERMISS);
+ $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
}
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -46,7 +46,7 @@
$xoops->tpl()->assign('user_ownpage', true);
$xoops->tpl()->assign('lang_editprofile', _US_EDITPROFILE);
$xoops->tpl()->assign('lang_changepassword', _PROFILE_MA_CHANGEPASSWORD);
- $xoops->tpl()->assign('lang_avatar', _US_AVATAR);
+ $xoops->tpl()->assign('lang_avatar', XoopsLocale::AVATAR);
$xoops->tpl()->assign('lang_inbox', _US_INBOX);
$xoops->tpl()->assign('lang_logout', _US_LOGOUT);
if ($xoops->getConfig('self_delete') == 1) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html 2013-01-27 15:15:23 UTC (rev 10928)
@@ -30,7 +30,7 @@
</div>
</fieldset>
</form>
-<p><{$lang_notregister}></p>
+<p><{translate key='Q_NOT_REGISTERED'}> <{translate key='CLICK_HERE_TO_REGISTER'}></p>
<fieldset name="lost">
<legend class="bold"><{$lang_lostpassword}></legend>
<form class="form-horizontal" action="lostpass.php" method="post">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -30,7 +30,7 @@
$xoopsConfigUser = $xoops->getConfigs();
if (empty($xoopsConfigUser['allow_register'])) {
- $xoops->redirect('index.php', 6, _US_NOREGISTER);
+ $xoops->redirect('index.php', 6, XoopsLocale::E_WE_ARE_CLOSED_FOR_REGISTRATION);
}
$op = isset($_POST['op']) ? $_POST['op'] : (isset($_GET["op"]) ? $_GET["op"] : 'register');
@@ -47,26 +47,26 @@
switch ($op) {
case 'newuser':
$xoops->header();
- $xoops->tpl()->assign('xoops_pagetitle', _US_USERREG);
+ $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
$stop = '';
if (!$xoops->security()->check()) {
$stop .= implode('<br />', $xoops->security()->getErrors()) . "<br />";
}
if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
if (empty($agree_disc)) {
- $stop .= _US_UNEEDAGREE . '<br />';
+ $stop .= XoopsLocale::E_YOU_HAVE_TO_AGREE_TO_DISCLAIMER . '<br />';
}
}
$stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
if (empty($stop)) {
- echo _US_USERNAME . ": " . $myts->htmlSpecialChars($uname) . "<br />";
- echo _US_EMAIL . ": " . $myts->htmlSpecialChars($email) . "<br />";
+ echo XoopsLocale::USERNAME . ": " . $myts->htmlSpecialChars($uname) . "<br />";
+ echo XoopsLocale::EMAIL . ": " . $myts->htmlSpecialChars($email) . "<br />";
if ($url != '') {
$url = $xoops->formatURL($url);
- echo _US_WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />';
+ echo XoopsLocale::WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br />';
}
$f_timezone = ($timezone_offset < 0) ? 'GMT ' . $timezone_offset : 'GMT +' . $timezone_offset;
- echo _US_TIMEZONE . ": $f_timezone<br />";
+ echo XoopsLocale::TIME_ZONE . ": $f_timezone<br />";
echo "<form action='register.php' method='post'>";
$cpatcha = new XoopsFormCaptcha();
echo "<br />" . $cpatcha->getCaption() . ": " . $cpatcha->render();
@@ -78,7 +78,7 @@
<input type='hidden' name='pass' value='" . $myts->htmlSpecialChars($pass) . "' />
<input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' />
<input type='hidden' name='user_mailok' value='" . $user_mailok . "' />
- <br /><br /><input type='hidden' name='op' value='finish' />" . $xoops->security()->getTokenHTML() . "<input type='submit' value='" . _US_FINISH . "' /></form>";
+ <br /><br /><input type='hidden' name='op' value='finish' />" . $xoops->security()->getTokenHTML() . "<input type='submit' value='" . XoopsLocale::A_FINISH . "' /></form>";
} else {
echo "<span class='red'>$stop</span>";
include $xoops->path('include/registerform.php');
@@ -122,17 +122,17 @@
$newuser->setVar('level', 0, true);
}
if (!$member_handler->insertUser($newuser)) {
- echo _US_REGISTERNG;
+ echo XoopsLocale::E_USER_NOT_REGISTERED;
$xoops->footer();
}
$newid = $newuser->getVar('uid');
if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
- echo _US_REGISTERNG;
+ echo XoopsLocale::E_USER_NOT_REGISTERED;
$xoops->footer();
}
if ($xoopsConfigUser['activation_type'] == 1) {
XoopsUserUtility::sendWelcome($newuser);
- $xoops->redirect('index.php', 4, _US_ACTLOGIN);
+ $xoops->redirect('index.php', 4, XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD);
}
// Sending notification email to user for self activation
if ($xoopsConfigUser['activation_type'] == 0) {
@@ -207,10 +207,10 @@
exit();
}
if ($thisuser->getVar('actkey') != $actkey) {
- $xoops->redirect('index.php', 5, _US_ACTKEYNOT);
+ $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_KEY_INCORRECT);
} else {
if ($thisuser->getVar('level') > 0) {
- $xoops->redirect('user.php', 5, _US_ACONTACT, false);
+ $xoops->redirect('user.php', 5, XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED, false);
} else {
if (false != $member_handler->activateUser($thisuser)) {
$xoopsConfigUser = $xoops->getConfigs();
@@ -234,10 +234,10 @@
}
$xoops->footer();
} else {
- $xoops->redirect('user.php', 5, _US_ACTLOGIN, false);
+ $xoops->redirect('user.php', 5, XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD, false);
}
} else {
- $xoops->redirect('index.php', 5, _US_ACTFAILD);
+ $xoops->redirect('index.php', 5, XoopsLocale::E_ACTIVATION_FAILED);
}
}
}
@@ -246,8 +246,8 @@
case 'register':
default:
$xoops->header();
- $xoops->tpl()->assign('xoops_pagetitle', _US_USERREG);
- $xoops->theme()->addMeta('meta', 'keywords', _US_USERREG . ", " . _US_NICKNAME); // FIXME!
+ $xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::USER_REGISTRATION);
+ $xoops->theme()->addMeta('meta', 'keywords', XoopsLocale::USER_REGISTRATION . ", " . XoopsLocale::USERNAME); // FIXME!
$xoops->theme()->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
include $xoops->path('include/registerform.php');
$reg_form->display();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -48,8 +48,8 @@
if (!$xoops->isUser()) {
$xoops->header('system_userform.html');
$xoops->tpl()->assign('xoops_pagetitle', XoopsLocale::A_LOGIN);
- $xoops->theme()->addMeta('meta', 'keywords', XoopsLocale::USERNAME . ", " . _US_PASSWORD . ", " . _US_LOSTPASSWORD);
- $xoops->theme()->addMeta('meta', 'description', _US_LOSTPASSWORD . " " . _US_NOPROBLEM);
+ $xoops->theme()->addMeta('meta', 'keywords', XoopsLocale::USERNAME . ", " . _US_PASSWORD . ", " . XoopsLocale::Q_LOST_YOUR_PASSWORD);
+ $xoops->theme()->addMeta('meta', 'description', XoopsLocale::Q_LOST_YOUR_PASSWORD . " " . XoopsLocale::NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE);
$xoops->tpl()->assign('lang_login', XoopsLocale::A_LOGIN);
$xoops->tpl()->assign('lang_username', XoopsLocale::C_USERNAME);
if (isset($_GET['xoops_redirect'])) {
@@ -59,11 +59,10 @@
$xoops->tpl()->assign('lang_rememberme', _US_REMEMBERME);
}
$xoops->tpl()->assign('lang_password', XoopsLocale::C_PASSWORD);
- $xoops->tpl()->assign('lang_notregister', _US_NOTREGISTERED);
- $xoops->tpl()->assign('lang_lostpassword', _US_LOSTPASSWORD);
- $xoops->tpl()->assign('lang_noproblem', _US_NOPROBLEM);
- $xoops->tpl()->assign('lang_youremail', _US_YOUREMAIL);
- $xoops->tpl()->assign('lang_sendpassword', _US_SENDPASSWORD);
+ $xoops->tpl()->assign('lang_lostpassword', XoopsLocale::Q_LOST_YOUR_PASSWORD);
+ $xoops->tpl()->assign('lang_noproblem', XoopsLocale::NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE);
+ $xoops->tpl()->assign('lang_youremail', XoopsLocale::C_YOUR_EMAIL);
+ $xoops->tpl()->assign('lang_sendpassword', XoopsLocale::SEND_PASSWORD);
$xoops->tpl()->assign('mailpasswd_token', $xoops->security()->createToken());
$xoops->footer();
}
@@ -96,14 +95,14 @@
if ($xoops->isUser()) {
$xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
}
- $message = _US_LOGGEDOUT . '<br />' . _US_THANKYOUFORVISIT;
+ $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
$xoops->redirect(XOOPS_URL . '/', 1, $message);
}
if ($op == 'delete') {
$xoopsConfigUser = $xoops->getConfigs();
if (!$xoops->isUser() || $xoopsConfigUser['self_delete'] != 1) {
- $xoops->redirect('index.php', 5, _US_NOPERMISS);
+ $xoops->redirect('index.php', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
} else {
$groups = $xoops->user->getGroups();
if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
@@ -113,17 +112,20 @@
$ok = !isset($_POST['ok']) ? 0 : intval($_POST['ok']);
if ($ok != 1) {
$xoops->header();
- $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL . '<br/>' . _US_REMOVEINFO);
+ $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
$xoops->footer();
} else {
$del_uid = $xoops->user->getVar("uid");
$member_handler = $xoops->getHandlerMember();
if (false != $member_handler->deleteUser($xoops->user)) {
$xoops->getHandlerOnline()->destroy($del_uid);
- $xoops->getHandlerNotification()->unsubscribeByUser($del_uid);
- $xoops->redirect('index.php', 5, _US_BEENDELED);
+ //todo, use preload here?
+ if ($xoops->isActiveModule('notifications')) {
+ Notifications::getInstance()->getHandlerNotification()->unsubscribeByUser($del_uid);
+ }
+ $xoops->redirect('index.php', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
}
- $xoops->redirect('index.php', 5, _US_NOPERMISS);
+ $xoops->redirect('index.php', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
}
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -43,7 +43,7 @@
$xoops->header('system_userinfo.html');
$xoops->tpl()->assign('user_ownpage', true);
$xoops->tpl()->assign('lang_editprofile', _US_EDITPROFILE);
- $xoops->tpl()->assign('lang_avatar', _US_AVATAR);
+ $xoops->tpl()->assign('lang_avatar', XoopsLocale::AVATAR);
$xoops->tpl()->assign('lang_inbox', _US_INBOX);
$xoops->tpl()->assign('lang_logout', _US_LOGOUT);
if ($xoopsConfigUser['self_delete'] == 1) {
@@ -95,13 +95,13 @@
$xoops->tpl()->assign('user_avatarurl', $avatar);
$xoops->tpl()->assign('lang_realname', _US_REALNAME);
$xoops->tpl()->assign('user_realname', $thisUser->getVar('name'));
-$xoops->tpl()->assign('lang_website', _US_WEBSITE);
+$xoops->tpl()->assign('lang_website', XoopsLocale::WEBSITE);
if ($thisUser->getVar('url', 'E') == '') {
$xoops->tpl()->assign('user_websiteurl', '');
} else {
$xoops->tpl()->assign('user_websiteurl', '<a href="' . $thisUser->getVar('url', 'E') . '" rel="external">' . $thisUser->getVar('url') . '</a>');
}
-$xoops->tpl()->assign('lang_email', _US_EMAIL);
+$xoops->tpl()->assign('lang_email', XoopsLocale::EMAIL);
$xoops->tpl()->assign('lang_privmsg', _US_PM);
$xoops->tpl()->assign('lang_icq', _US_ICQ);
$xoops->tpl()->assign('user_icq', $thisUser->getVar('user_icq'));
@@ -131,7 +131,6 @@
$xoops->tpl()->assign('lang_myinfo', _US_MYINFO);
$xoops->tpl()->assign('user_posts', $thisUser->getVar('posts'));
$xoops->tpl()->assign('lang_lastlogin', _US_LASTLOGIN);
-$xoops->tpl()->assign('lang_notregistered', _US_NOTREGISTERED);
$xoops->tpl()->assign('lang_signature', _US_SIGNATURE);
$xoops->tpl()->assign('lang_posts', _US_POSTS);
$var = $thisUser->getVar('user_sig', 'N');
Modified: 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/Xoops.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth/Xoops.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -57,7 +57,7 @@
$member_handler = $xoops->getHandlerMember();
$user = $member_handler->loginUser($uname, $pwd);
if ($user == false) {
- $this->setErrors(1, _US_INCORRECTLOGIN);
+ $this->setErrors(1, XoopsLocale::E_INCORRECT_LOGIN);
}
return $user;
}
Modified: 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/Auth.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -113,7 +113,7 @@
}
$ret .= sprintf(XoopsLocale::F_USING_AUTHENTICATION_METHOD, $this->auth_method);
} else {
- $ret .= _US_INCORRECTLOGIN;
+ $ret .= XoopsLocale::E_INCORRECT_LOGIN;
}
return $ret;
}
Modified: 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/Mailer/Abstract.php 2013-01-27 09:21:25 UTC (rev 10927)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale/Mailer/Abstract.php 2013-01-27 15:15:23 UTC (rev 10928)
@@ -42,7 +42,7 @@
// It is supposed no need to change the charset
$this->charSet = strtolower(XoopsLocale::getCharset());
// You MUST specify the language code value so that the file exists: XOOPS_ROOT_PAT/class/mail/phpmailer/language/lang-["your-language-code"].php
- $this->multimailer->SetLanguage(XoopsLocale::getLocale());
+ $this->multimailer->SetLanguage('en');
}
/**
|
|
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 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
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-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -49,8 +49,6 @@
class XoopsLocaleEn_US extends Xoops_Locale_Abstract
{
-
- //const PLEASE_WAIT = "Please wait";
const ABOUT = "About";
const ACTION = "Action";
const ACTIONS = "Actions";
@@ -161,6 +159,7 @@
const CATEGORY = "Category";
const CENTER = "Center";
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 CHARSET = "Charset";
const CHARSETS = "Charsets";
@@ -275,6 +274,7 @@
const EF_FOLDER_NOT_WRITABLE = "Folder '%s' is not writable by the server!";
const EF_IMAGE_SIZE_NOT_FETCHED = "'%s' image size was not fetched, skipping max dimension check...";
const EF_INVALID_SQL = "SQL '%s' is invalid!";
+ const EF_KEYWORDS_MUST_BE_GREATER_THAN = "Keywords must be at least <strong>%s</strong> characters long!";
const EF_NOTIFICATION_EMAIL_NOT_SENT_TO = "Notification email was not sent to '%s'!";
const EF_NOT_CREATED = "'%s' was not created!";
const EF_NOT_DELETED = "'%s' was not deleted!";
@@ -292,7 +292,7 @@
const EF_TABLE_NOT_UPDATED = "Table '%s' was not updated!"; // L134
const EF_UNEXPECTED_ERROR = "Unexpected error: %s";
const EF_USERNAME_MUST_BE_LESS_THAN = "Username is too long, it must be less than '%s' characters!";
- const EF_USERNAME_MUST_BE_LONGER_THAN = "Username is too short, it must be more than '%s' characters!";
+ const EF_USERNAME_MUST_BE_MORE_THAN = "Username is too short, it must be more than '%s' characters!";
const EF_USER_NAME_ALREADY_EXISTS = "User name '%s' already exists!";
const EF_USER_NOT_FOUND_IN_DIRECTORY_SERVER = "User '%s' not found in the directory server (%s) in %s!";
const EMAIL = "Email";
@@ -382,7 +382,7 @@
const E_TEMPLATE_FILE_NOT_OPENED = "Template file was not opened!";
const E_TLS_CONNECTION_NOT_OPENED = "TLS connection was not opened!";
const E_TO_MANY_ATTEMPTS = "Too many attempts!";
- const E_USERNAME_SHOULD_NOT_CONTAIN_SPACES = "There cannot be any spaces in the username!";
+ const E_UPLOAD_DIRECTORY_NOT_SET = "Upload directory not set!";
const E_USERNAME_TAKEN = "Username already taken!";
const E_USERS_NOT_FOUND = "No users found!";
const E_USER_ID_NOT_FETCHED = "User ID was not fetched!";
@@ -416,7 +416,7 @@
const F_AUTHORIZED_MIME_TYPES = "Authorized mime types: %s";
const F_BY_REGISTERED_USERS_ARE_ALWAYS_APPROVED = "%s by registered users are always approved";
const F_CLICK_HERE = "Click <a href='%s'>here</a>.";
- const F_CONFIRMATION_EMAIL_MAILED = "Confirmation email for %s mailed.";
+ const F_CONFIRMATION_EMAIL_SENT = "Confirmation email for %s mailed.";
const F_CURRENT_TEXT_LENGTH = "Current text length: %s";
const F_DAYS = "%s days";
const F_DELETED = "%s deleted";
@@ -433,7 +433,6 @@
const F_INTERESTING_SITE = "Interesting site: %s";
const F_IN_FILE_LINE = "%s in file %s line %s";
const F_IS_REQUIRED = "%s is required";
- const EF_KEYWORDS_MUST_BE_GREATER_THAN = "Keywords must be at least <strong>%s</strong> characters long!";
const F_KEYWORDS_SHORTER_THAN_WILL_BE_IGNORED = "Keywords shorter than <strong>%s</strong> characters will be ignored";
const F_MAXIMUM_ATTEMPTS = "Maximum attempts you can try: %d";
const F_MAX_PIXELS_WIDTH_HEIGHT = "Max Pixels: %s x %s (width x height)";
@@ -465,7 +464,6 @@
const F_USER_FOUND = "%s user found";
const F_USING_AUTHENTICATION_METHOD = "Using %s authentication method";
const F_WELCOME_TO = "Welcome to %s";
- const CF_WROTE = "%s wrote:";
const F_YES_DELETE_ALL = "Yes, delete all %s";
const F_YOUR_ACCOUNT_AT = "Your account at %s";
const GO_BACK = "Go back";
@@ -888,7 +886,6 @@
const NO_FILE_UPLOADED = "No file uploaded";
const NO_MATCH_FOUND_FOR_QUERY = "No match found for your query";
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";
@@ -923,7 +920,7 @@
const PDF_ICON = "PDF icon";
const PENDING = "Pending";
const PERMISSIONS = "Permissions";
- const PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION = "Please wait for your account to be activated by the administrators. You will receive an email once you are activated. This could take a while so please be patient.";
+ const PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION = "Please wait for your account to be activated by the administrators. You will receive an email once you are activated. This could take a while so please be patient.";
const PM = "PM";
const POSITION = "Position";
const POSITION_CONTAINS = "Position contains";
@@ -950,12 +947,13 @@
const QUERY = "Query";
const QUERY_MODE = "Query mode";
const QUOTE = "Quote";
- const Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES = "Are you sure you want to delete these message(s)?";
const Q_ARE_YOU_SURE = "Are you sure?";
const Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT = "Are you sure to delete your account?";
const Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_ITEM = "Are you sure you want to delete this item?";
+ const Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES = "Are you sure you want to delete these message(s)?";
const Q_LOST_YOUR_PASSWORD = "Lost your Password?";
const Q_NOT_REGISTERED = "Not registered?";
+ const Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS = "Receive occasional email notices <br />from administrators and moderators?";
const Q_USE_HTML = "Use HTML?";
const RANDOM = "Random";
const RANDOM_ITEMS = "Random items";
@@ -965,7 +963,6 @@
const READS = "Reads";
const REAL_NAME = "Real name";
const REAL_PLAYER = "Real Player";
- 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";
@@ -1009,7 +1006,7 @@
const SF_EXTENSION_IS_INSTALLED = "The extension '%s' is installed";
const SF_FOLDER_EXISTS = "The folder '%s' exists!";
const SF_FOUND_MATCHES = "Found <strong>%s</strong> match(es)";
- const SF_NOTIFICATION_EMAIL_SENT = "Notification email sent to %s!";
+ const SF_NOTIFICATION_EMAIL_SENT_TO = "Notification email sent to %s!";
const SF_PASSWORD_SENT_TO = "Password sent to %s!";
const SF_PRIVATE_MESSAGE_SENT_TO = "Private message sent to %s!";
const SF_SAVED = "%s saved";
@@ -1090,7 +1087,6 @@
const UPDATE_NOW = "Update now";
const UPDATE_OPTIONS = "Update options";
const UPLOAD_AVATAR = "Upload avatar";
- const E_UPLOAD_DIRECTORY_NOT_SET = "Upload directory not set!";
const URL = "URL";
const URL_CONTAINS = "URL contains";
const USER = "User";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -29,7 +29,7 @@
$email = isset($_POST['email']) ? trim($_POST['email']) : $email;
if ($email == '') {
- $xoops->redirect("user.php", 2, _US_SORRYNOTFOUND);
+ $xoops->redirect("user.php", 2, XoopsLocale::NO_);
exit();
}
@@ -38,7 +38,7 @@
$getuser = $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
if (empty($getuser)) {
- $msg = _US_SORRYNOTFOUND;
+ $msg = XoopsLocale::E_NO_USER_FOUND;
$xoops->redirect("user.php", 2, $msg);
} else {
$code = isset($_GET['code']) ? trim($_GET['code']) : '';
@@ -56,7 +56,7 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ, XOOPS_URL));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_NEW_PASSWORD_REQUEST_AT, XOOPS_URL));
if (!$xoopsMailer->send()) {
echo $xoopsMailer->getErrors();
}
@@ -64,10 +64,10 @@
$sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoops->db()->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
if (!$xoops->db()->queryF($sql)) {
$xoops->header();
- echo _US_MAILPWDNG;
+ echo XoopsLocale::E_USER_NOT_UPDATED;
$xoops->footer();
}
- $xoops->redirect("user.php", 3, sprintf(_US_PWDMAILED, $getuser[0]->getVar("uname")), false);
+ $xoops->redirect("user.php", 3, sprintf(XoopsLocale::SF_PASSWORD_SENT_TO, $getuser[0]->getVar("uname")), false);
// If no Code, send it
} else {
$xoopsMailer = $xoops->getMailer();
@@ -81,13 +81,13 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ, $xoops->getConfig('sitename')));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_NEW_PASSWORD_REQUEST_AT, $xoops->getConfig('sitename')));
$xoops->header();
if (!$xoopsMailer->send()) {
echo $xoopsMailer->getErrors();
}
echo "<h4>";
- printf(_US_CONFMAIL, $getuser[0]->getVar("uname"));
+ printf(XoopsLocale::F_CONFIRMATION_EMAIL_SENT, $getuser[0]->getVar("uname"));
echo "</h4>";
$xoops->footer();
}
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-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -56,12 +56,12 @@
$xoopsMailer->setToUsers($thisuser);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoops->getConfig('sitename')));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename')));
$xoops->footer();
if (!$xoopsMailer->send()) {
- printf(_US_ACTVMAILNG, $thisuser->getVar('uname') );
+ printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname') );
} else {
- printf(_US_ACTVMAILOK, $thisuser->getVar('uname') );
+ printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname') );
}
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
} else {
@@ -78,7 +78,7 @@
$member_handler = $xoops->getHandlerMember();
$getuser = $member_handler->getUsers(new Criteria('email', $myts->addSlashes(trim($_REQUEST['email']))));
if (count($getuser) == 0) {
- $xoops->redirect(XOOPS_URL, 2, _US_SORRYNOTFOUND);
+ $xoops->redirect(XOOPS_URL, 2, XoopsLocale::E_NO_USER_FOUND);
}
/* @var XoopsUser $getuser */
$getuser = $getuser[0];
@@ -94,11 +94,11 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser->getVar('uname') ));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $getuser->getVar('uname') ));
if (!$xoopsMailer->send()) {
- echo _US_YOURREGMAILNG;
+ echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
} else {
- echo _US_YOURREGISTERED;
+ echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
}
} else {
$form = new XoopsThemeForm('', 'form', 'activate.php');
Modified: 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/header.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -21,6 +21,4 @@
*/
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-XoopsLoad::load('system', 'system');
-$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
\ No newline at end of file
+XoopsLoad::load('system', 'system');
\ No newline at end of file
Modified: 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/user.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -61,7 +61,7 @@
$obj = $handler->getUser($_REQUEST['id']);
if (in_array(XOOPS_GROUP_ADMIN, $obj->getGroups()) && !in_array(XOOPS_GROUP_ADMIN, $xoops->user->getGroups())) {
// If not webmaster trying to edit a webmaster - disallow
- $xoops->redirect("user.php", 3, _US_NOEDITRIGHT);
+ $xoops->redirect("user.php", 3, XoopsLocale::E_NO_ACTION_PERMISSION);
}
include_once dirname(dirname(__FILE__)) . '/include/forms.php';
$form = profile_getUserForm($obj);
@@ -71,7 +71,7 @@
case "save":
$xoops->loadLanguage("main", $xoops->module->getVar('dirname', 'n'));
if (!$xoops->security()->check()) {
- $xoops->redirect('user.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+ $xoops->redirect('user.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
exit;
}
@@ -174,7 +174,7 @@
if ($user->isNew()) {
$xoops->redirect('user.php', 2, _PROFILE_AM_USERCREATED, false);
} else {
- $xoops->redirect('user.php', 2, _US_PROFUPDATED, false);
+ $xoops->redirect('user.php', 2, XoopsLocale::S_YOUR_PROFILE_UPDATED, false);
}
}
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -21,9 +21,8 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
-
$xoops->getConfigs();
if (!$xoops->user || $xoops->getConfig('allow_chgmail') != 1) {
@@ -35,7 +34,7 @@
if (!isset($_POST['submit']) || !isset($_POST['passwd'])) {
//show change password form
$form = new XoopsThemeForm(_PROFILE_MA_CHANGEMAIL, 'emailform', $_SERVER['REQUEST_URI'], 'post', true);
- $form->addElement(new XoopsFormPassword(_US_PASSWORD, 'passwd', 15, 50), true);
+ $form->addElement(new XoopsFormPassword(XoopsLocale::PASSWORD, 'passwd', 15, 50), true);
$form->addElement(new XoopsFormText(_PROFILE_MA_NEWMAIL, 'newmail', 15, 50), true);
$form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit'));
$form->assign($xoops->tpl());
@@ -48,7 +47,7 @@
$errors[] = _PROFILE_MA_WRONGPASSWORD;
}
if (!$xoops->checkEmail($email)) {
- $errors[] = _US_INVALIDMAIL;
+ $errors[] = XoopsLocale::E_INVALID_EMAIL;
}
if ($errors) {
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-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -23,7 +23,7 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
+
if (!$xoops->isUser()) {
$xoops->redirect(XOOPS_URL, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
}
@@ -51,10 +51,10 @@
$errors[] = _PROFILE_MA_WRONGPASSWORD;
}
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'));
}
if ($password != $vpass) {
- $errors[] = _US_PASSNOTSAME;
+ $errors[] = XoopsLocale::E_PASSWORDS_MUST_MATCH;
}
if ($errors) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -23,11 +23,10 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
// If not a user, redirect
if (!$xoops->isUser()) {
- $xoops->redirect(XOOPS_URL, 3, _US_NOEDITRIGHT);
+ $xoops->redirect(XOOPS_URL, 3, XoopsLocale::E_NO_ACTION_PERMISSION);
}
$myts = MyTextSanitizer::getInstance();
@@ -36,7 +35,7 @@
if ($op == 'save') {
if (!$xoops->security()->check()) {
- $xoops->redirect(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'n') . "/", 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+ $xoops->redirect(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'n') . "/", 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
exit();
}
$uid = $xoops->user->getVar('uid');
@@ -85,7 +84,7 @@
$profile->setVar('profile_id', $edituser->getVar('uid'));
$profile_handler->insert($profile);
unset($_SESSION['xoopsUserTheme']);
- $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, _US_PROFUPDATED);
+ $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, XoopsLocale::S_YOUR_PROFILE_UPDATED);
}
}
}
@@ -99,6 +98,6 @@
$xoops->tpl()->assign('stop', $stop);
}
- $xoops->appendConfig('profile_breadcrumbs', array('title' => _US_EDITPROFILE));
+ $xoops->appendConfig('profile_breadcrumbs', array('title' => XoopsLocale::EDIT_PROFILE));
}
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -23,7 +23,6 @@
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
$xoops->setConfig('profile_breadcrumbs', array(
array(
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-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -58,7 +58,7 @@
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_PASSWORD, 'pass', 5, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(XoopsLocale::PASSWORD, 'pass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
$elements[0][] =
@@ -133,7 +133,7 @@
$action = $_SERVER['REQUEST_URI'];
}
- $title = $user->isNew() ? _PROFILE_AM_ADDUSER : _US_EDITPROFILE;
+ $title = $user->isNew() ? _PROFILE_AM_ADDUSER : XoopsLocale::EDIT_PROFILE;
$form = new XoopsThemeForm($title, 'userinfo', $action, 'post', true);
@@ -170,7 +170,7 @@
//If the user is an admin and is editing someone else
$pwd_text = new XoopsFormPassword('', 'password', 3, 32);
$pwd_text2 = new XoopsFormPassword('', 'vpass', 3, 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);
$elements[0][] = array('element' => $pwd_tray, 'required' => 0); //cannot set an element tray required
@@ -226,7 +226,7 @@
include_once $xoops->path('modules/system/constants.php');
if ($gperm_handler->checkRight('system_admin', XOOPS_SYSTEM_GROUP, $xoops->user->getGroups(), 1)) {
//add group selection
- $group_select = new XoopsFormSelectGroup(_US_GROUPS, 'groups', false, $user->getGroups(), 5, true);
+ $group_select = new XoopsFormSelectGroup(XoopsLocale::USER_GROUPS, 'groups', false, $user->getGroups(), 5, true);
$elements[0][] = array('element' => $group_select, 'required' => 0);
//set as latest;
$weights[0][] = $count_fields + 1;
@@ -247,6 +247,6 @@
}
$form->addElement(new XoopsFormHidden('uid', $user->getVar('uid')));
- $form->addElement(new XoopsFormButton('', 'submit', _US_SAVECHANGES, 'submit', 'btn primary'));
+ $form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::SAVE_CHANGES, 'submit', 'btn primary'));
return $form;
}
\ No newline at end of file
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-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -29,7 +29,6 @@
{
$xoops = Xoops::getInstance();
- $xoops->loadLanguage('user');
$xoops->registry()->set('profile_id', $module->getVar('mid'));
// Create registration steps
@@ -42,29 +41,29 @@
profile_install_addCategory(_PROFILE_MI_CATEGORY_SETTINGS, 3);
profile_install_addCategory(_PROFILE_MI_CATEGORY_COMMUNITY, 4);
- 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('name', XoopsLocale::REAL_NAME, '', 1, 'textbox', 1, 1, 1, array(), 2, 255);
+ profile_install_addField('user_from', XoopsLocale::LOCATION, '', 1, 'textbox', 1, 2, 1, array(), 2, 255);
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);
- profile_install_addField('user_regdate', _US_MEMBERSINCE, '', 1, 'datetime', 3, 7, 0, array(), 0, 10);
+ profile_install_addField('user_occ', XoopsLocale::OCCUPATION, '', 1, 'textbox', 1, 4, 1, array(), 2, 255);
+ profile_install_addField('user_intrest', XoopsLocale::INTEREST, '', 1, 'textbox', 1, 5, 1, array(), 2, 255);
+ profile_install_addField('bio', XoopsLocale::EXTRA_INFO, '', 1, 'textarea', 2, 6, 1, array(), 2, 0);
+ profile_install_addField('user_regdate', XoopsLocale::MEMBER_SINCE, '', 1, 'datetime', 3, 7, 0, array(), 0, 10);
- profile_install_addField('user_icq', _US_ICQ, '', 2, 'textbox', 1, 1, 1, array(), 2, 255);
- profile_install_addField('user_aim', _US_AIM, '', 2, 'textbox', 1, 2, 1, array(), 2, 255);
- 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);
+ profile_install_addField('user_icq', XoopsLocale::ICQ, '', 2, 'textbox', 1, 1, 1, array(), 2, 255);
+ profile_install_addField('user_aim', XoopsLocale::AIM, '', 2, 'textbox', 1, 2, 1, array(), 2, 255);
+ profile_install_addField('user_yim', XoopsLocale::YIM, '', 2, 'textbox', 1, 3, 1, array(), 2, 255);
+ profile_install_addField('user_msnm', XoopsLocale::MSNM, '', 2, 'textbox', 1, 4, 1, array(), 2, 255);
profile_install_addField('user_viewemail', XoopsLocale::ALLOW_OTHER_USERS_TO_VIEW_EMAIL, '', 3, 'yesno', 3, 1, 1, array(), 2, 1, false);
- profile_install_addField('attachsig', _US_SHOWSIG, '', 3, 'yesno', 3, 2, 1, array(), 0, 1, false);
+ profile_install_addField('attachsig', XoopsLocale::ALWAYS_ATTACH_MY_SIGNATURE, '', 3, 'yesno', 3, 2, 1, array(), 0, 1, false);
profile_install_addField('user_mailok', XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, '', 3, 'yesno', 3, 3, 1, array(), 2, 1, false);
profile_install_addField('theme', _PROFILE_MA_THEME, '', 3, 'theme', 1, 4, 1, array(), 0, 0, false);
profile_install_addField('url', _...
[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);
}
break;
@@ -312,7 +312,7 @@
$xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'field.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />');
}
} else {
- $xoops->redirect('field.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('field.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
}
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-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -64,7 +64,7 @@
$form = $xoops->getModuleForm($obj, 'regstep');
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('step.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('step.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -113,7 +113,7 @@
$xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'step.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('step_name')) . '<br />');
}
} else {
- $xoops->redirect('step.php', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('step.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
Modified: 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/steplist.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -24,7 +24,7 @@
<td class="txtleft"><{$step.step_desc}></td>
<td class="txtcenter width10"><{$step.step_order}></td>
<td class="xo-actions txtcenter width10">
- <img id="loading_sml<{$step.step_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_sml<{$step.step_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="sml<{$step.step_id}>"
onclick="Xoops.changeStatus( 'step.php', { op: 'step_update', id: <{$step.step_id}> }, 'sml<{$step.step_id}>', 'step.php' )"
src="<{if $step.step_save}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>"
Modified: 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/smilies/templates/admin/smilies_smilies.html 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/admin/smilies_smilies.html 2013-02-02 21:45:44 UTC (rev 10968)
@@ -31,7 +31,7 @@
</td>
<td class="txtleft"><{$smiley.smiley_emotion}></td>
<td class="xo-actions txtcenter width5">
- <img id="loading_sml<{$smiley.smiley_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img id="loading_sml<{$smiley.smiley_id}>" src="<{xoAppUrl media/xoops/images/spinner.gif}>" style="display:none;" alt="<{translate key='LOADING'}>" />
<img class="cursorpointer" id="sml<{$smiley.smiley_id}>" onclick="Xoops.changeStatus( 'smilies.php', { op: 'smilies_update_display', smiley_id: <{$smiley.smiley_id}> }, 'sml<{$smiley.smiley_id}>', 'smilies.php' )" src="<{if $smiley.smiley_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smiley.smiley_display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" title="<{if $smiley.smiley_display}><{$smarty.const._AM_SMILIES_OFF}><{else}><{$smarty.const._AM_SMILIES_ON}><{/if}>" />
</td>
<td class="xo-actions txtcenter width10">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -77,7 +77,7 @@
$xoops->theme()->addScript('modules/system/js/blocks.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_MANAGMENT);
$admin_page->renderBreadcrumb();
@@ -189,7 +189,7 @@
$xoops->theme()->addScript('modules/system/js/blocks.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADDBLOCK);
$admin_page->renderBreadcrumb();
@@ -370,7 +370,7 @@
$groupperm_handler->addRight("block_read", $newid, $groupid);
}
}
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
break;
case 'edit':
@@ -390,7 +390,7 @@
$xoops->theme()->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_EDITBLOCK);
$admin_page->renderBreadcrumb();
@@ -402,7 +402,7 @@
// Call Footer
$xoops->footer();
} else {
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -413,7 +413,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_ADMIN, $system->adminVersion('blocksadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_BLOCKS_DELETEBLOCK);
$admin_page->renderBreadcrumb();
@@ -482,10 +482,10 @@
$tplfile_handler->deleteTpl($btemplate[0]);
}
}
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -513,7 +513,7 @@
// Call Footer
$xoops->footer();
} else {
- $xoops->redirect('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=blocksadmin', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
Modified: 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/blocksadmin/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -22,9 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_BLOCKS;
+$modversion['name'] = XoopsLocale::BLOCKS;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_BLOCKS_DESC;
+$modversion['description'] = SystemLocale::BLOCKS_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; The MPN SE Project; Andricq Nicolas (AKA MusS)';
$modversion['help'] = 'page=blocksadmin';
Modified: 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/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -61,7 +61,7 @@
$xoops->theme()->addScript('modules/system/js/module.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_MAIN);
$admin_page->addTips(_AM_SYSTEM_EXTENSIONS_TIPS);
@@ -86,7 +86,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_INSTALL);
$admin_page->renderBreadcrumb();
@@ -121,7 +121,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_UNINSTALL);
$admin_page->renderBreadcrumb();
@@ -155,7 +155,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_ADMIN, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_EXTENSIONS_UPDATE);
$admin_page->renderBreadcrumb();
Modified: 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/extensions/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -21,9 +21,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_EXTENSIONS;
+$modversion['name'] = XoopsLocale::EXTENSIONS;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_EXTENSIONS_DESC;
+$modversion['description'] = SystemLocale::EXTENSIONS_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Andricq Nicolas (AKA MusS)';
$modversion['help'] = 'page=extension';
Modified: 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/groupperm.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -42,10 +42,10 @@
$gperm_handler = $xoops->getHandlerGroupperm();
foreach ($_POST['perms'] as $perm_name => $perm_data) {
if (false == $gperm_handler->deleteByModule($modid, $perm_name)) {
- $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name') . '(' . $perm_name . ')');
+ $msg[] = sprintf(SystemLocale::EF_COULD_NOT_RESET_GROUP_PERMISSION_FOR_MODULE, $module->getVar('name') . '(' . $perm_name . ')');
}
if (!array_key_exists('groups', $perm_data)){
- $msg[] = sprintf(_MD_AM_PERMADDOK, $module->getVar('name'), $perm_name, ' /');
+ $msg[] = sprintf(SystemLocale::SF_ADDED_PERMISSION_FOR_GROUP, $module->getVar('name'), $perm_name, ' /');
}else{
foreach ($perm_data['groups'] as $group_id => $item_ids) {
foreach ($item_ids as $item_id => $selected) {
@@ -56,7 +56,7 @@
foreach ($parent_ids as $pid) {
if ($pid != 0 && !in_array($pid, array_keys($item_ids))) {
// one of the parent items were not selected, so skip this item
- $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>') . ' (' . _MD_AM_PERMADDNGP . ')';
+ $msg[] = sprintf(SystemLocale::EF_COULD_NOT_ADD_PERMISSION_FOR_GROUP, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>') . ' (' . XoopsLocale::E_ALL_PARENT_ITEMS_MUST_BE_SELECTED . ')';
continue 2;
}
}
@@ -67,9 +67,9 @@
$gperm->setVar('gperm_modid', $modid);
$gperm->setVar('gperm_itemid', $item_id);
if (!$gperm_handler->insert($gperm)) {
- $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
+ $msg[] = sprintf(SystemLocale::EF_COULD_NOT_ADD_PERMISSION_FOR_GROUP, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
} else {
- $msg[] = sprintf(_MD_AM_PERMADDOK, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
+ $msg[] = sprintf(SystemLocale::SF_ADDED_PERMISSION_FOR_GROUP, '<strong>' . $perm_name . '</strong>', '<strong>' . $perm_data['itemname'][$item_id] . '</strong>', '<strong>' . $group_list[$group_id] . '</strong>');
}
unset($gperm);
}
Modified: 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/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -53,7 +53,7 @@
$xoops->theme()->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_MAIN);
$admin_page->addItemButton(_AM_SYSTEM_GROUPS_ADD, 'admin.php?fct=groups&op=groups_add', 'add');
@@ -115,7 +115,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_ADD);
$admin_page->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
@@ -134,7 +134,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_EDIT);
$admin_page->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
@@ -148,7 +148,7 @@
// Assign form
$xoops->tpl()->assign('form', $form->render());
} else {
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -212,7 +212,7 @@
$blockperm->setVar('gperm_modid', 1);
$gperm_handler->insert($blockperm);
}
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::S_DATABASE_UPDATED);
}
break;
@@ -292,10 +292,10 @@
$blockperm->setVar('gperm_modid', 1);
$gperm_handler->insert($blockperm);
}
- $xoops->redirect("admin.php?fct=groups", 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect("admin.php?fct=groups", 1, XoopsLocale::S_DATABASE_UPDATED);
}
} else {
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -303,7 +303,7 @@
case 'groups_delete':
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_MANAGER, $system->adminVersion('groups', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_GROUPS_NAV_DELETE);
$admin_page->renderBreadcrumb();
@@ -322,7 +322,7 @@
$member_handler->deleteGroup($group);
$gperm_handler = $xoops->getHandlerGroupperm();
$gperm_handler->deleteByGroup($groups_id);
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::S_DATABASE_UPDATED);
} else {
$xoops->redirect('admin.php?fct=groups', 2, _AM_SYSTEM_GROUPS_ERROR_DELETE);
}
@@ -340,7 +340,7 @@
), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br />' . $obj->getVar("name") . '<br />');
}
} else {
- $xoops->redirect('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ $xoops->redirect('admin.php?fct=groups', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
}
break;
@@ -360,7 +360,7 @@
}
}
//if ($error == true)
- $xoops->redirect("admin.php?fct=users", 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ $xoops->redirect("admin.php?fct=users", 1, XoopsLocale::S_DATABASE_UPDATED);
}
break;
}
Modified: 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/groups/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -21,9 +21,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_ADGS;
+$modversion['name'] = XoopsLocale::GROUPS;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_ADGS_DESC;
+$modversion['description'] = SystemLocale::GROUPS_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Cointin Maxime (AKA Kraven30)';
$modversion['help'] = 'page=groups';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -60,7 +60,7 @@
$xoops->theme()->addScript('modules/system/js/module.js');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_MAIN);
$admin_page->addTips(_AM_SYSTEM_MODULES_TIPS);
@@ -177,7 +177,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_INSTALL);
$admin_page->renderBreadcrumb();
@@ -212,7 +212,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_UNINSTALL);
$admin_page->renderBreadcrumb();
@@ -246,7 +246,7 @@
$xoops->theme()->addStylesheet('modules/system/css/admin.css');
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_ADMIN, $system->adminVersion('modulesadmin', 'adminpath'));
$admin_page->addBreadcrumbLink(_AM_SYSTEM_MODULES_UPDATE);
$admin_page->renderBreadcrumb();
Modified: 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/modulesadmin/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -21,9 +21,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_MODULES;
+$modversion['name'] = XoopsLocale::MODULES;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_MODULES_DESC;
+$modversion['description'] = SystemLocale::MODULES_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Kazumi Ono; Andricq Nicolas (AKA MusS)';
$modversion['help'] = 'page=modulesadmin';
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 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -77,7 +77,7 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(XoopsLocale::PREFERENCES, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink($module->getVar('name'));
$admin_page->renderBreadcrumb();
@@ -150,9 +150,9 @@
register_shutdown_function(array(&$system, 'CleanCache'), $options);
$xoops->preload()->triggerEvent('system.preferences.save');
if (isset($redirect) && $redirect != '') {
- $xoops->redirect($redirect, 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect($redirect, 2, XoopsLocale::S_DATABASE_UPDATED);
} else {
- $xoops->redirect("admin.php?fct=preferences", 2, _AM_SYSTEM_DBUPDATED);
+ $xoops->redirect("admin.php?fct=preferences", 2, XoopsLocale::S_DATABASE_UPDATED);
}
break;
}
Modified: 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/preferences/xoops_version.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/xoops_version.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -22,9 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-$modversion['name'] = _AM_SYSTEM_PREF;
+$modversion['name'] = XoopsLocale::PREFERENCES;
$modversion['version'] = '1.0';
-$modversion['description'] = _AM_SYSTEM_PREF_DESC;
+$modversion['description'] = SystemLocale::PREFERENCES_DESC;
$modversion['author'] = '';
$modversion['credits'] = 'The XOOPS Project; Maxime Cointin (AKA Kraven30), Gregory Mage (AKA Mage)';
$modversion['help'] = 'page=preferences';
Modified: 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/main.php 2013-02-02 21:05:43 UTC (rev 10967)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php 2013-02-02 21:45:44 UTC (rev 10968)
@@ -56,7 +56,7 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
+ $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, XOOPS_URL . '/admin.php', true);
$admin_page->addBreadcrumbLink(_AM_SYSTEM_TEMPLATES_NAV_MANAGER, $system->adminVersion('tplsets', 'adminpath'));
$admin_page->renderBreadcrumb();
$admin_page->addTips(_AM_SYSTEM_TEMPLATES_NAV_TIPS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/sy...
[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')) == '') ? constant($config->getVar('conf_title')) : constant($config->getVar('conf_title')) . '<br /><br /><span>' . constant($config->getVar('conf_desc')) . '</span>';
+ $title = $config->getVar('conf_desc') == '' ? Xoops_Locale::translate($config->getVar('conf_title'), 'system') : Xoops_Locale::translate($config->getVar('conf_title'), 'system') . '<br /><br /><span>' . Xoops_Locale::translate($config->getVar('conf_desc'), 'system') . '</span>';
$form_theme_set = new XoopsFormSelect('', $config->getVar('conf_name'), $config->getConfValueForOutput(), 1, false);
$dirlist = XoopsLists::getThemesList();
if (!empty($dirlist)) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -96,8 +96,8 @@
<link rel="shortcut icon" type="image/ico" href="../favicon.ico"/>
<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="css/style.css"/>
<?php
- if (file_exists('language/' . $wizard->language . '/style.css')) {
- echo '<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="language/' . $wizard->language . '/style.css" />';
+ if (file_exists('locale/' . $wizard->language . '/style.css')) {
+ echo '<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="locale/' . $wizard->language . '/style.css" />';
}
?>
Modified: 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/language/english/install.php 2013-02-07 15:10:40 UTC (rev 11006)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/en_US/install.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -18,7 +18,6 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define("SHOW_HIDE_HELP", "Show/hide help text");
// Configuration check page
define("SERVER_API", "Server API");
@@ -27,9 +26,7 @@
define("XML_PARSING", "XML parsing");
define("REQUIREMENTS", "Requirements");
define("_PHP_VERSION", "PHP version");
-define("RECOMMENDED_SETTINGS", "Recommended settings");
define("RECOMMENDED_EXTENSIONS", "Recommended extensions");
-define("SETTING_NAME", "Setting name");
define("RECOMMENDED", "Recommended");
define("CURRENT", "Current");
define("RECOMMENDED_EXTENSIONS_MSG", "These extensions are not required for normal use, but may be necessary to exploit
@@ -56,8 +53,6 @@
define("DATABASE_CONFIG_TITLE", "Database configuration");
define("CONFIG_SAVE", "Configuration save");
define("CONFIG_SAVE_TITLE", "Saving your system configuration");
-define("TABLES_CREATION", "Tables creation");
-define("TABLES_CREATION_TITLE", "Database tables creation");
define("INITIAL_SETTINGS", "Initial settings");
define("INITIAL_SETTINGS_TITLE", "Please enter your initial settings");
define("DATA_INSERTION", "Data insertion");
@@ -66,9 +61,6 @@
define("WELCOME_TITLE", "Welcome to your XOOPS site"); // L0
-// Settings (labels and help text)
-define("XOOPS_PATHS", "XOOPS Physical paths");
-define("XOOPS_URLS", "Web locations");
define("XOOPS_ROOT_PATH_LABEL", "XOOPS documents root physical path");
define("XOOPS_ROOT_PATH_HELP", "Physical path to the XOOPS documents (served) directory WITHOUT trailing slash");
@@ -120,29 +112,12 @@
define("XOOPS_PATH_FOUND", "Path found.");
-define("READY_CREATE_TABLES", "No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed.");
-define("XOOPS_TABLES_FOUND", "The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step."); // L131
-define("XOOPS_TABLES_CREATED", "XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step.");
-define("READY_INSERT_DATA", "The installer is now ready to insert initial data into your database.");
-define("READY_SAVE_MAINFILE", "The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed.");
define("SAVED_MAINFILE", "Saved settings in mainfile.php");
define("SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step.");
define("DATA_ALREADY_INSERTED", "XOOPS data found in database.<br />Press <em>next</em> to go to the next step.");
define("DATA_INSERTED", "Initial data have been inserted into database.<br />Press <em>next</em> to go to the next step.");
-// %s is database name
-define("DATABASE_CREATED", "Database %s created!"); // L43
-// %s is table name
-define("TABLE_NOT_CREATED", "Unable to create table %s"); // L118
-define("TABLE_CREATED", "Table %s created."); // L45
-define("ROWS_INSERTED", "%d entries inserted to table %s."); // L119
-define("ROWS_FAILED", "Failed inserting %d entries to table %s."); // L120
-define("TABLE_ALTERED", "Table %s updated."); // L133
-define("TABLE_NOT_ALTERED", "Failed updating table %s."); // L134
-define("TABLE_DROPPED", "Table %s dropped."); // L163
-define("TABLE_NOT_DROPPED", "Failed deleting table %s."); // L164
-
// Error messages
define("ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server.");
define("ERR_NO_XOOPS_FOUND", "No XOOPS installation could be found in the specified folder.");
@@ -164,13 +139,14 @@
define("_INSTALL_CHARSET", "UTF-8");
+define("_LANGCODE", "en-US");
define("SUPPORT", "Supports");
define("LOGIN", "Authentication");
-define("LOGIN_TITLE", "Authentication");
-define("USER_LOGIN", "Administrator Login");
-define("USERNAME", "Username :");
+//define("LOGIN_TITLE", "Authentication");
+//define("USER_LOGIN", "Administrator Login");
+//define("USERNAME", "Username :");
define("PASSWORD", "Password :");
define("ICONV_CONVERSION", "Character set conversion");
Modified: 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/language/english/support.php 2013-02-07 15:10:40 UTC (rev 11006)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/locale/en_US/support.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -7,7 +7,7 @@
$supports = array();
// Support site for English
-$supports["english"] = array(
+$supports["en_US"] = array(
"url" => "http://www.xoops.org/",
"title" => "English support",
);
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-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -30,6 +30,7 @@
$xoops = Xoops::getInstance();
/* @var $wizard XoopsInstallWizard */
$wizard = $_SESSION['wizard'];
+$xoops->loadLocale('system');
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$config_handler = $xoops->getHandlerConfig();
@@ -44,10 +45,6 @@
$wizard->redirectToPage('+1');
}
-$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();
$criteria->add(new Criteria('conf_modid', 1));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -26,21 +26,14 @@
/* @var $wizard XoopsInstallWizard */
$wizard = $_SESSION['wizard'];
-
-$xoops->loadLanguage('admin', 'system', $wizard->language);
-$xoops->loadLanguage('global', '', $wizard->language);
-$xoops->loadLocale('xoops', $wizard->language);//this must be changed to receive a locale
-$xoops->loadLanguage('admin/extension', 'system', $wizard->language);
-$xoops->loadLocale();
-
$pageHasForm = true;
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $xoops->loadLocale('system');
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
$system = System::getInstance();
- $system->loadLanguage('modulesadmin','system');
$system_module = new SystemModule();
@@ -56,8 +49,10 @@
if (count($msgs) > 0) {
$content = "<div class='x2-note successMsg'>" . INSTALLED_EXTENSION . "</div><ul class='log'>";
foreach ($msgs as $msg) {
- $tempvar = $msg->modinfo['name'];
- $content .= "<dt>{$tempvar}</dt>";
+ if ($msg instanceof XoopsModule) {
+ $tempvar = $msg->modinfo['name'];
+ $content .= "<dt>{$tempvar}</dt>";
+ }
}
$content .= "</ul>";
} else {
@@ -67,15 +62,15 @@
//Set active modules in cache folder
$xoops->setActiveModules();
} else {
- if (!$xoops->getConfig('language')) {
- $xoops->setConfig('language', $_COOKIE['xo_install_lang']);
+ if (!$xoops->getConfig('locale')) {
+ $xoops->setConfig('locale', $_COOKIE['xo_install_lang']);
}
+ $xoops->loadLocale('system');
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
include_once XOOPS_ROOT_PATH . "/modules/system/class/extension.php";
include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
$system = System::getInstance();
- $system->loadLanguage('modulesadmin','system');
// Get installed modules
$system_module = new SystemExtension();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_langselect.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_langselect.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_langselect.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -30,7 +30,7 @@
/* @var $wizard XoopsInstallWizard */
$wizard = $_SESSION['wizard'];
-setcookie('xo_install_lang', 'english', null, null, null);
+setcookie('xo_install_lang', 'en_US', null, null, null);
if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_REQUEST['lang'])) {
$lang = $_REQUEST['lang'];
setcookie('xo_install_lang', $lang, null, null, null);
@@ -45,7 +45,7 @@
//$title = LANGUAGE_SELECTION;
$content = '<div class="languages">';
-$languages = getDirList("./language/");
+$languages = getDirList("./locale/");
foreach ($languages as $lang) {
$sel = ($lang == $wizard->language) ? ' checked="checked"' : '';
$content .= "<label><input type=\"radio\" name=\"lang\" value=\"{$lang}\"{$sel} />{$lang}</label>\n";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -31,21 +31,15 @@
/* @var $wizard XoopsInstallWizard */
$wizard = $_SESSION['wizard'];
-
-$xoops->loadLanguage('admin', 'system', $wizard->language);
-$xoops->loadLanguage('global', '', $wizard->language);
-$xoops->loadLocale('xoops', $wizard->language);//this must be changed to receive a locale
-$xoops->loadLanguage('admin/modulesadmin', 'system', $wizard->language);
-
$pageHasForm = true;
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $xoops->loadLocale('system');
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
$system_module = new SystemModule();
$system = System::getInstance();
- $system->loadLanguage('modulesadmin','system');
$msgs = array();
foreach ($_REQUEST['modules'] as $dirname => $installmod) {
@@ -70,16 +64,15 @@
//Set active modules in cache folder
$xoops->setActiveModules();
} else {
- if (!$xoops->getConfig('language')) {
- $xoops->setConfig('language', $_COOKIE['xo_install_lang']);
+ if (!$xoops->getConfig('locale')) {
+ $xoops->setConfig('locale', $_COOKIE['xo_install_lang']);
}
+ $xoops->loadLocale('system');
include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
include_once XOOPS_ROOT_PATH . "/modules/system/class/system.php";
- $system_module = new SystemModule();
$system = System::getInstance();
- $system->loadLanguage('modulesadmin','system');
// Get installed modules
$system_module = new SystemModule();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_siteinit.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_siteinit.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_siteinit.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -31,22 +31,16 @@
$xoops->setActiveModules();
$root = dirname(dirname(__FILE__));
$language = $wizard->language;
-$xoops->loadLocale('xoops', $language);//this must be changed to receive a locale
+$xoops->setConfig('locale', $language);
+$xoops->loadLocale();
+$xoops->loadLocale('system');
-// system modules
-if (file_exists($file = $root . '/modules/system/language/' . $language . '/modinfo.php')) {
- include $file;
-} else {
- include $root . '/modules/system/language/english/modinfo.php';
- $language = 'english';
-}
// Install system module
include_once $root . "/modules/system/class/module.php";
include_once $root . "/modules/system/class/system.php";
-$xoops->loadLanguage('admin', 'system');
+
$system_module = new SystemModule();
$system = System::getInstance();
-$system->loadLanguage('modulesadmin', 'system');
$system_module->install('system', true);
$pageHasForm = true;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_tablesfill.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_tablesfill.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_tablesfill.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -35,7 +35,8 @@
$settings = $_SESSION['settings'];
$language = $wizard->language;
-$xoops->loadLocale('xoops', $language);//this must be changed to receive a locale
+$xoops->setConfig('locale', $language);
+$xoops->loadLocale();
$dbm = new XoopsDatabaseManager();
@@ -62,8 +63,6 @@
if ($process) {
//$cm = 'dummy';
$wizard->loadLangFile('install2');
- $language = $wizard->language;
- $xoops->loadLanguage('global', '', $language);
$temp = md5($adminpass);
$regdate = time();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -48,9 +48,9 @@
$wizard->redirectToPage('+1');
}
-$xoops->loadLanguage('admin', 'system', $wizard->language);
-$xoops->loadLanguage('admin/preferences', 'system', $wizard->language);
+$xoops->loadLocale('system');
+
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('conf_modid', 1));
$criteria->add(new Criteria('conf_name', 'theme_set'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -334,13 +334,7 @@
return false;
}
if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'))) {
- if (XoopsLoad::fileExists($file = XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/language/' . $xoops->getConfig('language') . '/blocks.php')) {
- include_once $file;
- } else {
- if (XoopsLoad::fileExists($file = XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/language/english/blocks.php')) {
- include_once $file;
- }
- }
+ $xoops->loadLanguage('blocks', $this->getVar('dirname'));
include_once XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file');
$options = explode('|', $this->getVar('options'));
$edit_form = $edit_func($options);
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_global.php (from rev 11006, XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_global.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_global.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -0,0 +1,193 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+//define('_PLEASEWAIT','Please Wait');
+//define('_FETCHING','Loading...');
+//define('_TAKINGBACK','Taking you back to where you were....');
+//define('_LOGOUT','Logout');
+//define('_SUBJECT','Subject');
+//define('_MESSAGEICON','Message Icon');
+//define('_COMMENTS','Comments');
+//define('_POSTANON','Post Anonymously');
+//define('_DISABLESMILEY','Disable smiley');
+//define('_DISABLEHTML','Disable html');
+//define('_PREVIEW','Preview');
+//define('_GO','Go!');
+//define('_NESTED','Nested');
+//define('_NOCOMMENTS','No Comments');
+//define('_FLAT','Flat');
+//define('_THREADED','Threaded');
+//define('_OLDESTFIRST','Oldest First');
+//define('_NEWESTFIRST','Newest First');
+//define('_MORE','more...');
+//define('_MULTIPAGE','To have your article span multiple pages, insert the word <font color=red>[pagebreak]</font> (with brackets) in the article.');
+//define('_IFNOTRELOAD','If the page does not automatically reload, please click <a href=\'%s\'>here</a>');
+// Error messages issued by XoopsObject::cleanVars()
+//define('_XOBJ_ERR_REQUIRED','%s is required');
+//define('_XOBJ_ERR_SHORTERTHAN','%s must be shorter than %d characters.');
+// %%%%%% File Name themeuserpost.php %%%%%
+//define('_PROFILE','Profile');
+//define('_POSTEDBY','Posted by');
+//define('_VISITWEBSITE','Visit Website');
+//define('_SENDPMTO','Send Private Message to %s');
+//define('_SENDEMAILTO','Send Email to %s');
+//define('_ADD','Add');
+//define('_REPLY','Reply');
+//define('_DATE','Date'); // Posted date
+// %%%%%% File Name admin_functions.php %%%%%
+//define('_MAIN','Main');
+//define('_MANUAL','Manual');
+//define('_INFO','Info');
+//define('_CPHOME','Control Panel Home');
+//define('_YOURHOME','Home Page');
+// %%%%%% File Name misc.php (who's-online popup) %%%%%
+//define('_WHOSONLINE','Who\'s Online');
+//define('_GUESTS','Guests');
+//define('_MEMBERS','Members');
+//define('_ONLINEPHRASE','<strong>%s</strong> user(s) are online');
+//define('_ONLINEPHRASEX','<strong>%s</strong> user(s) are browsing <strong>%s</strong>');
+//define('_CLOSE','Close'); // Close window
+// %%%%%% File Name module.textsanitizer.php %%%%%
+//define('_QUOTEC','Quote:');
+// %%%%%% File Name admin.php %%%%%
+//define('_NOPERM','Sorry, you don\'t have the permission to access this area.');
+// %%%%% Common Phrases %%%%%
+//define('_NO','No');
+//define('_YES','Yes');
+//define('_EDIT','Edit');
+//define('_DELETE','Delete');
+//define('_SUBMIT','Submit');
+//define('_MODULENOEXIST','Selected module does not exist!');
+//define('_ALIGN','Align');
+//define('_LEFT','Left');
+//define('_CENTER','Center');
+//define('_RIGHT','Right');
+//define('_FORM_ENTER','Please enter %s');
+//define('_MUSTWABLE','File %s must be writable by the server!'); // %s represents file name
+// Module info
+//define('_PREFERENCES','Preferences');
+//define('_VERSION','Version');
+//define('_DESCRIPTION','Description');
+//define('_AUTHOR','Author');
+//define('_CREDITS','Credits');
+//define('_LICENCE','Licence');
+//define('_ERRORS','Errors');
+//define('_NONE','None');
+//define('_ON','on');
+//define('_READS','reads');
+//define('_WELCOMETO','Welcome to %s');
+//define('_SEARCH','Search');
+//define('_ALL','All');
+//define('_TITLE','Title');
+//define('_OPTIONS','Options');
+//define('_QUOTE','Quote');
+//define('_LIST','List');
+//define('_LOGIN','User Login');
+//define('_USERNAME','Username: ');
+//define('_PASSWORD','Password: ');
+//define('_SELECT','Select');
+//define('_IMAGE','Image');
+//define('_SEND','Send');
+//define('_CANCEL','Cancel');
+//define('_ASCENDING','Ascending order');
+//define('_DESCENDING','Descending order');
+//define('_BACK','Back');
+//define('_NOTITLE','No title');
+//define('_NOCACHE','No Cache');
+//define('_CLONE','Clone');
+// %%%%% For xoopsform files %%%%%
+//define('_STARTSWITH','Starts with');
+//define('_ENDSWITH','Ends with');
+//define('_MATCHES','Matches');
+//define('_CONTAINS','Contains');
+//define('_REQUIRED','Required');
+// %%%%%% File Name commentform.php %%%%%
+//define('_REGISTER','Register');
+// %%%%%% File Name xoopscodes.php %%%%%
+//define('_SIZE','SIZE'); // font size
+//define('_FONT','FONT'); // font family
+//define('_COLOR','COLOR'); // font color
+//define('_EXAMPLE','SAMPLE');
+//define('_ENTERURL','Enter the URL of the link you want to add:');
+//define('_ENTERWEBTITLE','Enter the web site title:');
+//define('_ENTERIMGURL','Enter the URL of the image you want to add.');
+//define('_ENTERIMGPOS','Now, enter the position of the image.');
+//define('_IMGPOSRORL','\'R\' or \'r\' for right, \'L\' or \'l\' for left, or leave it blank.');
+//define('_ERRORIMGPOS','ERROR! Enter the position of the image.');
+//define('_ENTEREMAIL','Enter the email address you want to add.');
+//define('_ENTERCODE','Enter the codes that you want to add.');
+//define('_ENTERQUOTE','Enter the text that you want to be quoted.');
+//define('_ENTERTEXTBOX','Please input text into the textbox.');
+//define('_ALLOWEDCHAR','Allowed max chars length: ');
+//define('_CURRCHAR','Current chars length: ');
+//define('_PLZCOMPLETE','Please complete the subject and message fields.');
+//define('_MESSAGETOOLONG','Your message is too long.');
+/**
+* xoops smilie
+*/
+//define('_AM_ADDSMILE',' Add a new smilie');
+//define('_AM_SMILECODE','Code');
+//define('_AM_SMILEEMOTION','Description');
+//define('_AM_DISPLAYF','Display in the form');
+// %%%%% TIME FORMAT SETTINGS %%%%%
+//define('_SECOND','1 second');
+//define('_SECONDS','%s seconds');
+//define('_MINUTE','1 minute');
+//define('_MINUTES','%s minutes');
+//define('_HOUR','1 hour');
+//define('_HOURS','%s hours');
+//define('_DAY','1 day');
+//define('_DAYS','%s days');
+//define('_WEEK','1 week');
+//define('_MONTH','1 month');
+//define('_DATESTRING','Y/n/j G:i:s');
+//define('_MEDIUMDATESTRING','Y/n/j G:i');
+//define('_SHORTDATESTRING','Y/n/j');
+/**
+* The following characters are recognized in the format string:
+* a - 'am' or 'pm'
+* A - 'AM' or 'PM'
+* d - day of the month, 2 digits with leading zeros; i.e. '01' to '31'
+* D - day of the week, textual, 3 letters; i.e. 'Fri'
+* F - month, textual, long; i.e. 'January'
+* h - hour, 12-hour format; i.e. '01' to '12'
+* H - hour, 24-hour format; i.e. '00' to '23'
+* g - hour, 12-hour format without leading zeros; i.e. '1' to '12'
+* G - hour, 24-hour format without leading zeros; i.e. '0' to '23'
+* i - minutes; i.e. '00' to '59'
+* j - day of the month without leading zeros; i.e. '1' to '31'
+* l (lowercase 'L') - day of the week, textual, long; i.e. 'Friday'
+* L - boolean for whether it is a leap year; i.e. '0' or '1'
+* m - month; i.e. '01' to '12'
+* n - month without leading zeros; i.e. '1' to '12'
+* M - month, textual, 3 letters; i.e. 'Jan'
+* s - seconds; i.e. '00' to '59'
+* S - English ordinal suffix, textual, 2 characters; i.e. 'th','nd'
+* t - number of days in the given month; i.e. '28' to '31'
+* T - Timezone setting of this machine; i.e. 'MDT'
+* U - seconds since the epoch
+* w - day of the week, numeric, i.e. '0' (Sunday) to '6' (Saturday)
+* Y - year, 4 digits; i.e. '1999'
+* y - year, 2 digits; i.e. '99'
+* z - day of the year; i.e. '0' to '365'
+* Z - timezone offset in seconds (i.e. '-43200' to '43200')
+*/
+// %%%%% LANGUAGE SPECIFIC SETTINGS %%%%%
+//define('_CHARSET','UTF-8');
+//define('_LANGCODE','en_US');
+// change 0 to 1 if this language is a multi-bytes language
+//define('XOOPS_USE_MULTIBYTES','0');
+/**
+* Additions to 2.4.0
+**/
+//define('_RESET','Reset');
+//define('_RE','Re:');
+
+/**
+* Additions to 2.6.0
+**/
+//define('_FORM_VALID_URL','Starting with http or https');
+//define('_FORM_VALID_MAIL','Enter a valid email address');
+?>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php 2013-02-08 23:23:51 UTC (rev 11011)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php 2013-02-10 00:51:04 UTC (rev 11012)
@@ -1,193 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-//define('_PLEASEWAIT','Please Wait');
-//define('_FETCHING','Loading...');
-//define('_TAKINGBACK','Taking you back to where you were....');
-//define('_LOGOUT','Logout');
-//define('_SUBJECT','Subject');
-//define('_MESSAGEICON','Message Icon');
-//define('_COMMENTS','Comments');
-//define('_POSTANON','Post Anonymously');
-//define('_DISABLESMILEY','Disable smiley');
-//define('_DISABLEHTML','Disable html');
-//define('_PREVIEW','Preview');
-//define('_GO','Go!');
-//define('_NESTED','Nested');
-//define('_NOCOMMENTS','No Comments');
-//define('_FLAT','Flat');
-//define('_THREADED','Threaded');
-//define('_OLDESTFIRST','Oldest First');
-//define('_NEWESTFIRST','Newest First');
-//define('_MORE','more...');
-//define('_MULTIPAGE','To have your article span multiple pages, insert the word <font color=red>[pagebreak]</font> (with brackets) in the article.');
-//define('_IFNOTRELOAD','If the page does not automatically reload, please click <a href=\'%s\'>here</a>');
-// Error messages issued by XoopsObject::cleanVars()
-//define('_XOBJ_ERR_REQUIRED','%s is required');
-//define('_XOBJ_ERR_SHORTERTHAN','%s must be shorter than %d characters.');
-// %%%%%% File Name themeuserpost.php %%%%%
-//define('_PROFILE','Profile');
-//define('_POSTEDBY','Posted by');
-//define('_VISITWEBSITE','Visit Website');
-//define('_SENDPMTO','Send Private Message to %s');
-//define('_SENDEMAILTO','Send Email to %s');
-//define('_ADD','Add');
-//define('_REPLY','Reply');
-//define('_DATE','Date'); // Posted date
-// %%%%%% File Name admin_functions.php %%%%%
-//define('_MAIN','Main');
-//define('_MANUAL','Manual');
-//define('_INFO','Info');
-//define('_CPHOME','Control Panel Home');
-//define('_YOURHOME','Home Page');
-// %%%%%% File Name misc.php (who's-online popup) %%%%%
-//define('_WHOSONLINE','Who\'s Online');
-//define('_GUESTS','Guests');
-//define('_MEMBERS','Members');
-//define('_ONLINEPHRASE','<strong>%s</strong> user(s) are online');
-//define('_ONLINEPHRASEX','<strong>%s</strong> user(s) are browsing <strong>%s</strong>');
-//define('_CLOSE','Close'); // Close window
-// %%%%%% File Name module.textsanitizer.php %%%%%
-//define('_QUOTEC','Quote:');
-// %%%%%% File Name admin.php %%%%%
-//define('_NOPERM','Sorry, you don\'t have the permission to access this area.');
-// %%%%% Common Phrases %%%%%
-//define('_NO','No');
-//define('_YES','Yes');
-//define('_EDIT','Edit');
-//define('_DELETE','Delete');
-//define('_SUBMIT','Submit');
-//define('_MODULENOEXIST','Selected module does not exist!');
-//define('_ALIGN','Align');
-//define('_LEFT','Left');
-//define('_CENTER','Center');
-//define('_RIGHT','Right');
-//define('_FORM_ENTER','Please enter %s');
-//define('_MUSTWABLE','File %s must be writable by the server!'); // %s represents file name
-// Module info
-//define('_PREFERENCES','Preferences');
-//define('_VERSION','Version');
-//define('_DESCRIPTION','Description');
-//define('_AUTHOR','Author');
-//define('_CREDITS','Credits');
-//define('_LICENCE','Licence');
-//define('_ERRORS','Errors');
-//define('_NONE','None');
-//define('_ON','on');
-//define('_READS','reads');
-//define('_WELCOMETO','Welcome to %s');
-//define('_SEARCH','Search');
-//define('_ALL','All');
-//define('_TITLE','Title');
-//define('_OPTIONS','Options');
-//define('_QUOTE','Quote');
-//define('_LIST','List');
-//define('_LOGIN','User Login');
-//define('_USERNAME','Username: ');
-//define('_PASSWORD','Password: ');
-//define('_SELECT','Select');
-//define('_IMAGE','Image');
-//define('_SEND','Send');
-//define('_CANCEL','Cancel');
-//define('_ASCENDING','Ascending order');
-//define('_DESCENDING','Descending order');
-//define('_BACK','Back');
-//define('_NOTITLE','No title');
-//define('_NOCACHE','No Cache');
-//define('_CLONE','Clone');
-// %%%%% For xoopsform files %%%%%
-//define('_STARTSWITH','Starts with');
-//define('_ENDSWITH','Ends with');
-//define('_MATCHES','Matches');
-//define('_CONTAINS','Contains');
-//define('_REQUIRED','Required');
-// %%%%%% File Name commentform....
[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
\*======================================================================*/
- function submit($URI, $formvars="", $formfiles="")
- {
- unset($postdata);
+ function submit($URI, $formvars="", $formfiles="")
+ {
+ unset($postdata);
- $postdata = $this->_prepare_post_body($formvars, $formfiles);
+ $postdata = $this->_prepare_post_body($formvars, $formfiles);
- $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"] = '';
+ $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->_submit_method,$this->_submit_type,$postdata);
- }
- else
- {
- $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
- // no proxy, send only the path
- $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
- }
+ 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->_submit_method,$this->_submit_type,$postdata);
+ }
+ else
+ {
+ $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+ // no proxy, send only the path
+ $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
+ }
- $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)
- {
- if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
- $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+ if($this->_redirectaddr)
+ {
+ /* url was redirected, check if we've hit the max depth */
+ if($this->maxredirs > $this->_redirectdepth)
+ {
+ if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+ $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
- // 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;
- if( strpos( $this->_redirectaddr, "?" ) > 0 )
- $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
- else
- $this->submit($this->_redirectaddr,$formvars, $formfiles);
- }
- }
- }
+ // 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;
+ if( strpos( $this->_redirectaddr, "?" ) > 0 )
+ $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
+ else
+ $this->submit($this->_redirectaddr,$formvars, $formfiles);
+ }
+ }
+ }
- 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;
- }
- }
+ 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->_submit_method, $this->_submit_type, $postdata);
- }
- else
- {
- $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
- // no proxy, send only the path
- $this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata);
- }
+ }
+ 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->_submit_method, $this->_submit_type, $postdata);
+ }
+ else
+ {
+ $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+ // no proxy, send only the path
+ $this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata);
+ }
- if($this->_redirectaddr)
- {
- /* url was redirected, check if we've hit the max depth */
- if($this->maxredirs > $this->_redirectdepth)
- {
- if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
- $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+ if($this->_redirectaddr)
+ {
+ /* url was redirected, check if we've hit the max depth */
+ if($this->maxredirs > $this->_redirectdepth)
+ {
+ if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+ $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
- // 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;
- if( strpos( $this->_redirectaddr, "?" ) > 0 )
- $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
- else
- $this->submit($this->_redirectaddr,$formvars, $formfiles);
- }
- }
- }
+ // 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;
+ if( strpos( $this->_redirectaddr, "?" ) > 0 )
+ $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
+ else
+ $this->submit($this->_redirectaddr,$formvars, $formfiles);
+ }
+ }
+ }
- 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;
+ 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;
- }
+ default:
+ // not a valid protocol
+ $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+ return false;
+ break;
+ }
+ return true;
+ }
/*======================================================================*\
- Function: fetchlinks
- Purpose: fetch the links from a web page
- Input: $URI where you are fetching from
- Output: $this->results an array of the URLs
+ Function: fetchlinks
+ Purpose: fetch the links from a web page
+ Input: $URI where you are fetching from
+ Output: $this->results an array of the URLs
\*======================================================================*/
- function fetchlinks($URI)
- {
- if ($this->fetch($URI))
- {
- if($this->lastredirectaddr)
- $URI = $this->lastredirectaddr;
- if(is_array($this->results))
- {
- for($x=0;$x<count($this->results);$x++)
- $this->results[$x] = $this->_striplinks($this->results[$x]);
- }
- else
- $this->results = $this->_striplinks($this->results);
+ function fetchlinks($URI)
+ {
+ if ($this->fetch($URI))
+ {
+ if($this->lastredirectaddr)
+ $URI = $this->lastredirectaddr;
+ if(is_array($this->results))
+ {
+ for($x=0;$x<count($this->results);$x++)
+ $this->results[$x] = $this->_striplinks($this->results[$x]);
+ }
+ else
+ $this->results = $this->_striplinks($this->results);
- if($this->expandlinks)
- $this->results = $this->_expandlinks($this->results, $URI);
- return true;
- }
- else
- return false;
- }
+ if($this->expandlinks)
+ $this->results = $this->_expandlinks($this->results, $URI);
+ return true;
+ }
+ else
+ return false;
+ }
/*======================================================================*\
- Function: fetchform
- Purpose: fetch the form elements from a web page
- Input: $URI where you are fetching from
- Output: $this->results the resulting html form
+ Function: fetchform
+ Purpose: fetch the form elements from a web page
+ Input: $URI where you are fetching from
+ Output: $this->results the resulting html form
\*======================================================================*/
- function fetchform($URI)
- {
+ function fetchform($URI)
+ {
- if ($this->fetch($URI))
- {
+ if ($this->fetch($URI))
+ {
- if(is_array($this->results))
- {
- for($x=0;$x<count($this->results);$x++)
- $this->results[$x] = $this->_stripform($this->results[$x]);
- }
- else
- $this->results = $this->_stripform($this->results);
+ if(is_array($this->results))
+ {
+ for($x=0;$x<count($this->results);$x++)
+ $this->results[$x] = $this->_stripform($this->results[$x]);
+ }
+ else
+ $this->results = $this->_stripform($this->results);
- return true;
- }
- else
- return false;
- }
+ return true;
+ }
+ else
+ return false;
+ }
/*======================================================================*\
- Function: fetchtext
- Purpose: fetch the text from a web page, stripping the links
- Input: $URI where you are fetching from
- Output: $this->results the text from the web page
+ Function: fetchtext
+ Purpose: fetch the text from a web page, stripping the links
+ Input: $URI where you are fetching from
+ Output: $this->results the text from the web page
\*======================================================================*/
- function fetchtext($URI)
- {
- if($this->fetch($URI))
- {
- if(is_array($this->results))
- {
- for($x=0;$x<count($this->results);$x++)
- $this->results[$x] = $this->_striptext($this->results[$x]);
- }
- else
- $this->results = $this->_striptext($this->results);
- return true;
- }
- else
- return false;
- }
+ function fetchtext($URI)
+ {
+ if($this->fetch($URI))
+ {
+ if(is_array($this->results))
+ {
+ for($x=0;$x<count($this->results);$x++)
+ $this->results[$x] = $this->_striptext($this->results[$x]);
+ }
+ else
+ $this->results = $this->_striptext($this->results);
+ return true;
+ }
+ else
+ return false;
+ }
/*======================================================================*\
- Function: submitlinks
- Purpose: grab links from a form submission
- Input: $URI where you are submitting from
- Output: $this->results an array of the links from the post
+ Function: submitlinks
+ Purpose: grab links from a form submission
+ Input: $URI where you are submitting from
+ Output: $this->results an array of the links from the post
\*======================================================================*/
- function submitlinks($URI, $formvars="", $formfiles="")
- {
- if($this->submit($URI,$formvars, $formfiles))
- {
- if($this->lastredirectaddr)
- $URI = $this->lastredirectaddr;
- if(is_array($this->results))
- {
- for($x=0;$x<count($this->results);$x++)
- {
- $this->results[$x] = $this->_striplinks($this->results[$x]);
- if($this->expandlinks)
- $this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
- }
- }
- else
- {
- $this->results = $this->_striplinks($this->results);
- if($this->expandlinks)
- $this->results = $this->_expandlinks($this->results,$URI);
- }
- return true;
- }
- else
- return false;
- }
+ function submitlinks($URI, $formvars="", $formfiles="")
+ {
+ if($this->submit($URI,$formvars, $formfiles))
+ {
+ if($this->lastredirectaddr)
+ $URI = $this->lastredirectaddr;
+ if(is_array($this->results))
+ {
+ for($x=0;$x<count($this->results);$x++)
+ {
+ $this->results[$x] = $this->_striplinks($this->results[$x]);
+ if($this->expandlinks)
+ $this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+ }
+ }
+ else
+ {
+ $this->results = $this->_striplinks($this->results);
+ if($this->expandlinks)
+ $this->results = $this->_expandlinks($this->results,$URI);
+ }
+ return true;
+ }
+ else
+ return false;
+ }
/*======================================================================*\
- Function: submittext
- Purpose: grab text from a form submission
- Input: $URI where you are submitting from
- Output: $this->results the text from the web page
+ Function: submittext
+ Purpose: grab text from a form submission
+ Input: $URI where you are submitting from
+ Output: $this->results the text from the web page
\*======================================================================*/
- function submittext($URI, $formvars = "", $formfiles = "")
- {
- if($this->submit($URI,$formvars, $formfiles))
- {
- if($this->lastredirectaddr)
- $URI = $this->lastredirectaddr;
- if(is_array($this->results))
- {
- for($x=0;$x<count($this->results);$x++)
- {
- $this->results[$x] = $this->_striptext($this->results[$x]);
- if($this->expandlinks)
- $this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
- }
- }
- else
- {
- $this->results = $this->_striptext($this->results);
- if($this->expandlinks)
- $this->results = $this->_expandlinks($this->results,$URI);
- }
- return true;
- }
- else
- return false;
- }
+ function submittext($URI, $formvars = "", $formfiles = "")
+ {
+ if($this->submit($URI,$formvars, $formfiles))
+ {
+ if($this->lastredirectaddr)
+ $URI = $this->lastredirectaddr;
+ if(is_array($this->results))
+ {
+ for($x=0;$x<count($this->results);$x++)
+ {
+ $this->results[$x] = $this->_striptext($this->results[$x]);
+ if($this->expandlinks)
+ $this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+ }
+ }
+ else
+ {
+ $this->results = $this->_striptext($this->results);
+ if($this->expandlinks)
+ $this->results = $this->_expandlinks($this->results,$URI);
+ }
+ return true;
+ }
+ else
+ return false;
+ }
/*======================================================================*\
- Function: set_submit_multipart
- Purpose: Set the form submission content type to
- multipart/form-data
+ Function: set_submit_multipart
+ Purpose: Set the form submission content type to
+ multipart/form-data
\*======================================================================*/
- function set_submit_multipart()
- {
- $this->_submit_type = "multipart/form-data";
- }
+ function set_submit_multipart()
+ {
+ $this->_submit_type = "multipart/form-data";
+ }
/*======================================================================*\
- Function: set_submit_normal
- Purpose: Set the form submission content type to
- application/x-www-form-urlencoded
+ Function: set_submit_normal
+ Purpose: Set the form submission content type to
+ application/x-www-form-urlencoded
\*======================================================================*/
- function set_submit_normal()
- {
- $this->_submit_type = "application/x-www-form-urlencoded";
- }
+ function set_submit_normal()
+ {
+ $this->_submit_type = "application/x-www-form-urlencoded";
+ }
/*======================================================================*\
- Private functions
+ Private functions
\*======================================================================*/
/*======================================================================*\
- Function: _striplinks
- Purpose: strip the hyperlinks from an html document
- Input: $document document to strip.
- Output: $match an array of the links
+ Function: _striplinks
+ Purpose: strip the hyperlinks from an html document
+ Input: $document document to strip.
+ Output: $match an array of the links
\*======================================================================*/
- function _striplinks($document)
- {
- preg_match_all("'<\s*a\s.*?href\s*=\s* # find <a href=
- ([\"\'])? # find single or double quote
- (?(1) (.*?)\\1 | ([^\s\>]+)) # if quote found, match up to next matching
- # quote, otherwise match up to next space
- 'isx",$document,$links);
+ function _striplinks($document)
+ {
+ preg_match_all("'<\s*a\s.*?href\s*=\s* # find <a href=
+ ([\"\'])? # find single or double quote
+ (?(1) (.*?)\\1 | ([^\s\>]+)) # if quote found, match up to next matching
+ # quote, otherwise match up to next space
+ 'isx",$document,$links);
- // catenate the non-empty matches from the conditional subpattern
+ // catenate the non-empty matches from the conditional subpattern
- while(list($key,$val) = each($links[2]))
- {
- if(!empty($val))
- $match[] = $val;
- }
+ while(list($key,$val) = each($links[2]))
+ {
+ if(!empty($val))
+ $match[] = $val;
+ }
- while(list($key,$val) = each($links[3]))
- {
- if(!empty($val))
- $match[] = $val;
- }
+ while(list($key,$val) = each($links[3]))
+ {
+ if(!empty($val))
+ $match[] = $val;
+ }
- // return the links
- return $match;
- }
+ // return the links
+ return $match;
+ }
/*======================================================================*\
- Function: _stripform
- Purpose: strip the form elements from an html document
- Input: $document document to strip.
- Output: $match an array of the links
+ Function: _stripform
+ Purpose: strip the form elements from an html document
+ Input: $document document to strip.
+ Output: $match an array of the links
\*======================================================================*/
- function _stripform($document)
- {
- preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+ function _stripform($document)
+ {
+ preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
- // catenate the matches
- $match = implode("\r\n",$elements[0]);
+ // catenate the matches
+ $match = implode("\r\n",$elements[0]);
- // return the links
- return $match;
- }
+ // return the links
+ return $match;
+ }
/*======================================================================*\
- Function: _striptext
- Purpose: strip the text from an html document
- Input: $document document to strip.
- Output: $text the resulting text
+ Function: _striptext
+ Purpose: strip the text from an html document
+ Input: $document document to strip.
+ Output: $text the resulting text
\*======================================================================*/
- function _striptext($document)
- {
+ function _striptext($document)
+ {
- // I didn't use preg eval (//e) since that is only available in PHP 4.0.
- // so, list your entities one by one here. I included some of the
- // more common ones.
+ // I didn't use preg eval (//e) since that is only available in PHP 4.0.
+ // so, list your entities one by one here. I included some of the
+ // more common ones.
- $search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
- "'<[\/\!]*?[^<>]*?>'si", // strip out html tags
- "'([\r\n])[\s]+'", // strip out white space
- "'&(quot|#34|#034|#x22);'i", // replace html entities
- "'&(amp|#38|#038|#x26);'i", // added hexadecimal values
- "'&(lt|#60|#060|#x3c);'i",
- "'&(gt|#62|#062|#x3e);'i",
- "'&(nbsp|#160|#xa0);'i",
- "'&(iexcl|#161);'i",
- "'&(cent|#162);'i",
- "'&(pound|#163);'i",
- "'&(copy|#169);'i",
- "'&(reg|#174);'i",
- "'&(deg|#176);'i",
- "'&(#39|#039|#x27);'",
- "'&(euro|#8364);'i", // europe
- "'&a(uml|UML);'", // german
- "'&o(uml|UML);'",
- "'&u(uml|UML);'",
- "'&A(uml|UML);'",
- "'&O(uml|UML);'",
- "'&U(uml|UML);'",
- "'ß'i",
- );
- $replace = array( "",
- "",
- "\\1",
- "\"",
- "&",
- "<",
- ">",
- " ",
- chr(161),
- chr(162),
- chr(163),
- chr(169),
- chr(174),
- chr(176),
- chr(39),
- chr(128),
- "\xE4",
- "\xF6",
- "\xFC",
- "\xC4",
- "\xD6",
- "\xDC",
- "\xDF",
- );
+ $search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+ "'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+ "'([\r\n])[\s]+'", // strip out white space
+ "'&(quot|#34|#034|#x22);'i", // replace html entities
+ "'&(amp|#38|#038|#x26);'i", // added hexadecimal values
+ "'&(lt|#60|#060|#x3c);'i",
+ "'&(gt|#62|#062|#x3e);'i",
+ "'&(nbsp|#160|#xa0);'i",
+ "'&(iexcl|#161);'i",
+ "'&(cent|#162);'i",
+ "'&(pound|#163);'i",
+ "'&(copy|#169);'i",
+ "'&(reg|#174);'i",
+ "'&(deg|#176);'i",
+ "'&(#39|#039|#x27);'",
+ "'&(euro|#8364);'i", // europe
+ "'&a(uml|UML);'", // german
+ "'&o(uml|UML);'",
+ "'&u(uml|UML);'",
+ "'&A(uml|UML);'",
+ "'&O(uml|UML);'",
+ "'&U(uml|UML);'",
+ "'ß'i",
+ );
+ $replace = array( "",
+ "",
+ "\\1",
+ "\"",
+ "&",
+ "<",
+ ">",
+ " ",
+ chr(161),
+ chr(162),
+ chr(163),
+ chr(169),
+ chr(174),
+ chr(176),
+ chr(39),
+ chr(128),
+ "\xE4",
+ "\xF6",
+ "\xFC",
+ "\xC4",
+ "\xD6",
+ "\xDC",
+ "\xDF",
+ );
- $text = preg_replace($search,$replace,$document);
+ $text = preg_replace($search,$replace,$document);
- return $text;
- }
+ return $text;
+ }
/*======================================================================*\
- Function: _expandlinks
- Purpose: expand each link into a fully qualified URL
- Input: $links the links to qualify
- $URI the full URI to get the base from
- Output: $expandedLinks the expanded links
+ Function: _expandlinks
+ Purpose: expand each link into a fully qualified URL
+ Input: $links the links to qualify
+ $URI the full URI to get the base from
+ Output: $expandedLinks the expanded links
\*======================================================================*/
- function _expandlinks($links,$URI)
- {
+ function _expandlinks($links,$URI)
+ {
- preg_match("/^[^\?]+/",$URI,$match);
+ preg_match("/^[^\?]+/",$URI,$...
[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 $start
+ * perform a query on the database
*
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ *
+ * @return bool|resource query result or FALSE if successful
+ * or TRUE if successful and no result
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function queryF($sql, $limit = 0, $start = 0);
+ abstract public function queryF($sql, $limit = 0, $start = 0);
/**
- * @param $sql
- * @param int $limit
- * @param int $start
+ * perform a query
*
+ * This method is empty and does nothing! It should therefore only be
+ * used if nothing is exactly what you want done! ;-)
+ *
+ * @param string $sql a valid MySQL query
+ * @param int $limit number of records to return
+ * @param int $start offset of first record to return
+ *
+ * @return this returns nothing
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function query($sql, $limit = 0, $start = 0);
+ abstract public function query($sql, $limit = 0, $start = 0);
/**
- * @param $file
+ * 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
+ * @deprecated since version 2.6.0 - alpha 3
* @abstract
*/
- abstract function queryFromFile($file);
+ abstract public function queryFromFile($file);
/**
- * @param $result
- * @param $offset
+ * Get field name
*
+ * @param resource $result query result
+ * @param int $offset numerical field index
+ *
+ * @return string
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function getFieldName($result, $offset);
+ abstract public function getFieldName($result, $offset);
/**
- * @param $result
- * @param $offset
+ * Get field type
*
+ * @param resource $result query result
+ * @param int $offset numerical field index
+ *
+ * @return string
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function getFieldType($result, $offset);
+ abstract public function getFieldType($result, $offset);
/**
- * @param $result
+ * Get number of fields in result
*
+ * @param resource $result query result
+ *
+ * @return int
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
* @abstract
*/
- abstract function getFieldsNum($result);
-}
\ No newline at end of file
+ abstract public function getFieldsNum($result);
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/databasefactory.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/databasefactory.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -1,26 +1,30 @@
<?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.
-*/
+ 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.
+ */
/**
- * Factory Class for XOOPS Database
+ * XoopsDatabaseFactory 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)
- * @package class
- * @subpackage database
- * @version $Id$
+ * PHP version 5.3
+ *
+ * @category Xoops\Class\Database\Databasefactory
+ * @package DatabaseFactory
+ * @author Kazumi Ono <on...@xo...>
+ * @author readheadedrod <red...@ho...>
+ * @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
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
class XoopsDatabaseFactory
{
@@ -30,33 +34,55 @@
* if the class has not been instantiated yet, this will also take
* care of that
*
+ * NOTE: Persistance connection is not included. XOOPS_DB_PCONNECT is ignored.
+ * allowWebChanges also needs to be addressed
+ *
* @static
* @staticvar XoopsDatabase The only instance of database class
+ *
* @return XoopsDatabase Reference to the only instance of database class
*/
- static function getDatabaseConnection()
+ public static function getDatabaseConnection()
{
+ global $xoopsDB;
static $instance;
if (!isset($instance)) {
- if (XoopsLoad::fileExists($file = XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php')) {
- require_once $file;
-
+ //New database connector
+ $config = new \Doctrine\DBAL\Configuration();
+ $connectionParams = array(
+ 'dbname' => XOOPS_DB_NAME,
+ 'user' => XOOPS_DB_USER,
+ 'password' => XOOPS_DB_PASS,
+ 'host' => XOOPS_DB_HOST,
+// 'port' => '',
+// 'unix_socket' => '',
+ 'charset' => XOOPS_DB_CHARSET,
+ 'driver' => 'pdo_mysql',
+ 'wrapperClass' => 'XoopsConnection',
+// 'driverOptions' => array('')
+ );
+ $instance
+ = \Doctrine\DBAL\DriverManager::getConnection(
+ $connectionParams,
+ $config
+ );
+ // Legacy support
+ if (isset($instance)) {
+ include_once XOOPS_ROOT_PATH . '/class/database/mysqldatabase.php';
if (!defined('XOOPS_DB_PROXY')) {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseSafe';
} else {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
}
-
$xoopsPreload = XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.class.database.databasefactory.connection', array(&$class));
- /* @var $instance XoopsDatabase */
- $instance = new $class();
- $instance->setPrefix(XOOPS_DB_PREFIX);
- if (!$instance->connect()) {
- trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
- }
+ $xoopsDB = new $class();
+ $xoopsDB->setPrefix(XOOPS_DB_PREFIX);
+ $xoopsDB->conn = $instance;
} else {
- trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+ $xoopsDB = null;
+ $xoopsPreload = XoopsPreload::getInstance();
+ $xoopsPreload->trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
}
}
return $instance;
@@ -68,13 +94,18 @@
*
* @static
* @staticvar XoopsDatabase The only instance of database class
+ *
* @return XoopsDatabase Reference to the only instance of database class
+ * @depreciated do not use for anything. Will be removed when dependencies are removed from installer.
*/
- static function getDatabase()
+ public static function getDatabase()
{
static $database;
if (!isset($database)) {
- if (XoopsLoad::fileExists($file = XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php')) {
+ if (XoopsLoad::fileExists(
+ $file = XOOPS_ROOT_PATH . '/class/database/'
+ . XOOPS_DB_TYPE . 'database.php'
+ )) {
include_once $file;
if (!defined('XOOPS_DB_PROXY')) {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseSafe';
@@ -84,9 +115,9 @@
unset($database);
$database = new $class();
} else {
- trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+ trigger_error('notrace:Database Failed in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
}
}
return $database;
}
-}
\ No newline at end of file
+}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/manager.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/manager.php 2013-08-27 22:17:02 UTC (rev 11987)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/database/manager.php 2013-08-28 02:02:20 UTC (rev 11988)
@@ -1,340 +1,381 @@
-<?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.
-*/
-
-/**
- * Database manager for XOOPS
- *
- * @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 2.6.0
- * @author Haruki Setoyama <ha...@pl...>
- * @version $Id$
- */
-
-class XoopsDatabaseManager
-{
- /**
- * @var array
- */
- private $s_tables = array();
-
- /**
- * @var array
- */
- private $f_tables = array();
-
- /**
- * @var XoopsDatabase
- */
- public $db;
-
- /**
- * @var array
- */
- public $successStrings = array();
-
- /**
- * @var array
- */
- public $failureStrings = array();
-
- /**
- *
- */
- public function __construct()
- {
- $xoops = Xoops::getInstance();
- $this->db = $xoops->db();
- $this->db->setPrefix(XOOPS_DB_PREFIX);
- $this->successStrings = array(
- 'create' => XoopsLocale::SF_TABLE_CREATED,
- 'insert' => XoopsLocale::SF_ENTRIES_INSERTED_TO_TABLE,
- 'alter' => XoopsLocale::SF_TABLE_UPDATED,
- 'drop' => XoopsLocale::SF_TABLE_DROPPED,
- );
- $this->failureStrings = array(
- 'create' => XoopsLocale::EF_TABLE_NOT_CREATED,
- 'insert' => XoopsLocale::EF_ENTRIES_NOT_INSERTED_TO_TABLE,
- 'alter' => XoopsLocale::EF_TABLE_NOT_UPDATED,
- 'drop' => XoopsLocale::EF_TABLE_NOT_DROPPED,
- );
- }
-
- /**
- * @return bool
- */
- public function isConnectable()
- {
- return ($this->db->connect(false) != false) ? true : false;
- }
-
- /**
- * @return bool
- */
- public function dbExists()
- {
- return ($this->db->connect() != false) ? true : false;
- }
-
- /**
- * @return bool
- */
- public function createDB()
- {
- $this->db->connect(false);
-
- $result = $this->db->query("CREATE DATABASE " . XOOPS_DB_NAME);
-
- return ($result != false) ? true : false;
- }
-
- /**
- * @param string $sql_file_path
- * @param bool $force
- *
- * @return bool
- */
- public function queryFromFile($sql_file_path, $force = false)
- {
- if (!XoopsLoad::fileExists($sql_file_path)) {
- return false;
- }
- $queryFunc = (bool)$force ? "queryF" : "query";
- $sql_query = trim(fread(fopen($sql_file_path, 'r'), filesize($sql_file_path)));
- SqlUtility::splitMySqlFile($pieces, $sql_query);
- $this->db->connect();
- foreach ($pieces as $piece) {
- $piece = trim($piece);
- // [0] contains the prefixed query
- // [4] contains unprefixed table name
- $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
- if ($prefixed_query != false) {
- $table = $this->db->prefix($prefixed_query[4]);
- if ($prefixed_query[1] == 'CREATE TABLE') {
- if ($this->db->$queryFunc($prefixed_query[0]) != false) {
- if (!isset($this->s_tables['create'][$table])) {
- $this->s_tables['create'][$table] = 1;
- }
- } else {
- if (!isset($this->f_tables['create'][$table])) {
- $this->f_tables['create'][$table] = 1;
- }
- }
- } else {
- if ($prefixed_query[1] == 'INSERT INTO') {
- if ($this->db->$queryFunc($prefixed_query[0]) != false) {
- if (!isset($this->s_tables['insert'][$table])) {
- $this->s_tables['insert'][$table] = 1;
- } else {
- $this->s_tables['insert'][$table]++;
- }
- } else {
- if (!isset($this->f_tables['insert'][$table])) {
- $this->f_tables['insert'][$table] = 1;
- } else {
- $this->f_tables['insert'][$table]++;
- }
- }
- } else {
- if ($prefixed_query[1] == 'ALTER TABLE') {
- if ($this->db->$queryFunc($prefixed_query[0]) != false) {
- if (!isset($this->s_tables['alter'][$table])) {
- $this->s_tables['alter'][$table] = 1;
- }
- } else {
- if (!isset($this->s_tables['alter'][$table])) {
- $this->f_tables['alter'][$table] = 1;
- }
- }
- } else {
- if ($prefixed_query[1] == 'DROP TABLE') {
- if ($this->db->$queryFunc('DROP TABLE ' . $table) != false) {
- if (!isset($this->s_tables['drop'][$table])) {
- $this->s_tables['drop'][$table] = 1;
- }
- } else {
- if (!isset($this->s_tables['drop'][$table])) {
- $this->f_tables['drop'][$table] = 1;
- }
- }
- }
- }
- }
- }
- }
- }
- return true;
- }
-
- /**
- * @return string
- */
- public function report()
- {
- $commands = array('create', 'insert', 'alter', 'drop');
- $content = '<ul class="log">';
- foreach ($commands as $cmd) {
- if (!@empty($this->s_tables[$cmd])) {
- foreach ($this->s_tables[$cmd] as $key => $val) {
- $content .= '<li class="success">';
- $content .= ($cmd != 'insert') ? sprintf($this->successStrings[$cmd], $key) : sprintf($this->successStrings[$cmd], $val, $key);
- $content .= "</li>\n";
- }
- }
- }
- foreach ($commands as $cmd) {
- if (!@empty($this->f_tables[$cmd])) {
- foreach ($this->f_tables[$cmd] as $key => $val) {
- $content .= '<li class="failure">';
- $content .= ($cmd != 'insert') ? sprintf($this->failureStrings[$cmd], $key) : sprintf($this->failureStrings[$cmd], $val, $key);
- $content .= "</li>\n";
- }
- }
- }
- $content .= '</ul>';
- return $content;
- }
-
- /**
- * @param string $sql
- *
- * @return mixed
- */
- public function query($sql)
- {
- $this->db->connect();
- return $this->db->query($sql);
- }
-
- /**
- * @param $table
- *
- * @return string
- */
- public function prefix($table)
- {
- $this->db->connect();
- return $this->db->prefix($table);
- }
-
- /**
- * @param $ret
- *
- * @return array
- */
- public function fetchArray($ret)
- {
- $this->db->connect();
- return $this->db->fetchArray($ret);
- }
-
- /**
- * @param $table
- * @param $query
- *
- * @return bool|void
- */
- public function insert($table, $query)
- {
- $this->db->connect();
- $table = $this->db->prefix($table);
- $query = 'INSERT INTO ' . $table . ' ' . $query;
- if (!$this->db->queryF($query)) {
- if (!isset($this->f_tables['insert'][$table])) {
- $this->f_tables['insert'][$table] = 1;
- } else {
- $this->f_tables['insert'][$table]++;
- }
- return false;
- } else {
- if (!isset($this->s_tables['insert'][$table])) {
- $this->s_tables['insert'][$table] = 1;
- } else {
- $this->s_tables['insert'][$table]++;
- }
- return $this->db->getInsertId();
- }
- }
-
- /**
- * @return bool
- */
- public function isError()
- {
- return (isset($this->f_tables)) ? true : false;
- }
-
- /**
- * @param $tables
- *
- * @return array
- */
- public function deleteTables($tables)
- {
- $deleted = array();
- $this->db->connect();
- foreach ($tables as $key => $val) {
- if (!$this->db->query("DROP TABLE " . $this->db->prefix($key))) {
- $deleted[] = $val;
- }
- }
- return $deleted;
- }
-
- /**
- * @param $table
- *
- * @return bool
- */
- public function tableExists($table)
- {
- $table = trim($table);
- $ret = false;
- if ($table != '') {
- $this->db->connect();
- $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix($table);
- $ret = (false != $this->db->query($sql)) ? true : false;
- }
- return $ret;
- }
-
- /**
- * This method allows to copy fields from one table to another
- *
- * @param array $fieldsMap Map of the fields
- * ex: array('oldfieldname' => 'newfieldname');
- * @param string $oTableName Old Table
- * @param string $nTableName New Table
- * @param bool $dropTable Drop old Table
- */
- public function copyFields($fieldsMap, $oTableName, $nTableName, $dropTable = false)
- {
- $sql = "SHOW COLUMNS FROM " . $this->db->prefix($oTableName);
- $result = $this->db->queryF($sql);
- if (($rows = $this->db->getRowsNum($result)) == count($fieldsMap)) {
- $sql = "SELECT * FROM " . $this->db->prefix($oTableName);
- $result = $this->db->queryF($sql);
- while ($myrow = $this->db->fetchArray($result)) {
- ksort($fieldsMap);
- ksort($myrow);
- $sql = "INSERT INTO `" . $this->db->prefix($nTableName) . "` " . "(`" . implode("`,`", $fieldsMap) . "`)" . " VALUES ('" . implode("','", $myrow) . "')";
-
- $this->db->queryF($sql);
- }
- if ($dropTable) {
- $sql = "DROP TABLE " . $this->db->prefix($oTableName);
- $this->db->queryF($sql);
- }
- }
- }
-}
\ No newline at end of file
+<?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.
+ */
+
+/**
+ * Database manager for XOOPS
+ *
+ * PHP version 5.3
+ *
+ * @category Xoops\Class\Database\Manager
+ * @package Manager
+ * @author Haruki Setoyama <ha...@pl...>
+ * @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 XoopsDatabaseManager
+{
+ /**
+ * @var array
+ */
+ private $s_tables = array();
+
+ /**
+ * @var array
+ */
+ private $f_tables = array();
+
+ /**
+ * @var XoopsDatabase
+ */
+ public $db;
+
+ /**
+ * @var array
+ */
+ public $successStrings = array();
+
+ /**
+ * @var array
+ */
+ public $failureStrings = array();
+
+ /**
+ *Construct declaration
+ */
+ public function __construct()
+ {
+ $xoops = Xoops::getInstance();
+ $xoops->db();
+ global $xoopsDB;
+ $this->db = $xoopsDB;
+ $this->db->setPrefix(XOOPS_DB_PREFIX);
+ $this->successStrings = array(
+ 'create' => XoopsLocale::SF_TABLE_CREATED,
+ 'insert' => XoopsLocale::SF_ENTRIES_INSERTED_TO_TABLE,
+ 'alter' => XoopsLocale::SF_TABLE_UPDATED,
+ 'drop' => XoopsLocale::SF_TABLE_DROPPED,
+ );
+ $this->failureStrings = array(
+ 'create' => XoopsLocale::EF_TABLE_NOT_CREATED,
+ 'insert' => XoopsLocale::EF_ENTRIES_NOT_INSERTED_TO_TABLE,
+ 'alter' => XoopsLocale::EF_TABLE_NOT_UPDATED,
+ 'drop' => XoopsLocale::EF_TABLE_NOT_DROPPED,
+ );
+ }
+
+ /**
+ * Is the database connectable?
+ *
+ * @return bool is it connectable?
+ */
+ public function isConnectable()
+ {
+ return ($this->db->connect(false) != false) ? true : false;
+ }
+
+ /**
+ * Checks if a database exists
+ *
+ * @return bool returns if exists
+ */
+ public function dbExists()
+ {
+ return ($this->db->connect() != false) ? true : false;
+ }
+
+ /**
+ * creates a database table
+ *
+ * @return bool return if successful
+ */
+ public function createDB()
+ {
+ $this->db->connect(false);
+
+ $result = $this->db->query("CREATE DATABASE " . XOOPS_DB_NAME);
+
+ return ($result != false) ? true : false;
+ }
+
+ /**
+ * Loads a query from a file
+ *
+ * @param string $sql_file_path name of file to read
+ * @param bool $force weither to force the query or not
+ *
+ * @return bool
+ */
+ public function queryFromFile($sql_file_path, $force = false)
+ {
+ if (!XoopsLoad::fileExists($sql_file_path)) {
+ return false;
+ }
+ $queryFunc = (bool)$force ? "queryF" : "query";
+ $sql_query = trim(fread(fopen($sql_file_path, 'r'), filesize($sql_file_path)));
+ SqlUtility::splitMySqlFile($pieces, $sql_query);
+ $this->db->connect();
+ foreach ($pieces as $piece) {
+ $piece = trim($piece);
+ // [0] contains the prefixed query
+ // [4] contains unprefixed table name
+ $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
+ if ($prefixed_query != false) {
+ $table = $this->db->prefix($prefixed_query[4]);
+ if ($prefixed_query[1] == 'CREATE TABLE') {
+ if ($this->db->$queryFunc($prefixed_query[0]) != false) {
+ if (!isset($this->s_tables['create'][$table])) {
+ $this->s_tables['create'][$table] = 1;
+ }
+ } else {
+ if (!isset($this->f_tables['create'][$table])) {
+ $this->f_tables['create'][$table] = 1;
+ }
+ }
+ } else {
+ if ($prefixed_query[1] == 'INSERT INTO') {
+ if ($this->db->$queryFunc($prefixed_query[0]) != false) {
+ if (!isset($this->s_tables['insert'][$table])) {
+ $this->s_tables['insert'][$table] = 1;
+ } else {
+ $this->s_tables['insert'][$table]++;
+ }
+ } else {
+ if (!isset($this->f_tables['insert'][$table])) {
+ $this->f_tables['insert'][$table] = 1;
+ } else {
+ $this->f_tables['insert'][$table]++;
+ }
+ }
+ } else {
+ if ($prefixed_query[1] == 'ALTER TABLE') {
+ if ($this->db->$queryFunc($prefixed_query[0]) != false) {
+ if (!isset($this->s_tables['alter'][$table])) {
+ $this->s_tables['alter'][$table] = 1;
+ }
+ } else {
+ if (!isset($this->s_tables['alter'][$table])) {
+ $this->f_tables['alter'][$table] = 1;
+ }
+ }
+ } else {
+ if ($prefixed_query[1] == 'DROP TABLE') {
+ if ($this->db->$queryFunc('DROP TABLE ' . $table) != false) {
+ if (!isset($this->s_tables['drop'][$table])) {
+ $this->s_tables['drop'][$table] = 1;
+ }
+ } else {
+ if (!isset($this->s_tables['drop'][$table])) {
+ $this->f_tables['drop'][$table] = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * returns a report
+ *
+ * @return string
+ */
+ public function report()
+ {
+ $commands = array('create', 'insert', 'alter', 'drop');
+ $content = '<ul class="log">';
+ foreach ($commands as $cmd) {
+ if (!@empty($this->s_tables[$cmd])) {
+ foreach ($this->s_tables[$cmd] as $key => $val) {
+ $content .= '<li class="success">';
+ $content .= ($cmd != 'insert')
+ ? sprintf($this->successStrings[$cmd], $key)
+ : sprintf($this->successStrings[$cmd], $val, $key);
+ $content .= "</li>\n";
+ }
+ }
+ }
+ foreach ($commands as $cmd) {
+ if (!@empty($this->f_tables[$cmd])) {
+ foreach ($this->f_tables[$cmd] as $key => $val) {
+ $content .= '<li class="failure">';
+ $content .= ($cmd != 'insert')
+ ? sprintf($this->failureStrings[$cmd], $key)
+ : sprintf($this->failureStrings[$cmd], $val, $key);
+ $content .= "</li>\n";
+ }
+ }
+ }
+ $content .= '</ul>';
+ return $content;
+ }
+
+ /**
+ * runs a query
+ *
+ * @param string $sql sql statement to perform
+ *
+ * @return mixed
+ */
+ public function query($sql)
+ {
+ $this->db->connect();
+ return $this->db->query($sql);
+ }
+
+ /**
+ * Setup prefix table
+ *
+ * @param string $table table to prefix
+ *
+ * @return string prefixed table
+ */
+ public function prefix($table)
+ {
+ $this->db->connect();
+ return $this->db->prefix($table);
+ }
+
+ /**
+ * fetches an array
+ *
+ * @param string $ret resource that was returned from query
+ *
+ * @return array returns the array
+ */
+ public function fetchArray($ret)
+ {
+ $this->db->connect();
+ return $this->db->fetchArray($ret);
+ }
+
+ /**
+ * Inserts into a table
+ *
+ * @param string $table table to insert into
+ * @param string $query query to use to insert
+ *
+ * @return bool|void
+ */
+ public function insert($table, $query)
+ {
+ $this->db->connect();
+ $table = $this->db->prefix($table);
+ $query = 'INSERT INTO ' . $table . ' ' . $query;
+ if (!$this->db->qu...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X