Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2013-05-08 08:43:02
|
Revision: 11516
http://sourceforge.net/p/xoops/svn/11516
Author: beckmi
Date: 2013-05-08 08:42:52 +0000 (Wed, 08 May 2013)
Log Message:
-----------
ID: 1269 Block template file will not get updated after module update (Irmtfan)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
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/tplsets/jquery.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 2013-05-08 08:07:58 UTC (rev 11515)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-05-08 08:42:52 UTC (rev 11516)
@@ -1,6 +1,12 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
===============================
+2013/05/08: Version 2.5.7 Beta 1
+===============================
+Bugfixes:
+- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+
+===============================
2013/04/21: Version 2.5.6 Final
===============================
Bugfixes:
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php 2013-05-08 08:07:58 UTC (rev 11515)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php 2013-05-08 08:42:52 UTC (rev 11516)
@@ -30,6 +30,6 @@
/**
* Define XOOPS version
*/
-define('XOOPS_VERSION', 'XOOPS 2.5.6');
+define('XOOPS_VERSION', 'XOOPS 2.5.7 Beta 1');
?>
\ No newline at end of file
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 2013-05-08 08:07:58 UTC (rev 11515)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-05-08 08:42:52 UTC (rev 11516)
@@ -612,6 +612,7 @@
$tplfile_new->setVar('tpl_desc', $block['description'], true);
$tplfile_new->setVar('tpl_lastmodified', time());
$tplfile_new->setVar('tpl_lastimported', 0);
+ $tplfile_new->setVar('tpl_file', $block['template'], true); // irmtfan bug fix: block template file will not updated after update the module
if (!$tplfile_handler->insert($tplfile_new)) {
$msgs[] = ' <span style="color:#ff0000;">'.sprintf(_AM_SYSTEM_MODULES_TEMPLATE_UPDATE_ERROR, "<strong>".$block['template']."</strong>").'</span>';
} else {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-05-08 08:07:58 UTC (rev 11515)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-05-08 08:42:52 UTC (rev 11516)
@@ -38,7 +38,7 @@
@$op = "default";
}
-$GLOBAL['xoopsLogger']->usePopup = true;
+$GLOBALS['xoopsLogger']->usePopup = true;
switch ($op) {
// Display tree folder
|
|
From: <be...@us...> - 2013-05-16 09:42:17
|
Revision: 11551
http://sourceforge.net/p/xoops/svn/11551
Author: beckmi
Date: 2013-05-16 09:42:13 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Fixing admin theme color switch issue
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/themes/default/js/styleswitch.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/tooltip.js
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 2013-05-16 05:22:22 UTC (rev 11550)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-05-16 09:42:13 UTC (rev 11551)
@@ -4,7 +4,9 @@
2013/05/08: Version 2.5.7 Beta 1
===============================
Bugfixes:
-- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
+- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/styleswitch.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/styleswitch.js 2013-05-16 05:22:22 UTC (rev 11550)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/styleswitch.js 2013-05-16 09:42:13 UTC (rev 11551)
@@ -32,7 +32,7 @@
function switchStylestyle(styleName)
{
- $('link[@rel*=style][title]').each(function(i)
+ $('link[rel*=style][title]').each(function(i)
{
this.disabled = true;
if (this.getAttribute('title') == 'Style sheet') this.disabled = false;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/tooltip.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/tooltip.js 2013-05-16 05:22:22 UTC (rev 11550)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/js/tooltip.js 2013-05-16 09:42:13 UTC (rev 11551)
@@ -1,4 +1,3 @@
-( function($) {
/*
* Tooltip script
* powered by jQuery (http://www.jquery.com)
@@ -61,5 +60,4 @@
// starting the script on page load
$(document).ready(function(){
tooltip();
-});
});
\ No newline at end of file
|
|
From: <be...@us...> - 2013-06-30 08:00:23
|
Revision: 11800
http://sourceforge.net/p/xoops/svn/11800
Author: beckmi
Date: 2013-06-30 08:00:14 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
added check for menu link description in ModuleAdmin, fixed wrong return icon in Smarty xoModuleIcons32
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.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 2013-06-29 15:46:07 UTC (rev 11799)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-06-30 08:00:14 UTC (rev 11800)
@@ -9,6 +9,8 @@
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
- added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
- fixing errors in upgrade from 2.4.0 to 2.4.1 (mamba,voltan)
+- added check for menu link description in ModuleAdmin
+- fixed wrong return icon in Smarty xoModuleIcons32
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php 2013-06-29 15:46:07 UTC (rev 11799)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php 2013-06-30 08:00:14 UTC (rev 11800)
@@ -11,29 +11,28 @@
/**
* xoModuleIcons32 Smarty compiler plug-in
*
- * @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Andricq Nicolas (AKA MusS)
- * @since 2.5.2
- * @version $Id$
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Andricq Nicolas (AKA MusS)
+ * @since 2.5.2
+ * @version $Id$
*/
function smarty_compiler_xoModuleIcons32($argStr, &$smarty)
{
global $xoops, $xoTheme;
-
- $icons = xoops_getModuleOption('typeicons', 'system');
- if ( $icons == '' ) $icons = 'default';
-
- if ( file_exists( $xoops->path('Frameworks/moduleclasses/icons/32/' . $icons . '/index.html'))) {
- $url = $xoops->url( 'Frameworks/moduleclasses/icons/32/' . $icons . '/' . $argStr );
+
+ if (file_exists($xoops->path('Frameworks/moduleclasses/icons/32/index.html'))) {
+ $url = $xoops->url('Frameworks/moduleclasses/icons/32/' . $argStr);
+
} else {
- if ( file_exists( $xoops->path('modules/system/images/icons/default/' . $argStr ))) {
- $url = $xoops->url( 'modules/system/images/icons/default/' . $argStr );
+ if (file_exists($xoops->path('modules/system/images/icons/default/' . $argStr))) {
+ $url = $xoops->url('modules/system/images/icons/default/' . $argStr);
} else {
- $url = $xoops->url( 'modules/system/images/icons/default/xoops/xoops.png' );
+ $url = $xoops->url('modules/system/images/icons/default/xoops/xoops.png');
}
}
- return "\necho '" . addslashes( $url ) . "';";
+ return "\necho '" . addslashes($url) . "';";
}
+
?>
\ No newline at end of file
|
|
From: <be...@us...> - 2013-07-03 20:01:18
|
Revision: 11807
http://sourceforge.net/p/xoops/svn/11807
Author: beckmi
Date: 2013-07-03 20:01:14 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
fixed issue with jGrows in xoops.css (xoobaru/tarik)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops.css
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 2013-07-03 18:19:27 UTC (rev 11806)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-07-03 20:01:14 UTC (rev 11807)
@@ -11,6 +11,7 @@
- fixing errors in upgrade from 2.4.0 to 2.4.1 (mamba,voltan)
- added check for menu link description in ModuleAdmin
- fixed wrong return icon in Smarty xoModuleIcons32
+- fixed issue with jGrows in xoops.css (xoobaru/tarik)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops.css 2013-07-03 18:19:27 UTC (rev 11806)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops.css 2013-07-03 20:01:14 UTC (rev 11807)
@@ -90,7 +90,7 @@
}
/* jGrowl redirection */
-div.jGrowl {padding: 1em; z-index: 9999;}
+div.jGrowl {margin-top:1em; padding: 0; z-index: 9999;}
/* JGrowl Box position in the page */
body > div.jGrowl {position: fixed;}
body > div.jGrowl.top-right {right: 25%; left: 25%; top: 2px;}
|
|
From: <be...@us...> - 2013-08-05 15:12:40
|
Revision: 11877
http://sourceforge.net/p/xoops/svn/11877
Author: beckmi
Date: 2013-08-05 15:12:37 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.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 2013-08-05 01:24:55 UTC (rev 11876)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-05 15:12:37 UTC (rev 11877)
@@ -12,6 +12,7 @@
- added check for menu link description in ModuleAdmin
- fixed wrong return icon in Smarty xoModuleIcons32
- fixed issue with jGrows in xoops.css (xoobaru/tarik)
+- fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.textsanitizer.php 2013-08-05 01:24:55 UTC (rev 11876)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.textsanitizer.php 2013-08-05 15:12:37 UTC (rev 11877)
@@ -44,17 +44,6 @@
}
/**
- * MyTextSanitizerExtension
- *
- * @param object $ts
- * @return MyTextSanitizerExtension
- */
- function MyTextSanitizerExtension(&$ts)
- {
- $this->__construct($ts);
- }
-
- /**
* loadConfig
*
* @param string $path
@@ -159,18 +148,16 @@
var $patterns = array();
var $replacements = array();
+//mb------------------------------
+ var $callbackPatterns = array();
+ var $callbacks = array();
+//mb------------------------------
+
var $path_basic;
var $path_plugin;
var $config;
- function __construct()
- {
- $this->path_basic = XOOPS_ROOT_PATH . '/class/textsanitizer';
- $this->path_plugin = XOOPS_ROOT_PATH . '/Frameworks/textsanitizer';
- $this->config = $this->loadConfig();
- }
-
/**
* Constructor of this class
*
@@ -179,13 +166,16 @@
* when storing data.
*
* @access private
- * @todo Sofar, this does nuttin' ;-)
*/
- function MyTextSanitizer()
+
+ function __construct()
{
- $this->__construct();
+ $this->path_basic = XOOPS_ROOT_PATH . '/class/textsanitizer';
+ $this->path_plugin = XOOPS_ROOT_PATH . '/Frameworks/textsanitizer';
+ $this->config = $this->loadConfig();
}
+
/**
* Enter description here...
*
@@ -287,6 +277,29 @@
return $message;
}
+
+
+ function makeClickableCallback01($match)
+ {
+ return $match[1]."<a href=\"$match[2]://$match[3]\" title=\"$match[2]://$match[3]\" rel=\"external\">$match[2]://".$this->truncate( $match[3] ).'</a>';
+ }
+
+ function makeClickableCallback02($match)
+ {
+ return $match[1] ."<a href=\"http://www.$match[2]$match[6]\" title=\"www.$match[2]$match[6]\" rel=\"external\">" .$this->truncate('www.'.$match[2].$match[6]) .'</a>';
+ }
+
+ function makeClickableCallback03($match)
+ {
+ return $match[1]."<a href=\"ftp://ftp.$match[2].$match[3]\" title=\"ftp.$match[2].$match[3]\" rel=\"external\">" . $this->truncate('ftp.'.$match[2].$match[3]) .'</a>';
+ }
+
+ function makeClickableCallback04($match)
+ {
+ return $match[1]. "<a href=\"mailto:$match[2]@$match[3]\" title=\"$match[2]@$match[3]\">" .$this->truncate($match[2]."@".$match[3]) .'</a>';
+ }
+
+
/**
* Make links in the text clickable
*
@@ -294,28 +307,47 @@
* @return string
*/
function makeClickable(&$text) {
+
+ $text1 = $text;
+
$valid_chars = "a-z0-9\/\-_+=.~!%@?#&;:$\|";
$end_chars = "a-z0-9\/\-_+=~!%@?#&;:$\|";
- $patterns = array();
- $replacements = array();
+// $patterns = array();
+// $replacements = array();
+//
+// $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([{$valid_chars}]+[{$end_chars}])/ei";
+// $replacements[] = "'\\1<a href=\"\\2://\\3\" title=\"\\2://\\3\" rel=\"external\">\\2://'.MyTextSanitizer::truncate( '\\3' ).'</a>'";
+//
+//
+// $patterns[] = "/(^|[^]_a-z0-9-=\"'\/:\.])www\.((([a-zA-Z0-9\-]*\.){1,}){1}([a-zA-Z]{2,6}){1})((\/([a-zA-Z0-9\-\._\?\,\'\/\\+&%\$#\=~])*)*)/ei";
+// $replacements[] = "'\\1<a href=\"http://www.\\2\\6\" title=\"www.\\2\\6\" rel=\"external\">'.MyTextSanitizer::truncate( 'www.\\2\\6' ).'</a>'";
+//
+// $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([{$valid_chars}]+[{$end_chars}])/ei";
+// $replacements[] = "'\\1<a href=\"ftp://ftp.\\2.\\3\" title=\"ftp.\\2.\\3\" rel=\"external\">'.MyTextSanitizer::truncate( 'ftp.\\2.\\3' ).'</a>'";
+//
+// $patterns[] = "/(^|[^]_a-z0-9-=\"'\/:\.])([-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+)@((?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?)/ei";
+// $replacements[] = "'\\1<a href=\"mailto:\\2@\\3\" title=\"\\2@\\3\">'.MyTextSanitizer::truncate( '\\2@\\3' ).'</a>'";
+//
+// $text = preg_replace($patterns, $replacements, $text);
+//
+//----------------------------------------------------------------------------------
- $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([{$valid_chars}]+[{$end_chars}])/ei";
- $replacements[] = "'\\1<a href=\"\\2://\\3\" title=\"\\2://\\3\" rel=\"external\">\\2://'.MyTextSanitizer::truncate( '\\3' ).'</a>'";
+ $pattern = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([{$valid_chars}]+[{$end_chars}])/i";
+ $text1 = preg_replace_callback($pattern, 'self::makeClickableCallback01', $text1);
- $patterns[] = "/(^|[^]_a-z0-9-=\"'\/:\.])www\.((([a-zA-Z0-9\-]*\.){1,}){1}([a-zA-Z]{2,6}){1})((\/([a-zA-Z0-9\-\._\?\,\'\/\\+&%\$#\=~])*)*)/ei";
- $replacements[] = "'\\1<a href=\"http://www.\\2\\6\" title=\"www.\\2\\6\" rel=\"external\">'.MyTextSanitizer::truncate( 'www.\\2\\6' ).'</a>'";
+ $pattern = "/(^|[^]_a-z0-9-=\"'\/:\.])www\.((([a-zA-Z0-9\-]*\.){1,}){1}([a-zA-Z]{2,6}){1})((\/([a-zA-Z0-9\-\._\?\,\'\/\\+&%\$#\=~])*)*)/i";
+ $text1 = preg_replace_callback($pattern, 'self::makeClickableCallback02', $text1);
- $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([{$valid_chars}]+[{$end_chars}])/ei";
- $replacements[] = "'\\1<a href=\"ftp://ftp.\\2.\\3\" title=\"ftp.\\2.\\3\" rel=\"external\">'.MyTextSanitizer::truncate( 'ftp.\\2.\\3' ).'</a>'";
- $patterns[] = "/(^|[^]_a-z0-9-=\"'\/:\.])([-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+)@((?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?)/ei";
- $replacements[] = "'\\1<a href=\"mailto:\\2@\\3\" title=\"\\2@\\3\">'.MyTextSanitizer::truncate( '\\2@\\3' ).'</a>'";
+ $pattern = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([{$valid_chars}]+[{$end_chars}])/i";
+ $text1 = preg_replace_callback($pattern, 'self::makeClickableCallback03', $text1);
- $text = preg_replace($patterns, $replacements, $text);
- return $text;
+ $pattern = "/(^|[^]_a-z0-9-=\"'\/:\.])([-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+)@((?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?)/i";
+ $text1 = preg_replace_callback($pattern, 'self::makeClickableCallback04', $text1);
+
+ return $text1;
}
-
/**
* MyTextSanitizer::truncate()
*
@@ -333,6 +365,7 @@
return $ret;
}
+
/**
* Replace XoopsCodes with their equivalent HTML formatting
*
@@ -385,6 +418,13 @@
$this->executeExtensions();
$text = preg_replace($this->patterns, $this->replacements, $this->text);
+//-------------------------------------------------------------------------------
+ $count = sizeof($this->callbackPatterns);
+
+ for ($i = 0; $i < $count; $i++) {
+ $text = preg_replace_callback($this->callbackPatterns[$i], $this->callbacks[$i] , $text);
+ }
+//------------------------------------------------------------------------------
$text = $this->quoteConv($text);
return $text;
}
@@ -579,6 +619,8 @@
return $ret;
}
+
+
/**
* MyTextSanitizer::codePreConv()
*
@@ -589,31 +631,43 @@
function codePreConv($text, $xcode = 1)
{
if ($xcode != 0) {
- $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/esU";
- $replacements = "'[code\\1]'.base64_encode('\\2').'[/code]'";
- $text = preg_replace($patterns, $replacements, $text);
- }
- return $text;
- }
+// $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/esU";
+// $replacements = "'[code\\1]'.base64_encode('\\2').'[/code]'";
- /**
- * MyTextSanitizer::codeConv()
- *
- * @param mixed $text
- * @param mixed $xcode
- * @return
- */
- function codeConv($text, $xcode = 1)
- {
- if (empty($xcode)) {
- return $text;
+ $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/sU";
+ $text2 = preg_replace_callback($patterns, create_function('$matches',"return '[code'.\$matches[1].']' . base64_encode(\$matches[2]). '[/code]';"),$text);
}
- $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/esU";
- $replacements = "'<div class=\"xoopsCode\">'.\$this->executeExtension('syntaxhighlight', str_replace('\\\"', '\"', base64_decode('$2')), '$1').'</div>'";
- $text = preg_replace($patterns, $replacements, $text);
- return $text;
+ return $text2;
}
+
+function codeConvCallback($match)
+ {
+ return '<div class=\"xoopsCode\">'. $this->executeExtension('syntaxhighlight', str_replace('\\\"', '\"', base64_decode($match[2])), $match[1]).'</div>';
+ }
+
+
+ /**
+ * MyTextSanitizer::codeConv()
+ *
+ * @param mixed $text
+ * @param mixed $xcode
+ * @return
+ */
+ function codeConv($text, $xcode = 1)
+ {
+ if (empty($xcode)) {
+ return $text;
+ }
+ $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/sU";
+ $text1 = preg_replace_callback($patterns, array($this,'codeConvCallback'), $text);
+
+ return $text1;
+ }
+
+
+
+
/**
* MyTextSanitizer::executeExtensions()
*
@@ -684,6 +738,8 @@
}
return $ret;
}
+
+
// #################### Deprecated Methods ######################
/**
* *#@+
@@ -979,5 +1035,3 @@
return $this->nl2br($text);
}
}
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php 2013-08-05 01:24:55 UTC (rev 11876)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php 2013-08-05 15:12:37 UTC (rev 11877)
@@ -50,11 +50,20 @@
$javascript);
}
+ static function myCallback($match) {
+ return self::decode( $match[6], $match[3], $match[4] );
+ }
+
function load(&$ts)
{
- $ts->patterns[] = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/esU";
- $ts->replacements[] = __CLASS__ . "::decode( '\\5', '\\3', '\\4' )";
+// $ts->patterns[] = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/esU";
+// $ts->replacements[] = __CLASS__ . "::decode( '\\5', '\\3', '\\4' )";
+//mb------------------------------
+ $ts->callbackPatterns[] = "/\[(swf|flash)=(['\"]?)([^\"']*),([^\"']*)\\2]([^\"]*)\[\/\\1\]/sU";
+ $ts->callbacks[] = __CLASS__ . "::myCallback";
+//mb------------------------------
+
return true;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php 2013-08-05 01:24:55 UTC (rev 11876)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php 2013-08-05 15:12:37 UTC (rev 11877)
@@ -47,11 +47,18 @@
$javascript);
}
+ static function myCallback($match) {
+ return self::decode($match[1]);
+ }
+
function load(&$ts)
{
- $ts->patterns[] = "/\[mp3\](.*?)\[\/mp3\]/es";
- $ts->replacements[] = __CLASS__ . "::decode( '\\1' )";
-
+// $ts->patterns[] = "/\[mp3\](.*?)\[\/mp3\]/es";
+// $ts->replacements[] = __CLASS__ . "::decode( '\\1' )";
+//mb------------------------------
+ $ts->callbackPatterns[] = "/\[mp3\](.*?)\[\/mp3\]/s";
+ $ts->callbacks[] = __CLASS__ . "::myCallback";
+//mb------------------------------
return true;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php 2013-08-05 01:24:55 UTC (rev 11876)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php 2013-08-05 15:12:37 UTC (rev 11877)
@@ -51,11 +51,19 @@
$code ,
$javascript);
}
+ static function myCallback($match) {
+ return self::decode( $match[1] );
+ }
function load(&$ts)
{
- $ts->patterns[] = "/\[\[([^\]]*)\]\]/esU";
- $ts->replacements[] = __CLASS__ . "::decode( '\\1' )";
+// $ts->patterns[] = "/\[\[([^\]]*)\]\]/esU";
+// $ts->replacements[] = __CLASS__ . "::decode( '\\1' )";
+//mb------------------------------
+ $ts->callbackPatterns[] = "/\[\[([^\]]*)\]\]/sU";
+ $ts->callbacks[] = __CLASS__ . "::myCallback";
+//mb------------------------------
+
}
function decode($text)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php 2013-08-05 01:24:55 UTC (rev 11876)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php 2013-08-05 15:12:37 UTC (rev 11877)
@@ -47,10 +47,20 @@
return array($code, $javascript);
}
+static function myCallback($match) {
+ return self::decode( $match[4], $match[2], $match[3] );
+}
+
+
function load(&$ts)
{
- $ts->patterns[] = "/\[youtube=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/youtube\]/esU";
- $ts->replacements[] = __CLASS__ . "::decode( '\\4', '\\2', '\\3' )";
+// $ts->patterns[] = "/\[youtube=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/youtube\]/esU";
+// $ts->replacements[] = __CLASS__ . "::decode( '\\4', '\\2', '\\3' )";
+
+//mb------------------------------
+ $ts->callbackPatterns[] = "/\[youtube=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/youtube\]/sU";
+ $ts->callbacks[] = __CLASS__ . "::myCallback";
+//mb------------------------------
}
function decode($url, $width, $height)
|
|
From: <be...@us...> - 2013-08-06 17:50:36
|
Revision: 11884
http://sourceforge.net/p/xoops/svn/11884
Author: beckmi
Date: 2013-08-06 17:50:34 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
ID: 1143 (old 430840) class/module.errorhandler.php (uberrookie/zyspec)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.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 2013-08-06 13:15:31 UTC (rev 11883)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-06 17:50:34 UTC (rev 11884)
@@ -13,6 +13,7 @@
- fixed wrong return icon in Smarty xoModuleIcons32
- fixed issue with jGrows in xoops.css (xoobaru/tarik)
- fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
+- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php 2013-08-06 13:15:31 UTC (rev 11883)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php 2013-08-06 17:50:34 UTC (rev 11884)
@@ -100,9 +100,11 @@
}
include_once XOOPS_ROOT_PATH . '/header.php';
echo '<div><strong>' . $xoopsConfig['sitename'] . ' Error</strong><br /><br />';
- echo 'Error Code: $e_code<br /><br /><br />';
- echo '<strong>ERROR:</strong> $errmsg[$e_code]<br /><br /><br />';
+
+ echo "Error Code: $e_code<br /><br /><br />";
+ echo "<strong>ERROR:</strong> $errmsg[$e_code]<br /><br /><br />";
echo '[ <a href=\'javascript:history.go(-' . $pages . ')\'>Go Back</a> ]</div>';
+
include_once XOOPS_ROOT_PATH . '/footer.php';
exit();
}
|
|
From: <be...@us...> - 2013-08-20 11:17:32
|
Revision: 11952
http://sourceforge.net/p/xoops/svn/11952
Author: beckmi
Date: 2013-08-20 11:17:22 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
replaced _CAL_FORMAT with _SHORTDATESTRING, fixed bug in calendar.js
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/calendar.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/calendar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.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 2013-08-20 00:29:35 UTC (rev 11951)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-20 11:17:22 UTC (rev 11952)
@@ -15,6 +15,8 @@
- fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
- added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
+- assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
+- fixed bug in calendar.js (mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php 2013-08-20 00:29:35 UTC (rev 11951)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php 2013-08-20 11:17:22 UTC (rev 11952)
@@ -45,10 +45,10 @@
$display_value = $ele_value;
$ele_value = time();
} else {
- $display_value = date(_CAL_FORMAT, $ele_value);
+ $display_value = date(_SHORTDATESTRING, $ele_value);
}
- $jstime = formatTimestamp($ele_value, _CAL_FORMAT);
+ $jstime = formatTimestamp($ele_value, _SHORTDATESTRING);
if (is_object($GLOBALS['xoTheme'])) {
$GLOBALS['xoTheme']->addScript('include/calendar.js');
$GLOBALS['xoTheme']->addStylesheet('include/calendar-blue.css');
@@ -130,8 +130,8 @@
Calendar._TT["TODAY"] = "' . _CAL_TODAY . '";
// date formats
- Calendar._TT["DEF_DATE_FORMAT"] = "' . _CAL_FORMAT . '";
- Calendar._TT["TT_DATE_FORMAT"] = "' . _CAL_FORMAT . '";
+ Calendar._TT["DEF_DATE_FORMAT"] = "' . _SHORTDATESTRING . '";
+ Calendar._TT["TT_DATE_FORMAT"] = "' . _SHORTDATESTRING . '";
Calendar._TT["WK"] = "";
');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/calendar.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/calendar.js 2013-08-20 00:29:35 UTC (rev 11951)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/calendar.js 2013-08-20 11:17:22 UTC (rev 11952)
@@ -1261,13 +1261,14 @@
Date.prototype.print = function (frm) {
var str = new String(frm);
var m = this.getMonthFormatted();
+ var n = this.getMonth();
var d = this.getDate();
var y = this.getFullYear();
var s = new Array();
s["j"] = d;
s["d"] = (d < 10) ? ("0" + d) : d;
s["m"] = m;
- s["n"] = (m < 9) ? ("0" + (1+m)) : (1+m);
+ s["n"] = 1+n;
s["Y"] = y;
s["y"] = new String(y).substr(2, 2);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/calendar.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/calendar.php 2013-08-20 00:29:35 UTC (rev 11951)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/calendar.php 2013-08-20 11:17:22 UTC (rev 11952)
@@ -8,7 +8,9 @@
// Revision by TXMod Xoops - Added shot text: 30/06/2012
//
//%%%%% Time Zone %%%%
-define('_CAL_FORMAT',"Y-m-d");
+//define('_CAL_FORMAT',"Y-m-d");
+define('_CAL_FORMAT',_SHORTDATESTRING);
+
//%%%%% JQuery Calendar Time Zone %%%%
define('_CAL_JQUERY_FORMAT',"yy/mm/dd");
// Week Mini Text
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php 2013-08-20 00:29:35 UTC (rev 11951)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php 2013-08-20 11:17:22 UTC (rev 11952)
@@ -173,7 +173,8 @@
define('_MONTH','1 month');
define('_DATESTRING','Y/n/j G:i:s');
define('_MEDIUMDATESTRING','Y/n/j G:i');
-define('_SHORTDATESTRING','Y/n/j');
+//define('_SHORTDATESTRING','n/j/Y');
+define('_SHORTDATESTRING','m/d/Y');
/**
* The following characters are recognized in the format string:
* a - 'am' or 'pm'
|
|
From: <be...@us...> - 2013-08-27 10:08:41
|
Revision: 11982
http://sourceforge.net/p/xoops/svn/11982
Author: beckmi
Date: 2013-08-27 10:08:37 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
added link to Module's Admin after "Update" (currently only to XOOPS Modules section)
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/language/english/admin/modulesadmin.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 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-08-27 10:08:37 UTC (rev 11982)
@@ -17,6 +17,7 @@
- added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
- assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
- fixed bug in calendar.js (mamba)
+- added link to Module's Admin after "Update" (currently only to XOOPS Modules section)
===============================
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 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-08-27 10:08:37 UTC (rev 11982)
@@ -861,7 +861,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></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></div>';
foreach ($msgs as $msg) {
echo $msg.'<br />';
}
@@ -881,4 +881,4 @@
break;
}
-?>
\ No newline at end of file
+?>
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 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2013-08-27 10:08:37 UTC (rev 11982)
@@ -425,8 +425,16 @@
}
;
$msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a>';
- $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a></div>';
+ $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>';
+ $testdataDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata';
+ if (file_exists($testdataDirectory)) {
+ $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>';
+ } else {
+ $msgs[] = '</div>';
+ }
+
+
$ret = implode('<br />', $msgs);
unset($blocks);
unset($msgs);
@@ -742,4 +750,4 @@
return $msgs;
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php 2013-08-25 23:21:52 UTC (rev 11981)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php 2013-08-27 10:08:37 UTC (rev 11982)
@@ -7,7 +7,7 @@
* @version $Id$
*/
// Navigation
-define('_AM_SYSTEM_MODULES_ADMIN',"Modules Administration");
+define('_AM_SYSTEM_MODULES_ADMIN',"This Module Admin");
define('_AM_SYSTEM_MODULES_LIST',"Module List");
define('_AM_SYSTEM_MODULES_TOINSTALL',"Install module");
define('_AM_SYSTEM_MODULES_VALIDATE',"Validate changes");
@@ -16,7 +16,7 @@
define('_AM_SYSTEM_MODULES_RUSUREINS',"Press the button below to install this module");
define('_AM_SYSTEM_MODULES_RUSUREUNINS',"Are you sure you would like to uninstall this module?");
define('_AM_SYSTEM_MODULES_RUSUREUPD',"Press the button below to update this module");
-define('_AM_SYSTEM_MODULES_BTOMADMIN',"Back to Module Administration page");
+define('_AM_SYSTEM_MODULES_BTOMADMIN',"XOOPS Module Administration");
define('_AM_SYSTEM_MODULES_INSTALLING',"Installing ");
define('_AM_SYSTEM_MODULES_UNINSTAL',"Uninstall ");
define('_AM_SYSTEM_MODULES_DEACTIVATE',"Deactivate ");
@@ -155,7 +155,7 @@
define('_AM_SYSTEM_MODULES_TABLE_DROPPED_ERROR',"ERROR: Could not drop table %s");
define('_AM_SYSTEM_MODULES_TABLE_DROPPED_FAILDED',"ERROR: Not allowed to drop table %s !");
// Tips
-define('_AM_SYSTEM_MODULES_TIPS',
+define('_AM_SYSTEM_MODULES_TIPS',
"<ul>
<li>If you install a new module, remember to setup module preferences, blocks and users permissions!</li>
<li>For hide module into Main Menu block, set order to 0</li>
@@ -165,4 +165,6 @@
define('_AM_SYSTEM_MODULES_CONFIRM_TIPS',
"<ul>
<li>Check all modifications for validate.</li>
-</ul>");
\ No newline at end of file
+</ul>");
+// 2.5.7
+define('_AM_SYSTEM_MODULES_INSTALL_TESTDATA',"Add Test Data");
|
|
From: <be...@us...> - 2013-09-02 06:56:09
|
Revision: 11994
http://sourceforge.net/p/xoops/svn/11994
Author: beckmi
Date: 2013-09-02 06:56:06 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
assigning "static" to functions in XoopsUserUtility class
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.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 2013-08-31 22:17:30 UTC (rev 11993)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-02 06:56:06 UTC (rev 11994)
@@ -17,7 +17,9 @@
- added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
- assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
- fixed bug in calendar.js (mamba)
-- added link to Module's Admin after "Update" (currently only to XOOPS Modules section)
+- added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
+- added placeholder for a link to upload test data, if available after installation (mamba)
+- assigning "static" to functions in XoopsUserUtility class (mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php 2013-08-31 22:17:30 UTC (rev 11993)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php 2013-09-02 06:56:06 UTC (rev 11994)
@@ -33,7 +33,7 @@
* @param mixed $user
* @return
*/
- function sendWelcome($user)
+ static function sendWelcome($user)
{
global $xoopsConfigUser, $xoopsConfig;
@@ -79,7 +79,7 @@
*
* @return
*/
- function validate()
+ static function validate()
{
global $xoopsUser;
@@ -214,7 +214,7 @@
* @param bool $asString requiring integer or dotted string
* @return mixed string or integer value for the IP
*/
- function getIP($asString = false)
+ static function getIP($asString = false)
{
// Gets the proxy ip sent by the user
$proxy_ip = '';
@@ -258,7 +258,7 @@
* @param mixed $linked
* @return
*/
- function getUnameFromIds($uid, $usereal = false, $linked = false)
+ static function getUnameFromIds($uid, $usereal = false, $linked = false)
{
if (!is_array($uid)) {
$uid = array($uid);
@@ -299,7 +299,7 @@
* @param mixed $linked
* @return
*/
- function getUnameFromId($userid, $usereal = false, $linked = false)
+ static function getUnameFromId($userid, $usereal = false, $linked = false)
{
$myts =& MyTextSanitizer::getInstance();
$userid = intval($userid);
|
|
From: <ce...@us...> - 2013-09-02 12:26:20
|
Revision: 11995
http://sourceforge.net/p/xoops/svn/11995
Author: cesag
Date: 2013-09-02 12:26:14 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Solved bug into PM module readpmsg.php (escrime-info/slider84)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.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 2013-09-02 06:56:06 UTC (rev 11994)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-02 12:26:14 UTC (rev 11995)
@@ -20,6 +20,7 @@
- added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
- added placeholder for a link to upload test data, if available after installation (mamba)
- assigning "static" to functions in XoopsUserUtility class (mamba)
+- solved bug into PM module readpmsg.php (escrime-info/slider84)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt 2013-09-02 06:56:06 UTC (rev 11994)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/docs/changelog.txt 2013-09-02 12:26:14 UTC (rev 11995)
@@ -1,5 +1,6 @@
Version 1.09
-------------------
+- solved bug into readpmsg.php (escrime-info/slider84)
- updated code to make it consistent with other modules (mamba)
Version 1.08
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php 2013-09-02 06:56:06 UTC (rev 11994)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php 2013-09-02 12:26:14 UTC (rev 11995)
@@ -139,7 +139,7 @@
if (is_object($pm) && !empty($pm)) {
if ($pm->getVar('from_userid') != $GLOBALS['xoopsUser']->getVar('uid')) {
$reply_button = new XoopsFormButton('', 'send', _PM_REPLY);
- $reply_button->setExtra("onclick='javascript:openWithSelfMain(\"" . XOOPS_URL . "/modules/pm/pmlite.php?reply=1&msg_id={$msg_id}\", \"pmlite\", 565,500);'");
+ $reply_button->setExtra("onclick='javascript:openWithSelfMain(\"" . XOOPS_URL . "/modules/pm/pmlite.php?reply=1&msg_id=".$pm->getVar("msg_id")."\", \"pmlite\", 565,500);'");
$pmform->addElement($reply_button);
}
$pmform->addElement(new XoopsFormButton('', 'delete_message', _PM_DELETE, 'submit'));
|
|
From: <be...@us...> - 2013-09-03 10:25:48
|
Revision: 11997
http://sourceforge.net/p/xoops/svn/11997
Author: beckmi
Date: 2013-09-03 10:25:43 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
Updating: jGrowl to 1.2.13, jQuery Form to 3.42.0, HTML Purifier to 4.5.0
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/Frameworks/jquery/plugins/jquery.form.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js
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/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/Clone.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/AttrTransform/Nofollow.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/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/List.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/schema.ser
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/Filter/ExtractStyleBlocks.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/Iframe.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/Scripting.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/HTMLModuleManager.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/Strategy/FixNesting.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/DisableResources.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/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.includes.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/ConfigSchema/schema/Core.DisableExcludes.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeScripting.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 2013-09-03 09:02:03 UTC (rev 11996)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-03 10:25:43 UTC (rev 11997)
@@ -22,6 +22,11 @@
- assigning "static" to functions in XoopsUserUtility class (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
+Updated:
+ - jGrowl to 1.2.13 (mamba)
+ - jQuery Form to 3.42.0 (mamba)
+ - HTML Purifier to 4.5.0 (mamba)
+
===============================
2013/04/21: Version 2.5.6 Final
===============================
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.form.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.form.js 2013-09-03 09:02:03 UTC (rev 11996)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.form.js 2013-09-03 10:25:43 UTC (rev 11997)
@@ -1,360 +1,779 @@
-/*
+/*!
* jQuery Form Plugin
- * version: 2.33 (22-SEP-2009)
- * @requires jQuery v1.2.6 or later
- *
+ * version: 3.42.0-2013.09.02
+ * Requires jQuery v1.5 or later
+ * Copyright (c) 2013 M. Alsup
* Examples and documentation at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * Project repository: https://github.com/malsup/form
+ * Dual licensed under the MIT and GPL licenses.
+ * https://github.com/malsup/form#copyright-and-license
*/
+/*global ActiveXObject */
;(function($) {
+"use strict";
/*
- Usage Note:
- -----------
- Do not use both ajaxSubmit and ajaxForm on the same form. These
- functions are intended to be exclusive. Use ajaxSubmit if you want
- to bind your own submit handler to the form. For example,
+ Usage Note:
+ -----------
+ Do not use both ajaxSubmit and ajaxForm on the same form. These
+ functions are mutually exclusive. Use ajaxSubmit if you want
+ to bind your own submit handler to the form. For example,
- $(document).ready(function() {
- $('#myForm').bind('submit', function() {
- $(this).ajaxSubmit({
- target: '#output'
- });
- return false; // <-- important!
- });
- });
+ $(document).ready(function() {
+ $('#myForm').on('submit', function(e) {
+ e.preventDefault(); // <-- important
+ $(this).ajaxSubmit({
+ target: '#output'
+ });
+ });
+ });
- Use ajaxForm when you want the plugin to manage all the event binding
- for you. For example,
+ Use ajaxForm when you want the plugin to manage all the event binding
+ for you. For example,
- $(document).ready(function() {
- $('#myForm').ajaxForm({
- target: '#output'
- });
- });
+ $(document).ready(function() {
+ $('#myForm').ajaxForm({
+ target: '#output'
+ });
+ });
- When using ajaxForm, the ajaxSubmit function will be invoked for you
- at the appropriate time.
+ You can also use ajaxForm with delegation (requires jQuery v1.7+), so the
+ form does not have to exist when you invoke ajaxForm:
+
+ $('#myForm').ajaxForm({
+ delegation: true,
+ target: '#output'
+ });
+
+ When using ajaxForm, the ajaxSubmit function will be invoked for you
+ at the appropriate time.
*/
/**
+ * Feature detection
+ */
+var feature = {};
+feature.fileapi = $("<input type='file'/>").get(0).files !== undefined;
+feature.formdata = window.FormData !== undefined;
+
+var hasProp = !!$.fn.prop;
+
+// attr2 uses prop when it can but checks the return type for
+// an expected string. this accounts for the case where a form
+// contains inputs with names like "action" or "method"; in those
+// cases "prop" returns the element
+$.fn.attr2 = function() {
+ if ( ! hasProp )
+ return this.attr.apply(this, arguments);
+ var val = this.prop.apply(this, arguments);
+ if ( ( val && val.jquery ) || typeof val === 'string' )
+ return val;
+ return this.attr.apply(this, arguments);
+};
+
+/**
* ajaxSubmit() provides a mechanism for immediately submitting
* an HTML form using AJAX.
*/
$.fn.ajaxSubmit = function(options) {
- // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
- if (!this.length) {
- log('ajaxSubmit: skipping submit process - no element selected');
- return this;
- }
+ /*jshint scripturl:true */
- if (typeof options == 'function')
- options = { success: options };
+ // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+ if (!this.length) {
+ log('ajaxSubmit: skipping submit process - no element selected');
+ return this;
+ }
- var url = $.trim(this.attr('action'));
- if (url) {
- // clean url (don't include hash vaue)
- url = (url.match(/^([^#]+)/)||[])[1];
- }
- url = url || window.location.href || '';
+ var method, action, url, $form = this;
- options = $.extend({
- url: url,
- type: this.attr('method') || 'GET'
- }, options || {});
+ if (typeof options == 'function') {
+ options = { success: options };
+ }
+ else if ( options === undefined ) {
+ options = {};
+ }
- // hook for manipulating the form data before it is extracted;
- // convenient for use with rich editors like tinyMCE or FCKEditor
- var veto = {};
- this.trigger('form-pre-serialize', [this, options, veto]);
- if (veto.veto) {
- log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
- return this;
- }
+ method = options.type || this.attr2('method');
+ action = options.url || this.attr2('action');
- // provide opportunity to alter form data before it is serialized
- if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
- log('ajaxSubmit: submit aborted via beforeSerialize callback');
- return this;
- }
+ url = (typeof action === 'string') ? $.trim(action) : '';
+ url = url || window.location.href || '';
+ if (url) {
+ // clean url (don't include hash vaue)
+ url = (url.match(/^([^#]+)/)||[])[1];
+ }
- var a = this.formToArray(options.semantic);
- if (options.data) {
- options.extraData = options.data;
- for (var n in options.data) {
- if(options.data[n] instanceof Array) {
- for (var k in options.data[n])
- a.push( { name: n, value: options.data[n][k] } );
- }
- else
- a.push( { name: n, value: options.data[n] } );
- }
- }
+ options = $.extend(true, {
+ url: url,
+ success: $.ajaxSettings.success,
+ type: method || $.ajaxSettings.type,
+ iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+ }, options);
- // give pre-submit callback an opportunity to abort the submit
- if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
- log('ajaxSubmit: submit aborted via beforeSubmit callback');
- return this;
- }
+ // hook for manipulating the form data before it is extracted;
+ // convenient for use with rich editors like tinyMCE or FCKEditor
+ var veto = {};
+ this.trigger('form-pre-serialize', [this, options, veto]);
+ if (veto.veto) {
+ log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+ return this;
+ }
- // fire vetoable 'validate' event
- this.trigger('form-submit-validate', [a, this, options, veto]);
- if (veto.veto) {
- log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
- return this;
- }
+ // provide opportunity to alter form data before it is serialized
+ if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+ log('ajaxSubmit: submit aborted via beforeSerialize callback');
+ return this;
+ }
- var q = $.param(a);
+ var traditional = options.traditional;
+ if ( traditional === undefined ) {
+ traditional = $.ajaxSettings.traditional;
+ }
- if (options.type.toUpperCase() == 'GET') {
- options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
- options.data = null; // data is null for 'get'
- }
- else
- options.data = q; // data is the query string for 'post'
+ var elements = [];
+ var qx, a = this.formToArray(options.semantic, elements);
+ if (options.data) {
+ options.extraData = options.data;
+ qx = $.param(options.data, traditional);
+ }
- var $form = this, callbacks = [];
- if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
- if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+ // give pre-submit callback an opportunity to abort the submit
+ if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+ log('ajaxSubmit: submit aborted via beforeSubmit callback');
+ return this;
+ }
- // perform a load on the target only if dataType is not provided
- if (!options.dataType && options.target) {
- var oldSuccess = options.success || function(){};
- callbacks.push(function(data) {
- $(options.target).html(data).each(oldSuccess, arguments);
- });
- }
- else if (options.success)
- callbacks.push(options.success);
+ // fire vetoable 'validate' event
+ this.trigger('form-submit-validate', [a, this, options, veto]);
+ if (veto.veto) {
+ log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+ return this;
+ }
- options.success = function(data, status) {
- for (var i=0, max=callbacks.length; i < max; i++)
- callbacks[i].apply(options, [data, status, $form]);
- };
+ var q = $.param(a, traditional);
+ if (qx) {
+ q = ( q ? (q + '&' + qx) : qx );
+ }
+ if (options.type.toUpperCase() == 'GET') {
+ options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+ options.data = null; // data is null for 'get'
+ }
+ else {
+ options.data = q; // data is the query string for 'post'
+ }
- // are there files to upload?
- var files = $('input:file', this).fieldValue();
- var found = false;
- for (var j=0; j < files.length; j++)
- if (files[j])
- found = true;
+ var callbacks = [];
+ if (options.resetForm) {
+ callbacks.push(function() { $form.resetForm(); });
+ }
+ if (options.clearForm) {
+ callbacks.push(function() { $form.clearForm(options.includeHidden); });
+ }
- var multipart = false;
-// var mp = 'multipart/form-data';
-// multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+ // perform a load on the target only if dataType is not provided
+ if (!options.dataType && options.target) {
+ var oldSuccess = options.success || function(){};
+ callbacks.push(function(data) {
+ var fn = options.replaceTarget ? 'replaceWith' : 'html';
+ $(options.target)[fn](data).each(oldSuccess, arguments);
+ });
+ }
+ else if (options.success) {
+ callbacks.push(options.success);
+ }
- // options.iframe allows user to force iframe mode
- if (options.iframe || found || multipart) {
- // hack to fix Safari hang (thanks to Tim Molendijk for this)
- // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
- if (options.closeKeepAlive)
- $.get(options.closeKeepAlive, fileUpload);
- else
- fileUpload();
- }
- else
- $.ajax(options);
+ options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+ var context = options.context || this ; // jQuery 1.4+ supports scope context
+ for (var i=0, max=callbacks.length; i < max; i++) {
+ callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+ }
+ };
- // fire 'notify' event
- this.trigger('form-submit-notify', [this, options]);
- return this;
+ if (options.error) {
+ var oldError = options.error;
+ options.error = function(xhr, status, error) {
+ var context = options.context || this;
+ oldError.apply(context, [xhr, status, error, $form]);
+ };
+ }
+ if (options.complete) {
+ var oldComplete = options.complete;
+ options.complete = function(xhr, status) {
+ var context = options.context || this;
+ oldComplete.apply(context, [xhr, status, $form]);
+ };
+ }
- // private function for handling file uploads (hat tip to YAHOO!)
- function fileUpload() {
- var form = $form[0];
+ // are there files to upload?
- if ($(':input[name=submit]', form).length) {
- alert('Error: Form elements must not be named "submit".');
- return;
- }
+ // [value] (issue #113), also see comment:
+ // https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219
+ var fileInputs = $('input[type=file]:enabled', this).filter(function() { return $(this).val() != ''; });
- var opts = $.extend({}, $.ajaxSettings, options);
- var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+ var hasFileInputs = fileInputs.length > 0;
+ var mp = 'multipart/form-data';
+ var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
- var id = 'jqFormIO' + (new Date().getTime());
- var $io = $('<iframe id="' + id + '" name="' + id + '" src="about:blank" />');
- var io = $io[0];
+ var fileAPI = feature.fileapi && feature.formdata;
+ log("fileAPI :" + fileAPI);
+ var shouldUseFrame = (hasFileInputs || multipart) && !fileAPI;
- $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+ var jqxhr;
- var xhr = { // mock object
- aborted: 0,
- responseText: null,
- responseXML: null,
- status: 0,
- statusText: 'n/a',
- getAllResponseHeaders: function() {},
- getResponseHeader: function() {},
- setRequestHeader: function() {},
- abort: function() {
- this.aborted = 1;
- $io.attr('src','about:blank'); // abort op in progress
- }
- };
+ // options.iframe allows user to force iframe mode
+ // 06-NOV-09: now defaulting to iframe mode if file input is detected
+ if (options.iframe !== false && (options.iframe || shouldUseFrame)) {
+ // hack to fix Safari hang (thanks to Tim Molendijk for this)
+ // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+ if (options.closeKeepAlive) {
+ $.get(options.closeKeepAlive, function() {
+ jqxhr = fileUploadIframe(a);
+ });
+ }
+ else {
+ jqxhr = fileUploadIframe(a);
+ }
+ }
+ else if ((hasFileInputs || multipart) && fileAPI) {
+ jqxhr = fileUploadXhr(a);
+ }
+ else {
+ jqxhr = $.ajax(options);
+ }
- var g = opts.global;
- // trigger ajax global events so that activity/block indicators work like normal
- if (g && ! $.active++) $.event.trigger("ajaxStart");
- if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+ $form.removeData('jqxhr').data('jqxhr', jqxhr);
- if (s.beforeSend && s.beforeSend(xhr, s) === false) {
- s.global && $.active--;
- return;
- }
- if (xhr.aborted)
- return;
+ // clear element array
+ for (var k=0; k < elements.length; k++)
+ elements[k] = null;
- var cbInvoked = 0;
- var timedOut = 0;
+ // fire 'notify' event
+ this.trigger('form-submit-notify', [this, options]);
+ return this;
- // add submitting element to data if we know it
- var sub = form.clk;
- if (sub) {
- var n = sub.name;
- if (n && !sub.disabled) {
- options.extraData = options.extraData || {};
- options.extraData[n] = sub.value;
- if (sub.type == "image") {
- options.extraData[name+'.x'] = form.clk_x;
- options.extraData[name+'.y'] = form.clk_y;
- }
- }
- }
+ // utility fn for deep serialization
+ function deepSerialize(extraData){
+ var serialized = $.param(extraData, options.traditional).split('&');
+ var len = serialized.length;
+ var result = [];
+ var i, part;
+ for (i=0; i < len; i++) {
+ // #252; undo param space replacement
+ serialized[i] = serialized[i].replace(/\+/g,' ');
+ part = serialized[i].split('=');
+ // #278; use array instead of object storage, favoring array serializations
+ result.push([decodeURIComponent(part[0]), decodeURIComponent(part[1])]);
+ }
+ return result;
+ }
- // take a breath so that pending repaints get some cpu time before the upload starts
- setTimeout(function() {
- // make sure form attrs are set
- var t = $form.attr('target'), a = $form.attr('action');
+ // XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz)
+ function fileUploadXhr(a) {
+ var formdata = new FormData();
- // update form attrs in IE friendly way
- form.setAttribute('target',id);
- if (form.getAttribute('method') != 'POST')
- form.setAttribute('method', 'POST');
- if (form.getAttribute('action') != opts.url)
- form.setAttribute('action', opts.url);
+ for (var i=0; i < a.length; i++) {
+ formdata.append(a[i].name, a[i].value);
+ }
- // ie borks in some cases when setting encoding
- if (! options.skipEncodingOverride) {
- $form.attr({
- encoding: 'multipart/form-data',
- enctype: 'multipart/form-data'
- });
- }
+ if (options.extraData) {
+ var serializedData = deepSerialize(options.extraData);
+ for (i=0; i < serializedData.length; i++)
+ if (serializedData[i])
+ formdata.append(serializedData[i][0], serializedData[i][1]);
+ }
- // support timout
- if (opts.timeout)
- setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+ options.data = null;
- // add "extra" data to form if provided in options
- var extraInputs = [];
- try {
- if (options.extraData)
- for (var n in options.extraData)
- extraInputs.push(
- $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
- .appendTo(form)[0]);
+ var s = $.extend(true, {}, $.ajaxSettings, options, {
+ contentType: false,
+ processData: false,
+ cache: false,
+ type: method || 'POST'
+ });
- // add iframe to doc and submit the form
- $io.appendTo('body');
- io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
- form.submit();
- }
- finally {
- // reset attrs and remove "extra" input elements
- form.setAttribute('action',a);
- t ? form.setAttribute('target', t) : $form.removeAttr('target');
- $(extraInputs).remove();
- }
- }, 10);
+ if (options.uploadProgress) {
+ // workaround because jqXHR does not expose upload property
+ s.xhr = function() {
+ var xhr = $.ajaxSettings.xhr();
+ if (xhr.upload) {
+ xhr.upload.addEventListener('progress', function(event) {
+ var percent = 0;
+ var position = event.loaded || event.position; /*event.position is deprecated*/
+ var total = event.total;
+ if (event.lengthComputable) {
+ percent = Math.ceil(position / total * 100);
+ }
+ options.uploadProgress(event, position, total, percent);
+ }, false);
+ }
+ return xhr;
+ };
+ }
- var domCheckCount = 50;
+ s.data = null;
+ var beforeSend = s.beforeSend;
+ s.beforeSend = function(xhr, o) {
+ o.data = formdata;
+ if(beforeSend)
+ beforeSend.call(this, xhr, o);
+ };
+ return $.ajax(s);
+ }
- function cb() {
- if (cbInvoked++) return;
+ // private function for handling file uploads (hat tip to YAHOO!)
+ function fileUploadIframe(a) {
+ var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+ var deferred = $.Deferred();
- io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+ // #341
+ deferred.abort = function(status) {
+ xhr.abort(status);
+ };
- var ok = true;
- try {
- if (timedOut) throw 'timeout';
- // extract the server response from the iframe
- var data, doc;
+ if (a) {
+ // ensure that every serialized input is still enabled
+ for (i=0; i < elements.length; i++) {
+ el = $(elements[i]);
+ if ( hasProp )
+ el.prop('disabled', false);
+ else
+ el.removeAttr('disabled');
+ }
+ }
- doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-
- var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
- log('isXml='+isXml);
- if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
- if (--domCheckCount) {
- // in some browsers (Opera) the iframe DOM is not always traversable when
- // the onload callback fires, so we loop a bit to accommodate
- cbInvoked = 0;
- setTimeout(cb, 100);
- return;
- }
- log('Could not access iframe DOM after 50 tries.');
- return;
- }
+ s = $.extend(true, {}, $.ajaxSettings, options);
+ s.context = s.context || s;
+ id = 'jqFormIO' + (new Date().getTime());
+ if (s.iframeTarget) {
+ $io = $(s.iframeTarget);
+ n = $io.attr2('name');
+ if (!n)
+ $io.attr2('name', id);
+ else
+ id = n;
+ }
+ else {
+ $io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+ $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+ }
+ io = $io[0];
- xhr.responseText = doc.body ? doc.body.innerHTML : null;
- xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
- xhr.getResponseHeader = function(header){
- var headers = {'content-type': opts.dataType};
- return headers[header];
- };
- if (opts.dataType == 'json' || opts.dataType == 'script') {
- // see if user embedded response in textarea
- var ta = doc.getElementsByTagName('textarea')[0];
- if (ta)
- xhr.responseText = ta.value;
- else {
- // account for browsers injecting pre around json response
- var pre = doc.getElementsByTagName('pre')[0];
- if (pre)
- xhr.responseText = pre.innerHTML;
- }
- }
- else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
- xhr.responseXML = toXml(xhr.responseText);
- }
- data = $.httpData(xhr, opts.dataType);
- }
- catch(e){
- ok = false;
- $.handleError(opts, xhr, 'error', e);
- }
+ xhr = { // mock object
+ aborted: 0,
+ responseText: null,
+ responseXML: null,
+ status: 0,
+ statusText: 'n/a',
+ getAllResponseHeaders: function() {},
+ getResponseHeader: function() {},
+ setRequestHeader: function() {},
+ abort: function(status) {
+ var e = (status === 'timeout' ? 'timeout' : 'aborted');
+ log('aborting upload... ' + e);
+ this.aborted = 1;
- // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
- if (ok) {
- opts.success(data, 'success');
- if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
- }
- if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
- if (g && ! --$.active) $.event.trigger("ajaxStop");
- if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+ try { // #214, #257
+ if (io.contentWindow.document.execCommand) {
+ io.contentWindow.document.execCommand('Stop');
+ }
+ }
+ catch(ignore) {}
- // clean up
- setTimeout(function() {
- $io.remove();
- xhr.responseXML = null;
- }, 100);
- };
+ $io.attr('src', s.iframeSrc); // abort op in progress
+ xhr.error = e;
+ if (s.error)
+ s.error.call(s.context, xhr, e, status);
+ if (g)
+ $.event.trigger("ajaxError", [xhr, s, e]);
+ if (s.complete)
+ s.complete.call(s.context, xhr, e);
+ }
+ };
- function toXml(s, doc) {
- if (window.ActiveXObject) {
- doc = new ActiveXObject('Microsoft.XMLDOM');
- doc.async = 'false';
- doc.loadXML(s);
- }
- else
- doc = (new DOMParser()).parseFromString(s, 'text/xml');
- return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
- };
- };
+ g = s.global;
+ // trigger ajax global events so that activity/block indicators work like normal
+ if (g && 0 === $.active++) {
+ $.event.trigger("ajaxStart");
+ }
+ if (g) {
+ $.event.trigger("ajaxSend", [xhr, s]);
+ }
+
+ if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+ if (s.global) {
+ $.activ...
[truncated message content] |
|
From: <be...@us...> - 2013-09-03 11:22:03
|
Revision: 11998
http://sourceforge.net/p/xoops/svn/11998
Author: beckmi
Date: 2013-09-03 11:21:59 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
fixed missing check on variable in userinfo.php
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.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 2013-09-03 10:25:43 UTC (rev 11997)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-03 11:21:59 UTC (rev 11998)
@@ -21,6 +21,7 @@
- added placeholder for a link to upload test data, if available after installation (mamba)
- assigning "static" to functions in XoopsUserUtility class (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
+- fixed missing check on variable in userinfo.php (cesag/mamba)
Updated:
- jGrowl to 1.2.13 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2013-09-03 10:25:43 UTC (rev 11997)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2013-09-03 11:21:59 UTC (rev 11998)
@@ -200,7 +200,7 @@
$results[$i]['link'] = XOOPS_URL . "/modules/" . $modules[$mid]->getVar('dirname', 'n') . "/" . $results[$i]['link'];
}
$results[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
- $results[$i]['time'] = $results[$i]['time'] ? formatTimestamp($results[$i]['time']) : '';
+ $results[$i]['time'] = isset($results[$i]['time']) ? formatTimestamp($results[$i]['time']) : '';
}
if ($count == 5) {
$showall_link = '<a href="' . XOOPS_URL . '/search.php?action=showallbyuser&mid=' . $mid . '&uid=' . $thisUser->getVar('uid') . '">' . _US_SHOWALL . '</a>';
@@ -222,4 +222,4 @@
$GLOBALS['xoopsTpl']->assign('recent_activity', _PROFILE_MA_RECENTACTIVITY);
$xoBreadcrumbs[] = array('title' => _PROFILE_MA_USERINFO);
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
-?>
\ No newline at end of file
+?>
|
|
From: <be...@us...> - 2013-09-05 09:40:29
|
Revision: 12008
http://sourceforge.net/p/xoops/svn/12008
Author: beckmi
Date: 2013-09-05 09:40:26 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
replaced extract($_POST) in /include/comment_delete.php with filters
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_delete.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 2013-09-05 09:12:59 UTC (rev 12007)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-05 09:40:26 UTC (rev 12008)
@@ -22,6 +22,7 @@
- assigning "static" to functions in XoopsUserUtility class (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
- fixed missing check on variable in userinfo.php (cesag/mamba)
+- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
Updated:
- jGrowl to 1.2.13 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_delete.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_delete.php 2013-09-05 09:12:59 UTC (rev 12007)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_delete.php 2013-09-05 09:40:26 UTC (rev 12008)
@@ -24,18 +24,28 @@
include_once $GLOBALS['xoops']->path('include/comment_constants.php');
$op = 'delete';
+
+$filters = array
+ (
+ "com_mode" => FILTER_SANITIZE_FULL_SPECIAL_CHARS ,
+ "op" => FILTER_SANITIZE_FULL_SPECIAL_CHARS ,
+ "com_order" => FILTER_VALIDATE_INT,
+ "com_id"=> FILTER_VALIDATE_INT
+ );
+
if (!empty($_POST)) {
- extract($_POST);
- $com_mode = isset($com_mode) ? htmlspecialchars(trim($com_mode), ENT_QUOTES) : 'flat';
- $com_order = isset($com_order) ? intval($com_order) : XOOPS_COMMENT_OLD1ST;
- $com_id = isset($com_id) ? intval($com_id) : 0;
+ $result = filter_input_array(INPUT_POST, $filters);
} else {
- $com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : 'flat';
- $com_order = isset($_GET['com_order']) ? intval($_GET['com_order']) : XOOPS_COMMENT_OLD1ST;
- $com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
-
+ $result = filter_input_array(INPUT_GET, $filters);
}
+$com_mode = $result['com_mode'] ? $result['com_mode'] : 'flat';
+$com_order = $result['com_order'] ? $result['com_order'] : XOOPS_COMMENT_OLD1ST;
+$com_id = $result['com_id'] ? $result['com_id'] : 0;
+if ($result['op']) {
+ $op = $result['op'];
+}
+
if ('system' == $xoopsModule->getVar('dirname')) {
$comment_handler =& xoops_gethandler('comment');
$comment =& $comment_handler->get($com_id);
@@ -62,10 +72,14 @@
// for the confirmation page
$comment_confirm_extra[$extra_param] = ${$extra_param};
} elseif (isset($_GET[$extra_param])) {
- $redirect_page .= $extra_param . '=' . $_GET[$extra_param] . '&';
+// $redirect_page .= $extra_param . '=' . $_GET[$extra_param] . '&';
+ $redirect_page .= $extra_param . '=' . filter_input(INPUT_GET, $extra_param, FILTER_SANITIZE_STRING) . '&';
+
+
// for the confirmation page
- $comment_confirm_extra[$extra_param] = $_GET[$extra_param];
+// $comment_confirm_extra[$extra_param] = $_GET[$extra_param];
+ $comment_confirm_extra[$extra_param] = filter_input(INPUT_GET, $extra_param, FILTER_SANITIZE_STRING);
}
}
}
@@ -271,4 +285,4 @@
break;
}
-?>
\ No newline at end of file
+?>
|
|
From: <be...@us...> - 2013-09-14 12:50:56
|
Revision: 12039
http://sourceforge.net/p/xoops/svn/12039
Author: beckmi
Date: 2013-09-14 12:50:52 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
adding some missing generic default fonts
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css
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 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:50:52 UTC (rev 12039)
@@ -19,11 +19,13 @@
- fixed bug in calendar.js (mamba)
- added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
- added placeholder for a link to upload test data, if available after installation (mamba)
-- assigning "static" to functions in XoopsUserUtility class (mamba)
+- assigning "static" to various class methods (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
- fixed missing check on variable in userinfo.php (cesag/mamba)
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
+- adding some missing generic default fonts (mamba)
+
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/css/admin.css 2013-09-14 12:50:52 UTC (rev 12039)
@@ -78,7 +78,7 @@
/* label */
.label {
-
+
color: #2F5376;
font-weight: bold;
}
@@ -131,7 +131,7 @@
/* menu */
div.rmmenuicon {
margin: 3px;
- font-family: Tahoma, Arial, Helvetica;
+ font-family: Tahoma, Arial, Helvetica, sans-serif;
text-align: center;
}
@@ -194,4 +194,4 @@
.txtchangelog {
height: 350px;
overflow: auto;
-}
\ No newline at end of file
+}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/globalnav.css 2013-09-14 12:50:52 UTC (rev 12039)
@@ -19,9 +19,9 @@
position: absolute;
background : #3390EF url(../img/navbar-bg.png) repeat-x left top;
color: #333;
- font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana Sans-serif;
+ font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana, Sans-serif;
font-weight: bold;
-
+
cursor: hand;
cursor: pointer;
z-index: 10;
@@ -54,14 +54,14 @@
body#sitemap .menu .xo-gbnavmodsitemap {background-color:transparent; color:#333; text-decoration: underline;}
.clearfix:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
visibility: hidden;
}
.clearfix {display: inline-block;}
/* Hides from IE-mac \*/
* html .clearfix {height: 1%;}
.clearfix {display: block;}
-/* End hide from IE-mac */
\ No newline at end of file
+/* End hide from IE-mac */
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css 2013-09-14 12:49:29 UTC (rev 12038)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/css/style.css 2013-09-14 12:50:52 UTC (rev 12039)
@@ -14,7 +14,7 @@
/* IMPORTANT !!! :
propriety semantic order = position box, width, heigth, margin, background-color, background-image, padding, content (color, style font, ...), border, ...
*/
-
+
/* include style sheets */
@import url(reset.css); /* reset css for web browsers */
@import url(globalnav.css); /* horizontal menu in header */
@@ -29,7 +29,7 @@
margin: 0;
background-color: #fff;
color: #333;
- font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana Sans-serif;
+ font-family: "Malgun Gothic", AppleGothic, Dotum, Lucida Grande, Verdana, Sans-serif;
line-height: 1.5em;
}
html {font-size:100.01%;}
@@ -78,11 +78,11 @@
a.pdf { background-image: url(../icons/action/pdf.png);}
a.friend { background-image: url(../icons/action/friend.png);}
/* ===== titles ===== */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6 {
margin: 1em 0 .5em 0;
- line-height: 1.2;
+ line-height: 1.2;
font-weight: bold;
- font-style: normal;
+ font-style: normal;
}
h1 { font-size: 1.4em; font-weight: bold;}
h2 {font-size: 1.2em;}
@@ -115,7 +115,7 @@
q, cite, em, dfn, strong { font-style:italic;}
bdo { direction: ltr;}
acronym, abbr, abbr[title], dfn { border-bottom: 1px dashed; cursor: help;}
-abbr[title] { border-bottom: 1px dotted; cursor: help;}
+abbr[title] { border-bottom: 1px dotted; cursor: help;}
acronym:hover, abbr:hover { border-bottom: #3390EF 1px dashed;}
::selection { background-color: #E7F4F7; color: #3390EF;}
::-moz-selection { background-color: #E7F4F7; color: #3390EF;}
@@ -135,8 +135,8 @@
#xo-canvas-content dd {}
#xo-canvas-content dl {}
#xo-canvas-content dt {}
-dl { margin: .75em 0;}
-dt { margin: .75em 0 0 0; font-weight: bold;}
+dl { margin: .75em 0;}
+dt { margin: .75em 0 0 0; font-weight: bold;}
dd { margin: .25em 0 .25em 1em; }
/* ===== forms ===== */
fieldset { margin: .5em; padding : 1em;}
@@ -333,7 +333,7 @@
margin-bottom: 1em;
color: #aaa;
font-size: .9em;
- font-family: Tahoma;
+ font-family: Tahoma, sans-serif;
text-align: center;
text-shadow: 1px 1px 2px #ccc;
border : 1px solid #ddd;
@@ -422,7 +422,7 @@
background-color: #fff;
padding: 6px;
color: inherit;
- font-family: "Courier New",Courier,monospace;
+ font-family: "Courier New",Courier,monospace;
border: 1px solid #ddd;
}
.xoopsQuote {
@@ -629,7 +629,7 @@
font-size: 1.4em;
font-weight: bold;
border-bottom: 2px solid #333;
-}
+}
/* fix bug publisher module */
#tabs ul li {list-style: none;}
|
|
From: <be...@us...> - 2013-09-14 12:53:20
|
Revision: 12040
http://sourceforge.net/p/xoops/svn/12040
Author: beckmi
Date: 2013-09-14 12:53:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
removing some unreachable statements
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/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/user.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 2013-09-14 12:50:52 UTC (rev 12039)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 12:53:17 UTC (rev 12040)
@@ -24,8 +24,8 @@
- fixed missing check on variable in userinfo.php (cesag/mamba)
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
- adding some missing generic default fonts (mamba)
+- removing some unreachable statements (mamba)
-
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2013-09-14 12:50:52 UTC (rev 12039)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2013-09-14 12:53:17 UTC (rev 12040)
@@ -783,7 +783,7 @@
return true;
}
- return false;
+// return false;
}
function BMPcompressionWindowsLookup($compressionid)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php 2013-09-14 12:50:52 UTC (rev 12039)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php 2013-09-14 12:53:17 UTC (rev 12040)
@@ -109,7 +109,7 @@
if (empty($id)) {
redirect_header('index.php', 1, '');
- exit();
+// exit();
}
$member_handler =& xoops_gethandler('member');
$thisuser =& $member_handler->getUser($id);
|
|
From: <be...@us...> - 2013-09-14 14:06:20
|
Revision: 12041
http://sourceforge.net/p/xoops/svn/12041
Author: beckmi
Date: 2013-09-14 14:06:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
replacing deprecated HTML tags
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css
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 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 14:06:17 UTC (rev 12041)
@@ -25,6 +25,7 @@
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
- adding some missing generic default fonts (mamba)
- removing some unreachable statements (mamba)
+- replacing deprecated HTML tags (mamba)
Updated:
- jGrowl to 1.2.13 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl 2013-09-14 14:06:17 UTC (rev 12041)
@@ -37,12 +37,12 @@
}
body {
- background: black;
+ background: black;
}
p, table, div {
background: #f0ead8;
-}
+}
p {
margin: 0;
@@ -98,8 +98,8 @@
<div>
{section name=templates loop=$_debug_tpls}
{section name=indent loop=$_debug_tpls[templates].depth} {/section}
- <font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
- {$_debug_tpls[templates].filename|escape:html}</font>
+ <span color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
+ {$_debug_tpls[templates].filename|escape:html}</span>
{if isset($_debug_tpls[templates].exec_time)}
<span class="exectime">
({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
@@ -154,4 +154,4 @@
_smarty_console.document.close();
// ]]>
</script>
-{/if}
\ No newline at end of file
+{/if}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 2013-09-14 14:06:17 UTC (rev 12041)
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span> ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span> ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<span color="$1">$2</span>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span> ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span> ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.js 2013-09-14 14:06:17 UTC (rev 12041)
@@ -13,8 +13,8 @@
this.field = field;
this.initPalette = !palette || palette > 3 ? 3 : palette;
var w = 194, h = 240,
- move = screen ?
- ',left=' + ((screen.width - w) >> 1) + ',top=' + ((screen.height - h) >> 1) : '',
+ move = screen ?
+ ',left=' + ((screen.width - w) >> 1) + ',top=' + ((screen.height - h) >> 1) : '',
o_colWindow = window.open(this.path+'color-picker.html', null, "help=no,status=no,scrollbars=no,resizable=no" + move + ",width=" + w + ",height=" + h + ",dependent=yes", true);
o_colWindow.opener = window;
o_colWindow.focus();
@@ -33,11 +33,11 @@
function TCPaint(c, b_noPref) {
c = (b_noPref ? '' : '#') + c.toUpperCase();
- if (this.o_samp)
- this.o_samp.innerHTML = '<font face=Tahoma size=2>' + c +' <font color=white>' + c + '</font></font>'
+ if (this.o_samp)
+ this.o_samp.innerHTML = '<span face=Tahoma size=2>' + c +' <span color=white>' + c + '</span></span>'
if(this.doc.layers)
this.sample.bgColor = c;
- else {
+ else {
if (this.sample.backgroundColor != null) this.sample.backgroundColor = c;
else if (this.sample.background != null) this.sample.background = c;
}
@@ -64,7 +64,7 @@
s += this.bldCell(i * 51, k * 51 + (j % 2) * 51 * 3, Math.floor(j / 2) * 51, 8, 10);
s += "</tr>";
}
- return s
+ return s
}
function TCGenerateMac() {
var s = '';
@@ -127,10 +127,10 @@
this.build1 = TCGenerateWind;
this.build2 = TCGenerateGray;
this.build3 = TCGenerateMac;
- this.show = document.layers ?
+ this.show = document.layers ?
function (div) { this.divs[div].visibility = 'show' } :
function (div) { this.divs[div].visibility = 'visible' };
- this.hide = document.layers ?
+ this.hide = document.layers ?
function (div) { this.divs[div].visibility = 'hide' } :
function (div) { this.divs[div].visibility = 'hidden' };
// event handlers
@@ -147,25 +147,25 @@
function TCDraw(o_win, o_doc) {
this.win = o_win;
this.doc = o_doc;
- var
- s_tag_openT = o_doc.layers ?
- 'layer visibility=hidden top=30 left=5 width=182' :
- 'div style=visibility:hidden;position:absolute;left:6px;top:30px;width:182px;height:0',
- s_tag_openS = o_doc.layers ? 'layer top=32 left=6' : 'div',
- s_tag_close = o_doc.layers ? 'layer' : 'div'
-
- this.doc.write('<' + s_tag_openS + ' id=sam name=sam><table cellpadding=0 cellspacing=0 border=1 width=181 align=center class=bd><tr><td align=center height=18><div id="samp"><font face=Tahoma size=2>sample <font color=white>sample</font></font></div></td></tr></table></' + s_tag_close + '>');
- this.sample = o_doc.layers ? o_doc.layers['sam'] :
+ var
+ s_tag_openT = o_doc.layers ?
+ 'layer visibility=hidden top=30 left=5 width=182' :
+ 'div style=visibility:hidden;position:absolute;left:6px;top:30px;width:182px;height:0',
+ s_tag_openS = o_doc.layers ? 'layer top=32 left=6' : 'div',
+ s_tag_close = o_doc.layers ? 'layer' : 'div'
+
+ this.doc.write('<' + s_tag_openS + ' id=sam name=sam><table cellpadding=0 cellspacing=0 border=1 width=181 align=center class=bd><tr><td align=center height=18><div id="samp"><span face=Tahoma size=2>sample <span color=white>sample</span></span></div></td></tr></table></' + s_tag_close + '>');
+ this.sample = o_doc.layers ? o_doc.layers['sam'] :
o_doc.getElementById ? o_doc.getElementById('sam').style : o_doc.all['sam'].style
for (var k = 0; k < 4; k ++) {
this.doc.write('<' + s_tag_openT + ' id="p' + k + '" name="p' + k + '"><table cellpadding=0 cellspacing=0 border=1 align=center>' + this['build' + k]() + '</table></' + s_tag_close + '>');
- this.divs[k] = o_doc.layers
- ? o_doc.layers['p' + k] : o_doc.all
+ this.divs[k] = o_doc.layers
+ ? o_doc.layers['p' + k] : o_doc.all
? o_doc.all['p' + k].style : o_doc.getElementById('p' + k).style
}
- if (!o_doc.layers && o_doc.body.innerHTML)
- this.o_samp = o_doc.all
+ if (!o_doc.layers && o_doc.body.innerHTML)
+ this.o_samp = o_doc.all
? o_doc.all.samp : o_doc.getElementById('samp');
this.C(this.initPalette);
if (this.field.value) this.P(this.field.value, true)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -18,7 +18,7 @@
// Translator: XOOPS Translation Team
define('SHOW_HIDE_HELP',"Show/hide help text");
// License
-define('LICENSE_NOT_WRITEABLE','License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
+define('LICENSE_NOT_WRITEABLE','License is %s . <br/><span style="colour:#ff0000">Make ../include/license.php Writable</span>');
define('LICENSE_IS_WRITEABLE','License is %s');
// Configuration check page
define('SERVER_API',"Server API");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -4,7 +4,7 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
// License
-define('LICENSE_NOT_WRITEABLE','License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
+define('LICENSE_NOT_WRITEABLE','License is %s . <br/><span style="colour:#ff0000">Make ../include/license.php Writable</span>');
define('LICENSE_IS_WRITEABLE','License is %s');
define('_INSTALL_WEBMASTER','Webmasters');
define('_INSTALL_WEBMASTERD','Webmasters of this site');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -6,7 +6,7 @@
$content .= '
<p>
- <acronym title="eXtensible Object-Oriented Portal System">XOOPS</acronym> is an open-source
+ <abbr title="eXtensible Object-Oriented Portal System">XOOPS</abbr> is an open-source
Object-Oriented Web publishing system written in PHP. It is an ideal tool for
developing small to large dynamic community websites, intra company portals, corporate portals, weblogs and much more.
</p>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/global.php 2013-09-14 14:06:17 UTC (rev 12041)
@@ -22,7 +22,7 @@
define('_OLDESTFIRST','Oldest First');
define('_NEWESTFIRST','Newest First');
define('_MORE','more...');
-define('_MULTIPAGE','To have your article span multiple pages, insert the word <font color=red>[pagebreak]</font> (with brackets) in the article.');
+define('_MULTIPAGE','To have your article span multiple pages, insert the word <span color=red>[pagebreak]</span> (with brackets) in the article.');
define('_IFNOTRELOAD','If the page does not automatically reload, please click <a href=\'%s\'>here</a>');
// Error messages issued by XoopsObject::cleanVars()
define('_XOBJ_ERR_REQUIRED','%s is required');
@@ -108,7 +108,7 @@
define("_MD_STRTYOPENG","This can not be changed afterwards!");
define("_MD_ASFILE","Store as files (in uploads directory)");
define("_MD_INDB","Store in the database (as binary \"blob\" data)");
-define("_MD_IMGMAIN","Category");
+define("_MD_IMGMAIN","Category");
define("_MD_EDITIMGCAT","Images Settings");
define('_IMGMANAGER','Image Manager');
define('_NUMIMAGES','%s images');
@@ -219,4 +219,4 @@
**/
define('_DBDATESTRING','Y-m-d');
define('_DBTIMESTRING','H:i:s');
-define('_DBTIMESTAMPSTRING','Y-m-d H:i:s');
\ No newline at end of file
+define('_DBTIMESTAMPSTRING','Y-m-d H:i:s');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css 2013-09-14 12:53:17 UTC (rev 12040)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/css/help.css 2013-09-14 14:06:17 UTC (rev 12041)
@@ -1,46 +1,46 @@
-/* Help */
-.tips{
- color:#000;
- border:1px solid #00cc00;
- padding:8px;
- margin:15px 10px;
+/* Help */
+.tips{
+ color:#000;
+ border:1px solid #00cc00;
+ padding:8px;
+ margin:15px 10px;
}
-
-.tips img {
+
+.tips img {
width:22px;
height:22px;
}
-
-p {
+
+p {
text-align:justify;
}
-
-.xo-help-menu {
- border:1px solid #ccc;
+
+.xo-help-menu {
+ border:1px solid #ccc;
padding: 5px;
margin: 5px auto;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-khtml-border-radius: 3px;
-}
-
-#help-template {
- width: 98% !important;
+}
+
+#help-template {
+ width: 98% !important;
border:1px solid #ccc;
- padding: 5px;
+ padding: 5px;
}
-#help-content {
- width: 98% !important;
- margin: 0 auto;
+#help-content {
+ width: 98% !important;
+ margin: 0 auto;
}
#non-modhelp {
padding: 20px;
background-color: #dfdfdf;
border:1px solid #ccc;
- font-style: 12px;
+ font-size: 12px;
font-weight: bold;
-
-}
\ No newline at end of file
+
+}
|
|
From: <be...@us...> - 2013-09-14 15:28:20
|
Revision: 12042
http://sourceforge.net/p/xoops/svn/12042
Author: beckmi
Date: 2013-09-14 15:28:17 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
ID: 1285 check if session exists before attempting to start a new one (wishcraft)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.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 2013-09-14 14:06:17 UTC (rev 12041)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 15:28:17 UTC (rev 12042)
@@ -5,6 +5,10 @@
===============================
Bugfixes:
- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
+- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
+- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
+
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
- added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
@@ -13,13 +17,11 @@
- fixed wrong return icon in Smarty xoModuleIcons32
- fixed issue with jGrows in xoops.css (xoobaru/tarik)
- fix for deprecated "preg_replace/e" function in PHP 5.5 (mamba)
-- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
- added: check if 'date.timezone' is set in php.ini, if not, set it to UTC (cesag/mamba)
- assigned _SHORTDATESTRING to _CAL_FORMAT to have consistency in local languages (jcweb/guspel)
- fixed bug in calendar.js (mamba)
- added link to Module's Admin after "Update" (currently only to XOOPS Modules section) (mamba)
- added placeholder for a link to upload test data, if available after installation (mamba)
-- assigning "static" to various class methods (mamba)
- solved bug into PM module readpmsg.php (escrime-info/slider84)
- fixed missing check on variable in userinfo.php (cesag/mamba)
- replaced extract($_POST) in /include/comment_delete.php with filters (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php 2013-09-14 14:06:17 UTC (rev 12041)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php 2013-09-14 15:28:17 UTC (rev 12042)
@@ -200,8 +200,11 @@
array(&$sess_handler, 'write'),
array(&$sess_handler, 'destroy'),
array(&$sess_handler, 'gc'));
-session_start();
+if (strlen(session_id()) == 0) {
+ session_start();
+}
+
/**
* Remove expired session for xoopsUserId
*/
|
|
From: <be...@us...> - 2013-09-14 16:40:21
|
Revision: 12043
http://sourceforge.net/p/xoops/svn/12043
Author: beckmi
Date: 2013-09-14 16:40:18 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
Bug fixes (missing index in Profile, wrong name in email notification template)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.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 2013-09-14 15:28:17 UTC (rev 12042)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 16:40:18 UTC (rev 12043)
@@ -4,7 +4,7 @@
2013/05/08: Version 2.5.7 Beta 1
===============================
Bugfixes:
-- ID: 1269 Block template file will not updated after update the module (Irmtfan)
+- ID: 1269 Block template file will not updated after update the module (irmtfan)
- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
- ID: 1287 assigning "static" to various class methods (wishcraft/mamba)
- ID: 1285 check if session exists before attempting to start a new one (wishcraft)
@@ -28,7 +28,12 @@
- adding some missing generic default fonts (mamba)
- removing some unreachable statements (mamba)
- replacing deprecated HTML tags (mamba)
+- bug in commentrenderer.php (Roby73/irmtfan)
+- added missing info about new language constants in Fast Comments (irmtfan/mamba)
+- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
+- fixed template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
+
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl 2013-09-14 15:28:17 UTC (rev 12042)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail_template/default_notify.tpl 2013-09-14 16:40:18 UTC (rev 12043)
@@ -1,6 +1,6 @@
Hello {X_UNAME},
-The event {X_NOTIFY_EVENT} has occurred to the {X_ITEM_TYPE} "{X_ITEM_TILE}" you are monitoring in the {X_MODULE} module at our site.
+The event {X_NOTIFY_EVENT} has occurred to the {X_ITEM_TYPE} "{X_ITEM_NAME}" you are monitoring in the {X_MODULE} module at our site.
You can view the {X_ITEM_TYPE} here:
{X_ITEM_URL}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2013-09-14 15:28:17 UTC (rev 12042)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2013-09-14 16:40:18 UTC (rev 12043)
@@ -21,7 +21,7 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
include_once $GLOBALS['xoops']->path('modules/system/constants.php');
-$uid = intval($_GET['uid']);
+$uid = isset($_GET['uid'])? intval($_GET['uid']):0;
if ($uid <= 0) {
if (is_object($GLOBALS['xoopsUser']) ) {
$uid = $GLOBALS['xoopsUser']->getVar('uid');
|
|
From: <be...@us...> - 2013-09-14 18:07:54
|
Revision: 12044
http://sourceforge.net/p/xoops/svn/12044
Author: beckmi
Date: 2013-09-14 18:07:51 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
bugs: 1227 and 1278
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.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 2013-09-14 16:40:18 UTC (rev 12043)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-14 18:07:51 UTC (rev 12044)
@@ -4,10 +4,13 @@
2013/05/08: Version 2.5.7 Beta 1
===============================
Bugfixes:
-- ID: 1269 Block template file will not updated after update the module (irmtfan)
- ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec)
+- ID: 1227 Sorting bug in Profile module search (Zyspec)
+- 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: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
+- 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: 1285 check if session exists before attempting to start a new one (wishcraft)
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
@@ -31,9 +34,7 @@
- bug in commentrenderer.php (Roby73/irmtfan)
- added missing info about new language constants in Fast Comments (irmtfan/mamba)
- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
-- fixed template issue in email notifications (changed X_ITEM_TILE to X_ITEM_NAME) (alain01/slider84/mamba)
-
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php 2013-09-14 16:40:18 UTC (rev 12043)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php 2013-09-14 18:07:51 UTC (rev 12044)
@@ -342,14 +342,32 @@
}
}
- if ($_REQUEST['sortby'] == "name") {
- $criteria->setSort("name");
- } else if ($_REQUEST['sortby'] == "email") {
- $criteria->setSort("email");
- } else if ($_REQUEST['sortby'] == "uname") {
- $criteria->setSort("uname");
- } else if (isset($fields[$_REQUEST['sortby']])) {
- $criteria->setSort($fields[$_REQUEST['sortby']]->getVar('field_name'));
+// if ($_REQUEST['sortby'] == "name") {
+// $criteria->setSort("name");
+// } else if ($_REQUEST['sortby'] == "email") {
+// $criteria->setSort("email");
+// } else if ($_REQUEST['sortby'] == "uname") {
+// $criteria->setSort("uname");
+// } else if (isset($fields[$_REQUEST['sortby']])) {
+// $criteria->setSort($fields[$_REQUEST['sortby']]->getVar('field_name'));
+// }
+
+// change by zyspec:
+ $sortby = 'uname';
+ if (!empty($_REQUEST['sortby'])) {
+ switch ($_REQUEST['sortby']) {
+ case 'name':
+ case 'email':
+ case 'uname':
+ $sortby = $_REQUEST['sortby'];
+ break;
+ default:
+ if (isset($fields[$_REQUEST['sortby']])) {
+ $sortby = $fields[$_REQUEST['sortby']]->getVar('field_name');
+ }
+ break;
+ }
+ $criteria->setSort($sortby);
}
// add search groups , only for Webmasters
@@ -403,7 +421,9 @@
if ($total_users > $limit) {
$search_url[] = "op=results";
$search_url[] = "order=" . $order;
- $search_url[] = "sortby=" . htmlspecialchars($_REQUEST['sortby']);
+//TODO remove it for final release
+// $search_url[] = "sortby=" . htmlspecialchars($_REQUEST['sortby']);
+ $search_url[] = "sortby=" . htmlspecialchars($sortby); // change by zyspec
$search_url[] = "limit=" . $limit;
if (isset($search_url)) {
$args = implode("&", $search_url);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php 2013-09-14 16:40:18 UTC (rev 12043)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/mailusers/main.php 2013-09-14 18:07:51 UTC (rev 12044)
@@ -263,7 +263,7 @@
//echo $xoopsMailer->getErrors();
if ( $count_criteria > $limit ) {
- $form = new XoopsThemeForm(_AM_SENDMTOUSERS, "mailusers", "admin.php?fct=mailusers", 'post', true);
+ $form = new XoopsThemeForm(_AM_SYSTEM_MAILUSERS_LIST, "mailusers", "admin.php?fct=mailusers", 'post', true);
if ( !empty($_POST['mail_to_group']) ) {
foreach ( $_POST['mail_to_group'] as $mailgroup) {
$group_hidden = new XoopsFormHidden("mail_to_group[]", $mailgroup);
|
|
From: <be...@us...> - 2013-09-15 01:28:36
|
Revision: 12050
http://sourceforge.net/p/xoops/svn/12050
Author: beckmi
Date: 2013-09-15 01:28:32 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Bug ID: 1273 template duplicate issue (irmtfan)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql
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/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.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 2013-09-14 21:28:28 UTC (rev 12049)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-15 01:28:32 UTC (rev 12050)
@@ -11,6 +11,7 @@
- ID: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
- 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: 1273 template duplicate issue (irmtfan)
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql 2013-09-14 21:28:28 UTC (rev 12049)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/sql/mysql.structure.sql 2013-09-15 01:28:32 UTC (rev 12050)
@@ -498,7 +498,7 @@
#
# Table structure for table `tplfile`
#
-
+# irmtfan bug fix: solve templates duplicate issue
CREATE TABLE tplfile (
tpl_id mediumint(7) unsigned NOT NULL auto_increment,
tpl_refid smallint(5) unsigned NOT NULL default '0',
@@ -511,7 +511,8 @@
tpl_type varchar(20) NOT NULL default '',
PRIMARY KEY (tpl_id),
KEY tpl_refid (tpl_refid,tpl_type),
- KEY tpl_tplset (tpl_tplset,tpl_file(10))
+ KEY tpl_tplset (tpl_tplset,tpl_file(10)) ,
+ UNIQUE tpl_refid_module_set_file_type (tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type)
) ENGINE=MyISAM;
# --------------------------------------------------------
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 2013-09-14 21:28:28 UTC (rev 12049)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-15 01:28:32 UTC (rev 12050)
@@ -30,20 +30,22 @@
// ------------------------------------------------------------------------- //
// Check users rights
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit(_NOPERM);
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
+ exit(_NOPERM);
+}
include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
include_once XOOPS_ROOT_PATH . '/modules/system/admin/modulesadmin/modulesadmin.php';
-if ( isset($_POST) ) {
- foreach ( $_POST as $k => $v ) {
+if (isset($_POST)) {
+ foreach ($_POST as $k => $v) {
${$k} = $v;
}
}
// Get Action type
-$op = system_CleanVars ( $_REQUEST, 'op', 'list', 'string' );
-$module = system_CleanVars ( $_REQUEST, 'module', '', 'string' );
+$op = system_CleanVars($_REQUEST, 'op', 'list', 'string');
+$module = system_CleanVars($_REQUEST, 'module', '', 'string');
if (in_array($op, array('confirm', 'submit', 'install_ok', 'update_ok', 'uninstall_ok'))) {
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -60,41 +62,43 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(
+ XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'
+ );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('modules/system/js/admin.js');
$xoTheme->addScript('modules/system/js/module.js');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') );
- $xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_TIPS );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help'));
+ $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_TIPS);
$xoBreadCrumb->render();
// Get Module Handler
$module_handler =& xoops_gethandler('module');
- $criteria = new CriteriaCompo();
+ $criteria = new CriteriaCompo();
$criteria->setSort('weight');
$criteria->setOrder('ASC');
// Get all installed modules
- $installed_mods = $module_handler->getObjects( $criteria );
- $listed_mods = array();
- $i = 0;
- $install_mods = array();
- foreach ( $installed_mods as $module ) {
- $listed_mods[$i] = $module->toArray();
+ $installed_mods = $module_handler->getObjects($criteria);
+ $listed_mods = array();
+ $i = 0;
+ $install_mods = array();
+ foreach ($installed_mods as $module) {
+ $listed_mods[$i] = $module->toArray();
$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]['last_update'] = formatTimestamp( $module->getVar('last_update'), 'm' );
+ $listed_mods[$i]['version'] = round($module->getVar('version') / 100, 2);
+ $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');
$listed_mods[$i]['license'] = $module->getInfo('license');
$listed_mods[$i]['description'] = $module->getInfo('description');
- if ( round( $module->getInfo( 'version' ), 2 ) != $listed_mods[$i]['version']){
+ if (round($module->getInfo('version'), 2) != $listed_mods[$i]['version']) {
$listed_mods[$i]['warning_update'] = true;
- }else{
+ } else {
$listed_mods[$i]['warning_update'] = false;
}
$install_mods[] = $module->getInfo('dirname');
@@ -102,14 +106,14 @@
$i++;
}
// Get module to install
- $dirlist = XoopsLists::getModulesList();
+ $dirlist = XoopsLists::getModulesList();
$toinstall_mods = array();
- $i=0;
+ $i = 0;
foreach ($dirlist as $file) {
- if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php' ) ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
clearstatcache();
$file = trim($file);
- if ( !in_array($file, $install_mods) ) {
+ if (!in_array($file, $install_mods)) {
$i++;
}
}
@@ -129,34 +133,36 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(
+ XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'
+ );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_TOINSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#install' );
- $xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_TIPS );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_TOINSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
+ $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_TIPS);
$xoBreadCrumb->render();
// Get Module Handler
$module_handler =& xoops_gethandler('module');
// Get all installed modules
$installed_mods = $module_handler->getObjects();
- foreach ( $installed_mods as $module ) {
+ foreach ($installed_mods as $module) {
$install_mods[] = $module->getInfo('dirname');
}
// Get module to install
- $dirlist = XoopsLists::getModulesList();
+ $dirlist = XoopsLists::getModulesList();
$toinstall_mods = array();
- $i=0;
+ $i = 0;
foreach ($dirlist as $file) {
- if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php' ) ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
clearstatcache();
$file = trim($file);
- if ( !in_array($file, $install_mods) ) {
+ if (!in_array($file, $install_mods)) {
$module =& $module_handler->create();
$module->loadInfo($file);
$toinstall_mods[$i]['name'] = $module->getInfo('name');
@@ -183,16 +189,16 @@
case 'order':
// Get Module Handler
$module_handler =& xoops_gethandler('module');
- if ( isset($_POST['mod']) ) {
- $i=1;
+ if (isset($_POST['mod'])) {
+ $i = 1;
foreach ($_POST['mod'] as $order) {
- if( $order > 0 ) {
+ if ($order > 0) {
$module = $module_handler->get($order);
//Change order only for visible modules
if ($module->getVar('weight') != 0) {
$module->setVar('weight', $i);
if (!$module_handler->insert($module)) {
- $error=true;
+ $error = true;
}
$i++;
}
@@ -208,32 +214,32 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_VALIDATE );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#confirm' );
- $xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_CONFIRM_TIPS );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_VALIDATE);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#confirm');
+ $xoBreadCrumb->addTips(_AM_SYSTEM_MODULES_CONFIRM_TIPS);
$xoBreadCrumb->render();
$error = array();
- if ( !is_writable(XOOPS_CACHE_PATH.'/') ) {
+ if (!is_writable(XOOPS_CACHE_PATH . '/')) {
// attempt to chmod 666
- if ( !chmod(XOOPS_CACHE_PATH.'/', 0777) ) {
- $error[] = sprintf(_MUSTWABLE, "<strong>".XOOPS_CACHE_PATH.'/</strong>');
+ if (!chmod(XOOPS_CACHE_PATH . '/', 0777)) {
+ $error[] = sprintf(_MUSTWABLE, "<strong>" . XOOPS_CACHE_PATH . '/</strong>');
}
}
- if ( count($error) > 0 ) {
+ if (count($error) > 0) {
// Display Error
xoops_error($error);
// Call Footer
xoops_cp_footer();
exit();
}
- $i = 0;
+ $i = 0;
$modifs_mods = array();
- $module = empty($_POST['module']) ? array() : $_POST['module'];
+ $module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
- $mid = (int) $mid;
+ $mid = (int)$mid;
$modifs_mods[$i]['mid'] = $mid;
$modifs_mods[$i]['oldname'] = $myts->htmlspecialchars($myts->stripSlashesGPC($oldname[$mid]));
$modifs_mods[$i]['newname'] = $myts->htmlspecialchars(trim($myts->stripslashesGPC($newname[$mid])));
@@ -249,21 +255,21 @@
case 'display':
// Get module handler
$module_handler =& xoops_gethandler('module');
- $module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
- if ( $module_id > 0 ) {
- $module =& $module_handler->get( $module_id );
- $old = $module->getVar('isactive');
+ $module_id = system_CleanVars($_POST, 'mid', 0, 'int');
+ if ($module_id > 0) {
+ $module =& $module_handler->get($module_id);
+ $old = $module->getVar('isactive');
// Set value
- $module->setVar('isactive', !$old );
+ $module->setVar('isactive', !$old);
if (!$module_handler->insert($module)) {
- $error=true;
+ $error = true;
}
- $blocks = XoopsBlock::getByModule($module_id);
- $bcount = count($blocks);
- for ($i = 0; $i < $bcount; $i++) {
- $blocks[$i]->setVar('isactive', !$old);
- $blocks[$i]->store();
- }
+ $blocks = XoopsBlock::getByModule($module_id);
+ $bcount = count($blocks);
+ for ($i = 0; $i < $bcount; $i++) {
+ $blocks[$i]->setVar('isactive', !$old);
+ $blocks[$i]->store();
+ }
//Set active modules in cache folder
xoops_setActiveModules();
}
@@ -272,24 +278,24 @@
case 'display_in_menu':
// Get module handler
$module_handler =& xoops_gethandler('module');
- $module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
- if ( $module_id > 0 ) {
+ $module_id = system_CleanVars($_POST, 'mid', 0, 'int');
+ if ($module_id > 0) {
$module =& $module_handler->get($module_id);
- $old = $module->getVar('weight');
+ $old = $module->getVar('weight');
// Set value
- $module->setVar('weight', !$old );
+ $module->setVar('weight', !$old);
if (!$module_handler->insert($module)) {
- $error=true;
+ $error = true;
}
}
- break;
+ break;
case 'submit':
- $ret = array();
- $write = false;
+ $ret = array();
+ $write = false;
$module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
- if (isset($newstatus[$mid]) && $newstatus[$mid] ==1) {
+ if (isset($newstatus[$mid]) && $newstatus[$mid] == 1) {
if ($oldstatus[$mid] == 0) {
$ret[] = xoops_module_activate($mid);
}
@@ -299,12 +305,12 @@
}
}
$newname[$mid] = trim($newname[$mid]);
- if ($oldname[$mid] != $newname[$mid] ) {
+ if ($oldname[$mid] != $newname[$mid]) {
$ret[] = xoops_module_change($mid, $newname[$mid]);
$write = true;
}
}
- if ( $write ) {
+ if ($write) {
// Flush cache files for cpanel GUIs
xoops_load('cpanel', 'system');
XoopsSystemCpanel::flush();
@@ -317,13 +323,13 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_SUBMITRES );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#submit' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_SUBMITRES);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#submit');
$xoBreadCrumb->render();
- if ( count($ret) > 0 ) {
+ if (count($ret) > 0) {
$xoopsTpl->assign('result', $ret);
}
// Call Footer
@@ -334,30 +340,38 @@
$module = $myts->htmlspecialchars($module);
// Get module handler
$module_handler =& xoops_gethandler('module');
- $mod =& $module_handler->create();
+ $mod =& $module_handler->create();
$mod->loadInfoAsVar($module);
// Construct message
if ($mod->getInfo('image') != false && trim($mod->getInfo('image')) != '') {
- $msgs ='<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+ $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim(
+ $mod->getInfo('image')
+ ) . '" alt="" />';
}
- $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's') . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREINS;
+ $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's')
+ . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREINS;
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_INSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#install' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_INSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
$xoBreadCrumb->render();
// Display question message
- xoops_confirm(array('module' => $module, 'op' => 'install_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_INSTALL);
+ xoops_confirm(
+ array('module' => $module, 'op' => 'install_ok', 'fct' => 'modulesadmin'),
+ 'admin.php',
+ $msgs,
+ _AM_SYSTEM_MODULES_INSTALL
+ );
// Call Footer
xoops_cp_footer();
break;
case 'install_ok':
- $ret = array();
+ $ret = array();
$ret[] = xoops_module_install($module);
// Flush cache files for cpanel GUIs
xoops_load('cpanel', 'system');
@@ -369,11 +383,11 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_INSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#install' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_INSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#install');
$xoBreadCrumb->render();
if (count($ret) > 0) {
foreach ($ret as $msg) {
@@ -390,29 +404,37 @@
$module = $myts->htmlspecialchars($module);
// Get module handler
$module_handler =& xoops_gethandler('module');
- $mod =& $module_handler->getByDirname($module);
+ $mod =& $module_handler->getByDirname($module);
// Construct message
if ($mod->getInfo('image') != false && trim($mod->getInfo('image')) != '') {
- $msgs ='<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+ $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim(
+ $mod->getInfo('image')
+ ) . '" alt="" />';
}
- $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name') . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUNINS;
+ $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name')
+ . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUNINS;
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UNINSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#delete' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UNINSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#delete');
$xoBreadCrumb->render();
// Display Question
- xoops_confirm(array('module' => $module, 'op' => 'uninstall_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_UNINSTALL);
+ xoops_confirm(
+ array('module' => $module, 'op' => 'uninstall_ok', 'fct' => 'modulesadmin'),
+ 'admin.php',
+ $msgs,
+ _AM_SYSTEM_MODULES_UNINSTALL
+ );
// Call Footer
xoops_cp_footer();
break;
case 'uninstall_ok':
- $ret = array();
+ $ret = array();
$ret[] = xoops_module_uninstall($module);
// Flush cache files for cpanel GUIs
xoops_load("cpanel", "system");
@@ -424,11 +446,11 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UNINSTALL );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#delete' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UNINSTALL);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#delete');
$xoBreadCrumb->render();
if (count($ret) > 0) {
foreach ($ret as $msg) {
@@ -445,70 +467,83 @@
$module = $myts->htmlspecialchars($module);
// Get module handler
$module_handler =& xoops_gethandler('module');
- $mod =& $module_handler->getByDirname($module);
+ $mod =& $module_handler->getByDirname($module);
// Construct message
if ($mod->getInfo('image') != false && trim($mod->getInfo('image')) != '') {
- $msgs ='<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim($mod->getInfo('image')) . '" alt="" />';
+ $msgs = '<img src="' . XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . trim(
+ $mod->getInfo('image')
+ ) . '" alt="" />';
}
- $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's') . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUPD;
+ $msgs .= '<br /><span style="font-size:smaller;">' . $mod->getVar('name', 's')
+ . '</span><br /><br />' . _AM_SYSTEM_MODULES_RUSUREUPD;
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UPDATE );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#update' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UPDATE);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#update');
$xoBreadCrumb->render();
// Display message
- xoops_confirm(array('dirname' => $module, 'op' => 'update_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _AM_SYSTEM_MODULES_UPDATE);
+ xoops_confirm(
+ array('dirname' => $module, 'op' => 'update_ok', 'fct' => 'modulesadmin'),
+ 'admin.php',
+ $msgs,
+ _AM_SYSTEM_MODULES_UPDATE
+ );
// Call Footer
xoops_cp_footer();
break;
case 'update_ok':
- $dirname = $myts->htmlspecialchars(trim($dirname));
+ $dirname = $myts->htmlspecialchars(trim($dirname));
$module_handler =& xoops_gethandler('module');
- $module =& $module_handler->getByDirname($dirname);
+ $module =& $module_handler->getByDirname($dirname);
// Save current version for use in the update function
$prev_version = $module->getVar('version');
- $clearTpl = new XoopsTpl();
+ $clearTpl = new XoopsTpl();
$clearTpl->clearCache($dirname);
// we dont want to change the module name set by admin
$temp_name = $module->getVar('name');
$module->loadInfoAsVar($dirname);
$module->setVar('name', $temp_name);
- $module->setVar('last_update', time() );
+ $module->setVar('last_update', time());
// Call Header
// Define main template
$xoopsOption['template_main'] = 'system_header.html';
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
// Define Breadcrumb and tips
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- $xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_UPDATE );
- $xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') . '#update' );
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath'));
+ $xoBreadCrumb->addLink(_AM_SYSTEM_MODULES_UPDATE);
+ $xoBreadCrumb->addHelp(system_adminVersion('modulesadmin', 'help') . '#update');
$xoBreadCrumb->render();
if (!$module_handler->insert($module)) {
- echo '<p>Could not update '.$module->getVar('name').'</p>';
- echo "<br /><div class='center'><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN . "</a></div>";
+ echo '<p>Could not update ' . $module->getVar('name') . '</p>';
+ echo "<br /><div class='center'><a href='admin.php?fct=modulesadmin'>" . _AM_SYSTEM_MODULES_BTOMADMIN
+ . "</a></div>";
} else {
$newmid = $module->getVar('mid');
- $msgs = array();
+ $msgs = array();
$msgs[] = '<div id="xo-module-log"><div class="header">';
- $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UPDATING . $module->getInfo('name', 's') . '</h4>';
+ $msgs[] = $errs[] = '<h4>' . _AM_SYS...
[truncated message content] |
|
From: <be...@us...> - 2013-09-15 01:45:13
|
Revision: 12051
http://sourceforge.net/p/xoops/svn/12051
Author: beckmi
Date: 2013-09-15 01:45:10 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Bug # 1271 install last page no css/js (Tarik)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.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 2013-09-15 01:28:32 UTC (rev 12050)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-15 01:45:10 UTC (rev 12051)
@@ -8,11 +8,13 @@
- ID: 1227 Sorting bug in Profile module search (Zyspec)
- 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: 1273 template duplicate issue (irmtfan)
- ID: 1278 _AM_SENDMTOUSERS missed (Mowaffaq/mamba)
- 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: 1273 template duplicate issue (irmtfan)
+
- reversing fix for potential lack of rendering css and javascript in Installer on the last screen by culex
- removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
- added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2013-09-15 01:28:32 UTC (rev 12050)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2013-09-15 01:45:10 UTC (rev 12051)
@@ -167,6 +167,7 @@
//window.location = newinstallurl;
loadjscssfile(newPro, 'js');
loadjscssfile(newINST, 'js');
+ loadjscssfile(newCSSDeflt, 'css');
loadjscssfile(newCSS, 'css');
} else {
// Do nothing
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2013-09-15 01:28:32 UTC (rev 12050)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2013-09-15 01:45:10 UTC (rev 12051)
@@ -42,11 +42,11 @@
$_SESSION['newinstallPRO'] = XOOPS_URL.'/'.$installer_modified.'/js/prototype-1.6.0.3.js';
$_SESSION['newinstallINST'] = XOOPS_URL.'/'.$installer_modified.'/js/xo-installer.js';
if (file_exists('language/' . $wizard->language . '/style.css')) {
- $_SESSION['newinstallCSS'] = XOOPS_URL.'/'.'language/' . $wizard->language . '/style.css';
- $_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
+$_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
+$_SESSION['newinstallCSS'] = XOOPS_URL.'/'.$installer_modified.'/language/' . $wizard->language . '/style.css';
} else {
- $_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
- $_SESSION['newinstallCSS'] = '';
+$_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
+$_SESSION['newinstallCSS'] = '';
}
$js = '<script type="text/javascript">';
|
|
From: <be...@us...> - 2013-09-28 21:37:56
|
Revision: 12104
http://sourceforge.net/p/xoops/svn/12104
Author: beckmi
Date: 2013-09-28 21:37:53 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
fixing a typo
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/tplsets/jquery.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 2013-09-28 06:05:44 UTC (rev 12103)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-09-28 21:37:53 UTC (rev 12104)
@@ -38,6 +38,9 @@
- added missing info about new language constants in Fast Comments (irmtfan/mamba)
- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
+Security fixes
+ - XSS issues reported by Mehdi Dadkhah (rgriffith)
+
Updated:
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-09-28 06:05:44 UTC (rev 12103)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-09-28 21:37:53 UTC (rev 12104)
@@ -26,8 +26,8 @@
error_reporting(0);
$GLOBALS['xoopsLogger']->activated = false;
-if ( file_exists("./../../language/".$xoopsConfig['language']."/admin/tplsets.php") ) {
- include_once './../../language/'.$xoopsConfig['language']."/admin/tplsets.php");
+if ( file_exists('./../../language/'.$xoopsConfig['language'].'"/admin/tplsets.php') ) {
+ include_once './../../language/'.$xoopsConfig['language'].'/admin/tplsets.php';
} else {
include_once './../../language/english/admin/tplsets.php';
}
|
|
From: <be...@us...> - 2013-10-01 20:23:36
|
Revision: 12116
http://sourceforge.net/p/xoops/svn/12116
Author: beckmi
Date: 2013-10-01 20:23:34 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
Setting minimum PHP version at 5.3.7
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/release_notes.txt
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 2013-10-01 20:19:32 UTC (rev 12115)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-10-01 20:23:34 UTC (rev 12116)
@@ -37,6 +37,7 @@
- bug in commentrenderer.php (Roby73/irmtfan)
- added missing info about new language constants in Fast Comments (irmtfan/mamba)
- fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
+- set minimum PHP version to 5.3.7
Security fixes
- XSS issues reported by Mehdi Dadkhah (rgriffith)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php 2013-10-01 20:19:32 UTC (rev 12115)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php 2013-10-01 20:23:34 UTC (rev 12116)
@@ -145,9 +145,9 @@
function xoPhpVersion()
{
- if (version_compare(phpversion(), '5.2.0', '>=')) {
+ if (version_compare(phpversion(), '5.3.7', '>=')) {
return xoDiag(1, phpversion());
- } else if (version_compare(phpversion(), '5.1.0', '>=')) {
+ } elseif (version_compare(phpversion(), '5.3.0', '>=')) {
return xoDiag(0, phpversion());
} else {
return xoDiag(-1, phpversion());
Modified: XoopsCore/branches/2.5.x/2.5.7/release_notes.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/release_notes.txt 2013-10-01 20:19:32 UTC (rev 12115)
+++ XoopsCore/branches/2.5.x/2.5.7/release_notes.txt 2013-10-01 20:23:34 UTC (rev 12116)
@@ -1,8 +1,8 @@
-XOOPS 2.5.6 Final
+XOOPS 2.5.7 Beta 1
-The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.6 Final.
+The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.7 Beta 1.
-This release is focused on making XOOPS 2.5.6 compatible with PHP 5.4.x, and on security enhancements
+This release is focused on making XOOPS 2.5.7 compatible with PHP 5.5.x, and on security enhancements
See the Changelog for more details.
@@ -10,7 +10,7 @@
-----------------------------------
PHP:
-Any PHP version >= 5.2 (PHP 5.3+ is strongly recommended)
+Any PHP version >= 5.3.7 (PHP 5.4+ is strongly recommended)
MySQL:
MySQL server 5.0+
|
|
From: <be...@us...> - 2013-10-06 19:12:00
|
Revision: 12153
http://sourceforge.net/p/xoops/svn/12153
Author: beckmi
Date: 2013-10-06 19:11:55 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Updating Smarty to 2.6.28
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl
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 2013-10-06 18:36:28 UTC (rev 12152)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-10-06 19:11:55 UTC (rev 12153)
@@ -46,6 +46,7 @@
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
- HTML Purifier to 4.5.0 (mamba)
+ - Smarty to 2.6.28 (mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php 2013-10-06 18:36:28 UTC (rev 12152)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php 2013-10-06 19:11:55 UTC (rev 12153)
@@ -27,7 +27,7 @@
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <an...@ph...>
* @package Smarty
- * @version 2.6.27
+ * @version 2.6.28
*/
/* $Id$ */
@@ -35,7 +35,7 @@
/**
* DIR_SEP isn't used anymore, but third party apps might
*/
-if (!defined('DIR_SEP')) {
+if(!defined('DIR_SEP')) {
define('DIR_SEP', DIRECTORY_SEPARATOR);
}
@@ -465,7 +465,7 @@
*
* @var string
*/
- var $_version = '2.6.27';
+ var $_version = '2.6.28';
/**
* current template inclusion depth
@@ -576,11 +576,11 @@
* assigns values to template variables
*
* @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to assign
+ * @param mixed $value the value to assign
*/
function assign($tpl_var, $value = null)
{
- if (is_array($tpl_var)) {
+ if (is_array($tpl_var)){
foreach ($tpl_var as $key => $val) {
if ($key != '') {
$this->_tpl_vars[$key] = $val;
@@ -596,7 +596,7 @@
* assigns values to template variables by reference
*
* @param string $tpl_var the template variable name
- * @param mixed $value the referenced value to assign
+ * @param mixed $value the referenced value to assign
*/
function assign_by_ref($tpl_var, &$value)
{
@@ -608,7 +608,7 @@
* appends values to template variables
*
* @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to append
+ * @param mixed $value the value to append
*/
function append($tpl_var, $value=null, $merge=false)
{
@@ -616,11 +616,11 @@
// $tpl_var is an array, ignore $value
foreach ($tpl_var as $_key => $_val) {
if ($_key != '') {
- if (!@is_array($this->_tpl_vars[$_key])) {
+ if(!@is_array($this->_tpl_vars[$_key])) {
settype($this->_tpl_vars[$_key],'array');
}
- if ($merge && is_array($_val)) {
- foreach ($_val as $_mkey => $_mval) {
+ if($merge && is_array($_val)) {
+ foreach($_val as $_mkey => $_mval) {
$this->_tpl_vars[$_key][$_mkey] = $_mval;
}
} else {
@@ -630,11 +630,11 @@
}
} else {
if ($tpl_var != '' && isset($value)) {
- if (!@is_array($this->_tpl_vars[$tpl_var])) {
+ if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array');
}
- if ($merge && is_array($value)) {
- foreach ($value as $_mkey => $_mval) {
+ if($merge && is_array($value)) {
+ foreach($value as $_mkey => $_mval) {
$this->_tpl_vars[$tpl_var][$_mkey] = $_mval;
}
} else {
@@ -648,16 +648,16 @@
* appends values to template variables by reference
*
* @param string $tpl_var the template variable name
- * @param mixed $value the referenced value to append
+ * @param mixed $value the referenced value to append
*/
function append_by_ref($tpl_var, &$value, $merge=false)
{
if ($tpl_var != '' && isset($value)) {
- if (!@is_array($this->_tpl_vars[$tpl_var])) {
+ if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array');
}
if ($merge && is_array($value)) {
- foreach ($value as $_key => $_val) {
+ foreach($value as $_key => $_val) {
$this->_tpl_vars[$tpl_var][$_key] = &$value[$_key];
}
} else {
@@ -685,7 +685,7 @@
/**
* Registers custom function to be used in templates
*
- * @param string $function the name of the template function
+ * @param string $function the name of the template function
* @param string $function_impl the name of the PHP function to register
*/
function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
@@ -708,10 +708,10 @@
/**
* Registers object to be used in templates
*
- * @param string $object name of template object
- * @param object &$object_impl the referenced PHP object to register
- * @param null|array $allowed list of allowed methods (empty = all)
- * @param boolean $smarty_args smarty argument format, else traditional
+ * @param string $object name of template object
+ * @param object &$object_impl the referenced PHP object to register
+ * @param null|array $allowed list of allowed methods (empty = all)
+ * @param boolean $smarty_args smarty argument format, else traditional
* @param null|array $block_functs list of methods that are block format
*/
function register_object($object, &$object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
@@ -736,7 +736,7 @@
/**
* Registers block function to be used in templates
*
- * @param string $block name of template block
+ * @param string $block name of template block
* @param string $block_impl PHP function to register
*/
function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
@@ -758,7 +758,7 @@
/**
* Registers compiler function
*
- * @param string $function name of template function
+ * @param string $function name of template function
* @param string $function_impl name of PHP function to register
*/
function register_compiler_function($function, $function_impl, $cacheable=true)
@@ -780,7 +780,7 @@
/**
* Registers modifier to be used in templates
*
- * @param string $modifier name of template modifier
+ * @param string $modifier name of template modifier
* @param string $modifier_impl name of PHP function to register
*/
function register_modifier($modifier, $modifier_impl)
@@ -802,8 +802,8 @@
/**
* Registers a resource to fetch a template
*
- * @param string $type name of resource
- * @param array $functions array of functions to handle resource
+ * @param string $type name of resource
+ * @param array $functions array of functions to handle resource
*/
function register_resource($type, $functions)
{
@@ -927,10 +927,10 @@
/**
* clear cached content for the given template and cache id
*
- * @param string $tpl_file name of template file
- * @param string $cache_id name of cache_id
- * @param string $compile_id name of compile_id
- * @param string $exp_time expiration time
+ * @param string $tpl_file name of template file
+ * @param string $cache_id name of cache_id
+ * @param string $compile_id name of compile_id
+ * @param string $exp_time expiration time
* @return boolean
*/
function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
@@ -953,7 +953,6 @@
'auto_id' => $_auto_id,
'exp_time' => $exp_time);
require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-
return smarty_core_rm_auto($_params, $this);
}
@@ -963,7 +962,7 @@
/**
* clear the entire contents of cache (all templates)
*
- * @param string $exp_time expire time
+ * @param string $exp_time expire time
* @return boolean results of {@link smarty_core_rm_auto()}
*/
function clear_all_cache($exp_time = null)
@@ -975,9 +974,9 @@
/**
* test to see if valid cache exists for this template
*
- * @param string $tpl_file name of template file
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $tpl_file name of template file
+ * @param string $cache_id
+ * @param string $compile_id
* @return string|false results of {@link _read_cache_file()}
*/
function is_cached($tpl_file, $cache_id = null, $compile_id = null)
@@ -994,7 +993,6 @@
'compile_id' => $compile_id
);
require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
-
return smarty_core_read_cache_file($_params, $this);
}
@@ -1013,9 +1011,9 @@
* or all compiled template files if one is not specified.
* This function is for advanced use only, not normally needed.
*
- * @param string $tpl_file
- * @param string $compile_id
- * @param string $exp_time
+ * @param string $tpl_file
+ * @param string $compile_id
+ * @param string $exp_time
* @return boolean results of {@link smarty_core_rm_auto()}
*/
function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
@@ -1029,40 +1027,37 @@
'exp_time' => $exp_time,
'extensions' => array('.inc', '.php'));
require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-
return smarty_core_rm_auto($_params, $this);
}
/**
* Checks whether requested template exists.
*
- * @param string $tpl_file
+ * @param string $tpl_file
* @return boolean
*/
function template_exists($tpl_file)
{
$_params = array('resource_name' => $tpl_file, 'quiet'=>true, 'get_source'=>false);
-
return $this->_fetch_resource_info($_params);
}
/**
* Returns an array containing template variables
*
- * @param string $name
- * @param string $type
+ * @param string $name
+ * @param string $type
* @return array
*/
function &get_template_vars($name=null)
{
- if (!isset($name)) {
+ if(!isset($name)) {
return $this->_tpl_vars;
- } elseif (isset($this->_tpl_vars[$name])) {
+ } elseif(isset($this->_tpl_vars[$name])) {
return $this->_tpl_vars[$name];
} else {
// var non-existant, return valid reference
$_tmp = null;
-
return $_tmp;
}
}
@@ -1070,20 +1065,19 @@
/**
* Returns an array containing config variables
*
- * @param string $name
- * @param string $type
+ * @param string $name
+ * @param string $type
* @return array
*/
function &get_config_vars($name=null)
{
- if (!isset($name) && is_array($this->_config[0])) {
+ if(!isset($name) && is_array($this->_config[0])) {
return $this->_config[0]['vars'];
- } elseif (isset($this->_config[0]['vars'][$name])) {
+ } else if(isset($this->_config[0]['vars'][$name])) {
return $this->_config[0]['vars'][$name];
} else {
// var non-existant, return valid reference
$_tmp = null;
-
return $_tmp;
}
}
@@ -1091,7 +1085,7 @@
/**
* trigger Smarty error
*
- * @param string $error_msg
+ * @param string $error_msg
* @param integer $error_type
*/
function trigger_error($error_msg, $error_type = E_USER_WARNING)
@@ -1116,9 +1110,9 @@
/**
* executes & returns or displays the template results
*
- * @param string $resource_name
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $resource_name
+ * @param string $cache_id
+ * @param string $compile_id
* @param boolean $display
*/
function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
@@ -1144,7 +1138,7 @@
$this->debugging = true;
}
} else {
- $this->debugging = (bool) ($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
+ $this->debugging = (bool)($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
}
}
@@ -1195,7 +1189,8 @@
if ($display) {
- if ($this->debugging) {
+ if ($this->debugging)
+ {
// capture time for debugging info
$_params = array();
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
@@ -1225,13 +1220,11 @@
error_reporting($_smarty_old_error_level);
// restore initial cache_info
$this->_cache_info = array_pop($_cache_info);
-
return true;
} else {
error_reporting($_smarty_old_error_level);
// restore initial cache_info
$this->_cache_info = array_pop($_cache_info);
-
return $_smarty_results;
}
} else {
@@ -1273,7 +1266,7 @@
$_smarty_results = ob_get_contents();
ob_end_clean();
- foreach ((array) $this->_plugins['outputfilter'] as $_output_filter) {
+ foreach ((array)$this->_plugins['outputfilter'] as $_output_filter) {
$_smarty_results = call_user_func_array($_output_filter[0], array($_smarty_results, &$this));
}
}
@@ -1310,7 +1303,6 @@
echo smarty_core_display_debug_console($_params, $this);
}
error_reporting($_smarty_old_error_level);
-
return;
} else {
error_reporting($_smarty_old_error_level);
@@ -1334,7 +1326,7 @@
/**
* return a reference to a registered object
*
- * @param string $name
+ * @param string $name
* @return object
*/
function &get_registered_object($name) {
@@ -1354,7 +1346,7 @@
*/
function clear_config($var = null)
{
- if (!isset($var)) {
+ if(!isset($var)) {
// clear all values
$this->_config = array(array('vars' => array(),
'files' => array()));
@@ -1366,23 +1358,22 @@
/**
* get filepath of requested plugin
*
- * @param string $type
- * @param string $name
+ * @param string $type
+ * @param string $name
* @return string|false
*/
function _get_plugin_filepath($type, $name)
{
$_params = array('type' => $type, 'name' => $name);
require_once(SMARTY_CORE_DIR . 'core.assemble_plugin_filepath.php');
-
return smarty_core_assemble_plugin_filepath($_params, $this);
}
/**
* test if resource needs compiling
*
- * @param string $resource_name
- * @param string $compile_path
+ * @param string $resource_name
+ * @param string $compile_path
* @return boolean
*/
function _is_compiled($resource_name, $compile_path)
@@ -1414,8 +1405,8 @@
/**
* compile the template
*
- * @param string $resource_name
- * @param string $compile_path
+ * @param string $resource_name
+ * @param string $compile_path
* @return boolean
*/
function _compile_resource($resource_name, $compile_path)
@@ -1450,9 +1441,9 @@
/**
* compile the given source
*
- * @param string $resource_name
- * @param string $source_content
- * @param string $compiled_content
+ * @param string $resource_name
+ * @param string $source_content
+ * @param string $compiled_content
* @return boolean
*/
function _compile_source($resource_name, &$source_content, &$compiled_content, $cache_include_path=null)
@@ -1464,6 +1455,7 @@
require_once($this->compiler_file);
}
+
$smarty_compiler = new $this->compiler_class;
$smarty_compiler->template_dir = $this->template_dir;
@@ -1494,6 +1486,7 @@
}
$smarty_compiler->_cache_include = $cache_include_path;
+
$_results = $smarty_compiler->_compile_file($resource_name, $source_content, $compiled_content);
if ($smarty_compiler->_cache_serial) {
@@ -1513,7 +1506,7 @@
/**
* Get the compile path for this resource
*
- * @param string $resource_name
+ * @param string $resource_name
* @return string results of {@link _get_auto_filename()}
*/
function _get_compile_path($resource_name)
@@ -1528,18 +1521,18 @@
*
* sets $source_content to the source of the template, and
* $resource_timestamp to its time stamp
- * @param string $resource_name
- * @param string $source_content
- * @param integer $resource_timestamp
- * @param boolean $get_source
- * @param boolean $quiet
+ * @param string $resource_name
+ * @param string $source_content
+ * @param integer $resource_timestamp
+ * @param boolean $get_source
+ * @param boolean $quiet
* @return boolean
*/
function _fetch_resource_info(&$params)
{
- if (!isset($params['get_source'])) { $params['get_source'] = true; }
- if (!isset($params['quiet'])) { $params['quiet'] = false; }
+ if(!isset($params['get_source'])) { $params['get_source'] = true; }
+ if(!isset($params['quiet'])) { $params['quiet'] = false; }
$_return = false;
$_params = array('resource_name' => $params['resource_name']) ;
@@ -1596,28 +1589,27 @@
if (!$params['quiet']) {
$this->trigger_error('unable to read resource: "' . $params['resource_name'] . '"');
}
- } elseif ($_return && $this->security) {
+ } else if ($_return && $this->security) {
require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
if (!smarty_core_is_secure($_params, $this)) {
if (!$params['quiet'])
$this->trigger_error('(secure mode) accessing "' . $params['resource_name'] . '" is not allowed');
$params['source_content'] = null;
$params['resource_timestamp'] = null;
-
return false;
}
}
-
return $_return;
}
+
/**
* parse out the type and name from the resource
*
- * @param string $resource_base_path
- * @param string $resource_name
- * @param string $resource_type
- * @param string $resource_name
+ * @param string $resource_base_path
+ * @param string $resource_name
+ * @param string $resource_type
+ * @param string $resource_name
* @return boolean
*/
@@ -1632,7 +1624,7 @@
$params['resource_type'] = $this->default_resource_type;
$params['resource_name'] = $_resource_name_parts[0];
} else {
- if (strlen($_resource_name_parts[0]) == 1) {
+ if(strlen($_resource_name_parts[0]) == 1) {
// 1 char is not resource type, but part of filepath
$params['resource_type'] = $this->default_resource_type;
$params['resource_name'] = $params['resource_name'];
@@ -1646,27 +1638,23 @@
if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $params['resource_name'])) {
// relative pathname to $params['resource_base_path']
// use the first directory where the file is found
- foreach ((array) $params['resource_base_path'] as $_curr_path) {
+ foreach ((array)$params['resource_base_path'] as $_curr_path) {
$_fullpath = $_curr_path . DIRECTORY_SEPARATOR . $params['resource_name'];
if (file_exists($_fullpath) && is_file($_fullpath)) {
$params['resource_name'] = $_fullpath;
-
return true;
}
// didn't find the file, try include_path
$_params = array('file_path' => $_fullpath);
require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
- if (smarty_core_get_include_path($_params, $this)) {
+ if(smarty_core_get_include_path($_params, $this)) {
$params['resource_name'] = $_params['new_file_path'];
-
return true;
}
}
-
return false;
} else {
/* absolute path */
-
return file_exists($params['resource_name']);
}
} elseif (empty($this->_plugins['resource'][$params['resource_type']])) {
@@ -1682,9 +1670,9 @@
/**
* Handle modifiers
*
- * @param string|null $modifier_name
- * @param array|null $map_array
- * @return string result of modifiers
+ * @param string|null $modifier_name
+ * @param array|null $map_array
+ * @return string result of modifiers
*/
function _run_mod_handler()
{
@@ -1698,21 +1686,19 @@
$_args[0] = $_val;
$_var[$_key] = call_user_func_array($_func_name, $_args);
}
-
return $_var;
}
/**
* Remove starting and ending quotes from the string
*
- * @param string $string
+ * @param string $string
* @return string
*/
function _dequote($string)
{
if ((substr($string, 0, 1) == "'" || substr($string, 0, 1) == '"') &&
substr($string, -1) == substr($string, 0, 1))
-
return substr($string, 1, -1);
else
return $string;
@@ -1722,7 +1708,7 @@
/**
* read in a file
*
- * @param string $filename
+ * @param string $filename
* @return string
*/
function _read_file($filename)
@@ -1733,7 +1719,6 @@
$contents .= fread($fd, 8192);
}
fclose($fd);
-
return $contents;
} else {
return false;
@@ -1743,9 +1728,9 @@
/**
* get a concrete filename for automagically created content
*
- * @param string $auto_base
- * @param string $auto_source
- * @param string $auto_id
+ * @param string $auto_base
+ * @param string $auto_source
+ * @param string $auto_id
* @return string
* @staticvar string|null
* @staticvar string|null
@@ -1755,14 +1740,14 @@
$_compile_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
$_return = $auto_base . DIRECTORY_SEPARATOR;
- if (isset($auto_id)) {
+ if(isset($auto_id)) {
// make auto_id safe for directory names
$auto_id = str_replace('%7C',$_compile_dir_sep,(urlencode($auto_id)));
// split into separate directories
$_return .= $auto_id . $_compile_dir_sep;
}
- if (isset($auto_source)) {
+ if(isset($auto_source)) {
// make source name safe for filename
$_filename = urlencode(basename($auto_source));
$_crc32 = sprintf('%08X', crc32($auto_source));
@@ -1779,13 +1764,13 @@
/**
* unlink a file, possibly using expiration time
*
- * @param string $resource
+ * @param string $resource
* @param integer $exp_time
*/
function _unlink($resource, $exp_time = null)
{
- if (isset($exp_time)) {
- if (time() - @filemtime($resource) >= $exp_time) {
+ if(isset($exp_time)) {
+ if(time() - @filemtime($resource) >= $exp_time) {
return @unlink($resource);
}
} else {
@@ -1796,12 +1781,11 @@
/**
* returns an auto_id for auto-file-functions
*
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $cache_id
+ * @param string $compile_id
* @return string|null
*/
- function _get_auto_id($cache_id=null, $compile_id=null)
- {
+ function _get_auto_id($cache_id=null, $compile_id=null) {
if (isset($cache_id))
return (isset($compile_id)) ? $cache_id . '|' . $compile_id : $cache_id;
elseif(isset($compile_id))
@@ -1813,17 +1797,17 @@
/**
* trigger Smarty plugin error
*
- * @param string $error_msg
- * @param string $tpl_file
+ * @param string $error_msg
+ * @param string $tpl_file
* @param integer $tpl_line
- * @param string $file
+ * @param string $file
* @param integer $line
* @param integer $error_type
*/
function _trigger_fatal_error($error_msg, $tpl_file = null, $tpl_line = null,
$file = null, $line = null, $error_type = E_USER_ERROR)
{
- if (isset($file) && isset($line)) {
+ if(isset($file) && isset($line)) {
$info = ' ('.basename($file).", line $line)";
} else {
$info = '';
@@ -1840,14 +1824,12 @@
* callback function for preg_replace, to call a non-cacheable block
* @return string
*/
- function _process_compiled_include_callback($match)
- {
+ function _process_compiled_include_callback($match) {
$_func = '_smarty_tplfunc_'.$match[2].'_'.$match[3];
ob_start();
$_func($this);
$_ret = ob_get_contents();
ob_end_clean();
-
return $_ret;
}
@@ -1918,13 +1900,11 @@
/* return next set of cache_attrs */
$_return = current($_cache_attrs);
next($_cache_attrs);
-
return $_return;
} else {
/* add a reference to a new set of cache_attrs */
$_cache_attrs[] = array();
-
return $_cache_attrs[count($_cache_attrs)-1];
}
@@ -1958,23 +1938,25 @@
/**
* Extracts the filter name from the given callback
*
- * @param callback $function
+ * @param callback $function
* @return string
*/
- function _get_filter_name($function)
- {
- if (is_array($function)) {
- $_class_name = (is_object($function[0]) ?
- get_class($function[0]) : $function[0]);
+ function _get_filter_name($function)
+ {
+ if (is_array($function)) {
+ $_class_name = (is_object($function[0]) ?
+ get_class($function[0]) : $function[0]);
+ return $_class_name . '_' . $function[1];
+ }
+ else {
+ return $function;
+ }
+ }
- return $_class_name . '_' . $function[1];
- } else {
- return $function;
- }
- }
-
/**#@-*/
}
/* vim: set expandtab: */
+
+?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php 2013-10-06 18:36:28 UTC (rev 12152)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php 2013-10-06 19:11:55 UTC (rev 12153)
@@ -32,8 +32,8 @@
* Template compiling class
* @package Smarty
*/
-class Smarty_Compiler extends Smarty
-{
+class Smarty_Compiler extends Smarty {
+
// internal vars
/**#@+
* @access private
@@ -162,7 +162,7 @@
. '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-
+
// matches valid modifier syntax:
// |foo
// |@foo
@@ -217,9 +217,9 @@
* compile a resource
*
* sets $compiled_content to the compiled source
- * @param string $resource_name
- * @param string $source_content
- * @param string $compiled_content
+ * @param string $resource_name
+ * @param string $source_content
+ * @param string $compiled_content
* @return true
*/
function _compile_file($resource_name, $source_content, &$compiled_content)
@@ -263,11 +263,11 @@
/* replace special blocks by "{php}" */
$source_content = preg_replace_callback($search, create_function ('$matches', "return '"
- . $this->_quote_replace($this->left_delimiter) . 'php'
- . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
- ...
[truncated message content] |
|
From: <be...@us...> - 2013-10-30 21:29:04
|
Revision: 12221
http://sourceforge.net/p/xoops/svn/12221
Author: beckmi
Date: 2013-10-30 21:28:59 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
Updating to TinyMCE 2.5.10
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/license.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/js/xoopsemotions.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/en.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/langs/en_dlg.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/js/xoopsimagebrowser.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/js/xoopsimagemanager.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/en.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/langs/en_dlg.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/js/xoopsmlcontent.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/en.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/langs/en_dlg.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
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 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-10-30 21:28:59 UTC (rev 12221)
@@ -47,6 +47,7 @@
- jQuery Form to 3.42.0 (mamba)
- HTML Purifier to 4.5.0 (mamba)
- Smarty to 2.6.28 (mamba)
+ - TinyMCE to 3.5.10 (mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2013-10-30 21:28:59 UTC (rev 12221)
@@ -1,3 +1,19 @@
+Version 3.5.10 (2013-10-24)
+ Fixed bug where dialogs using inlinepopups plugin would display incorrectly sometimes
+ Fixed bug in paste plugin word import that was removing type from lists
+ Fixed bug where IE 11 wouldn't be properly detected if IE 10 emulation was enabled.
+Version 3.5.9 (2013-10-10)
+ Added IE 11 compatibility. IE 11 is treated as Gecko but it has still many IE bugs.
+ Fixed bug where importing CSS classes would fail if it contained @import rules to remote domain on Gecko.
+ Fixed bug in spelling plugin where misspelt words are not always marked.
+ Fixed bug where script tag was removed when nested inside a div or p.
+ Fixed full screen plugin state migration from original editor.
+ Fixed edgecase on up/down arrow keys scrolling with native lists.
+ Fixed bug where space can scroll webpage when using keyboard to access toolbar buttons.
+ Fixed bug where up/down arrow keys scroll entire webpage when using keyboard nav in menu ui.
+ Fixed bug where applying ins/del as inline elements would apply them as blocks.
+ Fixed bug where backspace on a space after an image would produce a BR on WebKit.
+ Fixed bug where it wasn't possible to change block type of text blocks.
Version 3.5.8 (2012-11-20)
Fixed bug where html5 data attributes where stripped from contents.
Fixed bug where toolbar was annouced multiple times with JAWS on Firefox.
@@ -170,7 +186,7 @@
Added new types and selector options to make it easier to create editor instances with different configs.
Added new preview of formatting options in various listboxes.
Added new preview_styles option that enables control over what gets previewed.
- Fixed bug where content css would be loaded twice into iframe.
+ Fixed bug where content css would be loaded twice into iframe.
Fixed bug where start elements with only whitespace in the attribute part wouldn't be correctly parsed.
Fixed bug where the advlink dialog would produce an error about the addSelectAccessibility function not being defined.
Fixed bug where the caret would be placed at an incorrect position if span was removed by the invalid_elements setting.
@@ -178,7 +194,7 @@
Version 3.4.9 (2012-02-23)
Added settings to wordcount plugin to configure update rate and checking wordcount on backspace and delete using wordcount_update_rate and wordcount_update_on_delete.
Fixed bug in Webkit and IE where deleting empty paragraphs would remove entire editor contents.
- Fixed bug where pressing enter on end of list item with a heading would create a new item with heading.
+ Fixed bug where pressing enter on end of list item with a heading would create a new item with heading.
Fixed edit css style dialog text-decoration none checkbox so it disables other text-decoration options when enabled.
Fixed bug in Gecko where undo wasn't added when focus was lost.
Fixed bug in Gecko where shift-enter in table cell ending with BR doesn't move caret to new line.
@@ -205,8 +221,8 @@
Added spacebar onclick handler to toolbar buttons to ensure that the accessibility behaviour works correctly.
Fixed bug where a stranded bullet point would get created in WebKit.
Fixed bug where selecting text in a blockquote and pressing backspace toggles the style.
- Fixed bug where pressing enter from a heading in IE, the resulting P tag below it shares the style property.
- Fix white space in between spans from being deleted.
+ Fixed bug where pressing enter from a heading in IE, the resulting P tag below it shares the style property.
+ Fix white space in between spans from being deleted.
Fixed bug where scrollbars where visible in the character map dialog on Gecko.
Fixed issue with missing translation for one of the emoticons.
Fixed bug where dots in id:s where causing problems. Patch provided by Abhishek Dev.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/license.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/license.txt 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/license.txt 2013-10-30 21:28:59 UTC (rev 12221)
@@ -20,7 +20,7 @@
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
+can use it too, but we suggest you first think carefuly about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js 2013-10-30 21:28:59 UTC (rev 12221)
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<span color="$1">$2</span>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span> ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span> ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span> ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span> ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js 2013-10-30 21:28:59 UTC (rev 12221)
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().getElementsByTagName("table")[0]);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.DOM;var a=function(d,f,e){var c=function(g){var i=d.controlManager.get(g);var h=f.controlManager.get(g);if(i&&h){h.displayColor(i.value)}};c("forecolor");c("backcolor");f.setContent(d.getContent({format:"raw"}),{format:"raw"});f.selection.moveToBookmark(e);if(d.plugins.spellchecker&&f.plugins.spellchecker){f.plugins.spellchecker.setLanguage(d.plugins.spellchecker.selectedLang)}};tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(i,c){var l=this,m={},k=b.doc.documentElement,d,o,h,g,f,e,j;i.addCommand("mceFullScreen",function(){var q,r;if(i.getParam("fullscreen_is_enabled")){if(i.getParam("fullscreen_new_window")){closeFullscreen()}else{b.win.setTimeout(function(){var t=i;var s=tinyMCE.get(t.getParam("fullscreen_editor_id"));s.plugins.fullscreen.saveState(t);tinyMCE.remove(t)},10)}return}if(i.getParam("fullscreen_new_window")){l.fullscreenSettings={bookmark:i.selection.getBookmark()};q=b.win.open(c+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{q.resizeTo(screen.availWidth,screen.availHeight)}catch(p){}}else{o=b.getStyle(b.doc.body,"overflow",1)||"auto";h=b.getStyle(k,"overflow",1);d=b.getViewPort();g=d.x;f=d.y;if(tinymce.isOpera&&o=="visible"){o="auto"}if(tinymce.isIE&&o=="scroll"){o="auto"}if(tinymce.isIE&&(h=="visible"||h=="scroll")){h="auto"}if(o=="0px"){o=""}b.setStyle(b.doc.body,"overflow","hidden");k.style.overflow="hidden";d=b.getViewPort();b.win.scrollTo(0,0);if(tinymce.isIE){d.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){e="absolute;top:"+d.y}else{e="fixed;top:0"}n=b.add(b.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+e+";left:0;width:"+d.w+"px;height:"+d.h+"px;z-index:200000;"});b.add(n,"div",{id:"mce_fullscreen"});tinymce.each(i.settings,function(s,t){m[t]=s});m.id="mce_fullscreen";m.width=n.clientWidth;m.height=n.clientHeight-15;m.fullscreen_is_enabled=true;m.fullscreen_editor_id=i.id;m.theme_advanced_resizing=false;m.save_onsavecallback=function(){i.setContent(tinyMCE.get(m.id).getContent());i.execCommand("mceSave")};tinymce.each(i.getParam("fullscreen_settings"),function(t,s){m[s]=t});l.fullscreenSettings={bookmark:i.selection.getBookmark(),fullscreen_overflow:o,fullscreen_html_overflow:h,fullscreen_scrollx:g,fullscreen_scrolly:f};if(m.theme_advanced_toolbar_location==="external"){m.theme_advanced_toolbar_location="top"}tinyMCE.oldSettings=tinyMCE.settings;l.fullscreenEditor=new tinymce.Editor("mce_fullscreen",m);l.fullscreenEditor.onInit.add(function(){l.loadState(l.fullscreenEditor)});l.fullscreenEditor.render();l.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");l.fullscreenElement.update();l.resizeFunc=tinymce.dom.Event.add(b.win,"resize",function(){var v=tinymce.DOM.getViewPort(),t=l.fullscreenEditor,s,u;s=t.dom.getSize(t.getContainer().getElementsByTagName("table")[0]);u=t.dom.getSize(t.getContainer().getElementsByTagName("iframe")[0]);t.theme.resizeTo(v.w-s.w+u.w,v.h-s.h+u.h)})}});i.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});i.onNodeChange.add(function(q,p){p.setActive("fullscreen",q.getParam("fullscreen_is_enabled"))});l.loadState=function(p){if(!(p&&l.fullscreenSettings)){throw"No fullscreen editor to load to"}a(i,p,l.fullscreenSettings.bookmark);p.focus()};l.saveState=function(q){if(!(q&&l.fullscreenSettings)){throw"No fullscreen editor to restore from"}var p=l.fullscreenSettings;a(q,i,q.selection.getBookmark());if(!i.getParam("fullscreen_new_window")){tinymce.dom.Event.remove(b.win,"resize",l.resizeFunc);delete l.resizeFunc;b.remove("mce_fullscreen_container");b.doc.documentElement.style.overflow=p.fullscreen_html_overflow;b.setStyle(b.doc.body,"overflow",p.fullscreen_overflow);b.win.scrollTo(p.fullscreen_scrollx,p.fullscreen_scrolly)}tinyMCE.settings=tinyMCE.oldSettings;delete tinyMCE.oldSettings;delete l.fullscreenEditor;delete l.fullscreenElement;delete l.fullscreenSettings;b.win.setTimeout(function(){i.selection.moveToBookmark(j);i.focus()},10)}},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm 2013-10-30 21:28:59 UTC (rev 12221)
@@ -46,7 +46,7 @@
settings['strict_loading_mode'] = true;
settings.save_onsavecallback = function() {
- window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});
+ moveContent();
window.opener.tinyMCE.get(oeID).execCommand('mceSave');
window.close();
};
@@ -56,11 +56,15 @@
}
function moveContent() {
- window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());
+ // find the original editor, execute restore state in it's plugin instance
+ window.opener.tinyMCE.get(oeID).plugins.fullscreen.saveState(tinyMCE.activeEditor);
+
+ // prevent moveContent from being called twice - e.g. if the unloadHandler runs after moveContent()
+ tinymce.dom.Event.remove(window, "beforeunload", unloadHandler);
}
function closeFullscreen() {
- moveContent();
+ // moveContent() will be called by the unload handler
window.close();
}
@@ -78,18 +82,21 @@
function render() {
var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
- e.value = window.opener.tinyMCE.get(oeID).getContent();
-
vp = dom.getViewPort();
settings.width = vp.w;
settings.height = vp.h - 15;
- tinymce.dom.Event.add(window, 'resize', function() {
- var vp = dom.getViewPort();
+ settings.oninit = function() {
+ var ed = tinyMCE.activeEditor;
+ window.opener.tinyMCE.get(oeID).plugins.fullscreen.loadState(ed);
- tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
- });
+ tinymce.dom.Event.add(window, 'resize', function() {
+ var vp = dom.getViewPort();
+ tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
+ });
+ }
+
tinyMCE.init(settings);
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js 2013-10-30 21:28:03 UTC (rev 12220)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js 2013-10-30 21:28:59 UTC (rev 12221)
@@ -1 +1 @@
-(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X