From: <be...@us...> - 2012-11-21 04:41:02
|
Revision: 10263 http://sourceforge.net/p/xoops/svn/10263 Author: beckmi Date: 2012-11-21 04:40:56 +0000 (Wed, 21 Nov 2012) Log Message: ----------- Updating TinyMCE to 3.5.8 Updating Smarty to 2.6.27 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/media/js/media.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/js/row.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/table/row.htm XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/autosave/langs/ Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-11-21 04:40:56 UTC (rev 10263) @@ -4,9 +4,11 @@ 2012/08/06: Version 2.5.6 Alpha =============================== Bugfixes: + - fixed errors related to static functions, so it works on PHP 5.4 (Mamba) Updated: - - TinyMCE to 3.5.6 (mamba) + - TinyMCE to 3.5.8 (mamba) + - Smarty to 2.6.27 (mamba) =============================== Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Config_File.class.php 2012-11-21 04:40:56 UTC (rev 10263) @@ -19,10 +19,10 @@ * * For questions, help, comments, discussion, etc., please join the * Smarty mailing list. Send a blank e-mail to - * sma...@go... + * sma...@go... * * @link http://www.smarty.net/ - * @version 2.6.26 + * @version 2.6.25-dev * @copyright Copyright: 2001-2005 New Digital Group, Inc. * @author Andrei Zmievski <an...@ph...> * @access public @@ -301,7 +301,7 @@ $vars = array(); continue; } - } else { + } else { $section_name = $match[1]; } if (!isset($config_data['sections'][$section_name])) @@ -390,4 +390,4 @@ /**#@-*/ } -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty.class.php 2012-11-21 04:40:56 UTC (rev 10263) @@ -27,7 +27,7 @@ * @author Monte Ohrt <monte at ohrt dot com> * @author Andrei Zmievski <an...@ph...> * @package Smarty - * @version 2.6.26 + * @version 2.6.27 */ /* $Id$ */ @@ -465,7 +465,7 @@ * * @var string */ - var $_version = '2.6.26'; + var $_version = '2.6.27'; /** * current template inclusion depth @@ -1090,7 +1090,8 @@ */ function trigger_error($error_msg, $error_type = E_USER_WARNING) { - trigger_error("Smarty error: $error_msg", $error_type); + $msg = htmlentities($error_msg); + trigger_error("Smarty error: $msg", $error_type); } @@ -1958,4 +1959,4 @@ /* vim: set expandtab: */ -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/Smarty_Compiler.class.php 2012-11-21 04:40:56 UTC (rev 10263) @@ -21,7 +21,7 @@ * @link http://smarty.php.net/ * @author Monte Ohrt <monte at ohrt dot com> * @author Andrei Zmievski <an...@ph...> - * @version 2.6.26 + * @version 2.6.25-dev * @copyright 2001-2005 New Digital Group, Inc. * @package Smarty */ @@ -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 @@ -304,7 +304,7 @@ } } } - + /* Compile the template tags into PHP code. */ $compiled_tags = array(); for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) { @@ -333,7 +333,7 @@ for ($j = $i + 1; $j < $for_max; $j++) { /* remove leading and trailing whitespaces of each line */ $text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]); - if ($compiled_tags[$j] == '{/strip}') { + if ($compiled_tags[$j] == '{/strip}') { /* remove trailing whitespaces from the last text_block */ $text_blocks[$j] = rtrim($text_blocks[$j]); } @@ -349,9 +349,9 @@ } } $compiled_content = ''; - + $tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%'; - + /* Interleave the compiled contents and text blocks to get the final result. */ for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) { if ($compiled_tags[$i] == '') { @@ -361,7 +361,7 @@ // replace legit PHP tags with placeholder $text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]); $compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]); - + $compiled_content .= $text_blocks[$i] . $compiled_tags[$i]; } $compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]); @@ -371,8 +371,8 @@ $compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content); // recover legit tags - $compiled_content = str_replace($tag_guard, '<?', $compiled_content); - + $compiled_content = str_replace($tag_guard, '<?', $compiled_content); + // remove \n from the end of the file, if any if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) { $compiled_content = substr($compiled_content, 0, -1); @@ -437,7 +437,7 @@ /* Matched comment. */ if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*') return ''; - + /* Split tag into two three parts: command, command modifiers and the arguments. */ if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*)) @@ -445,7 +445,7 @@ ~xs', $template_tag, $match)) { $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__); } - + $tag_command = $match[1]; $tag_modifier = isset($match[2]) ? $match[2] : null; $tag_args = isset($match[3]) ? $match[3] : null; @@ -585,7 +585,7 @@ } else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) { return $output; } else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) { - return $output; + return $output; } else { $this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__); } @@ -936,7 +936,7 @@ if (empty($name)) { return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__); } - + if (!preg_match('~^\w+$~', $name)) { return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__); } @@ -1225,7 +1225,7 @@ $buffer = isset($attrs['name']) ? $attrs['name'] : "'default'"; $assign = isset($attrs['assign']) ? $attrs['assign'] : null; $append = isset($attrs['append']) ? $attrs['append'] : null; - + $output = "<?php ob_start(); ?>"; $this->_capture_stack[] = array($buffer, $assign, $append); } else { @@ -1266,11 +1266,11 @@ if(empty($tokens)) { $_error_msg = $elseif ? "'elseif'" : "'if'"; - $_error_msg .= ' statement requires arguments'; + $_error_msg .= ' statement requires arguments'; $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__); } - - + + // make sure we have balanced parenthesis $token_count = array_count_values($tokens); if(isset($token_count['(']) && $token_count['('] != $token_count[')']) { @@ -1368,8 +1368,8 @@ if ($is_arg_start != 0) { if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) { $is_arg_start--; - } - } + } + } } else $is_arg_start = $i-1; /* Construct the argument for 'is' expression, so it knows @@ -1400,7 +1400,7 @@ } } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') { // variable function call - $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__); + $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__); } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) { // object or variable $token = $this->_parse_var_props($token); @@ -1753,12 +1753,12 @@ $_var_ref = $var_expr; else $_var_ref = substr($var_expr, 1); - + if(!$_has_math) { - + // get [foo] and .foo and ->foo and (...) pieces preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match); - + $_indexes = $match[0]; $_var_name = array_shift($_indexes); @@ -2018,7 +2018,7 @@ array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)"; break; - + case 'first': array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)"; @@ -2028,12 +2028,12 @@ array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])"; break; - + case 'show': array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)"; break; - + default: unset($_max_index); $compiled_ref = "\$this->_foreach[$_var]"; @@ -2159,7 +2159,7 @@ case 'rdelim': $compiled_ref = "'$this->right_delimiter'"; break; - + default: $this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__); break; @@ -2362,4 +2362,4 @@ /* vim: set et: */ -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/debug.tpl 2012-11-21 04:40:56 UTC (rev 10263) @@ -1,157 +1,157 @@ -{* Smarty *} -{* debug.tpl, last updated version 2.1.0 *} -{assign_debug_info} -{capture assign=debug_output} -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> -<head> - <title>Smarty Debug Console</title> -{literal} -<style type="text/css"> -/* <![CDATA[ */ -body, h1, h2, td, th, p { - font-family: sans-serif; - font-weight: normal; - font-size: 0.9em; - margin: 1px; - padding: 0; -} - -h1 { - margin: 0; - text-align: left; - padding: 2px; - background-color: #f0c040; - color: black; - font-weight: bold; - font-size: 1.2em; - } - -h2 { - background-color: #9B410E; - color: white; - text-align: left; - font-weight: bold; - padding: 2px; - border-top: 1px solid black; -} - -body { - background: black; -} - -p, table, div { - background: #f0ead8; -} - -p { - margin: 0; - font-style: italic; - text-align: center; -} - -table { - width: 100%; -} - -th, td { - font-family: monospace; - vertical-align: top; - text-align: left; - width: 50%; -} - -td { - color: green; -} - -.odd { - background-color: #eeeeee; -} - -.even { - background-color: #fafafa; -} - -.exectime { - font-size: 0.8em; - font-style: italic; -} - -#table_assigned_vars th { - color: blue; -} - -#table_config_vars th { - color: maroon; -} -/* ]]> */ -</style> -{/literal} -</head> -<body> - -<h1>Smarty Debug Console</h1> - -<h2>included templates & config files (load time in seconds)</h2> - -<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> - {if isset($_debug_tpls[templates].exec_time)} - <span class="exectime"> - ({$_debug_tpls[templates].exec_time|string_format:"%.5f"}) - {if %templates.index% eq 0}(total){/if} - </span> - {/if} - <br /> -{sectionelse} - <p>no templates included</p> -{/section} -</div> - -<h2>assigned template variables</h2> - -<table id="table_assigned_vars"> - {section name=vars loop=$_debug_keys} - <tr class="{cycle values="odd,even"}"> - <th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th> - <td>{$_debug_vals[vars]|@debug_print_var}</td></tr> - {sectionelse} - <tr><td><p>no template variables assigned</p></td></tr> - {/section} -</table> - -<h2>assigned config file variables (outer template scope)</h2> - -<table id="table_config_vars"> - {section name=config_vars loop=$_debug_config_keys} - <tr class="{cycle values="odd,even"}"> - <th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th> - <td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr> - {sectionelse} - <tr><td><p>no config vars assigned</p></td></tr> - {/section} -</table> -</body> -</html> -{/capture} -{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"} - {$debug_output} -{else} -<script type="text/javascript"> -// <![CDATA[ - if ( self.name == '' ) {ldelim} - var title = 'Console'; - {rdelim} - else {ldelim} - var title = 'Console_' + self.name; - {rdelim} - _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes"); - _smarty_console.document.write('{$debug_output|escape:'javascript'}'); - _smarty_console.document.close(); -// ]]> -</script> +{* Smarty *} +{* debug.tpl, last updated version 2.1.0 *} +{assign_debug_info} +{capture assign=debug_output} +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> + <title>Smarty Debug Console</title> +{literal} +<style type="text/css"> +/* <![CDATA[ */ +body, h1, h2, td, th, p { + font-family: sans-serif; + font-weight: normal; + font-size: 0.9em; + margin: 1px; + padding: 0; +} + +h1 { + margin: 0; + text-align: left; + padding: 2px; + background-color: #f0c040; + color: black; + font-weight: bold; + font-size: 1.2em; + } + +h2 { + background-color: #9B410E; + color: white; + text-align: left; + font-weight: bold; + padding: 2px; + border-top: 1px solid black; +} + +body { + background: black; +} + +p, table, div { + background: #f0ead8; +} + +p { + margin: 0; + font-style: italic; + text-align: center; +} + +table { + width: 100%; +} + +th, td { + font-family: monospace; + vertical-align: top; + text-align: left; + width: 50%; +} + +td { + color: green; +} + +.odd { + background-color: #eeeeee; +} + +.even { + background-color: #fafafa; +} + +.exectime { + font-size: 0.8em; + font-style: italic; +} + +#table_assigned_vars th { + color: blue; +} + +#table_config_vars th { + color: maroon; +} +/* ]]> */ +</style> +{/literal} +</head> +<body> + +<h1>Smarty Debug Console</h1> + +<h2>included templates & config files (load time in seconds)</h2> + +<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> + {if isset($_debug_tpls[templates].exec_time)} + <span class="exectime"> + ({$_debug_tpls[templates].exec_time|string_format:"%.5f"}) + {if %templates.index% eq 0}(total){/if} + </span> + {/if} + <br /> +{sectionelse} + <p>no templates included</p> +{/section} +</div> + +<h2>assigned template variables</h2> + +<table id="table_assigned_vars"> + {section name=vars loop=$_debug_keys} + <tr class="{cycle values="odd,even"}"> + <th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th> + <td>{$_debug_vals[vars]|@debug_print_var}</td></tr> + {sectionelse} + <tr><td><p>no template variables assigned</p></td></tr> + {/section} +</table> + +<h2>assigned config file variables (outer template scope)</h2> + +<table id="table_config_vars"> + {section name=config_vars loop=$_debug_config_keys} + <tr class="{cycle values="odd,even"}"> + <th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th> + <td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr> + {sectionelse} + <tr><td><p>no config vars assigned</p></td></tr> + {/section} +</table> +</body> +</html> +{/capture} +{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"} + {$debug_output} +{else} +<script type="text/javascript"> +// <![CDATA[ + if ( self.name == '' ) {ldelim} + var title = 'Console'; + {rdelim} + else {ldelim} + var title = 'Console_' + self.name; + {rdelim} + _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes"); + _smarty_console.document.write('{$debug_output|escape:'javascript'}'); + _smarty_console.document.close(); +// ]]> +</script> {/if} \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.cycle.php 2012-11-21 04:40:56 UTC (rev 10263) @@ -63,7 +63,11 @@ $cycle_vars[$name]['values'] = $params['values']; } - $cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ','; + if (isset($params['delimiter'])) { + $cycle_vars[$name]['delimiter'] = $params['delimiter']; + } elseif (!isset($cycle_vars[$name]['delimiter'])) { + $cycle_vars[$name]['delimiter'] = ','; + } if(is_array($cycle_vars[$name]['values'])) { $cycle_array = $cycle_vars[$name]['values']; Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.fetch.php 2012-11-21 04:40:56 UTC (rev 10263) @@ -181,12 +181,12 @@ $content .= fgets($fp,4096); } fclose($fp); - $csplit = split("\r\n\r\n",$content,2); + $csplit = preg_split("!\r\n\r\n!",$content,2); $content = $csplit[1]; if(!empty($params['assign_headers'])) { - $smarty->assign($params['assign_headers'],split("\r\n",$csplit[0])); + $smarty->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0])); } } } else { Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/smarty/plugins/function.math.php 2012-11-21 04:40:56 UTC (rev 10263) @@ -37,7 +37,7 @@ } // match all vars in equation, make sure all are passed - preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]+)!",$equation, $match); + preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match); $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10', 'max','min','pi','pow','rand','round','sin','sqrt','srand','tan'); @@ -82,4 +82,4 @@ /* vim: set expandtab: */ -?> +?> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2012-11-21 02:25:02 UTC (rev 10262) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopseditor/tinymce/tinymce/changelog.txt 2012-11-21 04:40:56 UTC (rev 10263) @@ -1,445 +1,477 @@ -Version 3.5.6 (2012-07-26) - Added "text" as a valid option to the editor.getContent format option. Makes it easier to get a text representation of the editor contents. - Fixed bug where resizing an image to less that 0x0 pixels would display the ghost image at an incorrect position. - Fixed bug where the remove format button would produce extra paragraphs on WebKit if all of the contents was selected. - Fixed issue where edge resize handles on images of wouldn't scale it with the same aspect ratio. - Fixed so force_p_newlines option works again since some users want mixed mode paragraphs. - Fixed so directionality plugin modifies the dir attribute of all selected blocks in the editor. - Fixed bug where backspace/delete of a custom element would move it's attributes to the parent block on Gecko. -Version 3.5.5 (2012-07-19) - Added full resize support for images and tables on WebKit/Opera. It now behaves just like Gecko. - Added automatic embed support for Vimeo, Stream.cz and Google Maps in media plugin. Patch contributed by Jakub Matas. - Fixed bug where the lists plugin wouldn't properly remove all li elements when toggling selected items of. Patched by Taku AMANO. - Fixed bug where the lists plugin would remove the entire list if you pressed deleted at the beginning of the first element. Patched by Taku AMANO. - Fixed bug where the ordered/unordered list buttons could both be enabled if you nested lists. Patch contributed by Craig Petchell. - Fixed bug where shift+enter wouldn't produce a BR in a LI when having forced_root_blocks set to false. - Fixed bug where scrollbars aren't visible in fullscreen when window is resized. - Fixed bug with updating the border size using the advimage dialog on IE 9. - Fixed bug where the selection of inner elements on IE 8 in contentEditable mode would select the whole parent element. - Fixed bug where the enter key would produce an empty anchor if you pressed it at the space after a link on IE. - Fixed bug where autolink plugin would produce an exception for specific html see bug #5365 - Fixed so the formatChanged function takes an optional "similar" parameter to use while matching the format. -Version 3.5.4.1 (2012-06-24) - Fixed issue with Shift+A selecting all contents on Chrome. -Version 3.5.4 (2012-06-21) - Added missing mouse events to HTML5 schema. Some events needs to be manually defined though since the spec is huge. - Added image resizing for WebKit browsers by faking the whole resize behavior. - Fixed bug in context menu plugin where listener to hide menu wasn't removed correctly. - Fixed bug where media plugin wouldn't use placeholder size for the object/video elements. - Fixed bug where jQuery plugin would break attr function in jQuery 1.7.2. - Fixed bug where jQuery plugin would throw an error if you used the tinymce pseudo selector when TinyMCE wasn't loaded. - Fixed so encoding option gets applied when using jQuery val() or attr() to extract the contents. - Fixed so any non valid width/height passed to media plugin would get parsed to proper integer or percent values. -Version 3.5.3 (2012-06-19) - Added missing wbr element to HTML5 schema. - Added new mceToggleFormat command. Enabled you to toggle a specific format on/off. - Fixed bug where undo/redo state didn't update correctly after executing an execCommand call. - Fixed bug where the editor would get auto focused on IE running in quirks mode. - Fixed bug where pressing enter before an IMG or INPUT element wouldn't properly split the block. - Fixed bug where backspace would navigate back when selecting control types on IE. - Fixed bug where the editor remove method would unbind events for controls outside the editor instance UI. - Fixed bug where the autosave plugin would try to store a draft copy of editors that where removed. - Fixed bug where floated elements wouldn't expand the block created when pressing enter on non IE browsers. - Fixed bug where the caret would be placed in the wrong location when pressing enter at the beginning of a block. - Fixed bug where it wasn't possible to block events using the handle_event_callback option. - Fixed bug where keyboard navigation of the ColorSplitButton.js didn't work correctly. - Fixed bug where keyboard navigation didn't work correctly on split buttons. - Fixed bug where the legacy Event.add function didn't properly handle multiple id:s passed in. - Fixed bug where the caret would disappear on IE when selecting all contents and pressing backspace/delete. - Fixed bug where the getStart/getEnd methods would sometimes return elements from the wrong document on IE. - Fixed so paragraphs gets created if you press enter inside a form element. -Version 3.5.2 (2012-05-31) - Added new formatChanged method to tinymce.Formatter class. Enables easier state change handling of formats. - Added new selectorChanged method to tinymce.dom.Selection class. Enables easier state change handling of matching CSS selectors. - Changed the default theme to be advanced instead of simple since most users uses the advanced theme. - Changed so the theme_advanced_buttons doesn't have a default set if one button row is specified. - Changed the theme_advanced_toolbar_align default value to "left". - Changed the theme_advanced_toolbar_location default value to "top". - Changed the theme_advanced_statusbar_location default value to "bottom". - Fixed bug where the simple link dialog would remove class and target attributes from links when updating them if the drop downs wasn't visible. - Fixed bug where the link/unlink buttons wouldn't get disabled once a link was created by the autolink plugin logic. - Fixed bug where the border attribute was missing in the HTML5 schema. - Fixed bug where the legacyoutput plugin would use inline styles for font color. - Fixed bug where editing of anchor names wouldn't produce an undo level. - Fixed bug where the table plugin would delete the last empty block element in the editor. - Fixed bug where pasting table rows when they where selected would make it impossible to editor that table row. - Fixed bug with pressing enter in IE while having a select list focused would produce a JS error. - Fixed bug where it wasn't possible to merge table cells by selecting them and using merge from context menu. - Removed summary from HTML5 table attributes and fixed so this and other deprecated table fields gets hidden in the table dialog. -Version 3.5.1.1 (2012-05-25) - Fixed bug with control creation where plugin specific controls didn't work as expected. -Version 3.5.1 (2012-05-25) - Added new onBeforeAdd event to UndoManager patch contributed by Dan Rumney. - Added support for overriding the theme rendering logic by using a custom function. - Fixed bug where links wasn't automatically created by the autolink plugin on old IE versions when pressing enter in BR mode. - Fixed bug where enter on older IE versions wouldn't produce a new paragraph if the previous sibling paragraph was empty. - Fixed bug where toString on a faked DOM range on older IE versions wouldn't return a proper string. - Fixed bug where named anchors wouldn't work properly when schema was set to HTML5. - Fixed bug where HTML5 datalist options wasn't correctly parsed or indented. - Fixed bug where linking would add anchors around block elements when the HTML5 schema was used. - Fixed issue where the autolink plugin wouldn't properly handle mailto:us...@do.... - Optimized initialization and reduced rendering flicker by hiding the target element while initializing. -Version 3.5.0.1 (2012-05-10) - Fixed bug where selection normalization logic would break the selections of parent elements using the element path. - Fixed bug where the autolink plugin would include trailing dots in domain names in the link creation. - Fixed bug where the autolink plugin would produce an error on older IE versions when pressing enter. - Fixed bug where old IE versions would throw an error during initialization when the editor was placed in an size restricted div. -Version 3.5 (2012-05-03) - Fixed menu rendering issue if the document was in rtl mode. - Fixed bug where the hide function would throw an error about a missing variable. - Fixed bug where autolink wouldn't convert URLs when hitting enter on IE due to the new enter key logic. - Fixed bug where formatting using shortcuts like ctrl+b wouldn't work properly the first time. - Fixed bug where selection.setContent after a formatter call wouldn't generate formatted contents. - Fixed bug where whitespace would be removed before/after invalid_elements when they where removed. - Fixed bug where updating styles using the theme image dialog in non inline mode on IE9 would produce errors. - Fixed bug where IE 8 would produce an error when using the contextmenu plugin. - Fixed bug where delete/backspace could remove contents of noneditable elements. - Fixed so background color in style preview gets computed from body element if the current style element is transparent. -Version 3.5b3 (2012-03-29) - Added cancel button to colour picker dialog. - Added figure and figcaption to the html5 visualblocks plugin. - Added default alignment options for the figure element. - Fixed bug where empty inline elements within block elements would sometimes produce a br child element. - Fixed bug where urls pointing to the same domain as the current one would cause undefined errors. Patch contributed by Paul Giberson. - Fixed bug where enter inside an editable element inside an non editable element would split the element. - Fixed bug where cut/copy/paste of noneditable elements didn't work. - Fixed bug where backspace would sometimes produce font elements on WebKit. - Fixed bug where WebKit would produce spans out of various inline elements when using backspace. - Fixed bug where IE9 wouldn't properly update image styles when images where resized. - Fixed bug where drag/drop of noneditable elements didn't work correctly. - Fixed bug where applying formatting to all contents wouldn't work correctly when an end point was inside an empty bock. Patch contributed by Jose Luiz. - Fixed bug where IE10 removed the scopeName from the DOM element interface and there for it produced an undefined string in element path. - Fixed bug where the caret would be placed at an incorrect location if you applied block formatting while having the caret at the end of the block. - Fixed bug where applying column changes using the cell dialog would only update the first column. Patch contributed by krzyko. - Fixed bug where the visualblocks plugin would force editor focus if it was turned on by default. - Fixed bug where the tabfocus plugin would tab to iframes these are now ignored. - Fixed bug where format drop down list wouldn't show the currently active format for a parent element. - Fixed bug where paste of plain text in IE 9 would remove the new line characters from text. - Fixed bug where the menu buttons/split button menus wouldn't be opened at the right location on older IE versions. - Fixed bug where Gecko browsers wouldn't properly display the right format when having the selection as specific places. - Fixed bug where shift+enter inside the body when having forced_root_blocks set to false would throw an error. - Fixed bug where the jQuery plugin would break the attr method of jQuery 1.7.2. Patch contributed by Markus Kemmerling. - Fixed so options like content_css accepts and array as well as a comma separated string as input. - Restructured the internal logic to make it more separate from Editor.js. - Updated the Sizzle engine to the latest version. -Version 3.5b2 (2012-03-15) - Rewrote the enter key logic to normalize browser behavior. - Fixed so enter within PRE elements produces a BR and shift+enter breaks/end the PRE. Can be disabled using the br_in_pre option. - Fixed bug where the selection wouldn't be correct after applying formatting and having the caret at the end of the new format node. - Fixed bug where the noneditable plugin would process contents on raw input calls for example on undo/redo calls. - Fixed bug where WebKit could produce an exception when a bookmark was requested when there wasn't a proper selection. - Fixed bug where WebKit would fail to open the image dialog since it would be returning false for a class name instead of a string. - Fixed so alignment and indentation works properly when forced_root_blocks is set to false. It will produce a DIV by default. -Version 3.5b1 (2012-03-08) - Added new event class that is faster and enables support for faking events. - Added new self_closing_elements, short_ended_elements, boolean_attributes, non_empty_elements and block_elements options to control the HTML Schema. - Added new schema option and support for the HTML5 schema. - Added new visualblocks plugin that shows html5 blocks with visual borders. - 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 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. - Fixed bug where elements inside a white space preserve element like pre didn't inherit the behavior while parsing. -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 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. - Fixed bug where right-click on formatted text in IE selected the entire line. - Fixed bug where text ending with space could not be unformatted in IE. - Fixed bug where caret formatting would be removed when moving the caret when a selector expression was used. - Fixed bug where formatting would be applied to the body element when all contents where selected and format had both inline and selector parts. - Fixed bug where the media plugin would throw errors if you had iframe set as an invalid element in config. - Fixed bug where the caret would be placed at the top of the document if you inserted a table and undo:ed that operation. Patch contributed by Wesley Walser. - Fixed bug where content css files where loaded twice into the iframe. - Fixed so elements with comments would be trated as non empty elements. Patch contributed by Arjan Scherpenisse. -Version 3.4.8 (2012-02-02) - Fixed bug in IE where selected text ending with space cannot be formatted then formatted again to get original text. - Fixed bug in IE where images larger than editor area were being deselected when toolbar buttons are clicked. - Fixed bug where wrong text align buttons are active when multiple block elements are selected. - Fixed bug where selected link not showing in target field of link dialog in some selection cases. - Use settings for remove_trailing_br so this can be turned off instead of hard coding the value. - Fixed bug in IE where the media plugin displayed null text when some values aren't filled in. - Added API method 'onSetAttrib' that fires when the attribute value on a node changes. - Fix font size dropdown value not being updated when text already has a font size in the advanced template. - Fixed bug in IE where IE doesn't use ARIA attributes properly on options - causing labels to be read out 2 times. - Fixed bug where caret cannot be placed after table if table is at end of document in IE. - Fixed bug where adding range isn't always successful so we need to check range count otherwise an exception can occur. - 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 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. - Fixed bug where urls with an at sign in the path wouldn't be parsed correctly. Patch contributed by Jason Grout. - Fixed bug where Opera would remove the first character of a inline formatted word if you pressed backspace. - Fixed bugs with the autoresize plugin on various browsers and removed the need for the throbber. - Fixed performance issue where the contextmenu plugin would try to remove the menu even if it was removed. Patch contributed by mhu. -Version 3.4.7 (2011-11-03) - Modified the caret formatting behavior to word similar to common desktop wordprocessors like Word or Libre Office. - Fixed bug in Webkit - Cursor positioning does not work vertically within a table cell with multiple lines of text. - Fixed bug in IE where Inserting a table in IE8 places cursor in the second cell of the first row. - Fixed bug in IE where editor in a frame doesn't give focus to the toolbar using ALT-F10. - Fix for webkit and gecko so that deleting bullet from start of list outdents inner list items and moves first item into paragraph. - Fix new list items in IE8 not displayed on a new line when list contains nested list items. - Clear formatting in table cell breaks the cell. - Made media type list localisable. - Fix out of memory error when using prototype in media dialog. - Fixed bug where could not add a space in the middle of a th cell. - Fixed bug where adding a bullet between two existing bullets adds an extra one - Fixed bug where trying to insert a new entry midway through a bulleted list fails dismally when the next entry is tabbed in. - Fixed bug where pressing enter on an empty list item does not outdent properly in FF - Fixed bug where adding a heading after a list item in a table cell changes all styles in that cell - Fixed bug where hitting enter to exit from a bullet list moves cursor to the top of the page in Firefox. - Fixed bug where pressing backspace would not delete HRs in Firefox and IE when next to an empty paragraph. - Fixed bug where deleting part of the link text can cause a link with no destination to be saved. - Fixed bug where css style border widths wasn't handled correctly in table dialog. - Fixed bug where parsing invalid html contents on IE or WebKit could produce an infinite loop. - Fixed bug where scripts with custom script types wasn't properly passed though the editor. - Fixed issue where some Japanese kanji characters wasn't properly entity encoded when numeric entity mode was enabled. - Made emoticons dialog use the keyboard naviation. - Added navigation instructions to the symbols dialog. - Added ability to set default values for the media plugin. - Added new font_size_legacy_values option for converting old font element sizes to span with font-size properties. - Fixed bug where the symbols dialog was not accessible. - Added quirk for IE ensuring that the body of the document containing tinyMCE has a role="application" for accessibility. - Fixed bug where the advanced color picker wasn't working properly on FF 7. - Fixed issue where the advanced color picker was producing uppercase hex codes. - Fixed bug where IE 8 could throw exceptions if the contents contained resizable content elements. - Fixed bug where caret formatting wouldn't be correctly applied to previous sibling on WebKit. - Fixed bug where the select boxes for font size/family would loose it's value on WebKit due to recent iOS fixes. -Version 3.4.6 (2011-09-29) - Fixed bug where list items were being created for empty divs. - Added support in Media plugin for audio media using the embed tag - Fixed accessibility bugs in WebKit and IE8 where toolbar items were not being read. - Added new use_accessible_selects option to ensure accessible list boxes are used in all browsers (custom widget in firefox native on other browsers) - Fixed bug where classid attribute was not being checked from embed objects. - Fixed bug in jsrobot tests with intermittently failing. - Fixed bug where anchors wasn't updated properly if you edited them using IE 8. - Fixed bug where input method on WebKit on Mac OS X would fail to initialize when sometimes focusing the editor. - Fixed bug where it wasn't possible to select HR elements on WebKit by simply clicking on them. - Fixed bug where the media plugin wouldn't work on IE9 when not using the inlinepopups plugin. - Fixed bug where hspace,vspace,align and bgcolor would be removed from object elements in the media plugin. - Fixed bug where the new youtube format wouldn't be properly parsed by the media plugin. - Fixed bug where the style attribute of layers wasn't properly updated on IE and Gecko. - Fixed bug where editing contents in a layer would fail on Gecko since contentEditable doesn't inherit properly. - Fixed bug where IE 6/7 would produce JS errors when serializing contents containing layers. -Version 3.4.5 (2011-09-06) - Fixed accessibility bug in WebKit where the right and left arrow keys would update native list boxes. - Added new whitespace_elements option to enable users to specify specific elements where the whitespace is preserved. - Added new merge_siblings option to formats. This option makes it possible to disable the auto merging of siblings when applying formats. - Fixed bug in IE where trailing comma in paste plugin would cause plugin to not run correctly. - Fixed bug in WebKit where console messages would be logged when deleting an empty document. - Fixed bug in IE8 where caret positioned is on list item instead of paragraph when outdent splits the list - Fixed bug with image dialogs not inserting an image if id was omitted from valid_elements. - Fixed bug where the selection normalization logic wouldn't properly handle image elements in specific config cases. - Fixed bug where the map elements coords attribute would be messed up by IE when serializing the DOM. - Fixed bug where IE wouldn't properly handle custom elements when the contents was serialized. - Fixed bug where you couldn't move the caret in Gecko if you focused the editor using the API or a UI control. - Fixed bug where adjacent links would get merged on IE due to bugs in their link command. - Fixed bug where the color split buttons would loose the selection on IE if the editor was placed in a frame/iframe. - Fixed bug where floated images in WebKit wouldn't get properly linked. - Fixed bug where the fullscreen mode in a separate window wasn't forced into IE9+ standards mode. - Fixed bug where pressing enter in an empty editor on WebKit could produce DIV elements instead of P. - Fixed bug where spans would get removed incorrectly when merging two blocks on backspace/delete on WebKit. - Fixed bug where the editor contents wouldn't be completely removed on backspace/delete on WebKit. - Fixed bug where the fullpage plugin wouldn't properly render style elements in the head on IE 6/7. - Fixed bug where the nonbreaking_force_tab option in the nonbreaking plugin wouldn't work on Gecko/WebKit. - Fixed bug where the isDirty state would become true on non IE browsers if there was an table at the end of the contents. - Fixed bug where entities wasn't properly encoded on WebKit when pasting text as plain text. - Fixed bug where empty editors would produce an exception of valid_elements didn't include body and forced_root_blocks where disabled. - Fixed bug where the fullscreen mode wouldn't retain the header/footer in the fullpage plugin. - Fixed issue where the plaintext_mode and plaintext_mode_sticky language keys where swapped. -Version 3.4.4 (2011-08-04) - Added new html5 audio support. Patch contributed by Ronald M. Clifford. - Added mute option for video elements and preload options for video/audio patch contributed by Dmitry Kalinkin. - Fixed selection to match visual selection before applying formatting changes. - Fixed browser specific bugs in lists for WebKit and IE. - Fixed bug where IE would scroll the window if you closed an inline dialog that was larger than the viewport. Patch by Laurence Keijmel. - Fixed bug where pasting contents near a span element could remove parts of that span. Patch contributed by Wesley Walser. - Fixed bug where formatting change would be lost after pressing enter. - Fixed bug in WebKit where deleting across blocks would add extra styles. - Fixed bug where moving cursor vertically in tables in WebKit wasn't working. - Fixed bug in IE where deleting would cause error in console. - Fixed bug where the formatter was not applying formats across list elements. - Fixed bug where the wordcount plugin would try and update the wordcount if tinymce had been destroyed. - Fixed bug where tabfocus plugin would attempt to focus elements not displayed when their parent element was hidden. - Fixed bug where the contentEditable state would sometimes be removed if you deleted contents in Gecko. - Fixed bug where inserting contents using mceInsertContent would fail if "span" was disabled in valid_elements. - Fixed bug where initialization might fail if some resource on gecko wouldn't load properly and fire the onload event. - Fixed bug where ctrl+7/8/9 keys wouldn't properly add the specific formats associated with them. - Fixed bug where the HTML tags wasn't properly closed in the style plugins properties dialog. - Fixed bug where the list plugin would produce an exception if the user tried to delete an element at the very first location. -Version 3.4.3.2 (2011-06-30) - Fixed bug where deleting all of a paragraph inside a table cell would behave badly in webkit. - Fixed bugs in tests in firefox5 and WebKit. - Fixed bug where selection of table cells would produce an exception on Gecko. - Fixed bug where the caret wasn't properly rendered on Gecko when the editor was hidden. - Fixed bug where pasting plain text into WebKit would produce a pre element it will now produce more semantic markup. - Fixed bug where selecting list type formats using the advlist plugin on IE8 would loose editor selection. - Fixed bug where forced root blocks logic wouldn't properly pad elements created if they contained data attributes. - Fixed bug where it would remove all contents of the editor if you inserted an image when not having a caret in the document. - Fixed bug where the YUI compressor wouldn't properly encode strings with only a quote in them. - Fixed bug where WebKit on iOS5 wouldn't call nodeChanged when the selection was changed. - Fixed bug where mceFocus command wouldn't work properly on Gecko since it didn't focus the body element. - Fixed performance issue with the noneditable plugin where it would enable/disable controls to often. -Version 3.4.3.1 (2011-06-16) - Fixed bug where listboxes were not being handled correctly by JAWS in firefox with the o2k7 skin. - Fixed bug where custom buttons were not being rendered correctly when in high contrast mode. - Added support for iOS 5 that now supporting contentEditable in it's latest beta. - Fixed bug where urls in style attributes with a _ character followed by a number would cause incorrect output. - Fixed bug where custom_elements option wasn't working properly on IE browsers. - Fixed bug where custom_elements marked as block elements wouldn't get correctly treated as block elements. - Fixed bug where attributes with </> wasn't properly encoded as XML entities. -Version 3.4.3 (2011-06-09) - Fixed bug where deleting backwards before an image into a list would put the cursor in the wrong location. - Fixed bug where styles plugin would not apply styles across multiple selected block elements correctly. - Fixed bug where cursor would jump to start of document when selection contained empty table cells in IE8. - Fixed bug where applied styles wouldn't be kept if you pressed enter twice to produce two paragraphs. - Fixed bug where a ghost like caret would appear on Gecko when pressing enter while having a text color applied. - Fixed bug where IE would produce absolute urls if you inserted a image/link and reloaded the page. - Fixed bug where applying a heading style to a list item would cascade style to children list items. - Fixed bug where Editor loses focus when backspacing and changing styles in WebKit. - Fixed bug where exception was thrown in tinymce.util.URI when parsing a relative URI and no base_uri setting was provided. - Fixed bug where alt-f10 was not always giving focus to the toolbar on Safari. - Added new 'allow_html_in_named_anchor' option to allow html to occur within a named anchor tag. Use at own risk. - Added plugin dependency support. Will autoload plugins specified as a dependency if they haven't been loaded. - Fixed bug where the autolink plugin didn't work with non-English keyboards when pressing ). - Added possibility to change properties of all table cells in a column. - Added external_image_list option to get images list from user-defined variable or function. - Fixed bug where the autoresize plugin wouldn't reduce the editors height on Chrome. - Fixed bug where table size inputs were to small for values with size units. - Fixed bug where table cell/row size input values were not validated. - Fixed bug where menu item line-height would be set to wrong value by external styles. - Fixed bug where hasUndo() would return wrong answer. - Fixed bug where page title would be set to undefined by fullpage plugin. - Fixed bug where HTML5 video properties were not updated in embedded media settings. - Fixed bug where HTML comment on the first line would cause an error. - Fixed bug where spellchecker menu was positioned incorrectly on IE. - Fixed bug where breaking out of list elements on WebKit would produce a DIV instead of P after the list. - Fixed bug where pasting from Word in IE9 would add extra BR elements when text was word wrapped. - Fixed bug where numeric entities with leading zeros would produce incorrect decoding. - Fixed bug where hexadecimal entities wasn't properly decoded. - Fixed bug where bookmarks wasn't properly stored/restored on undo/redo. - Fixed bug where the mceInsertCommand didn't retain the values of links if they contained non url contents. - Fixed bug where the valid_styles option wouldn't be properly used on styles for specific elements. - Fixed so contentEditable is used for the body of the editor if it's supported. - Fixed so trailing BR elements gets removed even when forced_root_blocks option was set to false/null. - Fixed performance issue with mceInsertCommand and inserting very simple contents. - Fixed performance issue with older IE version and huge documents by optimizing the forced root blocks logic. - Fixed performance issue with table plugin where it checked for selected cells to often. - Fixed bug where creating a link on centered/floated image would produce an error on WebKit browsers. - Fixed bug where Gecko would remove single paragraphs if there where contents before/after it. - Fixed bug where the scrollbar would move up/down when pasting contents using the paste plugin. -Version 3.4.2 (2011-04-07) - Added new 'paste_text_sticky_default' option to paste plugin, enables you to set the default state for paste as plain text. - Added new autoresize_bottom_margin option to autoresize plugin that enables you to add an extra margin at the bottom. Patch contributed by Andrew Ozz. - Rewritten the fullpage plugin to handle style contents better and have a more normalized behavior across browsers. - Fixed bug where contents inserted with mceInsertContent wasn't parsed using the default dom parser. - Fixed bug where blocks containing a single anchor element would be treated as empty. - Fixed bug where merging of table cells on IE 6, 7 wouldn't look correctly until the contents was refreshed. - Fixed bug where context menu wouldn't work properly on Safari since it was passing out the ctrl key as pressed. - Fixed bug where image border color/style values were overwritten by advimage plugin. - Fixed bug where setting border in advimage plugin would throw error in IE. - Fixed bug where empty anchors list in link settings wasn't hidden. - Fixed bug where xhtmlextras popups were missing localized popup-size parameters. - Fixed bug where the context menu wouldn't select images on WebKit browsers. - Fixed bug where paste plugin wouldn't properly extract the contents on WebKit due to recent changes in browser behavior. - Fixed bug where focus of the editor would get on control contents on IE lost due to a bug in the ColorSplitButton control. - Fixed bug where contextmenu wasn't disabled on noneditable elements. - Fixed bug where getStyle function would trigger error when called on element without style property. - Fixed bug where editor fail to load if Javascript Compressor was used. - Fixed bug where list-style-type=lower-greek would produce errors in IE<8. - Fixed bug where spellchecker plugin would produce errors on IE6-7. - Fixed bug where theme_advanced_containers configuration option causes error. - Fixed bug where the mceReplaceContent command would produce an error since it didn't correctly handle a return value. - Fixed bug where you couldn't enter float point values for em in dialog input fields since it wouldn't be considered a valid size. - Fixed bug in xhtmlxtras plugin where it wasn't possible to remove some attributes in the attributes dialog. -Version 3.4.1 (2011-03-24) - Added significantly improved list handling via the new 'lists' plugin. - Added 'autolink' plugin to enable automatically linking URLs. Similar to the behavior IE has by default. - Added 'theme_advanced_show_current_color' setting to enable the forecolor and backcolor buttons to continuously show the current text color. - Added 'contextmenu_never_use_native' setting to disable the ctrl-right-click showing the native browser context menu behaviour. - Added 'paste_enable_default_filters' setting to enable the default paste filters to be disabled. - Fixed bug where selection locations on undo/redo didn't work correctly on specific contents. - Fixed bug where an exception would be trown on IE when loading TinyMCE inside an iframe. - Fixed bug where some ascii numeric entities wasn't properly decoded. - Fixed bug where some non western language codes wasn't proper... [truncated message content] |
From: <be...@us...> - 2012-12-10 04:48:17
|
Revision: 10346 http://sourceforge.net/p/xoops/svn/10346 Author: beckmi Date: 2012-12-10 04:48:14 +0000 (Mon, 10 Dec 2012) Log Message: ----------- XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/maintenance/main.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-10 01:13:08 UTC (rev 10345) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-10 04:48:14 UTC (rev 10346) @@ -3,6 +3,9 @@ =============================== 2012/08/06: Version 2.5.6 Alpha =============================== +Security fixes: + - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) + Bugfixes: - fixed errors related to static functions, so it works on PHP 5.4 (Mamba) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/maintenance/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/maintenance/main.php 2012-12-10 01:13:08 UTC (rev 10345) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/maintenance/main.php 2012-12-10 04:48:14 UTC (rev 10346) @@ -102,6 +102,11 @@ break; case 'maintenance_save': + // Check security + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header( 'admin.php?fct=maintenance', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors() ) ); + exit(); + } //Define Breadcrumb and tips $xoBreadCrumb->addLink(_AM_SYSTEM_MAINTENANCE_NAV_MANAGER, system_adminVersion('maintenance', 'adminpath')); //$xoBreadCrumb->addLink(_AM_SYSTEM_MAINTENANCE_NAV_MAINTENANCE); @@ -157,6 +162,11 @@ break; case 'dump_save': + // Check security + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header( 'admin.php?fct=maintenance', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors() ) ); + exit(); + } //Define Breadcrumb and tips $xoBreadCrumb->addLink(_AM_SYSTEM_MAINTENANCE_NAV_MANAGER, system_adminVersion('maintenance', 'adminpath')); $xoBreadCrumb->addLink(_AM_SYSTEM_MAINTENANCE_NAV_DUMP); |
From: <be...@us...> - 2012-12-12 22:08:24
|
Revision: 10372 http://sourceforge.net/p/xoops/svn/10372 Author: beckmi Date: 2012-12-12 22:08:20 +0000 (Wed, 12 Dec 2012) Log Message: ----------- updating phpThumb config Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-12 21:06:40 UTC (rev 10371) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-12 22:08:20 UTC (rev 10372) @@ -1,7 +1,7 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== -2012/08/06: Version 2.5.6 Alpha +2012/12/12: Version 2.5.6 Beta =============================== Security fixes: - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) @@ -13,7 +13,6 @@ - TinyMCE to 3.5.8 (mamba) - Smarty to 2.6.27 (mamba) - =============================== 2012/04/15: Version 2.5.5 Final =============================== Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php 2012-12-12 21:06:40 UTC (rev 10371) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php 2012-12-12 22:08:20 UTC (rev 10372) @@ -30,6 +30,6 @@ /** * Define XOOPS version */ -define('XOOPS_VERSION', 'XOOPS 2.5.6 Alpha'); +define('XOOPS_VERSION', 'XOOPS 2.5.6 Beta'); ?> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php 2012-12-12 21:06:40 UTC (rev 10371) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/class/thumbs/phpThumb.config.php 2012-12-12 22:08:20 UTC (rev 10372) @@ -78,8 +78,8 @@ //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = '*_thumb'; // cache 'pic.jpg' becomes 'pic_thumb.jpg' (or 'pic_thumb.png' if PNG output is selected, etc) //$PHPTHUMB_CONFIG['cache_default_only_suffix'] = 'small-*'; // cache 'pic.jpg' becomes 'small-pic.jpg' (or 'small-pic.png' if PNG output is selected, etc) -$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.str_replace('www.', '', @$_SERVER['SERVER_NAME']); -//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server +$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache_'.(isset($_SERVER['SERVER_NAME']) ? str_replace('www.', '', $_SERVER['SERVER_NAME']).'_' : ''); // keep cache file separate by domain +//$PHPTHUMB_CONFIG['cache_prefix'] = 'phpThumb_cache'; // allow phpThumb to share 1 set of cached files even if accessed under different servername/domains on same server $PHPTHUMB_CONFIG['cache_force_passthru'] = true; // if true, cached image data will always be passed to browser; if false, HTTP redirect will be used instead @@ -191,9 +191,9 @@ // * Security configuration -$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to at least 5 characters, and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs -$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, must be at least 5 characters long -$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled +$PHPTHUMB_CONFIG['high_security_enabled'] = false; // if enabled, requires 'high_security_password' set to be set and requires the use of phpThumbURL() function (at the bottom of phpThumb.config.php) to generate hashed URLs +$PHPTHUMB_CONFIG['high_security_password'] = ''; // required if 'high_security_enabled' is true, and must be at complex (uppercase, lowercase, numbers, punctuation, etc -- punctuation is strongest, lowercase is weakest; see PasswordStrength() in phpThumb.php). You can use a password generator like http://silisoftware.com/tools/password-random.php to generate a strong password +$PHPTHUMB_CONFIG['disable_debug'] = true; // prevent phpThumb from displaying any information about your system. If true, phpThumbDebug and error messages will be disabled $PHPTHUMB_CONFIG['allow_src_above_docroot'] = true; // if true, allow src to be anywhere in filesystem; if false (default) only allow src within document_root $PHPTHUMB_CONFIG['allow_src_above_phpthumb'] = true; // if true (default), allow src to be anywhere in filesystem; if false only allow src within sub-directory of phpThumb installation $PHPTHUMB_CONFIG['allow_parameter_file'] = false; // if true, allow use of 'file' parameter; if false (default) the 'file' parameter is disabled/ignored |
From: <be...@us...> - 2012-12-13 23:10:12
|
Revision: 10385 http://sourceforge.net/p/xoops/svn/10385 Author: beckmi Date: 2012-12-13 23:10:06 +0000 (Thu, 13 Dec 2012) Log Message: ----------- Updating to jQuery to 1.8.3, QueryUI to version 1.9.2 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-icons_f9bd01_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-icons_808080_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-icons_847e71_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-icons_8dc262_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_a83300_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.ui.js Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.menu.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.spinner.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.tooltip.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.accordion.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.autocomplete.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.button.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.core.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.datepicker.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.dialog.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.menu.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.progressbar.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.resizable.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.selectable.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.slider.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.spinner.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.tabs.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.theme.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.tooltip.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/jquery.ui.theme.css Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.custom.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.custom.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.custom.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.custom.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/images/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/index.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.custom.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/ui.theme.css Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-13 21:13:44 UTC (rev 10384) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2012-12-13 23:10:06 UTC (rev 10385) @@ -12,6 +12,8 @@ Updated: - TinyMCE to 3.5.8 (mamba) - Smarty to 2.6.27 (mamba) + - jQuery to 1.8.3 (mamba) + - jQueryUI to version 1.9.2 (mamba) =============================== 2012/04/15: Version 2.5.5 Final Deleted: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/index.html 2012-12-13 21:13:44 UTC (rev 10384) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/index.html 2012-12-13 23:10:06 UTC (rev 10385) @@ -1 +0,0 @@ - <script>history.go(-1);</script> \ No newline at end of file Deleted: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/index.html 2012-12-13 21:13:44 UTC (rev 10384) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/index.html 2012-12-13 23:10:06 UTC (rev 10385) @@ -1 +0,0 @@ - <script>history.go(-1);</script> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css 2012-12-13 23:10:06 UTC (rev 10385) @@ -0,0 +1,474 @@ +/*! jQuery UI - v1.9.2 - 2012-11-23 +* http://jqueryui.com +* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css +* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + +.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; } +.ui-accordion .ui-accordion-icons { padding-left: 2.2em; } +.ui-accordion .ui-accordion-noicons { padding-left: .7em; } +.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; } + +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; } +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ + +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +} +.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } +.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } + +.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; } +.ui-menu .ui-menu { margin-top: -3px; position: absolute; } +.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; } +.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; } +.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; } +.ui-menu .ui-menu-item a.ui-state-focus, +.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; } + +.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; } +.ui-menu .ui-state-disabled a { cursor: default; } + +/* icon support */ +.ui-menu-icons { position: relative; } +.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; } + +/* left-aligned */ +.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; } + +/* right-aligned */ +.ui-menu .ui-menu-icon { position: static; float: right; } + +.ui-progressbar { height:2em; text-align: left; overflow: hidden; } +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; } +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} +.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } + +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; } +.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; } +.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } +.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } +.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ +.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ +.ui-spinner-up { top: 0; } +.ui-spinner-down { bottom: 0; } + +/* TR overrides */ +.ui-spinner .ui-icon-triangle-1-s { + /* need to fix icons sprite */ + background-position:-65px -16px; +} + +.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ +.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; margin: 1px .2em 0 0; border-bottom: 0; padding: 0; white-space: nowrap; } +.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } +.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } + +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; + -webkit-box-shadow: 0 0 5px #aaa; + box-shadow: 0 0 5px #aaa; +} +/* Fades and background-images don't work well together in IE6, drop the image */ +* html .ui-tooltip { + background-image: none; +} +body .ui-tooltip { border-width: 2px; } + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; } +.ui-widget-content a { color: #222222/*{fcContent}*/; } +.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; } +.ui-widget-header a { color: #222222/*{fcHeader}*/; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; } +.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } +.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */ + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; -khtml-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; -khtml-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; } +.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; } \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css 2012-12-13 23:10:06 UTC (rev 10385) @@ -0,0 +1,16 @@ +/*! + * jQuery UI Accordion 1.9.2 + * http://jqueryui.com + * + * Copyright 2012 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Accordion#theming + */ +.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; } +.ui-accordion .ui-accordion-icons { padding-left: 2.2em; } +.ui-accordion .ui-accordion-noicons { padding-left: .7em; } +.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; } Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css 2012-12-13 23:10:06 UTC (rev 10385) @@ -0,0 +1,12 @@ +/*! + * jQuery UI CSS Framework 1.9.2 + * http://jqueryui.com + * + * Copyright 2012 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming + */ +@import "jquery.ui.base.css"; +@import "jquery.ui.theme.css"; Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css 2012-12-13 23:10:06 UTC (rev 10385) @@ -0,0 +1,19 @@ +/*! + * jQuery UI Autocomplete 1.9.2 + * http://jqueryui.com + * + * Copyright 2012 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Autocomplete#theming + */ +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css 2012-12-13 23:10:06 UTC (rev 10385) @@ -0,0 +1,25 @@ +/*! + * jQuery UI CSS Framework 1.9.2 + * http://jqueryui.com + * + * Copyright 2012 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming + */ +@import url("jquery.ui.core.css"); + +@import url("jquery.ui.accordion.css"); +@import url("jquery.ui.autocomplete.css"); +@import url("jquery.ui.button.css"); +@import url("jquery.ui.datepicker.css"); +@import url("jquery.ui.dialog.css"); +@import url("jquery.ui.menu.css"); +@import url("jquery.ui.progressbar.css"); +@import url("jquery.ui.resizable.css"); +@import url("jquery.ui.selectable.css"); +@import url("jquery.ui.slider.css"); +@import url("jquery.ui.spinner.css"); +@import url("jquery.ui.tabs.css"); +@import url("jquery.ui.tooltip.css"); Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css 2012-12-13 23:10:06 UTC (rev 10385) @@ -0,0 +1,40 @@ +/*! + * jQuery UI Button 1.9.2 + * http://jqueryui.com + * + * Copyright 2012 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Button#theming + */ +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; } +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-but... [truncated message content] |
From: <be...@us...> - 2013-01-06 19:07:28
|
Revision: 10686 http://sourceforge.net/p/xoops/svn/10686 Author: beckmi Date: 2013-01-06 19:07:24 +0000 (Sun, 06 Jan 2013) Log Message: ----------- fixed bug #1245 in class XoopsLoad.php (Alain91) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-06 18:33:49 UTC (rev 10685) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-06 19:07:24 UTC (rev 10686) @@ -8,6 +8,7 @@ Bugfixes: - fixed errors related to static functions, so it works on PHP 5.4 (Mamba) + - fixed bug #1245 in class XoopsLoad.php (Alain91) Updated: - TinyMCE to 3.5.8 (mamba) Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png 2013-01-06 18:33:49 UTC (rev 10685) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png 2013-01-06 19:07:24 UTC (rev 10686) Property changes on: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php 2013-01-06 18:33:49 UTC (rev 10685) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php 2013-01-06 19:07:24 UTC (rev 10686) @@ -137,9 +137,8 @@ * @return boolean True if the data was succesfully cached, false on failure * @access public */ - function write($key, $value = null, $duration = null) + function write($key, $data = null, $duration = null) { - $data = $value; if (!isset($data) || ! $this->init) { return false; } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php 2013-01-06 18:33:49 UTC (rev 10685) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php 2013-01-06 19:07:24 UTC (rev 10686) @@ -42,7 +42,7 @@ ); } $name = strtolower($name); - if (array_key_exists($name, $deprecated)) { + if (in_array($type,array('core','class')) && array_key_exists($name, $deprecated)) { if (isset($GLOBALS['xoopsLogger'])) { $GLOBALS['xoopsLogger']->addDeprecated("xoops_load('{$name}') is deprecated, use xoops_load('{$deprecated[$name]}')"); } else { @@ -56,7 +56,7 @@ return $loaded[$type][$name]; } - if (class_exists($name)) { + if (class_exists($name, false)) { $loaded[$type][$name] = true; return true; } |
From: <be...@us...> - 2013-01-23 02:48:31
|
Revision: 10867 http://sourceforge.net/p/xoops/svn/10867 Author: beckmi Date: 2013-01-23 02:48:25 +0000 (Wed, 23 Jan 2013) Log Message: ----------- Updating jQuery to 1.9.0 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-22 23:09:14 UTC (rev 10866) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-23 02:48:25 UTC (rev 10867) @@ -13,7 +13,7 @@ Updated: - TinyMCE to 3.5.8 (mamba) - Smarty to 2.6.27 (mamba) - - jQuery to 1.8.3 (mamba) + - jQuery to 1.9.0 (mamba) - jQueryUI to version 1.9.2 (mamba) =============================== Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js 2013-01-22 23:09:14 UTC (rev 10866) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js 2013-01-23 02:48:25 UTC (rev 10867) @@ -1,2 +1,4 @@ -/*! jQuery v1.8.3 jquery.com | jquery.org/license */ -(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression:... [truncated message content] |
From: <be...@us...> - 2013-01-23 03:12:46
|
Revision: 10868 http://sourceforge.net/p/xoops/svn/10868 Author: beckmi Date: 2013-01-23 03:12:32 +0000 (Wed, 23 Jan 2013) Log Message: ----------- Updating jQueryUI to 1.10.0 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.core.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.datepicker.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.dialog.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.menu.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.progressbar.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.resizable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.selectable.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.slider.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.spinner.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.tabs.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.tooltip.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.accordion.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.autocomplete.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.button.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.core.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.datepicker.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.dialog.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.menu.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.progressbar.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.resizable.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.selectable.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.slider.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.spinner.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.tabs.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.theme.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/jquery.ui.tooltip.min.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/ui.all.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/cupertino/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/redmond/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/smoothness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/images/ui-icons_8dc262_256x240.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/south-street/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-darkness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/ui-lightness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.ui.js XoopsCore/branches/2.5.x/2.5.6/release_notes.txt Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/minified/images/animated-overlay.gif Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,7 +1,7 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== -2012/12/12: Version 2.5.6 Beta +2013/01/22: Version 2.5.6 Beta =============================== Security fixes: - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) @@ -14,7 +14,7 @@ - TinyMCE to 3.5.8 (mamba) - Smarty to 2.6.27 (mamba) - jQuery to 1.9.0 (mamba) - - jQueryUI to version 1.9.2 (mamba) + - jQueryUI to version 1.10 (mamba) =============================== 2012/04/15: Version 2.5.5 Final Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/animated-overlay.gif =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/animated-overlay.gif =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/animated-overlay.gif 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/animated-overlay.gif 2013-01-23 03:12:32 UTC (rev 10868) Property changes on: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/images/animated-overlay.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery-ui.css 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,43 +1,118 @@ -/*! jQuery UI - v1.9.2 - 2012-11-23 +/*! jQuery UI - v1.10.0 - 2013-01-17 * http://jqueryui.com * Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css -* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */ +* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */ /* Layout helpers ----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } -.ui-helper-clearfix:after { clear: both; } -.ui-helper-clearfix { zoom: 1; } -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); +} +.ui-front { + z-index: 100; +} + /* Interaction Cues ----------------------------------*/ -.ui-state-disabled { cursor: default !important; } +.ui-state-disabled { + cursor: default !important; +} /* Icons ----------------------------------*/ /* states and images */ -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} /* Misc visuals ----------------------------------*/ /* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} -.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; } -.ui-accordion .ui-accordion-icons { padding-left: 2.2em; } -.ui-accordion .ui-accordion-noicons { padding-left: .7em; } -.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; } -.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } -.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; } +.ui-accordion .ui-accordion-header { + display: block; + cursor: pointer; + position: relative; + margin-top: 2px; + padding: .5em .5em .5em .7em; + min-height: 0; /* support: IE7 */ +} +.ui-accordion .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-noicons { + padding-left: .7em; +} +.ui-accordion .ui-accordion-icons .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-header .ui-accordion-header-icon { + position: absolute; + left: .5em; + top: 50%; + margin-top: -8px; +} +.ui-accordion .ui-accordion-content { + padding: 1em 2.2em; + border-top: 0; + overflow: auto; +} .ui-autocomplete { position: absolute; @@ -46,183 +121,664 @@ cursor: default; } -/* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ +.ui-button { + display: inline-block; + position: relative; + padding: 0; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + overflow: visible; /* removes extra width in IE */ +} +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2.2em; +} +/* button elements seem to need a little more width */ +button.ui-button-icon-only { + width: 2.4em; +} +.ui-button-icons-only { + width: 3.4em; +} +button.ui-button-icons-only { + width: 3.7em; +} -.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ -.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; } -.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ -button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } - -/*button text element */ -.ui-button .ui-button-text { display: block; line-height: 1.4; } -.ui-button-text-only .ui-button-text { padding: .4em 1em; } -.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } -.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } -.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } -.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* button text element */ +.ui-button .ui-button-text { + display: block; + line-height: normal; +} +.ui-button-text-only .ui-button-text { + padding: .4em 1em; +} +.ui-button-icon-only .ui-button-text, +.ui-button-icons-only .ui-button-text { + padding: .4em; + text-indent: -9999999px; +} +.ui-button-text-icon-primary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 1em .4em 2.1em; +} +.ui-button-text-icon-secondary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 2.1em .4em 1em; +} +.ui-button-text-icons .ui-button-text { + padding-left: 2.1em; + padding-right: 2.1em; +} /* no icon support for input elements, provide padding by default */ -input.ui-button { padding: .4em 1em; } +input.ui-button { + padding: .4em 1em; +} -/*button icon element(s) */ -.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } -.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } -.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } -.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } -.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } +/* button icon element(s) */ +.ui-button-icon-only .ui-icon, +.ui-button-text-icon-primary .ui-icon, +.ui-button-text-icon-secondary .ui-icon, +.ui-button-text-icons .ui-icon, +.ui-button-icons-only .ui-icon { + position: absolute; + top: 50%; + margin-top: -8px; +} +.ui-button-icon-only .ui-icon { + left: 50%; + margin-left: -8px; +} +.ui-button-text-icon-primary .ui-button-icon-primary, +.ui-button-text-icons .ui-button-icon-primary, +.ui-button-icons-only .ui-button-icon-primary { + left: .5em; +} +.ui-button-text-icon-secondary .ui-button-icon-secondary, +.ui-button-text-icons .ui-button-icon-secondary, +.ui-button-icons-only .ui-button-icon-secondary { + right: .5em; +} -/*button sets*/ -.ui-buttonset { margin-right: 7px; } -.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } +/* button sets */ +.ui-buttonset { + margin-right: 7px; +} +.ui-buttonset .ui-button { + margin-left: 0; + margin-right: -.3em; +} /* workarounds */ -button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* reset extra padding in Firefox, see h5bp.com/l */ +input.ui-button::-moz-focus-inner, +button.ui-button::-moz-focus-inner { + border: 0; + padding: 0; +} -.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } -.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } -.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } -.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker .ui-datepicker-prev { left:2px; } -.ui-datepicker .ui-datepicker-next { right:2px; } -.ui-datepicker .ui-datepicker-prev-hover { left:1px; } -.ui-datepicker .ui-datepicker-next-hover { right:1px; } -.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } -.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } -.ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } -.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } -.ui-datepicker td { border: 0; padding: 1px; } -.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } -.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } +.ui-datepicker { + width: 17em; + padding: .2em .2em 0; + display: none; +} +.ui-datepicker .ui-datepicker-header { + position: relative; + padding: .2em 0; +} +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next { + position: absolute; + top: 2px; + width: 1.8em; + height: 1.8em; +} +.ui-datepicker .ui-datepicker-prev-hover, +.ui-datepicker .ui-datepicker-next-hover { + top: 1px; +} +.ui-datepicker .ui-datepicker-prev { + left: 2px; +} +.ui-datepicker .ui-datepicker-next { + right: 2px; +} +.ui-datepicker .ui-datepicker-prev-hover { + left: 1px; +} +.ui-datepicker .ui-datepicker-next-hover { + right: 1px; +} +.ui-datepicker .ui-datepicker-prev span, +.ui-datepicker .ui-datepicker-next span { + display: block; + position: absolute; + left: 50%; + margin-left: -8px; + top: 50%; + margin-top: -8px; +} +.ui-datepicker .ui-datepicker-title { + margin: 0 2.3em; + line-height: 1.8em; + text-align: center; +} +.ui-datepicker .ui-datepicker-title select { + font-size: 1em; + margin: 1px 0; +} +.ui-datepicker select.ui-datepicker-month-year { + width: 100%; +} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { + width: 49%; +} +.ui-datepicker table { + width: 100%; + font-size: .9em; + border-collapse: collapse; + margin: 0 0 .4em; +} +.ui-datepicker th { + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} +.ui-datepicker td { + border: 0; + padding: 1px; +} +.ui-datepicker td span, +.ui-datepicker td a { + display: block; + padding: .2em; + text-align: right; + text-decoration: none; +} +.ui-datepicker .ui-datepicker-buttonpane { + background-image: none; + margin: .7em 0 0 0; + padding: 0 .2em; + border-left: 0; + border-right: 0; + border-bottom: 0; +} +.ui-datepicker .ui-datepicker-buttonpane button { + float: right; + margin: .5em .2em .4em; + cursor: pointer; + padding: .2em .6em .3em .6em; + width: auto; + overflow: visible; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { + float: left; +} /* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } +.ui-datepicker.ui-datepicker-multi { + width: auto; +} +.ui-datepicker-multi .ui-datepicker-group { + float: left; +} +.ui-datepicker-multi .ui-datepicker-group table { + width: 95%; + margin: 0 auto .4em; +} +.ui-datepicker-multi-2 .ui-datepicker-group { + width: 50%; +} +.ui-datepicker-multi-3 .ui-datepicker-group { + width: 33.3%; +} +.ui-datepicker-multi-4 .ui-datepicker-group { + width: 25%; +} +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { + border-left-width: 0; +} +.ui-datepicker-multi .ui-datepicker-buttonpane { + clear: left; +} +.ui-datepicker-row-break { + clear: both; + width: 100%; + font-size: 0; +} /* RTL support */ -.ui-datepicker-rtl { direction: rtl; } -.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } -.ui-datepicker-rtl .ui-datepicker-group { float:right; } -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl { + direction: rtl; +} +.ui-datepicker-rtl .ui-datepicker-prev { + right: 2px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next { + left: 2px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-prev:hover { + right: 1px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next:hover { + left: 1px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane { + clear: right; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button { + float: left; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, +.ui-datepicker-rtl .ui-datepicker-group { + float: right; +} +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { + border-right-width: 0; + border-left-width: 1px; +} -/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ -.ui-datepicker-cover { - position: absolute; /*must have*/ - z-index: -1; /*must have*/ - filter: mask(); /*must have*/ - top: -4px; /*must have*/ - left: -4px; /*must have*/ - width: 200px; /*must have*/ - height: 200px; /*must have*/ +.ui-dialog { + position: absolute; + top: 0; + left: 0; + padding: .2em; + outline: 0; } -.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; } -.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; } -.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } -.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } -.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } -.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } -.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } -.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } -.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } -.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } -.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } -.ui-draggable .ui-dialog-titlebar { cursor: move; } +.ui-dialog .ui-dialog-titlebar { + padding: .4em 1em; + position: relative; +} +.ui-dialog .ui-dialog-title { + float: left; + margin: .1em 0; + white-space: nowrap; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-dialog .ui-dialog-titlebar-close { + position: absolute; + right: .3em; + top: 50%; + width: 21px; + margin: -10px 0 0 0; + padding: 1px; + height: 20px; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; +} +.ui-dialog .ui-dialog-buttonpane { + text-align: left; + border-width: 1px 0 0 0; + background-image: none; + margin-top: .5em; + padding: .3em 1em .5em .4em; +} +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { + float: right; +} +.ui-dialog .ui-dialog-buttonpane button { + margin: .5em .4em .5em 0; + cursor: pointer; +} +.ui-dialog .ui-resizable-se { + width: 12px; + height: 12px; + right: -5px; + bottom: -5px; + background-position: 16px 16px; +} +.ui-draggable .ui-dialog-titlebar { + cursor: move; +} -.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; } -.ui-menu .ui-menu { margin-top: -3px; position: absolute; } -.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; } -.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; } -.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; } +.ui-menu { + list-style: none; + padding: 2px; + margin: 0; + display: block; + outline: none; +} +.ui-menu .ui-menu { + margin-top: -3px; + position: absolute; +} +.ui-menu .ui-menu-item { + margin: 0; + padding: 0; + width: 100%; +} +.ui-menu .ui-menu-divider { + margin: 5px -2px 5px -2px; + height: 0; + font-size: 0; + line-height: 0; + border-width: 1px 0 0 0; +} +.ui-menu .ui-menu-item a { + text-decoration: none; + display: block; + padding: 2px .4em; + line-height: 1.5; + min-height: 0; /* support: IE7 */ + font-weight: normal; +} .ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; } +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} -.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; } -.ui-menu .ui-state-disabled a { cursor: default; } +.ui-menu .ui-state-disabled { + font-weight: normal; + margin: .4em 0 .2em; + line-height: 1.5; +} +.ui-menu .ui-state-disabled a { + cursor: default; +} /* icon support */ -.ui-menu-icons { position: relative; } -.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; } +.ui-menu-icons { + position: relative; +} +.ui-menu-icons .ui-menu-item a { + position: relative; + padding-left: 2em; +} /* left-aligned */ -.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; } +.ui-menu .ui-icon { + position: absolute; + top: .2em; + left: .2em; +} /* right-aligned */ -.ui-menu .ui-menu-icon { position: static; float: right; } +.ui-menu .ui-menu-icon { + position: static; + float: right; +} -.ui-progressbar { height:2em; text-align: left; overflow: hidden; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } -.ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; } -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } -.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } -.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } -.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } -.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } -.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } -.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } -.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } -.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} -.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } +.ui-progressbar { + height: 2em; + text-align: left; + overflow: hidden; +} +.ui-progressbar .ui-progressbar-value { + margin: -1px; + height: 100%; +} +.ui-progressbar .ui-progressbar-overlay { + background: url("images/animated-overlay.gif"); + height: 100%; + filter: alpha(opacity=25); + opacity: 0.25; +} +.ui-progressbar-indeterminate .ui-progressbar-value { + background-image: none; +} -.ui-slider { position: relative; text-align: left; } -.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } -.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} -.ui-slider-horizontal { height: .8em; } -.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } -.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } -.ui-slider-horizontal .ui-slider-range-min { left: 0; } -.ui-slider-horizontal .ui-slider-range-max { right: 0; } +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} -.ui-slider-vertical { width: .8em; height: 100px; } -.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } -.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } -.ui-slider-vertical .ui-slider-range-min { bottom: 0; } -.ui-slider-vertical .ui-slider-range-max { top: 0; } -.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; } -.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; } -.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; } -.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */ -.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */ -.ui-spinner-up { top: 0; } -.ui-spinner-down { bottom: 0; } +.ui-slider { + position: relative; + text-align: left; +} +.ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + width: 1.2em; + height: 1.2em; + cursor: default; +} +.ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: .7em; + display: block; + border: 0; + background-position: 0 0; +} +/* For IE8 - See #6727 */ +.ui-slider.ui-state-disabled .ui-slider-handle, +.ui-slider.ui-state-disabled .ui-slider-range { + filter: inherit; +} + +.ui-slider-horizontal { + height: .8em; +} +.ui-slider-horizontal .ui-slider-handle { + top: -.3em; + margin-left: -.6em; +} +.ui-slider-horizontal .ui-slider-range { + top: 0; + height: 100%; +} +.ui-slider-horizontal .ui-slider-range-min { + left: 0; +} +.ui-slider-horizontal .ui-slider-range-max { + right: 0; +} + +.ui-slider-vertical { + width: .8em; + height: 100px; +} +.ui-slider-vertical .ui-slider-handle { + left: -.3em; + margin-left: 0; + margin-bottom: -.6em; +} +.ui-slider-vertical .ui-slider-range { + left: 0; + width: 100%; +} +.ui-slider-vertical .ui-slider-range-min { + bottom: 0; +} +.ui-slider-vertical .ui-slider-range-max { + top: 0; +} + +.ui-spinner { + position: relative; + display: inline-block; + overflow: hidden; + padding: 0; + vertical-align: middle; +} +.ui-spinner-input { + border: none; + background: none; + color: inherit; + padding: 0; + margin: .2em 0; + vertical-align: middle; + margin-left: .4em; + margin-right: 22px; +} +.ui-spinner-button { + width: 16px; + height: 50%; + font-size: .5em; + padding: 0; + margin: 0; + text-align: center; + position: absolute; + cursor: default; + display: block; + overflow: hidden; + right: 0; +} +/* more specificity required here to overide default borders */ +.ui-spinner a.ui-spinner-button { + border-top: none; + border-bottom: none; + border-right: none; +} +/* vertical centre icon */ +.ui-spinner .ui-icon { + position: absolute; + margin-top: -8px; + top: 50%; + left: 0; +} +.ui-spinner-up { + top: 0; +} +.ui-spinner-down { + bottom: 0; +} + /* TR overrides */ .ui-spinner .ui-icon-triangle-1-s { /* need to fix icons sprite */ - background-position:-65px -16px; + background-position: -65px -16px; } -.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ -.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } -.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; margin: 1px .2em 0 0; border-bottom: 0; padding: 0; white-space: nowrap; } -.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } -.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; } -.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; } -.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } +.ui-tabs { + position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ + padding: .2em; +} +.ui-tabs .ui-tabs-nav { + margin: 0; + padding: .2em .2em 0; +} +.ui-tabs .ui-tabs-nav li { + list-style: none; + float: left; + position: relative; + top: 0; + margin: 1px .2em 0 0; + border-bottom: 0; + padding: 0; + white-space: nowrap; +} +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em 1em; + text-decoration: none; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + margin-bottom: -1px; + padding-bottom: 1px; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active a, +.ui-tabs .ui-tabs-nav li.ui-state-disabled a, +.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { + cursor: text; +} +.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { + cursor: pointer; +} +.ui-tabs .ui-tabs-panel { + display: block; + border-width: 0; + padding: 1em 1.4em; + background: none; +} .ui-tooltip { padding: 8px; @@ -232,55 +788,180 @@ -webkit-box-shadow: 0 0 5px #aaa; box-shadow: 0 0 5px #aaa; } -/* Fades and background-images don't work well together in IE6, drop the image */ -* html .ui-tooltip { - background-image: none; +body .ui-tooltip { + border-width: 2px; } -body .ui-tooltip { border-width: 2px; } /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; } -.ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; } -.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; } -.ui-widget-content a { color: #222222/*{fcContent}*/; } -.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; } -.ui-widget-header a { color: #222222/*{fcHeader}*/; } +.ui-widget { + font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-size: 1.1em/*{fsDefault}*/; +} +.ui-widget .ui-widget { + font-size: 1em; +} +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-size: 1em; +} +.ui-widget-content { + border: 1px solid #aaaaaa/*{borderColorContent}*/; + background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; + color: #222222/*{fcContent}*/; +} +.ui-widget-content a { + color: #222222/*{fcContent}*/; +} +.ui-widget-header { + border: 1px solid #aaaaaa/*{borderColorHeader}*/; + background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; + color: #222222/*{fcHeader}*/; + font-weight: bold; +} +.ui-widget-header a { + color: #222222/*{fcHeader}*/; +} /* Interaction states ----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; } -.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; } -.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; } -.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; } +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { + border: 1px solid #d3d3d3/*{borderColorDefault}*/; + background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #555555/*{fcDefault}*/; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #555555/*{fcDefault}*/; + text-decoration: none; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus { + border: 1px solid #999999/*{borderColorHover}*/; + background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #212121/*{fcHover}*/; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited { + color: #212121/*{fcHover}*/; + text-decoration: none; +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + border: 1px solid #aaaaaa/*{borderColorActive}*/; + background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #212121/*{fcActive}*/; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #212121/*{fcActive}*/; + text-decoration: none; +} /* Interaction Cues ----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; } -.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; } -.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; } -.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; } -.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } -.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } -.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } -.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #fcefa1/*{borderColorHighlight}*/; + background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; + color: #363636/*{fcHighlight}*/; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #363636/*{fcHighlight}*/; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #cd0a0a/*{borderColorError}*/; + background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; + color: #cd0a0a/*{fcError}*/; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #cd0a0a/*{fcError}*/; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #cd0a0a/*{fcError}*/; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + filter:Alpha(Opacity=70); + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + filter:Alpha(Opacity=35); + background-image: none; +} +.ui-state-disabled .ui-icon { + filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ +} /* Icons ----------------------------------*/ /* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; } -.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; } -.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; } -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; } +.ui-icon { + width: 16px; + height: 16px; + background-position: 16px 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; +} +.ui-widget-header .ui-icon { + background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; +} +.ui-state-default .ui-icon { + background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; +} +.ui-state-active .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; +} +.ui-state-highlight .ui-icon { + background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; +} /* positioning */ .ui-icon-carat-1-n { background-position: 0 0; } @@ -464,11 +1145,42 @@ ----------------------------------*/ /* Corner radius */ -.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; -khtml-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; -khtml-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 4px/*{cornerRadius}*/; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 4px/*{cornerRadius}*/; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 4px/*{cornerRadius}*/; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 4px/*{cornerRadius}*/; +} /* Overlays */ -.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; } -.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; } \ No newline at end of file +.ui-widget-overlay { + background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; + opacity: .3/*{opacityOverlay}*/; + filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; +} +.ui-widget-shadow { + margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; + padding: 8px/*{thicknessShadow}*/; + background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; + opacity: .3/*{opacityShadow}*/; + filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; + border-radius: 8px/*{cornerRadiusShadow}*/; +} Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,16 +1,38 @@ /*! - * jQuery UI Accordion 1.9.2 + * jQuery UI Accordion 1.10.0 * http://jqueryui.com * - * Copyright 2012 jQuery Foundation and other contributors + * Copyright 2013 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * * http://docs.jquery.com/UI/Accordion#theming */ -.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; } -.ui-accordion .ui-accordion-icons { padding-left: 2.2em; } -.ui-accordion .ui-accordion-noicons { padding-left: .7em; } -.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; } -.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } -.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; } +.ui-accordion .ui-accordion-header { + display: block; + cursor: pointer; + position: relative; + margin-top: 2px; + padding: .5em .5em .5em .7em; + min-height: 0; /* support: IE7 */ +} +.ui-accordion .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-noicons { + padding-left: .7em; +} +.ui-accordion .ui-accordion-icons .ui-accordion-icons { + padding-left: 2.2em; +} +.ui-accordion .ui-accordion-header .ui-accordion-header-icon { + position: absolute; + left: .5em; + top: 50%; + margin-top: -8px; +} +.ui-accordion .ui-accordion-content { + padding: 1em 2.2em; + border-top: 0; + overflow: auto; +} Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.all.css 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,8 +1,8 @@ /*! - * jQuery UI CSS Framework 1.9.2 + * jQuery UI CSS Framework 1.10.0 * http://jqueryui.com * - * Copyright 2012 jQuery Foundation and other contributors + * Copyright 2013 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,8 +1,8 @@ /*! - * jQuery UI Autocomplete 1.9.2 + * jQuery UI Autocomplete 1.10.0 * http://jqueryui.com * - * Copyright 2012 jQuery Foundation and other contributors + * Copyright 2013 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * @@ -14,6 +14,3 @@ left: 0; cursor: default; } - -/* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.base.css 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,8 +1,8 @@ /*! - * jQuery UI CSS Framework 1.9.2 + * jQuery UI CSS Framework 1.10.0 * http://jqueryui.com * - * Copyright 2012 jQuery Foundation and other contributors + * Copyright 2013 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css 2013-01-23 02:48:25 UTC (rev 10867) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/css/ui/base/jquery.ui.button.css 2013-01-23 03:12:32 UTC (rev 10868) @@ -1,40 +1,114 @@ /*! - * jQuery UI Button 1.9.2 + * jQuery UI Button 1.10.0 * http://jqueryui.com * - * Copyright 2012 jQuery Foundation and other contributors + * Copyright 2013 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * * http://docs.jquery.com/UI/Button#theming */ -.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ -.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; } -.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ -button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } +.ui-button { + display: inline-block; + position: relative; + padding: 0; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + overflow: visible; /* removes extra width in IE */ +} +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2.2em; +} +/* button elements seem to need a little more width */ +button.ui-button-icon-only { + width: 2.4em; +} +.ui-button-icons-only { + width: 3.4em; +} +button.ui-button-icons-only { + width: 3.7em; +} -/*button text element */ -.ui-button .ui-button-text { display: block; line-height: 1.4; } -.ui-button-text-only .ui-button-text { padding: .4em 1em; } -.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } -.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } -.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; } -.ui-button... [truncated message content] |
From: <be...@us...> - 2013-01-23 20:57:19
|
Revision: 10882 http://sourceforge.net/p/xoops/svn/10882 Author: beckmi Date: 2013-01-23 20:57:13 +0000 (Wed, 23 Jan 2013) Log Message: ----------- Adding FastComment Hack by Voltan for testing Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_edit.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_form.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_new.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_post.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_reply.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_view.php XoopsCore/branches/2.5.x/2.5.6/htdocs/install/sql/mysql.structure.sql XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/comment.php XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/comment.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_comments.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_flat.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_nest.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_thread.html Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.6/upgrade/upd-2.4.0-to-2.4.1/ XoopsCore/branches/2.5.x/2.5.6/upgrade/upd-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.6/upgrade/upd-2.4.0-to-2.4.1/license.dist.php XoopsCore/branches/2.5.x/2.5.6/upgrade/upd-2.5.5-to-2.5.6/ XoopsCore/branches/2.5.x/2.5.6/upgrade/upd-2.5.5-to-2.5.6/index.php Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.6/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/ XoopsCore/branches/2.5.x/2.5.6/upgrade/upd-2.4.0a-to-2.4.0/ Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-23 20:57:13 UTC (rev 10882) @@ -16,6 +16,8 @@ - jQuery to 1.9.0 (mamba) - jQueryUI to version 1.10 (mamba) +Added: Fast Comment Hack (Voltan) + =============================== 2012/04/15: Version 2.5.5 Final =============================== Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -103,9 +103,18 @@ } else { $title = $this->_comments[$i]->getVar('com_title'); } - $poster = $this->_getPosterArray($this->_comments[$i]->getVar('com_uid')); + // Start edit by voltan + $poster = $this->_getPosterArray($this->_comments[$i]->getVar('com_uid'), $this->_comments[$i]->getVar('com_user'), $this->_comments[$i]->getVar('com_url')); if (false != $admin_view) { - $text = $this->_comments[$i]->getVar('com_text') . '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">' . _CM_STATUS . ': ' . $this->_statusText[$this->_comments[$i]->getVar('com_status')] . '<br />IP: <span style="font-weight: bold;">' . $this->_comments[$i]->getVar('com_ip') . '</span></div>'; + $com_email = $this->_comments[$i]->getVar('com_email'); + $text = $this->_comments[$i]->getVar('com_text'); + $text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">'; + $text .= _CM_STATUS . ': ' . $this->_statusText[$this->_comments[$i]->getVar('com_status')] . '<br />'; + $text .= 'IP: <span style="font-weight: bold;">' . $this->_comments[$i]->getVar('com_ip') . '</span>'; + if(!empty($com_email)) { + $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>'; + } + $text .= '</div>'; } else { // hide comments that are not active if (XOOPS_COMMENT_ACTIVE != $this->_comments[$i]->getVar('com_status')) { @@ -114,6 +123,7 @@ $text = $this->_comments[$i]->getVar('com_text'); } } + // End edit by voltan $this->_tpl->append('comments', array('id' => $this->_comments[$i]->getVar('com_id') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($this->_comments[$i]->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($this->_comments[$i]->getVar('com_modified'), 'm') , 'poster' => $poster)); } } @@ -148,7 +158,15 @@ } if (false != $admin_view) { // admins can see all - $text = $tree[$comment_id]['obj']->getVar('com_text') . '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">' . _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span></div>'; + $com_email = $tree[$comment_id]['obj']->getVar('com_email'); + $text = $tree[$comment_id]['obj']->getVar('com_text'); + $text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">'; + $text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />'; + $text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>'; + if(!empty($com_email)) { + $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>'; + } + $text .= '</div>'; } else { // hide comments that are not active if (XOOPS_COMMENT_ACTIVE != $tree[$comment_id]['obj']->getVar('com_status')) { @@ -166,7 +184,9 @@ $replies = array(); $this->_renderThreadReplies($tree, $comment_id, $replies, ' ', $admin_view); $show_replies = (count($replies) > 0) ? true : false; - $this->_tpl->append('comments', array('pid' => $tree[$comment_id]['obj']->getVar('com_pid') , 'id' => $tree[$comment_id]['obj']->getVar('com_id') , 'itemid' => $tree[$comment_id]['obj']->getVar('com_itemid') , 'rootid' => $tree[$comment_id]['obj']->getVar('com_rootid') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_modified'), 'm') , 'poster' => $this->_getPosterArray($tree[$comment_id]['obj']->getVar('com_uid')) , 'replies' => $replies , 'show_replies' => $show_replies)); + // Start edit by voltan + $this->_tpl->append('comments', array('pid' => $tree[$comment_id]['obj']->getVar('com_pid') , 'id' => $tree[$comment_id]['obj']->getVar('com_id') , 'itemid' => $tree[$comment_id]['obj']->getVar('com_itemid') , 'rootid' => $tree[$comment_id]['obj']->getVar('com_rootid') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_modified'), 'm') , 'poster' => $this->_getPosterArray($tree[$comment_id]['obj']->getVar('com_uid'), $tree[$comment_id]['obj']->getVar('com_user'), $tree[$comment_id]['obj']->getVar('com_url')) , 'replies' => $replies , 'show_replies' => $show_replies)); + // End edit by voltan } /** @@ -190,7 +210,9 @@ $title = $thread[$key]['obj']->getVar('com_title'); } $title = (false != $admin_view) ? $title . ' ' . $this->_statusText[$thread[$key]['obj']->getVar('com_status')] : $title; - $replies[] = array('id' => $key , 'prefix' => $current_prefix , 'date_posted' => formatTimestamp($thread[$key]['obj']->getVar('com_created'), 'm') , 'title' => $title , 'root_id' => $thread[$key]['obj']->getVar('com_rootid') , 'status' => $this->_statusText[$thread[$key]['obj']->getVar('com_status')] , 'poster' => $this->_getPosterName($thread[$key]['obj']->getVar('com_uid'))); + // Start edit by voltan + $replies[] = array('id' => $key , 'prefix' => $current_prefix , 'date_posted' => formatTimestamp($thread[$key]['obj']->getVar('com_created'), 'm') , 'title' => $title , 'root_id' => $thread[$key]['obj']->getVar('com_rootid') , 'status' => $this->_statusText[$thread[$key]['obj']->getVar('com_status')] , 'poster' => $this->_getPosterName($thread[$key]['obj']->getVar('com_uid'), $thread[$key]['obj']->getVar('com_user'), $thread[$key]['obj']->getVar('com_url'))); + // End edit by voltan $current_prefix .= $prefix; } if (isset($thread[$key]['child']) && ! empty($thread[$key]['child'])) { @@ -229,7 +251,15 @@ $title = $tree[$comment_id]['obj']->getVar('com_title'); } if (false != $admin_view) { - $text = $tree[$comment_id]['obj']->getVar('com_text') . '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">' . _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span></div>'; + $com_email = $tree[$comment_id]['obj']->getVar('com_email'); + $text = $tree[$comment_id]['obj']->getVar('com_text'); + $text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">'; + $text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />'; + $text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>'; + if(!empty($com_email)) { + $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>'; + } + $text .= '</div>'; } else { // skip this comment if it is not active and continue on processing its child comments instead if (XOOPS_COMMENT_ACTIVE != $tree[$comment_id]['obj']->getVar('com_status')) { @@ -246,7 +276,9 @@ } $replies = array(); $this->_renderNestReplies($tree, $comment_id, $replies, 25, $admin_view); - $this->_tpl->append('comments', array('pid' => $tree[$comment_id]['obj']->getVar('com_pid') , 'id' => $tree[$comment_id]['obj']->getVar('com_id') , 'itemid' => $tree[$comment_id]['obj']->getVar('com_itemid') , 'rootid' => $tree[$comment_id]['obj']->getVar('com_rootid') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_modified'), 'm') , 'poster' => $this->_getPosterArray($tree[$comment_id]['obj']->getVar('com_uid')) , 'replies' => $replies)); + // Start edit by voltan + $this->_tpl->append('comments', array('pid' => $tree[$comment_id]['obj']->getVar('com_pid') , 'id' => $tree[$comment_id]['obj']->getVar('com_id') , 'itemid' => $tree[$comment_id]['obj']->getVar('com_itemid') , 'rootid' => $tree[$comment_id]['obj']->getVar('com_rootid') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($tree[$comment_id]['obj']->getVar('com_modified'), 'm') , 'poster' => $this->_getPosterArray($tree[$comment_id]['obj']->getVar('com_uid'), $tree[$comment_id]['obj']->getVar('com_user'), $tree[$comment_id]['obj']->getVar('com_url')) , 'replies' => $replies)); + // End edit by voltan } /** @@ -268,9 +300,10 @@ } else { $title = $thread[$key]['obj']->getVar('com_title'); } - $text = (false != $admin_view) ? $thread[$key]['obj']->getVar('com_text') . '<div style="text-align:right; margin-top: 2px; margin-right: 2px;">' . _CM_STATUS . ': ' . $this->_statusText[$thread[$key]['obj']->getVar('com_status')] . '<br />IP: <span style="font-weight: bold;">' . $thread[$key]['obj']->getVar('com_ip') . '</span></div>' : $thread[$key]['obj']->getVar('com_text'); - $replies[] = array('id' => $key , 'prefix' => $prefix , 'pid' => $thread[$key]['obj']->getVar('com_pid') , 'itemid' => $thread[$key]['obj']->getVar('com_itemid') , 'rootid' => $thread[$key]['obj']->getVar('com_rootid') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($thread[$key]['obj']->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($thread[$key]['obj']->getVar('com_modified'), 'm') , 'poster' => $this->_getPosterArray($thread[$key]['obj']->getVar('com_uid'))); - + $text = (false != $admin_view) ? $thread[$key]['obj']->getVar('com_text') . '<div style="text-align:right; margin-top: 2px; margin-right: 2px;">' . _CM_STATUS . ': ' . $this->_statusText[$thread[$key]['obj']->getVar('com_status')] . '<br />IP: <span style="font-weight: bold;">' . $thread[$key]['obj']->getVar('com_ip') . '</span><br />' . _CM_EMAIL . ' :<span style="font-weight: bold;">' . $this->_comments[$i]->getVar('com_email') . '</span></div>' : $thread[$key]['obj']->getVar('com_text'); + // Start edit by voltan + $replies[] = array('id' => $key , 'prefix' => $prefix , 'pid' => $thread[$key]['obj']->getVar('com_pid') , 'itemid' => $thread[$key]['obj']->getVar('com_itemid') , 'rootid' => $thread[$key]['obj']->getVar('com_rootid') , 'title' => $title , 'text' => $text , 'date_posted' => formatTimestamp($thread[$key]['obj']->getVar('com_created'), 'm') , 'date_modified' => formatTimestamp($thread[$key]['obj']->getVar('com_modified'), 'm') , 'poster' => $this->_getPosterArray($thread[$key]['obj']->getVar('com_uid'), $thread[$key]['obj']->getVar('com_user'), $thread[$key]['obj']->getVar('com_url'))); + // End edit by voltan $prefix = $prefix + 25; } if (isset($thread[$key]['child']) && ! empty($thread[$key]['child'])) { @@ -297,21 +330,32 @@ * @return string * @access private */ - function _getPosterName($poster_id) + // Start edit by voltan + function _getPosterName($poster_id, $poster_user, $poster_website) { $poster['id'] = intval($poster_id); if ($poster['id'] > 0) { $com_poster =& $this->_memberHandler->getUser($poster_id); if (is_object($com_poster)) { $poster['uname'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $poster['id'] . '">' . $com_poster->getVar('uname') . '</a>'; - return $poster; + } - } - $poster['id'] = 0; // to cope with deleted user accounts - $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous']; + } elseif ($poster['id'] == 0 && $poster_user != '') { + $poster['id'] = 0; // to cope with deleted user accounts + if(!empty($poster_website)) { + $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>'; + } else { + $poster['uname'] = $poster_user; + } + } else { + $poster['id'] = 0; // to cope with deleted user accounts + $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous']; + } + return $poster; } - + // End edit by voltan + /** * Get an array with info about the poster * @@ -319,7 +363,8 @@ * @return array * @access private */ - function _getPosterArray($poster_id) + // Start edit by voltan + function _getPosterArray($poster_id, $poster_user, $poster_website) { $poster['id'] = intval($poster_id); if ($poster['id'] > 0) { @@ -334,19 +379,34 @@ $poster['from'] = $com_poster->getVar('user_from'); $poster['postnum'] = $com_poster->getVar('posts'); $poster['status'] = $com_poster->isOnline() ? _CM_ONLINE : ''; - return $poster; } - } - $poster['id'] = 0; // to cope with deleted user accounts - $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous']; - $poster['rank_title'] = ''; - $poster['avatar'] = 'blank.gif'; - $poster['regdate'] = ''; - $poster['from'] = ''; - $poster['postnum'] = 0; - $poster['status'] = ''; + } elseif ($poster['id'] == 0 && $poster_user != '') { + if(!empty($poster_website)) { + $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>'; + } else { + $poster['uname'] = $poster_user; + } + $poster['id'] = 0; // to cope with deleted user accounts + $poster['rank_title'] = ''; + $poster['avatar'] = 'blank.gif'; + $poster['regdate'] = ''; + $poster['from'] = ''; + $poster['postnum'] = 0; + $poster['status'] = ''; + } else { + $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous']; + $poster['id'] = 0; // to cope with deleted user accounts + $poster['rank_title'] = ''; + $poster['avatar'] = 'blank.gif'; + $poster['regdate'] = ''; + $poster['from'] = ''; + $poster['postnum'] = 0; + $poster['status'] = ''; + } + return $poster; } + // End edit by voltan /** * Get the IMG tag for the title icon Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_edit.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_edit.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_edit.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -65,6 +65,11 @@ $com_pid = $comment->getVar('com_pid'); $com_status = $comment->getVar('com_status'); $com_rootid = $comment->getVar('com_rootid'); +// Start Add by voltan +$com_user = $comment->getVar('com_user'); +$com_email = $comment->getVar('com_email'); +$com_url = $comment->getVar('com_url'); +// End Add by voltan if ($xoopsModule->getVar('dirname') != 'system') { include $GLOBALS['xoops']->path('header.php'); Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_form.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_form.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_form.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -45,6 +45,13 @@ } $cform->addElement(new XoopsFormText(_CM_TITLE, 'com_title', 50, 255, $com_title), true); +// Start add by voltan +if (!($com_user == '' && $com_email == '') || !$xoopsUser) { + $cform->addElement(new XoopsFormText(_CM_USER, 'com_user', 50, 60, $com_user), true); + $cform->addElement(new XoopsFormText(_CM_EMAIL, 'com_email', 50, 60, $com_email), true); + $cform->addElement(new XoopsFormText(_CM_URL, 'com_url', 50, 60, $com_url), false); +} +// End add by voltan $icons_radio = new XoopsFormRadio(_MESSAGEICON, 'com_icon', $com_icon); $subject_icons = XoopsLists::getSubjectsList(); foreach ($subject_icons as $iconfile) { Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_new.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_new.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_new.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -72,7 +72,11 @@ $com_pid = 0; $com_rootid = 0; $com_text = ''; - + // Start Add by voltan + $com_user = ''; + $com_email = ''; + $com_url = ''; + // End Add by voltan include_once $GLOBALS['xoops']->path('include/comment_form.php'); include_once $GLOBALS['xoops']->path('footer.php'); } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_post.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_post.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_post.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -58,6 +58,11 @@ } $op = ''; +$error_message = ''; +$com_user = ''; +$com_email = ''; +$com_url = ''; + if (!empty($_POST)) { if (isset($_POST['com_dopost'])) { $op = 'post'; @@ -76,11 +81,61 @@ xoops_load('XoopsCaptcha'); $xoopsCaptcha = XoopsCaptcha::getInstance(); if (! $xoopsCaptcha->verify()) { - $captcha_message = $xoopsCaptcha->getMessage(); - $op = 'preview'; + $error_message .= $xoopsCaptcha->getMessage() . '<br />'; } + + // Start add by voltan + xoops_load('XoopsUserUtility'); + xoops_loadLanguage('user'); + $myts =& MyTextSanitizer::getInstance(); + + // Check user name + $search_arr = array(" ","\t","\r\n","\r","\n",",",".","'",";",":",")", "(",'"','?','!','{','}','[',']','<','>','/','+','-','_', '\\','*','=','@','#','$','%','^','&'); + $replace_arr = array(' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', ' ',' ',' ',' ',' ',''); + $com_user = trim($_POST['com_user']); + $com_user = $myts->stripSlashesGPC($com_user); + $com_user = $myts->xoopsCodeDecode($com_user); + $com_user = $myts->filterXss($com_user); + $com_user = strip_tags($com_user); + $com_user = strtolower($com_user); + $com_user = htmlentities($com_user, ENT_COMPAT, 'utf-8'); + $com_user = preg_replace('`\[.*\]`U', ' ', $com_user); + $com_user = preg_replace('`&(amp;)?#?[a-z0-9]+;`i', ' ', $com_user); + $com_user = preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', '\\1', $com_user); + $com_user = str_replace($search_arr, $replace_arr, $com_user); + + // Check Url + if(!empty($_POST['com_url'])) { + $com_url = trim($_POST['com_url']); + $com_url = filter_var($com_url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED); + } + + // Check Email + $com_email = $myts->stripSlashesGPC(trim($_POST['com_email'])); + $com_email = htmlspecialchars(trim($com_email), ENT_QUOTES); + $com_email = filter_var($com_email, FILTER_VALIDATE_EMAIL); + // Invalid email address + if (!checkEmail($com_email)) { + $error_message .= _US_INVALIDMAIL . '<br />'; + } + if (strrpos($com_email, ' ') > 0) { + $error_message .= _US_EMAILNOSPACES . '<br />'; + } + // Check forbidden email address if current operator is not an administrator + if (!$xoopsUser_isAdmin) { + foreach ($xoopsConfigUser['bad_emails'] as $be) { + if (!empty($be) && preg_match('/' . $be . '/i', $com_email)) { + $error_message .= _US_INVALIDMAIL . '<br />'; + break; + } + } + } + if(!empty($error_message)) { + $op = 'preview'; + } + // End add by voltan } - + $com_mode = isset($_POST['com_mode']) ? htmlspecialchars(trim($_POST['com_mode']), ENT_QUOTES) : 'flat'; $com_order = isset($_POST['com_order']) ? intval($_POST['com_order']) : XOOPS_COMMENT_OLD1ST; $com_itemid = isset($_POST['com_itemid']) ? intval($_POST['com_itemid']) : 0; @@ -124,8 +179,8 @@ $com_text = $myts->htmlSpecialChars($myts->stripSlashesGPC($_POST['com_text'])); if ($xoopsModule->getVar('dirname') != 'system') { include_once $GLOBALS['xoops']->path('header.php'); - if (!empty($captcha_message)) { - xoops_error($captcha_message); + if (!empty($error_message)) { + xoops_error($error_message); } echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"> <tr><td class="head">' . $com_title . '</td></tr> @@ -147,6 +202,9 @@ case "post": $doimage = 1; $comment_handler =& xoops_gethandler('comment'); + // Start add by voltan + $myts =& MyTextSanitizer::getInstance(); + // Edit add by voltan $add_userpost = false; $call_approvefunc = false; $call_updatefunc = false; @@ -276,6 +334,11 @@ $comment->setVar('com_icon', $com_icon); $comment->setVar('com_modified', time()); $comment->setVar('com_modid', $com_modid); + // Start add by voltan + $comment->setVar('com_user', $com_user); + $comment->setVar('com_email', $com_email); + $comment->setVar('com_url', $com_url); + // End add by voltan if (isset($extra_params)) { $comment->setVar('com_exparams', $extra_params); } @@ -409,5 +472,4 @@ redirect_header(XOOPS_URL . '/', 1, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); break; } - ?> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_reply.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_reply.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_reply.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -47,7 +47,15 @@ } $comment_handler =& xoops_gethandler('comment'); $comment =& $comment_handler->get($com_id); -$r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid')); + +// Start edit by voltan +if($comment->getVar('com_uid') == 0 && $comment->getVar('com_user') != '') { + $r_name = $comment->getVar('com_user'); +} else { + $r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid')); +} +// End edit by voltan + $r_text = _CM_POSTER . ': <strong>' . $r_name . '</strong> ' . _CM_POSTED . ': <strong>' . formatTimestamp($comment->getVar('com_created')) . '</strong><br /><br />' . $comment->getVar('com_text'); $com_title = $comment->getVar('com_title', 'E'); if (!preg_match("/^" . _RE . "/i", $com_title)) { @@ -64,7 +72,12 @@ $com_icon = ''; $com_rootid = $comment->getVar('com_rootid'); $com_itemid = $comment->getVar('com_itemid'); - +// Start Add by voltan +$com_user = ''; +$com_email = ''; +$com_url = ''; +// End Add by voltan + include_once $GLOBALS['xoops']->path('header.php'); echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"> <tr><td class="head">' . $comment->getVar('com_title') . '</td></tr> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_view.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_view.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/comment_view.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -199,6 +199,95 @@ </tr> </table> </form>'; + + // Start add by voltan + if (! empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) { + + xoops_load('XoopsLists'); + xoops_load('XoopsFormLoader'); + + if(file_exists($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/comment_fast.php'))) { + include_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/comment_fast.php'); + } + if (isset($com_replytitle)) { + $myts =& MyTextSanitizer::getInstance(); + $com_title = $myts->htmlSpecialChars($com_replytitle); + if (!preg_match("/^" . _RE . "/i", $com_title)) { + $com_title = _RE . " " . xoops_substr($com_title, 0, 56); + } + } else { + $com_title = ''; + } + + // set form + $cform = new XoopsThemeForm(_CM_POSTCOMMENT, "commentfastform", 'comment_post.php', 'post', true); + $cform->addElement(new XoopsFormElementTray('')); + if (isset($xoopsModuleConfig['com_rule'])) { + include_once $GLOBALS['xoops']->path('include/comment_constants.php'); + switch ($xoopsModuleConfig['com_rule']) { + case XOOPS_COMMENT_APPROVEALL: + $rule_text = _CM_COMAPPROVEALL; + break; + case XOOPS_COMMENT_APPROVEUSER: + $rule_text = _CM_COMAPPROVEUSER; + break; + case XOOPS_COMMENT_APPROVEADMIN: + default: + $rule_text = _CM_COMAPPROVEADMIN; + break; + } + $cform->addElement(new XoopsFormLabel(_CM_COMRULES, $rule_text)); + } + $cform->addElement(new XoopsFormText(_CM_TITLE, 'com_title', 50, 255, $com_title), true); + if (!$xoopsUser) { + $cform->addElement(new XoopsFormText(_CM_USER, 'com_user', 50, 60, ''), true); + $cform->addElement(new XoopsFormText(_CM_EMAIL, 'com_email', 50, 60, ''), true); + $cform->addElement(new XoopsFormText(_CM_URL, 'com_url', 50, 60, ''), false); + } + $cform->addElement(new XoopsFormTextArea(_CM_MESSAGE, 'com_text', '', 10, 65), true); + if (!$xoopsUser) { + $cform->addElement(new XoopsFormCaptcha()); + } + + $cform->addElement(new XoopsFormHidden('com_id', 0)); + $cform->addElement(new XoopsFormHidden('com_pid', 0)); + $cform->addElement(new XoopsFormHidden('com_rootid', 0)); + $cform->addElement(new XoopsFormHidden('com_order', 0)); + $cform->addElement(new XoopsFormHidden('com_itemid', $com_itemid)); + $cform->addElement(new XoopsFormHidden('com_mode', $com_mode)); + $cform->addElement(new xoopsFormHidden('dohtml', 0)); + $cform->addElement(new xoopsFormHidden('dobr', 0)); + $cform->addElement(new xoopsFormHidden('dosmiley', 0)); + $cform->addElement(new xoopsFormHidden('doxcode', 0)); + + // add module specific extra params + if ('system' != $xoopsModule->getVar('dirname')) { + $comment_config = $xoopsModule->getInfo('comments'); + if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) { + $myts =& MyTextSanitizer::getInstance(); + foreach ($comment_config['extraParams'] as $extra_param) { + // This routine is included from forms accessed via both GET and POST + if (isset($_POST[$extra_param])) { + $hidden_value = $myts->stripSlashesGPC($_POST[$extra_param]); + } else if (isset($_GET[$extra_param])) { + $hidden_value = $myts->stripSlashesGPC($_GET[$extra_param]); + } else { + $hidden_value = ''; + } + $cform->addElement(new XoopsFormHidden($extra_param, $hidden_value)); + } + } + } + + $button_tray = new XoopsFormElementTray('', ' '); + $button_tray->addElement(new XoopsFormButton('', 'com_dopost', _CM_POSTCOMMENT, 'submit')); + $cform->addElement($button_tray); + $xoopsTpl->assign('commentform', $cform->render()); + } else { + $xoopsTpl->assign('commentform', ''); + } + // End add by voltan + $xoopsTpl->assign(array( 'commentsnav' => $navbar , 'editcomment_link' => 'comment_edit.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra , Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/sql/mysql.structure.sql =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/sql/mysql.structure.sql 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/install/sql/mysql.structure.sql 2013-01-23 20:57:13 UTC (rev 10882) @@ -96,34 +96,39 @@ # Table structure for table `comments` # -CREATE TABLE xoopscomments ( - com_id mediumint(8) unsigned NOT NULL auto_increment, - com_pid mediumint(8) unsigned NOT NULL default '0', - com_rootid mediumint(8) unsigned NOT NULL default '0', - com_modid smallint(5) unsigned NOT NULL default '0', - com_itemid mediumint(8) unsigned NOT NULL default '0', - com_icon varchar(25) NOT NULL default '', - com_created int(10) unsigned NOT NULL default '0', - com_modified int(10) unsigned NOT NULL default '0', - com_uid mediumint(8) unsigned NOT NULL default '0', - com_ip varchar(15) NOT NULL default '', - com_title varchar(255) NOT NULL default '', - com_text text, - com_sig tinyint(1) unsigned NOT NULL default '0', - com_status tinyint(1) unsigned NOT NULL default '0', - com_exparams varchar(255) NOT NULL default '', - dohtml tinyint(1) unsigned NOT NULL default '0', - dosmiley tinyint(1) unsigned NOT NULL default '0', - doxcode tinyint(1) unsigned NOT NULL default '0', - doimage tinyint(1) unsigned NOT NULL default '0', - dobr tinyint(1) unsigned NOT NULL default '0', - PRIMARY KEY (com_id), - KEY com_pid (com_pid), - KEY com_itemid (com_itemid), - KEY com_uid (com_uid), - KEY com_title (com_title(40)), - KEY com_status (com_status) -) ENGINE=MyISAM; +CREATE `xoopscomments` ( + `com_id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, + `com_pid` mediumint(8) unsigned NOT NULL DEFAULT '0', + `com_rootid` mediumint(8) unsigned NOT NULL DEFAULT '0', + `com_modid` smallint(5) unsigned NOT NULL DEFAULT '0', + `com_itemid` mediumint(8) unsigned NOT NULL DEFAULT '0', + `com_icon` varchar(25) NOT NULL DEFAULT '', + `com_created` int(10) unsigned NOT NULL DEFAULT '0', + `com_modified` int(10) unsigned NOT NULL DEFAULT '0', + `com_uid` mediumint(8) unsigned NOT NULL DEFAULT '0', + `com_user` varchar(60) NOT NULL, + `com_email` varchar(60) NOT NULL, + `com_url` varchar(60) NOT NULL, + `com_ip` varchar(15) NOT NULL DEFAULT '', + `com_title` varchar(255) NOT NULL DEFAULT '', + `com_text` text, + `com_sig` tinyint(1) unsigned NOT NULL DEFAULT '0', + `com_status` tinyint(1) unsigned NOT NULL DEFAULT '0', + `com_exparams` varchar(255) NOT NULL DEFAULT '', + `dohtml` tinyint(1) unsigned NOT NULL DEFAULT '0', + `dosmiley` tinyint(1) unsigned NOT NULL DEFAULT '0', + `doxcode` tinyint(1) unsigned NOT NULL DEFAULT '0', + `doimage` tinyint(1) unsigned NOT NULL DEFAULT '0', + `dobr` tinyint(1) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`com_id`), + KEY `com_pid` (`com_pid`), + KEY `com_itemid` (`com_itemid`), + KEY `com_uid` (`com_uid`), + KEY `com_title` (`com_title`(40)), + KEY `com_status` (`com_status`), + KEY `com_user` (`com_user`), + KEY `com_email` (`com_email`) +) ENGINE=MyISAM; # -------------------------------------------------------- # RMV-NOTIFY Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/comment.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/comment.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/comment.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -44,6 +44,11 @@ $this->initVar('com_created', XOBJ_DTYPE_INT, 0, false); $this->initVar('com_modified', XOBJ_DTYPE_INT, 0, false); $this->initVar('com_uid', XOBJ_DTYPE_INT, 0, true); + // Start Add by voltan + $this->initVar('com_user', XOBJ_DTYPE_TXTBOX, null, false, 60); + $this->initVar('com_email', XOBJ_DTYPE_TXTBOX, null, false, 60); + $this->initVar('com_url', XOBJ_DTYPE_TXTBOX, null, false, 60); + // End Add by voltan $this->initVar('com_ip', XOBJ_DTYPE_OTHER, null, false); $this->initVar('com_sig', XOBJ_DTYPE_INT, 0, false); $this->initVar('com_itemid', XOBJ_DTYPE_INT, 0, false); @@ -135,6 +140,30 @@ { return $this->getVar('com_uid', $format); } + + // Start Add by voltan + /** + * Returns Class Base Variable com_user + */ + function com_user($format = '') + { + return $this->getVar('com_user', $format); + } + /** + * Returns Class Base Variable com_email + */ + function com_email($format = '') + { + return $this->getVar('com_email', $format); + } + /** + * Returns Class Base Variable com_url + */ + function com_url($format = '') + { + return $this->getVar('com_url', $format); + } + // End Add by voltan /** * Returns Class Base Variable com_ip @@ -315,12 +344,14 @@ foreach($comment->cleanVars as $k => $v) { ${$k} = $v; } + // Start edit by voltan if ($comment->isNew()) { $com_id = $this->db->genId('xoopscomments_com_id_seq'); - $sql = sprintf("INSERT INTO %s (com_id, com_pid, com_modid, com_icon, com_title, com_text, com_created, com_modified, com_uid, com_ip, com_sig, com_itemid, com_rootid, com_status, com_exparams, dohtml, dosmiley, doxcode, doimage, dobr) VALUES (%u, %u, %u, %s, %s, %s, %u, %u, %u, %s, %u, %u, %u, %u, %s, %u, %u, %u, %u, %u)", $this->db->prefix('xoopscomments'), $com_id, $com_pid, $com_modid, $this->db->quoteString($com_icon), $this->db->quoteString($com_title), $this->db->quoteString($com_text), $com_created, $com_modified, $com_uid, $this->db->quoteString($com_ip), $com_sig, $com_itemid, $com_rootid, $com_status, $this->db->quoteString($com_exparams), $dohtml, $dosmiley, $doxcode, $doimage, $dobr); + $sql = sprintf("INSERT INTO %s (com_id, com_pid, com_modid, com_icon, com_title, com_text, com_created, com_modified, com_uid, com_user, com_email, com_url, com_ip, com_sig, com_itemid, com_rootid, com_status, com_exparams, dohtml, dosmiley, doxcode, doimage, dobr) VALUES (%u, %u, %u, %s, %s, %s, %u, %u, %u, %s, %s, %s, %s, %u, %u, %u, %u, %s, %u, %u, %u, %u, %u)", $this->db->prefix('xoopscomments'), $com_id, $com_pid, $com_modid, $this->db->quoteString($com_icon), $this->db->quoteString($com_title), $this->db->quoteString($com_text), $com_created, $com_modified, $com_uid, $this->db->quoteString($com_user), $this->db->quoteString($com_email), $this->db->quoteString($com_url), $this->db->quoteString($com_ip), $com_sig, $com_itemid, $com_rootid, $com_status, $this->db->quoteString($com_exparams), $dohtml, $dosmiley, $doxcode, $doimage, $dobr); } else { - $sql = sprintf("UPDATE %s SET com_pid = %u, com_icon = %s, com_title = %s, com_text = %s, com_created = %u, com_modified = %u, com_uid = %u, com_ip = %s, com_sig = %u, com_itemid = %u, com_rootid = %u, com_status = %u, com_exparams = %s, dohtml = %u, dosmiley = %u, doxcode = %u, doimage = %u, dobr = %u WHERE com_id = %u", $this->db->prefix('xoopscomments'), $com_pid, $this->db->quoteString($com_icon), $this->db->quoteString($com_title), $this->db->quoteString($com_text), $com_created, $com_modified, $com_uid, $this->db->quoteString($com_ip), $com_sig, $com_itemid, $com_rootid, $com_status, $this->db->quoteString($com_exparams), $dohtml, $dosmiley, $doxcode, $doimage, $dobr, $com_id); + $sql = sprintf("UPDATE %s SET com_pid = %u, com_icon = %s, com_title = %s, com_text = %s, com_created = %u, com_modified = %u, com_uid = %u, com_user = %s, com_email = %s, com_url = %s, com_ip = %s, com_sig = %u, com_itemid = %u, com_rootid = %u, com_status = %u, com_exparams = %s, dohtml = %u, dosmiley = %u, doxcode = %u, doimage = %u, dobr = %u WHERE com_id = %u", $this->db->prefix('xoopscomments'), $com_pid, $this->db->quoteString($com_icon), $this->db->quoteString($com_title), $this->db->quoteString($com_text), $com_created, $com_modified, $com_uid, $this->db->quoteString($com_user), $this->db->quoteString($com_email), $this->db->quoteString($com_url), $this->db->quoteString($com_ip), $com_sig, $com_itemid, $com_rootid, $com_status, $this->db->quoteString($com_exparams), $dohtml, $dosmiley, $doxcode, $doimage, $dobr, $com_id); } + // End edit by voltan if (!$result = $this->db->query($sql)) { return false; } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/comment.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/comment.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/comment.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -3,42 +3,46 @@ // _LANGCODE: en // _CHARSET : UTF-8 // Translator: XOOPS Translation Team -define('_CM_TITLE','Title'); -define('_CM_MESSAGE','Message'); -define('_CM_DOSMILEY','Enable Smiley Icons'); -define('_CM_DOHTML','Enable HTML Tags'); -define('_CM_DOAUTOWRAP','Auto wrap lines'); -define('_CM_DOXCODE','Enable XOOPS Codes'); -define('_CM_REFRESH','Refresh'); -define('_CM_PENDING','Pending'); -define('_CM_HIDDEN','Hidden'); -define('_CM_ACTIVE','Active'); -define('_CM_STATUS','Status'); -define('_CM_POSTCOMMENT','Publish Comment'); -define('_CM_REPLIES','Replies'); -define('_CM_PARENT','Parent'); -define('_CM_TOP','Top'); -define('_CM_BOTTOM','Bottom'); -define('_CM_ONLINE','Online!'); -define('_CM_POSTED','Published'); // Posted date -define('_CM_UPDATED','Updated'); -define('_CM_THREAD','Thread'); -define('_CM_POSTER','Author'); -define('_CM_JOINED','Joined'); -define('_CM_POSTS','Comments'); -define('_CM_FROM','From'); -define('_CM_COMDELETED','Comment(s) deleted.'); -define('_CM_COMDELETENG','Could not delete comment.'); -define('_CM_DELETESELECT','Delete all its child comments?'); -define('_CM_DELETEONE','No, delete only this comment'); -define('_CM_DELETEALL','Yes, delete all'); -define('_CM_THANKSPOST','Thanks for your comments!'); -define('_CM_NOTICE',"The comments are owned by the author. We aren't responsible for their content."); -define('_CM_COMRULES','Comment Rules'); -define('_CM_COMAPPROVEALL','Comments are always approved'); -define('_CM_COMAPPROVEUSER','Comments by registered users are always approved'); -define('_CM_COMAPPROVEADMIN','All comments need to be approved by administrator'); -define('_CM_COMANONPOST','Allow anonymous comments?'); -define('_CM_COMNOCOM','Disable comments'); +define('_CM_TITLE', 'Title'); +define('_CM_MESSAGE', 'Message'); +define('_CM_DOSMILEY', 'Enable Smiley Icons'); +define('_CM_DOHTML', 'Enable HTML Tags'); +define('_CM_DOAUTOWRAP', 'Auto wrap lines'); +define('_CM_DOXCODE', 'Enable XOOPS Codes'); +define('_CM_REFRESH', 'Refresh'); +define('_CM_PENDING', 'Pending'); +define('_CM_HIDDEN', 'Hidden'); +define('_CM_ACTIVE', 'Active'); +define('_CM_STATUS', 'Status'); +define('_CM_POSTCOMMENT', 'Publish Comment'); +define('_CM_REPLIES', 'Replies'); +define('_CM_PARENT', 'Parent'); +define('_CM_TOP', 'Top'); +define('_CM_BOTTOM', 'Bottom'); +define('_CM_ONLINE', 'Online!'); +define('_CM_POSTED', 'Published'); // Posted date +define('_CM_UPDATED', 'Updated'); +define('_CM_THREAD', 'Thread'); +define('_CM_POSTER', 'Author'); +define('_CM_JOINED', 'Joined'); +define('_CM_POSTS', 'Comments'); +define('_CM_FROM', 'From'); +define('_CM_COMDELETED', 'Comment(s) deleted.'); +define('_CM_COMDELETENG', 'Could not delete comment.'); +define('_CM_DELETESELECT', 'Delete all its child comments?'); +define('_CM_DELETEONE', 'No, delete only this comment'); +define('_CM_DELETEALL', 'Yes, delete all'); +define('_CM_THANKSPOST', 'Thanks for your comments!'); +define('_CM_NOTICE', "The comments are owned by the author. We aren't responsible for their content."); +define('_CM_COMRULES', 'Comment Rules'); +define('_CM_COMAPPROVEALL', 'Comments are always approved'); +define('_CM_COMAPPROVEUSER', 'Comments by registered users are always approved'); +define('_CM_COMAPPROVEADMIN', 'All comments need to be approved by administrator'); +define('_CM_COMANONPOST', 'Allow anonymous comments?'); +define('_CM_COMNOCOM', 'Disable comments'); +define('_CM_USER', 'Name'); +define('_CM_EMAIL', 'Email'); +define('_CM_URL', 'Website'); + ?> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/comments/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/comments/main.php 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/comments/main.php 2013-01-23 20:57:13 UTC (rev 10882) @@ -280,13 +280,20 @@ { $com_id = $comments_arr[$i]->getVar('com_id'); $comments_poster_uname = $xoopsConfig['anonymous']; + // Start edit by voltan if ($comments_arr[$i]->getVar('com_uid') > 0) { $poster =& $member_handler->getUser($comments_arr[$i]->getVar('com_uid')); if (is_object($poster)) { $comments_poster_uname = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$comments_arr[$i]->getVar('com_uid').'">'.$poster->getVar('uname').'</a>'; } - } - + } elseif($comments_arr[$i]->getVar('com_uid') == 0 && $comments_arr[$i]->getVar('com_user') != '') { + if($comments_arr[$i]->getVar('com_url') != '') { + $comments_poster_uname = '<div class="pad2 marg2"><a href="' . $comments_arr[$i]->getVar('com_url') . '">' . $comments_arr[$i]->getVar('com_user') . '</a> ( <a href="mailto:' . $comments_arr[$i]->getVar('com_email') . '">' . $comments_arr[$i]->getVar('com_email') . '</a> ) ' . '</div>'; + } else { + $comments_poster_uname = '<div class="pad2 marg2">' . $comments_arr[$i]->getVar('com_user') . ' ( <a href="mailto:' . $comments_arr[$i]->getVar('com_email') . '">' . $comments_arr[$i]->getVar('com_email') . '</a> ) ' . '</div>'; + } + } + // End edit by voltan $comments_icon = ($comments_arr[$i]->getVar('com_icon') == '') ? '/images/icons/no_posticon.gif' : '/images/subject/' . htmlspecialchars( $comments_arr[$i]->getVar('com_icon'), ENT_QUOTES ); $comments_icon = '<img src="' . XOOPS_URL . $comments_icon . '" alt="" />'; Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_comments.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_comments.html 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_comments.html 2013-01-23 20:57:13 UTC (rev 10882) @@ -1,69 +1,69 @@ -<{includeq file="db:system_header.html"}> -<!--Comments--> -<{if $form}> -<div class="spacer"><{$form}></div> -<{else}> -<div class="floatleft"><{$form_sort}></div> -<div class="floatright"> - <div class="xo-buttons"> - <button class="ui-corner-all" onclick="self.location.href='admin.php?fct=comments&op=comments_form_purge'"> - <img src="<{xoAdminIcons clear.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}>" /> - <{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}> - </button> - </div> -</div> -<div class="clear"></div> -<table id="xo-comment-sorter" cellspacing="1" class="outer tablesorter"> - <thead> - <tr> - <th class="txtcenter width5"><input name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' type='checkbox' value='Check All' /></th> - <th class="txtcenter width5"></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th> - <th class="txtcenter"><{$smarty.const._DATE}></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th> - <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th> - </tr> - </thead> - <form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post"> - <tbody> - <{foreach item=comments from=$comments}> - <tr class="<{cycle values='even,odd'}> alignmiddle"> - <td class="txtcenter"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td> - <td class="txtcenter"><{$comments.comments_icon}></td> - <td class="txtcenter"><{$comments.comments_title}></td> - <td class="txtcenter"><{$comments.comments_poster}></td> - <td class="txtcenter"><{$comments.comments_ip}></td> - <td class="txtcenter"><{$comments.comments_date}></td> - <td class="txtcenter"><{$comments.comments_modid}></td> - <td class="txtcenter"><{$comments.comments_status}></td> - <td class="xo-actions txtcenter"> - <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" /> - <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>"> - <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>"> - </a> - <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>"> - <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>"> - </a> - </td> - </tr> - <{/foreach}> - </tbody> - <tr> - <td><input type='submit' name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td> - <td colspan="7"> </td> - </tr> - </form> -</table> -<{foreach item=comments from=$comments_popup}> -<!--Pop-pup--> -<div id='dialog<{$comments.comments_id}>' title='<{$comments.comments_icon}> <{$comments.comments_title}>' style='display:none;'> - <img src="<{xoAdminIcons comment.png}>" alt="comments" title="comments" class="xo-commentsimg" /> - <p><{$comments.comments_text}></p> -</div> -<{/foreach}> -<!--Pop-pup--> -<div class="txtright"><{$nav}></div> -<{/if}> +<{includeq file="db:system_header.html"}> +<!--Comments--> +<{if $form}> +<div class="spacer"><{$form}></div> +<{else}> +<div class="floatleft"><{$form_sort}></div> +<div class="floatright"> + <div class="xo-buttons"> + <button class="ui-corner-all" onclick="self.location.href='admin.php?fct=comments&op=comments_form_purge'"> + <img src="<{xoAdminIcons clear.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}>" /> + <{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}> + </button> + </div> +</div> +<div class="clear"></div> +<table id="xo-comment-sorter" cellspacing="1" class="outer tablesorter"> + <thead> + <tr> + <th class="txtcenter width5"><input name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' type='checkbox' value='Check All' /></th> + <th class="txtcenter width5"></th> + <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th> + <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th> + <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th> + <th class="txtcenter"><{$smarty.const._DATE}></th> + <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th> + <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th> + <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th> + </tr> + </thead> + <form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post"> + <tbody> + <{foreach item=comments from=$comments}> + <tr class="<{cycle values='even,odd'}> alignmiddle"> + <td class="txtcenter"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td> + <td class="txtcenter"><{$comments.comments_icon}></td> + <td><{$comments.comments_title}></td> + <td class="txtcenter"><{$comments.comments_poster}></td> + <td class="txtcenter"><{$comments.comments_ip}></td> + <td class="txtcenter"><{$comments.comments_date}></td> + <td class="txtcenter"><{$comments.comments_modid}></td> + <td class="txtcenter"><{$comments.comments_status}></td> + <td class="xo-actions txtcenter"> + <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" /> + <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>"> + <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>"> + </a> + <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>"> + <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>"> + </a> + </td> + </tr> + <{/foreach}> + </tbody> + <tr> + <td><input type='submit' name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td> + <td colspan="7"> </td> + </tr> + </form> +</table> +<{foreach item=comments from=$comments_popup}> +<!--Pop-pup--> +<div id='dialog<{$comments.comments_id}>' title='<{$comments.comments_icon}> <{$comments.comments_title}>' style='display:none;'> + <img src="<{xoAdminIcons comment.png}>" alt="comments" title="comments" class="xo-commentsimg" /> + <p><{$comments.comments_text}></p> +</div> +<{/foreach}> +<!--Pop-pup--> +<div class="txtright"><{$nav}></div> +<{/if}> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_flat.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_flat.html 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_flat.html 2013-01-23 20:57:13 UTC (rev 10882) @@ -1,9 +1,10 @@ -<table class="outer" cellpadding="5" cellspacing="1"> - <tr> - <th class="width20"><{$lang_poster}></th> - <th><{$lang_thread}></th> - </tr> - <{foreach item=comment from=$comments}> - <{include file="db:system_comment.html" comment=$comment}> - <{/foreach}> -</table> \ No newline at end of file +<table class="outer" cellpadding="5" cellspacing="1"> + <tr> + <th class="width20"><{$lang_poster}></th> + <th><{$lang_thread}></th> + </tr> + <{foreach item=comment from=$comments}> + <{include file="db:system_comment.html" comment=$comment}> + <{/foreach}> +</table> +<{if $commentform}><div class="commentform"><{$commentform}></div><{/if}> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_nest.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_nest.html 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_nest.html 2013-01-23 20:57:13 UTC (rev 10882) @@ -1,30 +1,31 @@ -<{section name=i loop=$comments}> -<br /> -<table cellspacing="1" class="outer"> - <tr> - <th class="width20"><{$lang_poster}></th> - <th><{$lang_thread}></th> - </tr> - <{include file="db:system_comment.html" comment=$comments[i]}> -</table> - -<!-- start comment replies --> -<{foreach item=reply from=$comments[i].replies}> -<br /> -<table class="bnone collapse"> - <tr> - <td width="<{$reply.prefix}>"></td> - <td> - <table class="outer" cellspacing="1"> - <tr> - <th class="width20"><{$lang_poster}></th> - <th><{$lang_thread}></th> - </tr> - <{include file="db:system_comment.html" comment=$reply}> - </table> - </td> - </tr> -</table> -<{/foreach}> -<!-- end comment tree --> -<{/section}> \ No newline at end of file +<{section name=i loop=$comments}> +<br /> +<table cellspacing="1" class="outer"> + <tr> + <th class="width20"><{$lang_poster}></th> + <th><{$lang_thread}></th> + </tr> + <{include file="db:system_comment.html" comment=$comments[i]}> +</table> + +<!-- start comment replies --> +<{foreach item=reply from=$comments[i].replies}> +<br /> +<table class="bnone collapse"> + <tr> + <td width="<{$reply.prefix}>"></td> + <td> + <table class="outer" cellspacing="1"> + <tr> + <th class="width20"><{$lang_poster}></th> + <th><{$lang_thread}></th> + </tr> + <{include file="db:system_comment.html" comment=$reply}> + </table> + </td> + </tr> +</table> +<{/foreach}> +<!-- end comment tree --> +<{/section}> +<{if $commentform}><div class="commentform"><{$commentform}></div><{/if}> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_thread.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_thread.html 2013-01-23 19:53:54 UTC (rev 10881) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comments_thread.html 2013-01-23 20:57:13 UTC (rev 10882) @@ -1,37 +1,38 @@ -<{section name=i loop=$comments}> -<br /> -<table cellspacing="1" class="outer"> - <tr> - <th class="width20"><{$lang_poster}></th> - <th><{$lang_thread}></th> - </tr> - <{include file="db:system_comment.html" comment=$comments[i]}> -</table> - -<{if $show_threadnav == true}> -<div class="txtleft marg3 pad5"> -<a href="<{$comment_url}>" title="<{$lang_top}>"><{$lang_top}></a> | <a href="<{$comment_url}>&com_id=<{$comments[i].pid}>&com_rootid=<{$comments[i].rootid}>#newscomment<{$comments[i].pid}>"><{$lang_parent}></a> -</div> -<{/if}> - -<{if $comments[i].show_replies == true}> -<!-- start comment tree --> -<br /> -<table cellspacing="1" class="outer"> - <tr> - <th class="width50"><{$lang_subject}></th> - <th class="width20 txtcenter"><{$lang_poster}></th> - <th class="txtright"><{$lang_posted}></th> - </tr> - <{foreach item=reply from=$comments[i].replies}> - <tr> - <td class="even"><{$reply.prefix}> <a href="<{$comment_url}>&com_id=<{$reply.id}>&com_rootid=<{$reply.root_id}>" title=""><{$reply.title}></a></td> - <td class="odd txtcenter"><{$reply.poster.uname}></td> - <td class="even right"><{$reply.date_posted}></td> - </tr> - <{/foreach}> -</table> -<!-- end comment tree --> -<{/if}> - -<{/section}> \ No newline at end of file +<{section name=i loop=$comments}> +<br /> +<table cellspacing="1" class="outer"> + <tr> + <th class="width20"><{$lang_poster}></th> + <th><{$lang_thread}></th> + </tr> + <{include file="db:system_comment.html" comment=$comments[i]}> +</table> + +<{if $show_threadnav == true}> +<div class="txtleft marg3 pad5"> +<a href="<{$comment_url}>" title="<{$lang_top}>"><{$lang_top}></a> | <a href="<{$comment_url}>&com_id=<{$comments[i].pid}>&com_rootid=<{$comments[i].rootid}>#newscomment<{$comments[i].pid}>"><{$lang_parent}></a> +</div> +<{/if}> + +<{if $comments[i].show_replies == true}> +<!-- start comment tree --> +<br /> +<table cellspacing="1" class="outer"> + <tr> + <th class="width50"><{$lang_subject}></th> + <th class="width20 txtcenter"><{$lang_poster}></th> + <th class="txtright"><{$lang_posted}></th> + </tr> + <{foreach item=reply from=$comments[i].replies}> + <tr> + <td class="even"><{$reply... [truncated message content] |
From: <be...@us...> - 2013-01-26 17:08:47
|
Revision: 10908 http://sourceforge.net/p/xoops/svn/10908 Author: beckmi Date: 2013-01-26 17:08:43 +0000 (Sat, 26 Jan 2013) Log Message: ----------- fixing bugs with using references with non-variables Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopstree.php XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/object.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/32/dashboard.png XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6-RC1.png XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6.png Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.5.png Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-26 16:52:10 UTC (rev 10907) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-26 17:08:43 UTC (rev 10908) @@ -1,6 +1,13 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== +2013/01/xx: Version 2.5.6 RC1 +=============================== +Bugfixes: + - fixed issues with missing xoopscomments table (geekwright/sabahan/Mamba) + - fixed bug with using reference for non-variables (geekwright/mamba) + +=============================== 2013/01/22: Version 2.5.6 Beta =============================== Security fixes: Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/32/dashboard.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/32/dashboard.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/32/dashboard.png 2013-01-26 16:52:10 UTC (rev 10907) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/32/dashboard.png 2013-01-26 17:08:43 UTC (rev 10908) Property changes on: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/32/dashboard.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopstree.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopstree.php 2013-01-26 16:52:10 UTC (rev 10907) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopstree.php 2013-01-26 17:08:43 UTC (rev 10908) @@ -133,7 +133,7 @@ return $path; } list ($parentid, $name) = $this->db->fetchRow($result); - $myts = & MyTextSanitizer::getInstance(); + $myts = MyTextSanitizer::getInstance(); $name = $myts->htmlspecialchars($name); $path = "/" . $name . $path . ""; if ($parentid == 0) { @@ -151,7 +151,7 @@ if ($sel_name == "") { $sel_name = $this->id; } - $myts = & MyTextSanitizer::getInstance(); + $myts = MyTextSanitizer::getInstance(); echo "<select name='" . $sel_name . "'"; if ($onchange != "") { echo " onchange='" . $onchange . "'"; @@ -197,7 +197,7 @@ return $path; } list ($parentid, $name) = $this->db->fetchRow($result); - $myts = & MyTextSanitizer::getInstance(); + $myts = MyTextSanitizer::getInstance(); $name = $myts->htmlspecialchars($name); $path = "<a href='" . $funcURL . "&" . $this->id . "=" . $sel_id . "'>" . $name . "</a>" . $path . ""; if ($parentid == 0) { Deleted: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.5.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6-RC1.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6-RC1.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6-RC1.png 2013-01-26 16:52:10 UTC (rev 10907) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6-RC1.png 2013-01-26 17:08:43 UTC (rev 10908) Property changes on: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6-RC1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6.png 2013-01-26 16:52:10 UTC (rev 10907) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6.png 2013-01-26 17:08:43 UTC (rev 10908) Property changes on: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/img/xoops_2.5.6.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/object.php 2013-01-26 16:52:10 UTC (rev 10907) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/kernel/object.php 2013-01-26 17:08:43 UTC (rev 10908) @@ -371,7 +371,7 @@ return $ret; } $ret = $this->vars[$key]['value']; - $ts =& MyTextSanitizer::getInstance(); + $ts = MyTextSanitizer::getInstance(); switch ($this->vars[$key]['data_type']) { case XOBJ_DTYPE_UNICODE_TXTBOX: case XOBJ_DTYPE_TXTBOX: |
From: <be...@us...> - 2013-01-27 09:15:12
|
Revision: 10926 http://sourceforge.net/p/xoops/svn/10926 Author: beckmi Date: 2013-01-27 09:15:07 +0000 (Sun, 27 Jan 2013) Log Message: ----------- number of users when "all groups" selected was wrong (tatane/mamba) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-26 22:04:03 UTC (rev 10925) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 09:15:07 UTC (rev 10926) @@ -4,8 +4,9 @@ 2013/01/xx: Version 2.5.6 RC1 =============================== Bugfixes: - - fixed issues with missing xoopscomments table (geekwright/sabahan/Mamba) - - fixed bug with using reference for non-variables (geekwright/mamba) + - issues with missing xoopscomments table (geekwright/sabahan/Mamba) + - bug with using reference for non-variables (geekwright/mamba) + - number of users when "all groups" selected was wrong (tatane/mamba) =============================== 2013/01/22: Version 2.5.6 Beta @@ -14,8 +15,8 @@ - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) Bugfixes: - - fixed errors related to static functions, so it works on PHP 5.4 (Mamba) - - fixed bug #1245 in class XoopsLoad.php (Alain91) + - errors related to static functions, so it works on PHP 5.4 (Mamba) + - bug #1245 in class XoopsLoad.php (Alain91) Updated: - TinyMCE to 3.5.8 (mamba) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php 2013-01-26 22:04:03 UTC (rev 10925) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/users/main.php 2013-01-27 09:15:07 UTC (rev 10926) @@ -764,8 +764,12 @@ } //print_r($groups); $member_handler =& xoops_gethandler('member'); - $users_count = $member_handler->getUserCountByGroupLink($groups, $criteria); + if (empty($groups)) { + $users_count = $member_handler->getUserCount(); + } else { + $users_count = $member_handler->getUserCountByGroupLink($groups, $criteria); + } if ( $start < $users_count ) { echo sprintf(_AM_SYSTEM_USERS_USERSFOUND, $users_count)."<br />"; $criteria->setSort($sort); |
From: <be...@us...> - 2013-01-27 09:21:46
|
Revision: 10927 http://sourceforge.net/p/xoops/svn/10927 Author: beckmi Date: 2013-01-27 09:21:25 +0000 (Sun, 27 Jan 2013) Log Message: ----------- adding image folder names for Smilies and User Ranks (alfred) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 09:21:25 UTC (rev 10927) @@ -7,6 +7,7 @@ - issues with missing xoopscomments table (geekwright/sabahan/Mamba) - bug with using reference for non-variables (geekwright/mamba) - number of users when "all groups" selected was wrong (tatane/mamba) + - adding image folders for Smilies and User Ranks (alfred) =============================== 2013/01/22: Version 2.5.6 Beta Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php 2013-01-27 09:21:25 UTC (rev 10927) @@ -50,7 +50,7 @@ $smiles = $myts->getSmileys(FALSE); $count = count($smiles); for($i = 0; $i < $count; $i ++) { - echo "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />"; + echo "<img src='" . XOOPS_UPLOAD_URL . "/smilies/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />"; } echo " [<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&type=smilies&target={$textarea_id}\",\"smilies\",300,475);'>" . _MORE . "</a>]"; } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php 2013-01-27 09:21:25 UTC (rev 10927) @@ -82,7 +82,7 @@ $smilies['emotion'] = $smilies_arr[$i]->getVar("emotion"); $smilies['display'] = $smilies_arr[$i]->getVar("display"); $smilies_img = ($smilies_arr[$i]->getVar("smile_url")) ? $smilies_arr[$i]->getVar("smile_url") : 'blank.gif'; - $smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" />'; + $smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/smilies/' . $smilies_img . '" alt="" />'; $smilies['edit_delete'] = '<a href="admin.php?fct=smilies&op=edit_smilie&smilies_id=' . $smilies_id . '"> <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_SMILIES_EDIT . '" title="' . _AM_SYSTEM_SMILIES_EDIT . '"></a> <a href="admin.php?fct=smilies&op=smilies_delete&smilies_id=' . $smilies_id . '"> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php 2013-01-27 09:21:25 UTC (rev 10927) @@ -87,7 +87,7 @@ $userrank['rank_max'] = $userrank_arr[$i]->getVar("rank_max"); $userrank['rank_special'] = $userrank_arr[$i]->getVar("rank_special"); $rank_img = ($userrank_arr[$i]->getVar("rank_image")) ? $userrank_arr[$i]->getVar("rank_image") : 'blank.gif'; - $userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$rank_img.'" alt="" />'; + $userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/ranks/'.$rank_img.'" alt="" />'; $xoopsTpl->append_by_ref( 'userrank', $userrank ); unset( $userrank ); } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html 2013-01-27 09:21:25 UTC (rev 10927) @@ -10,7 +10,7 @@ <td class="odd"> <div class="comUserRank"> <div class="comUserRankText"><{$comment.poster.rank_title}></div> - <img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" /> + <img class="comUserRankImg" src="<{$xoops_upload_url}>/ranks/<{$comment.poster.rank_image}>" alt="" /> </div> <img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" /> <div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html 2013-01-27 09:21:25 UTC (rev 10927) @@ -26,8 +26,8 @@ <table class="width70 aligncenter bnone"> <tr class="txtcenter"> - <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user_uid}>&op=modifyUser'" /> - <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&op=delUser&uid=<{$user_uid}>'" /> + <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user_uid}>&op=users_edit'" /> + <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&op=users_delete&uid=<{$user_uid}>'" /> </tr> </table> @@ -66,7 +66,7 @@ <td class="odd"><{$user_email}></td> </tr> <{/if}> - <{if !$user_ownpage == true}> + <{if !$user_ownpage == true && $user_pmlink !=''}> <tr class="aligntop"> <td class="head"><{$lang_privmsg}></td> <td class="even"><{$user_pmlink}></td> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php 2013-01-27 09:15:07 UTC (rev 10926) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php 2013-01-27 09:21:25 UTC (rev 10927) @@ -156,7 +156,7 @@ } $userrank = $thisUser->rank(); if (isset($userrank['image']) && $userrank['image']) { - $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="" />'); + $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/ranks/' . $userrank['image'] . '" alt="" />'); } $xoopsTpl->assign('user_ranktitle', $userrank['title']); $date = $thisUser->getVar("last_login"); |
From: <be...@us...> - 2013-01-27 23:53:31
|
Revision: 10936 http://sourceforge.net/p/xoops/svn/10936 Author: beckmi Date: 2013-01-27 23:53:28 +0000 (Sun, 27 Jan 2013) Log Message: ----------- Reverting changes related to paths for ranks and smilies Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 23:53:28 UTC (rev 10936) @@ -7,7 +7,6 @@ - issues with missing xoopscomments table (geekwright/sabahan/Mamba) - bug with using reference for non-variables (geekwright/mamba) - number of users when "all groups" selected was wrong (tatane/mamba) - - adding image folders for Smilies and User Ranks (alfred) =============================== 2013/01/22: Version 2.5.6 Beta Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/commentrenderer.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -372,7 +372,7 @@ if (is_object($com_poster)) { $poster['uname'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $poster['id'] . '">' . $com_poster->getVar('uname') . '</a>'; $poster_rank = $com_poster->rank(); - $poster['rank_image'] = ($poster_rank['image'] != '') ? 'ranks/' . $poster_rank['image'] : 'ranks/blank.gif'; + $poster['rank_image'] = ($poster_rank['image'] != '') ? $poster_rank['image'] : 'blank.gif'; $poster['rank_title'] = $poster_rank['title']; $poster['avatar'] = $com_poster->getVar('user_avatar'); $poster['regdate'] = formatTimestamp($com_poster->getVar('user_regdate'), 's'); Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -282,7 +282,7 @@ { $smileys = $this->getSmileys(); foreach($smileys as $smile) { - $message = str_replace($smile['code'], '<img class="imgsmile" src="' . XOOPS_UPLOAD_URL . '/smilies/' . htmlspecialchars($smile['smile_url']) . '" alt="" />', $message); + $message = str_replace($smile['code'], '<img class="imgsmile" src="' . XOOPS_UPLOAD_URL . '/' . htmlspecialchars($smile['smile_url']) . '" alt="" />', $message); } return $message; } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/xoopscodes.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -50,7 +50,7 @@ $smiles = $myts->getSmileys(FALSE); $count = count($smiles); for($i = 0; $i < $count; $i ++) { - echo "<img src='" . XOOPS_UPLOAD_URL . "/smilies/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />"; + echo "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($smiles[$i]['smile_url'], ENT_QUOTES) . "' border='0' alt='' onclick='xoopsCodeSmilie(\"{$textarea_id}\", \" " . $smiles[$i]['code'] . " \");' onmouseover='style.cursor=\"hand\"' />"; } echo " [<a href='#moresmiley' onmouseover='style.cursor=\"hand\"' alt='' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&type=smilies&target={$textarea_id}\",\"smilies\",300,475);'>" . _MORE . "</a>]"; } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/misc.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -51,7 +51,7 @@ if ($smiles = $myts->getSmileys()) { $rcolor = 'even'; foreach ($smiles as $key => $smile) { - echo "<tr class='$rcolor'><td>" . $smile['code'] . "</td><td>" . $smile['emotion'] . "</td><td><img onmouseover='style.cursor=\"hand\"' onclick='doSmilie(\" " . $smile['code'] . " \");' src='" . XOOPS_UPLOAD_URL . "/smilies/" . $smile['smile_url'] . "' alt='' /></td></tr>"; + echo "<tr class='$rcolor'><td>" . $smile['code'] . "</td><td>" . $smile['emotion'] . "</td><td><img onmouseover='style.cursor=\"hand\"' onclick='doSmilie(\" " . $smile['code'] . " \");' src='" . XOOPS_UPLOAD_URL . "/" . $smile['smile_url'] . "' alt='' /></td></tr>"; $rcolor = ($rcolor == 'even') ? 'odd' : 'even'; } } else { Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/smilies/main.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -82,7 +82,7 @@ $smilies['emotion'] = $smilies_arr[$i]->getVar("emotion"); $smilies['display'] = $smilies_arr[$i]->getVar("display"); $smilies_img = ($smilies_arr[$i]->getVar("smile_url")) ? $smilies_arr[$i]->getVar("smile_url") : 'blank.gif'; - $smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/smilies/' . $smilies_img . '" alt="" />'; + $smilies['image'] = '<img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" />'; $smilies['edit_delete'] = '<a href="admin.php?fct=smilies&op=edit_smilie&smilies_id=' . $smilies_id . '"> <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_SMILIES_EDIT . '" title="' . _AM_SYSTEM_SMILIES_EDIT . '"></a> <a href="admin.php?fct=smilies&op=smilies_delete&smilies_id=' . $smilies_id . '"> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/userrank/main.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -87,7 +87,7 @@ $userrank['rank_max'] = $userrank_arr[$i]->getVar("rank_max"); $userrank['rank_special'] = $userrank_arr[$i]->getVar("rank_special"); $rank_img = ($userrank_arr[$i]->getVar("rank_image")) ? $userrank_arr[$i]->getVar("rank_image") : 'blank.gif'; - $userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/ranks/'.$rank_img.'" alt="" />'; + $userrank['rank_image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$rank_img.'" alt="" />'; $xoopsTpl->append_by_ref( 'userrank', $userrank ); unset( $userrank ); } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_comment.html 2013-01-27 23:53:28 UTC (rev 10936) @@ -10,7 +10,7 @@ <td class="odd"> <div class="comUserRank"> <div class="comUserRankText"><{$comment.poster.rank_title}></div> - <img class="comUserRankImg" src="<{$xoops_upload_url}>/ranks/<{$comment.poster.rank_image}>" alt="" /> + <img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" /> </div> <img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" /> <div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/system_userinfo.html 2013-01-27 23:53:28 UTC (rev 10936) @@ -26,8 +26,8 @@ <table class="width70 aligncenter bnone"> <tr class="txtcenter"> - <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user_uid}>&op=users_edit'" /> - <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&op=users_delete&uid=<{$user_uid}>'" /> + <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user_uid}>&op=modifyUser'" /> + <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&op=delUser&uid=<{$user_uid}>'" /> </tr> </table> @@ -66,7 +66,7 @@ <td class="odd"><{$user_email}></td> </tr> <{/if}> - <{if !$user_ownpage == true && $user_pmlink !=''}> + <{if !$user_ownpage == true}> <tr class="aligntop"> <td class="head"><{$lang_privmsg}></td> <td class="even"><{$user_pmlink}></td> Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php 2013-01-27 22:25:30 UTC (rev 10935) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/userinfo.php 2013-01-27 23:53:28 UTC (rev 10936) @@ -156,7 +156,7 @@ } $userrank = $thisUser->rank(); if (isset($userrank['image']) && $userrank['image']) { - $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/ranks/' . $userrank['image'] . '" alt="" />'); + $xoopsTpl->assign('user_rankimage', '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="" />'); } $xoopsTpl->assign('user_ranktitle', $userrank['title']); $date = $thisUser->getVar("last_login"); |
From: <be...@us...> - 2013-01-27 23:59:04
|
Revision: 10937 http://sourceforge.net/p/xoops/svn/10937 Author: beckmi Date: 2013-01-27 23:58:59 +0000 (Sun, 27 Jan 2013) Log Message: ----------- Reverting to jQuery 1.8.3 for compatibility reasons Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 23:53:28 UTC (rev 10936) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 23:58:59 UTC (rev 10937) @@ -21,7 +21,7 @@ Updated: - TinyMCE to 3.5.8 (mamba) - Smarty to 2.6.27 (mamba) - - jQuery to 1.9.0 (mamba) + - jQuery to 1.8.3 (mamba) - jQueryUI to version 1.10 (mamba) Added: Fast Comment Hack (Voltan) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js 2013-01-27 23:53:28 UTC (rev 10936) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/Frameworks/jquery/jquery.js 2013-01-27 23:58:59 UTC (rev 10937) @@ -1,4 +1,2 @@ -/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(cn[0].contentWindow||cn[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=A(e,t),cn.detach()),bn[e]=n),n}function A(e,t){var n=st(t.createElement(e)).appendTo(t.body),r=st.css(n[0],"display");return n.remove(),r}function j(e,t,n,r){var i;if(st.isArray(t))st.each(t,function(t,i){n||kn.test(e)?r(e,i):j(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==st.type(t))r(e,t);else for(i in t)j(e+"["+i+"]",t[i],n,r)}function D(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(lt)||[];if(st.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function L(e,n,r,i){function o(u){var l;return a[u]=!0,st.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||s||a[c]?s?!(l=c):t:(n.dataTypes.unshift(c),o(c),!1)}),l}var a={},s=e===$n;return o(n.dataTypes[0])||!a["*"]&&o("*")}function H(e,n){var r,i,o=st.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((o[r]?e:i||(i={}))[r]=n[r]);return i&&st.extend(!0,e,i),e}function M(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(o in c)o in r&&(n[c[o]]=r[o]);for(;"*"===l[0];)l.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("Content-Type"));if(i)for(o in u)if(u[o]&&u[o].test(i)){l.unshift(o);break}if(l[0]in r)a=l[0];else{for(o in r){if(!l[0]||e.converters[o+" "+l[0]]){a=o;break}s||(s=o)}a=a||s}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function q(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=u[++s];)if("*"!==i){if("*"!==l&&l!==i){if(n=a[l+" "+i]||a["* "+i],!n)for(r in a)if(o=r.split(" "),o[1]===i&&(n=a[l+" "+o[0]]||a["* "+o[0]])){n===!0?n=a[r]:a[r]!==!0&&(i=o[0],u.splice(s--,0,i));break}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(c){return{state:"parsererror",error:n?c:"No conversion from "+l+" to "+i}}}l=i}return{state:"success",data:t}}function _(){try{return new e.XMLHttpRequest}catch(t){}}function F(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function O(){return setTimeout(function(){Qn=t}),Qn=st.now()}function B(e,t){st.each(t,function(t,n){for(var r=(rr[t]||[]).concat(rr["*"]),i=0,o=r.length;o>i;i++)if(r[i].call(e,t,n))return})}function P(e,t,n){var r,i,o=0,a=nr.length,s=st.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Qn||O(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:st.extend({},t),opts:st.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Qn||O(),duration:n.duration,tweens:[],createTween:function(t,n){var r=st.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(R(c,l.opts.specialEasing);a>o;o++)if(r=nr[o].call(l,e,c,l.opts))return r;return B(l,c),st.isFunction(l.opts.start)&&l.opts.start.call(e,l),st.fx.timer(st.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function R(e,t){var n,r,i,o,a;for(n in e)if(r=st.camelCase(n),i=t[r],o=e[n],st.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=st.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function W(e,t,n){var r,i,o,a,s,u,l,c,f,p=this,d=e.style,h={},g=[],m=e.nodeType&&w(e);n.queue||(c=st._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,f=c.empty.fire,c.empty.fire=function(){c.unqueued||f()}),c.unqueued++,p.always(function(){p.always(function(){c.unqueued--,st.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===st.css(e,"display")&&"none"===st.css(e,"float")&&(st.support.inlineBlockNeedsLayout&&"inline"!==S(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",st.support.shrinkWrapBlocks||p.done(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(r in t)if(o=t[r],Zn.exec(o)){if(delete t[r],u=u||"toggle"===o,o===(m?"hide":"show"))continue;g.push(r)}if(a=g.length){s=st._data(e,"fxshow")||st._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?st(e).show():p.done(function(){st(e).hide()}),p.done(function(){var t;st._removeData(e,"fxshow");for(t in h)st.style(e,t,h[t])});for(r=0;a>r;r++)i=g[r],l=p.createTween(i,m?s[i]:0),h[i]=s[i]||st.style(e,i),i in s||(s[i]=l.start,m&&(l.end=l.start,l.start="width"===i||"height"===i?1:0))}}function $(e,t,n,r,i){return new $.prototype.init(e,t,n,r,i)}function I(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=wn[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function z(e){return st.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}var X,U,V=e.document,Y=e.location,J=e.jQuery,G=e.$,Q={},K=[],Z="1.9.0",et=K.concat,tt=K.push,nt=K.slice,rt=K.indexOf,it=Q.toString,ot=Q.hasOwnProperty,at=Z.trim,st=function(e,t){return new st.fn.init(e,t,X)},ut=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,lt=/\S+/g,ct=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ft=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,pt=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,dt=/^[\],:{}\s]*$/,ht=/(?:^|:|,)(?:\s*\[)+/g,gt=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,mt=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,yt=/^-ms-/,vt=/-([\da-z])/gi,bt=function(e,t){return t.toUpperCase()},xt=function(){V.addEventListener?(V.removeEventListener("DOMContentLoaded",xt,!1),st.ready()):"complete"===V.readyState&&(V.detachEvent("onreadystatechange",xt),st.ready())};st.fn=st.prototype={jquery:Z,constructor:st,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:ft.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof st?n[0]:n,st.merge(this,st.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:V,!0)),pt.test(i[1])&&st.isPlainObject(n))for(i in n)st.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=V.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=V,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):st.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),st.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return nt.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=st.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return st.each(this,e,t)},ready:function(e){return st.ready.promise().done(e),this},slice:function(){return this.pushStack(nt.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(st.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:tt,sort:[].sort,splice:[].splice},st.fn.init.prototype=st.fn,st.extend=st.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||st.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(e=arguments[u]))for(n in e)r=s[n],i=e[n],s!==i&&(c&&i&&(st.isPlainObject(i)||(o=st.isArray(i)))?(o?(o=!1,a=r&&st.isArray(r)?r:[]):a=r&&st.isPlainObject(r)?r:{},s[n]=st.extend(c,a,i)):i!==t&&(s[n]=i));return s},st.extend({noConflict:function(t){return e.$===st&&(e.$=G),t&&e.jQuery===st&&(e.jQuery=J),st},isReady:!1,readyWait:1,holdReady:function(e){e?st.readyWait++:st.ready(!0)},ready:function(e){if(e===!0?!--st.readyWait:!st.isReady){if(!V.body)return setTimeout(st.ready);st.isReady=!0,e!==!0&&--st.readyWait>0||(U.resolveWith(V,[st]),st.fn.trigger&&st(V).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===st.type(e)},isArray:Array.isArray||function(e){return"array"===st.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?Q[it.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==st.type(e)||e.nodeType||st.isWindow(e))return!1;try{if(e.constructor&&!ot.call(e,"constructor")&&!ot.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||ot.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||V;var r=pt.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=st.buildFragment([e],t,i),i&&st(i).remove(),st.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=st.trim(n),n&&dt.test(n.replace(gt,"@").replace(mt,"]").replace(ht,"")))?Function("return "+n)():(st.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||st.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&st.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(yt,"ms-").replace(vt,bt)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,r){var i,o=0,a=e.length,s=n(e);if(r){if(s)for(;a>o&&(i=t.apply(e[o],r),i!==!1);o++);else for(o in e)if(i=t.apply(e[o],r),i===!1)break}else if(s)for(;a>o&&(i=t.call(e[o],o,e[o]),i!==!1);o++);else for(o in e)if(i=t.call(e[o],o,e[o]),i===!1)break;return e},trim:at&&!at.call("\ufeff\u00a0")?function(e){return null==e?"":at.call(e)}:function(e){return null==e?"":(e+"").replace(ct,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?st.merge(r,"string"==typeof e?[e]:e):tt.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(rt)return rt.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else for(;n[o]!==t;)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,r){var i,o=0,a=e.length,s=n(e),u=[];if(s)for(;a>o;o++)i=t(e[o],o,r),null!=i&&(u[u.length]=i);else for(o in e)i=t(e[o],o,r),null!=i&&(u[u.length]=i);return et.apply([],u)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(r=e[n],n=e,e=r),st.isFunction(e)?(i=nt.call(arguments,2),o=function(){return e.apply(n||this,i.concat(nt.call(arguments)))},o.guid=e.guid=e.guid||st.guid++,o):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===st.type(r)){o=!0;for(u in r)st.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,st.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(st(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),st.ready.promise=function(t){if(!U)if(U=st.Deferred(),"complete"===V.readyState)setTimeout(st.ready);else if(V.addEventListener)V.addEventListener("DOMContentLoaded",xt,!1),e.addEventListener("load",st.ready,!1);else{V.attachEvent("onreadystatechange",xt),e.attachEvent("onload",st.ready);var n=!1;try{n=null==e.frameElement&&V.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!st.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}st.ready()}}()}return U.promise(t)},st.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){Q["[object "+t+"]"]=t.toLowerCase()}),X=st(V);var Tt={};st.Callbacks=function(e){e="string"==typeof e?Tt[e]||r(e):st.extend({},e);var n,i,o,a,s,u,l=[],c=!e.once&&[],f=function(t){for(n=e.memory&&t,i=!0,u=a||0,a=0,s=l.length,o=!0;l&&s>u;u++)if(l[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}o=!1,l&&(c?c.length&&f(c.shift()):n?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function r(t){st.each(t,function(t,n){var i=st.type(n);"function"===i?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==i&&r(n)})})(arguments),o?s=l.length:n&&(a=t,f(n))}return this},remove:function(){return l&&st.each(arguments,function(e,t){for(var n;(n=st.inArray(t,l,n))>-1;)l.splice(n,1),o&&(s>=n&&s--,u>=n&&u--)}),this},has:function(e){return st.inArray(e,l)>-1},empty:function(){return l=[],this},disable:function(){return l=c=n=t,this},disabled:function(){return!l},lock:function(){return c=t,n||p.disable(),this},locked:function(){return!c},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!c||(o?c.push(t):f(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},st.extend({Deferred:function(e){var t=[["resolve","done",st.Callbacks("once memory"),"resolved"],["reject","fail",st.Callbacks("once memory"),"rejected"],["notify","progress",st.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return st.Deferred(function(n){st.each(t,function(t,o){var a=o[0],s=st.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&st.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?st.extend(e,r):r}},i={};return r.pipe=r.then,st.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=nt.call(arguments),a=o.length,s=1!==a||e&&st.isFunction(e.promise)?a:0,u=1===s?e:st.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?nt.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=Array(a),n=Array(a),r=Array(a);a>i;i++)o[i]&&st.isFunction(o[i].promise)?o[i].promise().done(l(i,r,o)).fail(u.reject).progress(l(i,n,t)):--s;return s||u.resolveWith(r,o),u.promise()}}),st.support=function(){var n,r,i,o,a,s,u,l,c,f,p=V.createElement("div");if(p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",r=p.getElementsByTagName("*"),i=p.getElementsByTagName("a")[0],!r||!i||!r.length)return{};o=V.createElement("select"),a=o.appendChild(V.createElement("option")),s=p.getElementsByTagName("input")[0],i.style.cssText="top:1px;float:left;opacity:.5",n={getSetAttribute:"t"!==p.className,leadingWhitespace:3===p.firstChild.nodeType,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(i.getAttribute("style")),hrefNormalized:"/a"===i.getAttribute("href"),opacity:/^0.5/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:!!s.value,optSelected:a.selected,enctype:!!V.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==V.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===V.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},s.checked=!0,n.noCloneChecked=s.cloneNode(!0).checked,o.disabled=!0,n.optDisabled=!a.disabled;try{delete p.test}catch(d){n.deleteExpando=!1}s=V.createElement("input"),s.setAttribute("value",""),n.input=""===s.getAttribute("value"),s.value="t",s.setAttribute("type","radio"),n.radioValue="t"===s.value,s.setAttribute("checked","t"),s.setAttribute("name","t"),u=V.createDocumentFragment(),u.appendChild(s),n.appendChecked=s.checked,n.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,p.attachEvent&&(p.attachEvent("onclick",function(){n.noCloneEvent=!1}),p.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})p.setAttribute(l="on"+f,"t"),n[f+"Bubbles"]=l in e||p.attributes[l].expando===!1;return p.style.backgroundClip="content-box",p.cloneNode(!0).style.backgroundClip="",n.clearCloneStyle="content-box"===p.style.backgroundClip,st(function(){var r,i,o,a="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",s=V.getElementsByTagName("body")[0];s&&(r=V.createElement("div"),r.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",s.appendChild(r).appendChild(p),p.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=p.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",c=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",n.reliableHiddenOffsets=c&&0===o[0].offsetHeight,p.innerHTML="",p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",n.boxSizing=4===p.offsetWidth,n.doesNotIncludeMarginInBodyOffset=1!==s.offsetTop,e.getComputedStyle&&(n.pixelPosition="1%"!==(e.getComputedStyle(p,null)||{}).top,n.boxSizingReliable="4px"===(e.getComputedStyle(p,null)||{width:"4px"}).width,i=p.appendChild(V.createElement("div")),i.style.cssText=p.style.cssText=a,i.style.marginRight=i.style.width="0",p.style.width="1px",n.reliableMarginRight=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight)),p.style.zoom!==t&&(p.innerHTML="",p.style.cssText=a+"width:1px;padding:1px;display:inline;zoom:1",n.inlineBlockNeedsLayout=3===p.offsetWidth,p.style.display="block",p.innerHTML="<div></div>",p.firstChild.style.width="5px",n.shrinkWrapBlocks=3!==p.offsetWidth,s.style.zoom=1),s.removeChild(r),r=p=o=i=null)}),r=o=u=a=i=s=null,n}();var wt=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,Nt=/([A-Z])/g;st.extend({cache:{},expando:"jQuery"+(Z+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?st.cache[e[st.expando]]:e[st.expando],!!e&&!s(e)},data:function(e,t,n){return i(e,t,n,!1)},removeData:function(e,t){return o(e,t,!1)},_data:function(e,t,n){return i(e,t,n,!0)},_removeData:function(e,t){return o(e,t,!0)},acceptData:function(e){var t=e.nodeName&&st.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),st.fn.extend({data:function(e,n){var r,i,o=this[0],s=0,u=null;if(e===t){if(this.length&&(u=st.data(o),1===o.nodeType&&!st._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>s;s++)i=r[s].name,i.indexOf("data-")||(i=st.camelCase(i.substring(5)),a(o,i,u[i]));st._data(o,"parsedAttrs",!0)}return u}return"object"==typeof e?this.each(function(){st.data(this,e)}):st.access(this,function(n){return n===t?o?a(o,e,st.data(o,e)):null:(this.each(function(){st.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){st.removeData(this,e)})}}),st.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=st._data(e,n),r&&(!i||st.isArray(r)?i=st._data(e,n,st.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=st.queue(e,t),r=n.length,i=n.shift(),o=st._queueHooks(e,t),a=function(){st.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return st._data(e,n)||st._data(e,n,{empty:st.Callbacks("once memory").add(function(){st._removeData(e,t+"queue"),st._removeData(e,n)})})}}),st.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?st.queue(this[0],e):n===t?this:this.each(function(){var t=st.queue(this,e,n);st._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&st.dequeue(this,e)})},dequeue:function(e){return this.each(function(){st.dequeue(this,e)})},delay:function(e,t){return e=st.fx?st.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=st.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};for("string"!=typeof e&&(n=e,e=t),e=e||"fx";s--;)r=st._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var Ct,kt,Et=/[\t\r\n]/g,St=/\r/g,At=/^(?:input|select|textarea|button|object)$/i,jt=/^(?:a|area)$/i,Dt=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,Lt=/^(?:checked|selected)$/i,Ht=st.support.getSetAttribute,Mt=st.support.input;st.fn.extend({attr:function(e,t){return st.access(this,st.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){st.removeAttr(this,e)})},prop:function(e,t){return st.access(this,st.prop,e,t,arguments.length>1)},removeProp:function(e){return e=st.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):" ")){for(o=0;i=t[o++];)0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=st.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):"")){for(o=0;i=t[o++];)for(;r.indexOf(" "+i+" ")>=0;)r=r.replace(" "+i+" "," ");n.className=e?st.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return st.isFunction(e)?this.each(function(n){st(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n)for(var i,o=0,a=st(this),s=t,u=e.match(lt)||[];i=u[o++];)s=r?s:!a.hasClass(i),a[s?"addClass":"removeClass"](i);else("undefined"===n||"boolean"===n)&&(this.className&&st._data(this,"__className__",this.className),this.className=this.className||e===!1?"":st._data(this,"__className__")||"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(Et," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=st.isFunction(e),this.each(function(r){var o,a=st(this);1===this.nodeType&&(o=i?e.call(this,r,a.val()):e,null==o?o="":"number"==typeof o?o+="":st.isArray(o)&&(o=st.map(o,function(e){return null==e?"":e+""})),n=st.valHooks[this.type]||st.valHooks[this.nodeName.toLowerCase()],n&&"set"in n&&n.set(this,o,"value")!==t||(this.value=o))});if(o)return n=st.valHooks[o.type]||st.valHooks[o.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(o,"value"))!==t?r:(r=o.value,"string"==typeof r?r.replace(St,""):null==r?"":r)}}}),st.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(st.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&st.nodeName(n.parentNode,"optgroup"))){if(t=st(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=st.makeArray(t);return st(e).find("option").each(function(){this.selected=st.inArray(st(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return e.getAttribute===t?st.prop(e,n,r):(a=1!==s||!st.isXMLDoc(e),a&&(n=n.toLowerCase(),o=st.attrHooks[n]||(Dt.test(n)?kt:Ct)),r===t?o&&a&&"get"in o&&null!==(i=o.get(e,n))?i:(e.getAttribute!==t&&(i=e.getAttribute(n)),null==i?t:i):null!==r?o&&a&&"set"in o&&(i=o.set(e,r,n))!==t?i:(e.setAttribute(n,r+""),r):(st.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(lt);if(o&&1===e.nodeType)for(;n=o[i++];)r=st.propFix[n]||n,Dt.test(n)?!Ht&&Lt.test(n)?e[st.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:st.attr(e,n,""),e.removeAttribute(Ht?n:r)},attrHooks:{type:{set:function(e,t){if(!st.support.radioValue&&"radio"===t&&st.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!st.isXMLDoc(e),a&&(n=st.propFix[n]||n,o=st.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):At.test(e.nodeName)||jt.test(e.nodeName)&&e.href?0:t}}}}),kt={get:function(e,n){var r=st.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?Mt&&Ht?null!=i:Lt.test(n)?e[st.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?st.removeAttr(e,n):Mt&&Ht||!Lt.test(n)?e.setAttribute(!Ht&&st.propFix[n]||n,n):e[st.camelCase("default-"+n)]=e[n]=!0,n}},Mt&&Ht||(st.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return st.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t -},set:function(e,n,r){return st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&&Ct.set(e,n,r)}}),Ht||(Ct=st.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,""===t?!1:t,n)}},st.each(["width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),st.support.hrefNormalized||(st.each(["href","src","width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),st.each(["href","src"],function(e,t){st.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),st.support.style||(st.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),st.support.optSelected||(st.propHooks.selected=st.extend(st.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),st.support.enctype||(st.propFix.enctype="encoding"),st.support.checkOn||st.each(["radio","checkbox"],function(){st.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),st.each(["radio","checkbox"],function(){st.valHooks[this]=st.extend(st.valHooks[this],{set:function(e,n){return st.isArray(n)?e.checked=st.inArray(st(e).val(),n)>=0:t}})});var qt=/^(?:input|select|textarea)$/i,_t=/^key/,Ft=/^(?:mouse|contextmenu)|click/,Ot=/^(?:focusinfocus|focusoutblur)$/,Bt=/^([^.]*)(?:\.(.+)|)$/;st.event={global:{},add:function(e,n,r,i,o){var a,s,u,l,c,f,p,d,h,g,m,y=3!==e.nodeType&&8!==e.nodeType&&st._data(e);if(y){for(r.handler&&(a=r,r=a.handler,o=a.selector),r.guid||(r.guid=st.guid++),(l=y.events)||(l=y.events={}),(s=y.handle)||(s=y.handle=function(e){return st===t||e&&st.event.triggered===e.type?t:st.event.dispatch.apply(s.elem,arguments)},s.elem=e),n=(n||"").match(lt)||[""],c=n.length;c--;)u=Bt.exec(n[c])||[],h=m=u[1],g=(u[2]||"").split(".").sort(),p=st.event.special[h]||{},h=(o?p.delegateType:p.bindType)||h,p=st.event.special[h]||{},f=st.extend({type:h,origType:m,data:i,handler:r,guid:r.guid,selector:o,needsContext:o&&st.expr.match.needsContext.test(o),namespace:g.join(".")},a),(d=l[h])||(d=l[h]=[],d.delegateCount=0,p.setup&&p.setup.call(e,i,g,s)!==!1||(e.addEventListener?e.addEventListener(h,s,!1):e.attachEvent&&e.attachEvent("on"+h,s))),p.add&&(p.add.call(e,f),f.handler.guid||(f.handler.guid=r.guid)),o?d.splice(d.delegateCount++,0,f):d.push(f),st.event.global[h]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,m=st.hasData(e)&&st._data(e);if(m&&(u=m.events)){for(t=(t||"").match(lt)||[""],l=t.length;l--;)if(s=Bt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){for(f=st.event.special[d]||{},d=(r?f.delegateType:f.bindType)||d,p=u[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||st.removeEvent(e,d,m.handle),delete u[d])}else for(d in u)st.event.remove(e,d+t[l],n,r,!0);st.isEmptyObject(u)&&(delete m.handle,st._removeData(e,"events"))}},trigger:function(n,r,i,o){var a,s,u,l,c,f,p,d=[i||V],h=n.type||n,g=n.namespace?n.namespace.split("."):[];if(s=u=i=i||V,3!==i.nodeType&&8!==i.nodeType&&!Ot.test(h+st.event.triggered)&&(h.indexOf(".")>=0&&(g=h.split("."),h=g.shift(),g.sort()),c=0>h.indexOf(":")&&"on"+h,n=n[st.expando]?n:new st.Event(h,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=g.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:st.makeArray(r,[n]),p=st.event.special[h]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!st.isWindow(i)){for(l=p.delegateType||h,Ot.test(l+h)||(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(i.ownerDocument||V)&&d.push(u.defaultView||u.parentWindow||e)}for(a=0;(s=d[a++])&&!n.isPropagationStopped();)n.type=a>1?l:p.bindType||h,f=(st._data(s,"events")||{})[n.type]&&st._data(s,"handle"),f&&f.apply(s,r),f=c&&s[c],f&&st.acceptData(s)&&f.apply&&f.apply(s,r)===!1&&n.preventDefault();if(n.type=h,!(o||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===h&&st.nodeName(i,"a")||!st.acceptData(i)||!c||!i[h]||st.isWindow(i))){u=i[c],u&&(i[c]=null),st.event.triggered=h;try{i[h]()}catch(m){}st.event.triggered=t,u&&(i[c]=u)}return n.result}},dispatch:function(e){e=st.event.fix(e);var n,r,i,o,a,s=[],u=nt.call(arguments),l=(st._data(this,"events")||{})[e.type]||[],c=st.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){for(s=st.event.handlers.call(this,e,l),n=0;(o=s[n++])&&!e.isPropagationStopped();)for(e.currentTarget=o.elem,r=0;(a=o.handlers[r++])&&!e.isImmediatePropagationStopped();)(!e.namespace_re||e.namespace_re.test(a.namespace))&&(e.handleObj=a,e.data=a.data,i=((st.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u),i!==t&&(e.result=i)===!1&&(e.preventDefault(),e.stopPropagation()));return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(l.disabled!==!0||"click"!==e.type){for(i=[],r=0;u>r;r++)a=n[r],o=a.selector+" ",i[o]===t&&(i[o]=a.needsContext?st(o,this).index(l)>=0:st.find(o,this,null,[l]).length),i[o]&&i.push(a);i.length&&s.push({elem:l,handlers:i})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[st.expando])return e;var t,n,r=e,i=st.event.fixHooks[e.type]||{},o=i.props?this.props.concat(i.props):this.props;for(e=new st.Event(r),t=o.length;t--;)n=o[t],e[n]=r[n];return e.target||(e.target=r.srcElement||V),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,i.filter?i.filter(e,r):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,a=n.button,s=n.fromElement;return null==e.pageX&&null!=n.clientX&&(r=e.target.ownerDocument||V,i=r.documentElement,o=r.body,e.pageX=n.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i&&i.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i&&i.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?n.toElement:s),e.which||a===t||(e.which=1&a?1:2&a?3:4&a?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return st.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==V.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===V.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=st.extend(new st.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?st.event.trigger(i,null,t):st.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},st.removeEvent=V.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,n,r){var i="on"+n;e.detachEvent&&(e[i]===t&&(e[i]=null),e.detachEvent(i,r))},st.Event=function(e,n){return this instanceof st.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?u:l):this.type=e,n&&st.extend(this,n),this.timeStamp=e&&e.timeStamp||st.now(),this[st.expando]=!0,t):new st.Event(e,n)},st.Event.prototype={isDefaultPrevented:l,isPropagationStopped:l,isImmediatePropagationStopped:l,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=u,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=u,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u,this.stopPropagation()}},st.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){st.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!st.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),st.support.submitBubbles||(st.event.special.submit={setup:function(){return st.nodeName(this,"form")?!1:(st.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=st.nodeName(n,"input")||st.nodeName(n,"button")?n.form:t;r&&!st._data(r,"submitBubbles")&&(st.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),st._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&st.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return st.nodeName(this,"form")?!1:(st.event.remove(this,"._submit"),t)}}),st.support.changeBubbles||(st.event.special.change={setup:function(){return qt.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(st.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),st.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),st.event.simulate("change",this,e,!0)})),!1):(st.event.add(this,"beforeactivate._change",function(e){var t=e.target;qt.test(t.nodeName)&&!st._data(t,"changeBubbles")&&(st.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||st.event.simulate("change",this.parentNode,e,!0)}),st._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return st.event.remove(this,"._change"),!qt.test(this.nodeName)}}),st.support.focusinBubbles||st.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){st.event.simulate(t,e.target,st.event.fix(e),!0)};st.event.special[t]={setup:function(){0===n++&&V.addEventListener(e,r,!0)},teardown:function(){0===--n&&V.removeEventListener(e,r,!0)}}}),st.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(s in e)this.on(s,n,r,e[s],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=l;else if(!i)return this;return 1===o&&(a=i,i=function(e){return st().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=st.guid++)),this.each(function(){st.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,st(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=l),this.each(function(){st.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){st.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?st.event.trigger(e,n,r,!0):t},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),st.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){st.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)},_t.test(t)&&(st.event.fixHooks[t]=st.event.keyHooks),Ft.test(t)&&(st.event.fixHooks[t]=st.event.mouseHooks)}),function(e,t){function n(e){return ht.test(e+"")}function r(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>C.cacheLength&&delete e[t.shift()],e[n]=r}}function i(e){return e[P]=!0,e}function o(e){var t=L.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function a(e,t,n,r){var i,o,a,s,u,l,c,d,h,g;if((t?t.ownerDocument||t:R)!==L&&D(t),t=t||L,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!M&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Q.apply(n,K.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&W.getByClassName&&t.getElementsByClassName)return Q.apply(n,K.call(t.getElementsByClassName(a),0)),n}if(W.qsa&&!q.test(e)){if(c=!0,d=P,h=t,g=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(l=f(e),(c=t.getAttribute("id"))?d=c.replace(vt,"\\$&"):t.setAttribute("id",d),d="[id='"+d+"'] ",u=l.length;u--;)l[u]=d+p(l[u]);h=dt.test(e)&&t.parentNode||t,g=l.join(",")}if(g)try{return Q.apply(n,K.call(h.querySelectorAll(g),0)),n}catch(m){}finally{c||t.removeAttribute("id")}}}return x(e.replace(at,"$1"),t,n,r)}function s(e,t){for(var n=e&&t&&e.nextSibling;n;n=n.nextSibling)if(n===t)return-1;return e?1:-1}function u(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return i(function(t){return t=+t,i(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function f(e,t){var n,r,i,o,s,u,l,c=X[e+" "];if(c)return t?0:c.slice(0);for(s=e,u=[],l=C.preFilter;s;){(!n||(r=ut.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(i=[])),n=!1,(r=lt.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(at," ")}),s=s.slice(n.length));for(o in C.filter)!(r=pt[o].exec(s))||l[o]&&!(r=l[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?a.error(e):X(e,u).slice(0)}function p(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function d(e,t,n){var r=t.dir,i=n&&"parentNode"===t.dir,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=$+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(l=t[P]||(t[P]={}),(u=l[r])&&u[0]===c){if((s=u[1])===!0||s===N)return s===!0}else if(u=l[r]=[c],u[1]=e(t,n,a)||N,u[1]===!0)return!0}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function m(e,t,n,r,o,a){return r&&!r[P]&&(r=m(r)),o&&!o[P]&&(o=m(o,a)),i(function(i,a,s,u){var l,c,f,p=[],d=[],h=a.length,m=i||b(t||"*",s.nodeType?[s]:s,[]),y=!e||!i&&t?m:g(m,p,e,s,u),v=n?o||(i?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r)for(l=g(v,d),r(l,[],s,u),c=l.length;c--;)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f));if(i){if(o||e){if(o){for(l=[],c=v.length;c--;)(f=v[c])&&l.push(y[c]=f);o(null,v=[],l,u)}for(c=v.length;c--;)(f=v[c])&&(l=o?Z.call(i,f):p[c])>-1&&(i[l]=!(a[l]=f))}}else v=g(v===a?v.splice(h,v.length):v),o?o(null,a,v,u):Q.apply(a,v)})}function y(e){for(var t,n,r,i=e.length,o=C.relative[e[0].type],a=o||C.relative[" "],s=o?1:0,u=d(function(e){return e===t},a,!0),l=d(function(e){return Z.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r||n!==j)||((t=n).nodeType?u(e,n,r):l(e,n,r))}];i>s;s++)if(n=C.relative[e[s].type])c=[d(h(c),n)];else{if(n=C.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;i>r&&!C.relative[e[r].type];r++);return m(s>1&&h(c),s>1&&p(e.slice(0,s-1)).replace(at,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&p(e))}c.push(n)}return h(c)}function v(e,t){var n=0,r=t.length>0,o=e.length>0,s=function(i,s,u,l,c){var f,p,d,h=[],m=0,y="0",v=i&&[],b=null!=c,x=j,T=i||o&&C.find.TAG("*",c&&s.parentNode||s),w=$+=null==x?1:Math.E;for(b&&(j=s!==L&&s,N=n);null!=(f=T[y]);y++){if(o&&f){for(p=0;d=e[p];p++)if(d(f,s,u)){l.push(f);break}b&&($=w,N=++n)}r&&((f=!d&&f)&&m--,i&&v.push(f))}if(m+=y,r&&y!==m){for(p=0;d=t[p];p++)d(v,h,s,u);if(i){if(m>0)for(;y--;)v[y]||h[y]||(h[y]=G.call(l));h=g(h)}Q.apply(l,h),b&&!i&&h.length>0&&m+t.length>1&&a.uniqueSort(l)}return b&&($=w,j=x),v};return r?i(s):s}function b(e,t,n){for(var r=0,i=t.length;i>r;r++)a(e,t[r],n);return n}function x(e,t,n,r){var i,o,a,s,u,l=f(e);if(!r&&1===l.length){if(o=l[0]=l[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&!M&&C.relative[o[1].type]){if(t=C.find.ID(a.matches[0].replace(xt,Tt),t)[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?-1:o.length-1;i>=0&&(a=o[i],!C.relative[s=a.type]);i--)if((u=C.find[s])&&(r=u(a.matches[0].replace(xt,Tt),dt.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&p(o),!e)return Q.apply(n,K.call(r,0)),n;break}}return S(e,l)(r,t,M,n,dt.test(e)),n}function T(){}var w,N,C,k,E,S,A,j,D,L,H,M,q,_,F,O,B,P="sizzle"+-new Date,R=e.document,W={},$=0,I=0,z=r(),X=r(),U=r(),V=typeof t,Y=1<<31,J=[],G=J.pop,Q=J.push,K=J.slice,Z=J.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},et="[\\x20\\t\\r\\n\\f]",tt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",nt=tt.replace("w","w#"),rt="([*^$|!~]?=)",it="\\["+et+"*("+tt+")"+et+"*(?:"+rt+et+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+nt+")|)|)"+et+"*\\]",ot=":("+tt+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+it.replace(3,8)+")*)|.*)\\)|)",at=RegExp("^"+et+"+|((?:^|[^\\\\])(?:\\\\.)*)"+et+"+$","g"),ut=RegExp("^"+et+"*,"+et+"*"),lt=RegExp("^"+et+"*([\\x20\\t\\r\\n\\f>+~])"+et+"*"),ct=RegExp(ot),ft=RegExp("^"+nt+"$"),pt={ID:RegExp("^#("+tt+")"),CLASS:RegExp("^\\.("+tt+")"),NAME:RegExp("^\\[name=['\"]?("+tt+")['\"]?\\]"),TAG:RegExp("^("+tt.replace("w","w*")+")"),ATTR:RegExp("^"+it),PSEUDO:RegExp("^"+ot),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+et+"*(even|odd|(([+-]|)(\\d*)n|)"+et+"*(?:([+-]|)"+et+"*(\\d+)|))"+et+"*\\)|)","i"),needsContext:RegExp("^"+et+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+et+"*((?:-\\d)?\\d*)"+et+"*\\)|)(?=[^-]|$)","i")},dt=/[\x20\t\r\n\f]*[+~]/,ht=/\{\s*\[native code\]\s*\}/,gt=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,mt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,vt=/'|\\/g,bt=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,Tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{K.call(H.childNodes,0)[0].nodeType}catch(wt){K=function(e){for(var t,n=[];t=this[e];e++)n.push(t);return n}}E=a.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},D=a.setDocument=function(e){var r=e?e.ownerDocument||e:R;return r!==L&&9===r.nodeType&&r.documentElement?(L=r,H=r.documentElement,M=E(r),W.tagNameNoComments=o(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),W.attributes=o(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),W.getByClassName=o(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),W.getByName=o(function(e){e.id=P+0,e.innerHTML="<a name='"+P+"'></a><div name='"+P+"'></div>",H.insertBefore(e,H.firstChild);var t=r.getElementsByName&&r.getElementsByName(P).length===2+r.getElementsByName(P+0).length;return W.getIdNotName=!r.getElementById(P),H.removeChild(e),t}),C.attrHandle=o(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==V&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},W.getIdNotName?(C.find.ID=function(e,t){if(typeof t.getElementById!==V&&!M){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){return e.getAttribute("id")===t}}):(C.find.ID=function(e,n){if(typeof n.getElementById!==V&&!M){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==V&&r.getAttributeNode("id").value===e?[r]:t:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){var n=typeof e.getAttributeNode!==V&&e.getAttributeNode("id");return n&&n.value===t}}),C.find.TAG=W.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==V?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i];i++)1===n.nodeType&&r.push(n);return r}return o},C.find.NAME=W.getByName&&function(e,n){return typeof n.getElementsByName!==V?n.getElementsByName(name):t},C.find.CLASS=W.getByClassName&&function(e,n){return typeof n.getElementsByClassName===V||M?t:n.getElementsByClassName(e)},_=[],q=[":focus"],(W.qsa=n(r.querySelectorAll))&&(o(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||q.push("\\["+et+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||q.push(":checked")}),o(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&q.push("[*^$]="+et+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),q.push(",.*:")})),(W.matchesSelector=n(F=H.matchesSelector||H.mozMatchesSelector||H.webkitMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&o(function(e){W.disconnectedMatch=F.call(e,"div"),F.call(e,"[s!='']:x"),_.push("!=",ot)}),q=RegExp(q.join("|")),_=RegExp(_.join("|")),O=n(H.contains)||H.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},B=H.compareDocumentPosition?function(e,t){var n;return e===t?(A=!0,0):(n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&n||e.parentNode&&11===e.parentNode.nodeType?e===r||O(R,e)?-1:t===r||O(R,t)?1:0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,a=t.parentNode,u=[e],l=[t];if(e===t)return A=!0,0;if(e.sourceIndex&&t.sourceIndex)return(~t.sourceIndex||Y)-(O(R,e)&&~e.sourceIndex||Y);if(!o||!a)return e===r?-1:t===r?1:o?-1:a?1:0;if(o===a)return s(e,t);for(n=e;n=n.parentNode;)u.unshift(n);for(n=t;n=n.parentNode;)l.unshift(n);for(;u[i]===l[i];)i++;return i?s(u[i],l[i]):u[i]===R?-1:l[i]===R?1:0},A=!1,[0,0].sort(B),W.detectDuplicates=A,L):L},a.matches=function(e,t){return a(e,null,null,t)},a.matchesSelector=function(e,t){if((e.ownerDocument||e)!==L&&D(e),t=t.replace(bt,"='$1']"),!(!W.matchesSelector||M||_&&_.test(t)||q.test(t)))try{var n=F.call(e,t);if(n||W.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return a(t,L,null,[e]).length>0},a.contains=function(e,t){return(e.ownerDocument||e)!==L&&D(e),O(e,t)},a.attr=function(e,t){var n;return(e.ownerDocument||e)!==L&&D(e),M||(t=t.toLowerCase()),(n=C.attrHandle[t])?n(e):M||W.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},a.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},a.uniqueSort=function(e){var t,n=[],r=1,i=0;if(A=!W.detectDuplicates,e.sort(B),A){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));for(;i--;)e.splice(n[i],1)}return e},k=a.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=k(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=k(t);return n},C=a.selectors={cacheLength:50,createPseudo:i,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,Tt),e[3]=(e[4]||e[5]||"").replace(xt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||a.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&a.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&ct.test(n)&&(t=f(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(xt,Tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=z[e+" "];return t||(t=RegExp("(^|"+et+")"+e+"("+et+"|$)"))&&z(e,function(e){return t.test(e.className||typeof e.getAttribute!==V&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=a.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.substr(i.length-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){for(;g;){for(f=t;f=f[g];)if(s?f.nodeName.toLowerCase()===y:1===f.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(c=m[P]||(m[P]={}),l=c[e]||[],d=l[0]===$&&l[1],p=l[0]===$&&l[2],f=d&&m.childNodes[d];f=++d&&f&&f[g]||(p=d=0)||h.pop();)if(1===f.nodeType&&++p&&f===t){c[e]=[$,d,p];break}}else if(v&&(l=(t[P]||(t[P]={}))[e])&&l[0]===$)p=l[1];else for(;(f=++d&&f&&f[g]||(p=d=0)||h.pop())&&((s?f.nodeName.toLowerCase()!==y:1!==f.nodeType)||!++p||(v&&((f[P]||(f[P]={}))[e]=[$,p]),f!==t)););return p-=i,p===r||0===p%r&&p/r>=0}}},PSEUDO... [truncated message content] |
From: <be...@us...> - 2013-01-28 00:24:51
|
Revision: 10938 http://sourceforge.net/p/xoops/svn/10938 Author: beckmi Date: 2013-01-28 00:24:47 +0000 (Mon, 28 Jan 2013) Log Message: ----------- fix for Array to string conversion (geekwright/mamba) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-27 23:58:59 UTC (rev 10937) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-01-28 00:24:47 UTC (rev 10938) @@ -4,6 +4,7 @@ 2013/01/xx: Version 2.5.6 RC1 =============================== Bugfixes: + - Array to string conversion (geekwright/mamba) - issues with missing xoopscomments table (geekwright/sabahan/Mamba) - bug with using reference for non-variables (geekwright/mamba) - number of users when "all groups" selected was wrong (tatane/mamba) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php 2013-01-27 23:58:59 UTC (rev 10937) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php 2013-01-28 00:24:47 UTC (rev 10938) @@ -121,14 +121,16 @@ case 'theme': case 'theme_multi': - $ele = ($config[$i]->getVar('conf_formtype') != 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true); + $ele = ($config[$i]->getVar('conf_formtype') + != 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true); require_once XOOPS_ROOT_PATH . '/class/xoopslists.php'; $dirlist = XoopsLists::getThemesList(); if (!empty($dirlist)) { asort($dirlist); $ele->addOptionArray($dirlist); } - $form->addElement(new XoopsFormHidden('_old_theme', $config[$i]->getConfValueForOutput())); + $valueForOutput = $config[$i]->getConfValueForOutput(); + $form->addElement(new XoopsFormHidden('_old_theme', (is_array($valueForOutput) ? $valueForOutput[0] : $valueForOutput))); break; case 'tplset': |
From: <tr...@us...> - 2013-02-04 19:37:52
|
Revision: 10981 http://sourceforge.net/p/xoops/svn/10981 Author: trabis Date: 2013-02-04 19:37:48 +0000 (Mon, 04 Feb 2013) Log Message: ----------- Fixing some security issues and adding some static methods for php 5.4 compliance Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsform/grouppermform.php XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/groupperm.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_modules.html Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-04 19:37:48 UTC (rev 10981) @@ -7,7 +7,10 @@ - Array to string conversion (geekwright/mamba) - issues with missing xoopscomments table (geekwright/sabahan/Mamba) - bug with using reference for non-variables (geekwright/mamba) - - number of users when "all groups" selected was wrong (tatane/mamba) + - number of users when "all groups" selected was wrong (tatane/mamba) +Security fixes + - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) + - XSS/CSRF vulnerability in system/admin.php (Dingjie Yang,Qualys/trabis) =============================== 2013/01/22: Version 2.5.6 Beta @@ -18,7 +21,7 @@ Bugfixes: - errors related to static functions, so it works on PHP 5.4 (Mamba) - bug #1245 in class XoopsLoad.php (Alain91) - + Updated: - TinyMCE to 3.5.8 (mamba) - Smarty to 2.6.27 (mamba) @@ -33,10 +36,10 @@ Bugfixes: - preventing division by zero in pagenav.php (timgno) - ID: 3466534 tooltip "$ not defined" fix (culex) - - ID: 3513787 wrong cookie_domain (arion92fr) + - ID: 3513787 wrong cookie_domain (arion92fr) - ID: 3518291 Fix of variables assigned by reference in formelementtray (mamba) - problem in formtextdateselect (wishcraft) - + Updated: - phpThumb to 1.7.11 (mamba) - jGrowl to 1.2.6 (mowaffaq/mamba) @@ -53,8 +56,8 @@ - ID: 3511204 TinyEditor only loading in the 'Scoop' part of the News module (peekay/XavierS) - ID: 3511205 Bug in fresh install in page_configsave.php (XavierS) -Improved: - - replacing "msnbot" with "bingbot" in Protector (mamba) +Improved: + - replacing "msnbot" with "bingbot" in Protector (mamba) Updated: - HTML Purifier to 4.4.0 (mamba) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/databasefactory.php 2013-02-04 19:37:48 UTC (rev 10981) @@ -43,7 +43,7 @@ * @staticvar object The only instance of database class * @return object Reference to the only instance of database class */ - function &getDatabaseConnection() + static function &getDatabaseConnection() { static $instance; if (!isset($instance)) { Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsform/grouppermform.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsform/grouppermform.php 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsform/grouppermform.php 2013-02-04 19:37:48 UTC (rev 10981) @@ -72,6 +72,7 @@ $this->_permName = $permname; $this->_permDesc = $permdesc; $this->addElement(new XoopsFormHidden('modid', $this->_modid)); + $this->addElement(new XoopsFormHiddenToken($permname)); if ($url != "") { $this->addElement(new XoopsFormHidden('redirect_url', $url)); } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php 2013-02-04 19:37:48 UTC (rev 10981) @@ -33,7 +33,7 @@ */ class XoopsLists { - function getTimeZoneList() + static function getTimeZoneList() { xoops_loadLanguage('timezone'); @@ -75,7 +75,7 @@ /** * gets list of themes folder from themes directory */ - function getThemesList() + static function getThemesList() { return XoopsLists::getDirListAsArray(XOOPS_THEME_PATH . '/'); } @@ -83,7 +83,7 @@ /** * gets a list of module folders from the modules directory */ - function getModulesList() + static function getModulesList() { return XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/'); } @@ -91,7 +91,7 @@ /** * gets list of editors folder from xoopseditor directory */ - function getEditorList() + static function getEditorList() { return XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor/'); } @@ -99,7 +99,7 @@ /** * gets list of name of directories inside a directory */ - function getDirListAsArray($dirname) + static function getDirListAsArray($dirname) { $ignored = array( 'cvs' , @@ -149,7 +149,7 @@ /** * gets list of image file names in a directory */ - function getImgListAsArray($dirname, $prefix = '') + static function getImgListAsArray($dirname, $prefix = '') { $filelist = array(); if ($handle = opendir($dirname)) { @@ -169,7 +169,7 @@ /** * gets list of html file names in a certain directory */ - function getHtmlListAsArray($dirname, $prefix = '') + static function getHtmlListAsArray($dirname, $prefix = '') { $filelist = array(); if ($handle = opendir($dirname)) { @@ -190,7 +190,7 @@ * gets list of avatar file names in a certain directory * if directory is not specified, default directory will be searched */ - function getAvatarsList($avatar_dir = '') + static function getAvatarsList($avatar_dir = '') { $avatars = array(); if ($avatar_dir != '') { @@ -204,7 +204,7 @@ /** * gets list of all avatar image files inside default avatars directory */ - function getAllAvatarsList() + static function getAllAvatarsList() { $avatars = array(); $dirlist = array(); @@ -223,7 +223,7 @@ * gets list of subject icon image file names in a certain directory * if directory is not specified, default directory will be searched */ - function getSubjectsList($sub_dir = '') + static function getSubjectsList($sub_dir = '') { $subjects = array(); if ($sub_dir != '') { @@ -237,7 +237,7 @@ /** * gets list of language folders inside default language directory */ - function getLangList() + static function getLangList() { $lang_list = array(); $lang_list = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/language/'); @@ -247,9 +247,9 @@ /** * XoopsLists::getCountryList() * - * @return + * @return array */ - function getCountryList() + static function getCountryList() { xoops_loadLanguage('countries'); $country_list = array ( @@ -518,9 +518,9 @@ * * This Function is no longer being used by the core * - * @return + * @return array */ - function getHtmlList() + static function getHtmlList() { $html_list = array( 'a' => '<a>', @@ -589,9 +589,9 @@ /** * XoopsLists::getUserRankList() * - * @return + * @return array */ - function getUserRankList() + static function getUserRankList() { $db =& XoopsDatabaseFactory::getDatabaseConnection(); $myts =& MyTextSanitizer::getInstance(); Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/groupperm.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/groupperm.php 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/groupperm.php 2013-02-04 19:37:48 UTC (rev 10981) @@ -20,10 +20,11 @@ $member_handler =& xoops_gethandler('member'); $group_list = $member_handler->getGroupList(); + if (is_array($_POST['perms']) && !empty($_POST['perms'])) { $gperm_handler = xoops_gethandler('groupperm'); foreach ($_POST['perms'] as $perm_name => $perm_data) { - if (false != $gperm_handler->deleteByModule($modid, $perm_name)) { + if ($GLOBALS['xoopsSecurity']->check(true, false, $perm_name) && false != $gperm_handler->deleteByModule($modid, $perm_name)) { foreach ($perm_data['groups'] as $group_id => $item_ids) { foreach ($item_ids as $item_id => $selected) { if ($selected == 1) { Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php 2013-02-04 19:37:48 UTC (rev 10981) @@ -45,7 +45,7 @@ $op = system_CleanVars ( $_REQUEST, 'op', 'list', 'string' ); $module = system_CleanVars ( $_REQUEST, 'module', '', 'string' ); -if (in_array($op, array('submit', 'install_ok', 'update_ok', 'uninstall_ok'))) { +if (in_array($op, array('confirm', 'submit', 'install_ok', 'update_ok', 'uninstall_ok'))) { if (!$GLOBALS['xoopsSecurity']->check()) { $op = 'list'; } @@ -233,6 +233,7 @@ $modifs_mods = array(); $module = empty($_POST['module']) ? array() : $_POST['module']; foreach ($module as $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]))); Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_modules.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_modules.html 2013-02-04 14:59:21 UTC (rev 10980) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/templates/admin/system_modules.html 2013-02-04 19:37:48 UTC (rev 10981) @@ -187,6 +187,7 @@ </tr> </tfoot> </table> + <{php}>echo $GLOBALS['xoopsSecurity']->getTokenHTML();<{/php}> </form> <{/if}> |
From: <tr...@us...> - 2013-02-04 19:59:26
|
Revision: 10982 http://sourceforge.net/p/xoops/svn/10982 Author: trabis Date: 2013-02-04 19:59:15 +0000 (Mon, 04 Feb 2013) Log Message: ----------- Fixing blocks preview security issue Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/blocksadmin/main.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-04 19:37:48 UTC (rev 10981) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-04 19:59:15 UTC (rev 10982) @@ -10,7 +10,8 @@ - number of users when "all groups" selected was wrong (tatane/mamba) Security fixes - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) - - XSS/CSRF vulnerability in system/admin.php (Dingjie Yang,Qualys/trabis) + - XSS/CSRF vulnerability in system/modulesadmin/main.php (Dingjie Yang,Qualys/trabis) + - XSS/CSRF vulnerability in system/admin/blocksadmin/main.php (Marcin,Ariko-Security Team/trabis) =============================== 2013/01/22: Version 2.5.6 Beta Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/blocksadmin/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/blocksadmin/main.php 2013-02-04 19:37:48 UTC (rev 10981) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/blocksadmin/main.php 2013-02-04 19:59:15 UTC (rev 10982) @@ -250,6 +250,10 @@ break; case 'preview': + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('admin.php?fct=blocksadmin', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + exit(); + } // Initialize blocks handler $block_handler =& xoops_getmodulehandler('block'); $block =& $block_handler->create(); |
From: <tr...@us...> - 2013-02-04 20:20:18
|
Revision: 10983 http://sourceforge.net/p/xoops/svn/10983 Author: trabis Date: 2013-02-04 20:20:15 +0000 (Mon, 04 Feb 2013) Log Message: ----------- Fixing LFI vulnerability issue Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-04 19:59:15 UTC (rev 10982) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-04 20:20:15 UTC (rev 10983) @@ -12,7 +12,9 @@ - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) - XSS/CSRF vulnerability in system/modulesadmin/main.php (Dingjie Yang,Qualys/trabis) - XSS/CSRF vulnerability in system/admin/blocksadmin/main.php (Marcin,Ariko-Security Team/trabis) + - LFI vulnerability in system/admin/tplsets/jquery.php (Marcin,Ariko-Security Team/trabis) + =============================== 2013/01/22: Version 2.5.6 Beta =============================== Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php 2013-02-04 19:59:15 UTC (rev 10982) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php 2013-02-04 20:20:15 UTC (rev 10983) @@ -86,7 +86,7 @@ break; // Edit File case 'tpls_edit_file': - $path_file = XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file']); + $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file'])); //Button restore if(file_exists($path_file.'.back')){ |
From: <be...@us...> - 2013-02-05 04:05:48
|
Revision: 10986 http://sourceforge.net/p/xoops/svn/10986 Author: beckmi Date: 2013-02-05 04:05:43 +0000 (Tue, 05 Feb 2013) Log Message: ----------- Updating version number Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-05 03:53:54 UTC (rev 10985) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-05 04:05:43 UTC (rev 10986) @@ -1,7 +1,7 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== -2013/01/xx: Version 2.5.6 RC1 +2013/02/04: Version 2.5.6 RC1 =============================== Bugfixes: - Array to string conversion (geekwright/mamba) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php 2013-02-05 03:53:54 UTC (rev 10985) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/version.php 2013-02-05 04:05:43 UTC (rev 10986) @@ -30,6 +30,6 @@ /** * Define XOOPS version */ -define('XOOPS_VERSION', 'XOOPS 2.5.6 Beta'); +define('XOOPS_VERSION', 'XOOPS 2.5.6-RC1'); ?> \ No newline at end of file |
From: <be...@us...> - 2013-02-06 08:37:12
|
Revision: 10997 http://sourceforge.net/p/xoops/svn/10997 Author: beckmi Date: 2013-02-06 08:37:08 +0000 (Wed, 06 Feb 2013) Log Message: ----------- fix for potential lack of rendering css and javascript in Installer on the last screen (culex) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/install_tpl.php XoopsCore/branches/2.5.x/2.5.6/htdocs/install/page_end.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-06 06:13:16 UTC (rev 10996) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-06 08:37:08 UTC (rev 10997) @@ -8,6 +8,8 @@ - issues with missing xoopscomments table (geekwright/sabahan/Mamba) - bug with using reference for non-variables (geekwright/mamba) - number of users when "all groups" selected was wrong (tatane/mamba) + - fix for potential lack of rendering css and javascript in Installer on the last screen (culex) + Security fixes - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) - XSS/CSRF vulnerability in system/modulesadmin/main.php (Dingjie Yang,Qualys/trabis) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/install_tpl.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/install_tpl.php 2013-02-06 06:13:16 UTC (rev 10996) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/install/include/install_tpl.php 2013-02-06 08:37:08 UTC (rev 10997) @@ -28,7 +28,6 @@ **/ defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die'); - include_once '../language/' . $wizard->language . '/global.php'; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -153,4 +152,49 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> +<script type="text/javascript"> + /** + * Checking url in browser + * if page is install/page_end.php + * use folder rename variables from + * page_end.php to fetch js and css + **/ + var pathArray = window.location.pathname.split( '/' ); + var filename = location.pathname.substring(location.pathname.lastIndexOf('/')+1); + var chkUrl = pathArray[2]+"/"+filename; + if (chkUrl === 'install/page_end.php'){ + //window.location = newinstallurl; + loadjscssfile(newPro, 'js'); + loadjscssfile(newINST, 'js'); + loadjscssfile(newCSS, 'css'); + } else { + // Do nothing + } + +/** + * Load js and css files to header + * + * @param filename Filename based on var using $installer_modified if folder is renamed + * + * @param filetype js=javascript css=cascading style sheat + * + * @return boolean always true + */ +function loadjscssfile(filename, filetype) { + if (filetype == "js") { //if filename is a external JavaScript file + // alert('called'); + var fileref = document.createElement('script'); + fileref.setAttribute("type", "text/javascript"); + fileref.setAttribute("src", filename); + } + else if (filetype == "css") { //if filename is an external CSS file + var fileref = document.createElement("link"); + fileref.setAttribute("rel", "stylesheet"); + fileref.setAttribute("type", "text/css"); + fileref.setAttribute("href", filename); + } + if (typeof fileref != "undefined") + document.getElementsByTagName("head")[0].appendChild(fileref); + } +</script> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/install/page_end.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/install/page_end.php 2013-02-06 06:13:16 UTC (rev 10996) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/install/page_end.php 2013-02-06 08:37:08 UTC (rev 10997) @@ -34,10 +34,33 @@ $installer_modified = "install_remove_" . uniqid(mt_rand()); register_shutdown_function('install_finalize', $installer_modified); +/** + * Placing folder renamed in $_SESSION + * and echoing to document for use in install_tpl.php + **/ + +$_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'; +} else { + $_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css'; + $_SESSION['newinstallCSS'] = ''; +} + +$js = '<script type="text/javascript">'; +$js .= 'var newPro = '.json_encode($_SESSION["newinstallPRO"]).';'; +$js .= 'var newINST = '.json_encode($_SESSION["newinstallINST"]).';'; +$js .= 'var newCSS = '.json_encode($_SESSION["newinstallCSS"]).';'; +$js .= 'var newCSS = '.json_encode($_SESSION["newinstallCSSDeflt"]).';'; +$js .= '</script>'; +echo $js; + $pageHasForm = false; $content = ""; include "./language/{$wizard->language}/finish.php"; include './include/install_tpl.php'; -?> \ No newline at end of file +?> \ No newline at end of file |
From: <be...@us...> - 2013-02-06 09:01:02
|
Revision: 10998 http://sourceforge.net/p/xoops/svn/10998 Author: beckmi Date: 2013-02-06 09:00:59 +0000 (Wed, 06 Feb 2013) Log Message: ----------- fix for missing Protector logo under PHP 5.4 (function had to be static) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-06 08:37:08 UTC (rev 10997) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-02-06 09:00:59 UTC (rev 10998) @@ -9,6 +9,7 @@ - bug with using reference for non-variables (geekwright/mamba) - number of users when "all groups" selected was wrong (tatane/mamba) - fix for potential lack of rendering css and javascript in Installer on the last screen (culex) + - fix for missing Protector logo under PHP 5.4 (mamba) Security fixes - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php 2013-02-06 08:37:08 UTC (rev 10997) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php 2013-02-06 09:00:59 UTC (rev 10998) @@ -252,7 +252,7 @@ } -function get_filepath4bwlimit() +static function get_filepath4bwlimit() { return XOOPS_TRUST_PATH . '/modules/protector/configs/bwlimit' . substr( md5( XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX ) , 0 , 6 ) ; } @@ -309,7 +309,7 @@ } -function get_filepath4badips() +static function get_filepath4badips() { return XOOPS_TRUST_PATH . '/modules/protector/configs/badips' . substr( md5( XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX ) , 0 , 6 ) ; } @@ -329,7 +329,7 @@ } -function get_filepath4group1ips() +static function get_filepath4group1ips() { return XOOPS_TRUST_PATH . '/modules/protector/configs/group1ips' . substr( md5( XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX ) , 0 , 6 ) ; } Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php 2013-02-06 08:37:08 UTC (rev 10997) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/registry.php 2013-02-06 09:00:59 UTC (rev 10998) @@ -18,7 +18,7 @@ $this->_locks = array(); } - function &getInstance() + static function &getInstance() { static $instance = false; if (!$instance) { |
From: <be...@us...> - 2013-03-08 06:41:34
|
Revision: 11183 http://sourceforge.net/p/xoops/svn/11183 Author: beckmi Date: 2013-03-08 06:41:32 +0000 (Fri, 08 Mar 2013) Log Message: ----------- replacing ereg with preg_match in userutility.php (pmartina/paul) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/userutility.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-03-08 05:28:10 UTC (rev 11182) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-03-08 06:41:32 UTC (rev 11183) @@ -10,6 +10,7 @@ - number of users when "all groups" selected was wrong (tatane/mamba) - fix for potential lack of rendering css and javascript in Installer on the last screen (culex) - fix for missing Protector logo under PHP 5.4 (mamba) + - replacing ereg with preg_match in userutility.php (pmartina/paul) Security fixes - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/userutility.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/userutility.php 2013-03-08 05:28:10 UTC (rev 11182) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/userutility.php 2013-03-08 06:41:32 UTC (rev 11183) @@ -239,7 +239,7 @@ if (!empty($_SERVER['HTTP_COMING_FROM'])) { $proxy_ip = $_SERVER['HTTP_COMING_FROM']; } - if (!empty($proxy_ip) && $is_ip = ereg('^([0-9]{1,3}\.){3,3}[0-9]{1,3}', $proxy_ip, $regs) && count($regs) > 0) { + if (!empty($proxy_ip) && $is_ip = preg_match('/^([0-9]{1,3}.){3,3}[0-9]{1,3}/', $proxy_ip, $regs) && count($regs) > 0) { $the_IP = $regs[0]; } else { $the_IP = $_SERVER['REMOTE_ADDR']; |
From: <be...@us...> - 2013-03-25 12:30:55
|
Revision: 11303 http://sourceforge.net/p/xoops/svn/11303 Author: beckmi Date: 2013-03-25 12:30:49 +0000 (Mon, 25 Mar 2013) Log Message: ----------- fix for https://sourceforge.net/p/xoops/bugs/1219/ (alain091) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php XoopsCore/branches/2.5.x/2.5.6/htdocs/include/formdhtmltextarea_preview.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-03-25 06:29:33 UTC (rev 11302) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-03-25 12:30:49 UTC (rev 11303) @@ -1,7 +1,7 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== -2013/02/04: Version 2.5.6 RC1 +2013/03/25: Version 2.5.6 RC1 =============================== Bugfixes: - Array to string conversion (geekwright/mamba) @@ -11,6 +11,7 @@ - fix for potential lack of rendering css and javascript in Installer on the last screen (culex) - fix for missing Protector logo under PHP 5.4 (mamba) - replacing ereg with preg_match in userutility.php (pmartina/paul) + - #1219 dhtmltextarea editor accent not displayed (cesag/alain091) Security fixes - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2013-03-25 06:29:33 UTC (rev 11302) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/module.textsanitizer.php 2013-03-25 12:30:49 UTC (rev 11303) @@ -513,9 +513,11 @@ */ function &displayTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1) { + $charset = (defined('_CHARSET') ? _CHARSET : 'UTF-8'); + $text = mb_convert_encoding($text, $charset, mb_detect_encoding($text,$charset.', ISO-8859-1', true)); if ($html != 1) { // html not allowed - $text = $this->htmlSpecialChars($text); + $text = $this->htmlSpecialChars($text,ENT_COMPAT,$charset); } $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18) if ($smiley != 0) { Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/include/formdhtmltextarea_preview.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/include/formdhtmltextarea_preview.php 2013-03-25 06:29:33 UTC (rev 11302) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/include/formdhtmltextarea_preview.php 2013-03-25 12:30:49 UTC (rev 11303) @@ -38,7 +38,8 @@ } if (! headers_sent()) { - header('Content-Type:text/html; charset=ISO-8859-1'); + $charset = (defined('_CHARSET') ? _CHARSET : 'UTF-8'); + header('Content-Type:text/html; charset='.$charset); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Cache-Control: private, no-cache'); header('Pragma: no-cache'); |
From: <be...@us...> - 2013-03-26 05:36:34
|
Revision: 11309 http://sourceforge.net/p/xoops/svn/11309 Author: beckmi Date: 2013-03-26 05:36:31 +0000 (Tue, 26 Mar 2013) Log Message: ----------- added missing call for user language in /profile/index.php (xoobaru/zyspec) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/index.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-03-25 15:06:50 UTC (rev 11308) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-03-26 05:36:31 UTC (rev 11309) @@ -12,6 +12,7 @@ - fix for missing Protector logo under PHP 5.4 (mamba) - replacing ereg with preg_match in userutility.php (pmartina/paul) - #1219 dhtmltextarea editor accent not displayed (cesag/alain091) + - added missing call for user language in /profile/index.php (xoobaru/zyspec) Security fixes - XSS/CSRF vulnerability in system/admin/groupperm.php (Dingjie Yang,Qualys/trabis) Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/index.php 2013-03-25 15:06:50 UTC (rev 11308) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/index.php 2013-03-26 05:36:31 UTC (rev 11309) @@ -38,6 +38,7 @@ if (isset($_GET['xoops_redirect'])) { $GLOBALS['xoopsTpl']->assign('redirect_page', htmlspecialchars(trim($_GET['xoops_redirect']), ENT_QUOTES)); } + xoops_loadLanguage('user'); if ($GLOBALS['xoopsConfig']['usercookie']) { $GLOBALS['xoopsTpl']->assign('lang_rememberme', _US_REMEMBERME); } |
From: <be...@us...> - 2013-04-21 07:27:21
|
Revision: 11419 http://sourceforge.net/p/xoops/svn/11419 Author: beckmi Date: 2013-04-21 07:27:16 +0000 (Sun, 21 Apr 2013) Log Message: ----------- Preparing for XOOPS 2.5.6 Final release Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/README.txt XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/release_notes.txt Modified: XoopsCore/branches/2.5.x/2.5.6/docs/README.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/README.txt 2013-04-21 06:30:32 UTC (rev 11418) +++ XoopsCore/branches/2.5.x/2.5.6/docs/README.txt 2013-04-21 07:27:16 UTC (rev 11419) @@ -1,14 +1,11 @@ -XOOPS 2.5.5 Final +XOOPS 2.5.6 Final -The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.5 Final. Several bugs have been fixed as well as security enhancement based on report from High-Tech Bridge Security Research Lab. +The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.6 Final. This version has been made compatible with PHP 5.4, in addition to security security enhancement. +New is also Fast Comment Hack contributed by Voltan. (see changelog for more info). -This 2.5 series builds on the XOOPS 2.4.x series with objectives of usability improvements instead of architecture or API changes. -The system module is updated with a major redesign with jQuery based AJAX, done mainly by ForMusS, kraven_30, Mage with contributions from trabis, voltan, Kris_fr, onokazu etc. -Besides usability, some proof-of-concept experiments have also been proven for module and theme development. Unavoidably there are bugs and incompatibility introduced. +Download XOOPS 2.5.6 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.6/]Sourceforge repository[/url]. -Download XOOPS 2.5.5 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.5/]Sourceforge repository[/url]. - How to contribute ----------------------------------- Bug report: http://sourceforge.net/tracker/?group_id=41586&atid=430840 @@ -17,4 +14,4 @@ Release announcement: https://lists.sourceforge.net/lists/listinfo/xoops-announcement XOOPS Development Team -April 15th, 2012 \ No newline at end of file +April 21, 2013 \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-04-21 06:30:32 UTC (rev 11418) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-04-21 07:27:16 UTC (rev 11419) @@ -1,6 +1,13 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== +2013/04/21: Version 2.5.6 Final +=============================== +Bugfixes: +- updated English translations (Cesag,Mamba) +- extra check for $noHtml in XoopsEditorHandler->get (luciorota) + +=============================== 2013/03/25: Version 2.5.6 RC1 =============================== Bugfixes: @@ -20,7 +27,6 @@ - XSS/CSRF vulnerability in system/admin/blocksadmin/main.php (Marcin,Ariko-Security Team/trabis) - LFI vulnerability in system/admin/tplsets/jquery.php (Marcin,Ariko-Security Team/trabis) - =============================== 2013/01/22: Version 2.5.6 Beta =============================== @@ -37,7 +43,8 @@ - jQuery to 1.8.3 (mamba) - jQueryUI to version 1.10 (mamba) -Added: Fast Comment Hack (Voltan) +Added: +- Fast Comment Hack (Voltan) =============================== 2012/04/15: Version 2.5.5 Final Modified: XoopsCore/branches/2.5.x/2.5.6/release_notes.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/release_notes.txt 2013-04-21 06:30:32 UTC (rev 11418) +++ XoopsCore/branches/2.5.x/2.5.6/release_notes.txt 2013-04-21 07:27:16 UTC (rev 11419) @@ -1,122 +1,122 @@ -XOOPS 2.5.6 Beta - -The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.6 Beta. - -This release is focused on fixing open bugs, and on updating our libraries to the latest versions: - -See the Changelog for more details. - -System requirements ------------------------------------ - -PHP: -Any PHP version >= 5.2 (PHP 5.3+ is strongly recommended) - -MySQL: -MySQL server 5.0+ - -Web server: -Any server supporting the required PHP version (Apache highly recommended) - - -Downloading XOOPS ------------------------------------ - -You can get this release package from the [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS_2.5.5/]Sourceforge repository[/url]. -There are .zip, .7z, and .gz archives provided. - - -Installing XOOPS (new installation) ------------------------------------ - - 1. Copy the content of the htdocs/ folder where it can be accessed by your server - 2. Ensure that directories: - - uploads/, - - uploads/avatars/ - - uploads/images/ - - uploads/ranks/ - - uploads/smilies/ - - xoops_lib/modules/protector/configs/ - and files: - - mainfile.php and - - include/license.php - are writable by the web server - 3. For security considerations, you are encouraged to move directories "/xoops_lib" (for XOOPS libraries) and "/xoops_data" (for XOOPS data) out of Document Root, and change the folder names. - 4. Make the directory xoops_data/ writable; Create (if not already present) and make the directories xoops_data/caches/, xoops_data/caches/xoops_cache/, xoops_data/caches/smarty_cache/ and xoops_data/caches/smarty_compile/ writable. - 5. Access the folder where you installed the htdocs/ files using your web browser to launch the installation wizard - - -Installing Protector in XOOPS ------------------------------------ -We also highly recommend the installation of the PROTECTOR module which will bring additional security protection and logging capabilities to your site. - - -Upgrading from a previous version ------------------------------------ - -Upgrading from 2.5.x: ------------------------------------ - 1. Get the right update package from the sourceforge file repository - 2. Overwrite files in XOOPS directory on your server with the content of /htdocs - * make sure that you copy the content of /xoops_lib to whatever directory you keep it on the server now (it should be your current XOOPS_TRUST_PATH directory), then delete the /xoops_lib directory. There can NOT be two directories with the content of /xoops_lib - 3. Update the "System" module from the modules administration interface, as well as "Profile", "PM", and "Protector", as they have new GUI. - 4) Clear caches, using the Admin's Maintenance function - -Upgrading from versions older than 2.5.0: ------------------------------------------- - Following are instructions for upgrading from XOOPS 2.4.5 to 2.5 provided by John Healy: - 0. Verify the system requirements, in particular the version of PHP. Backup your XOOPS database and site directory. (There are several ways to do these actions, which are discussed elsewhere.) Turning your site off is optional. - Change the permissions on mainfile.php and /include/license.php to be writable, for example: - File Normal For upgrade - mainfile.php 400 700 - /include/license.php 444 777 - Get the correct update package from the SourceForge file repository. - 1. In the upgrade package folder, move the "upgrade" folder inside the "htdocs" folder, if it's not already there. Remove the install folder from the "htdocs" folder, if it's there. Remove the mainfile.php file from the "htdocs" folder, if it's there. - If you've moved the xoops_data and xoops_lib folders outside your site's root directory, move these folders out of the "htdocs" folder in the upgrade package folder. - 2. Delete the /modules/system directory on your current XOOPS site (to get rid of any old unnecessary files). - 3. Overwrite the files in the XOOPS directory on your current XOOPS site with the content of "htdocs" folder of the upgrade package. (There are several ways to do this action, which are discussed elsewhere.) - As noted above, if relocated, overwrite the files in your current xoops_data and xoops_lib with the content of those in the upgrade package. - 4. If you have Protector previously installed, open the "mainfile.php" file , and remove the Pre-check and Post-check lines (if they exist): - include XOOPS_TRUST_PATH.'/modules/protector/include/precheck.inc.php' ; - include XOOPS_TRUST_PATH.'/modules/protector/include/postcheck.inc.php' ; - 5. At your site's address (URL), login as administrator. Access <your.site.url>/upgrade/ with a browser, and follow the instructions (and any for updating your XOOPS database). After all updates have been applied (green checkmarks), note the link in the Updater to update the "system" module, and do so. - 6. Delete the "upgrade" folder from your site's "htdocs" directory. - 7. Update (reload) other modules, especially "Profile", "PM", and "Protector," if necessary. - 8. Change permissions on the files noted above back to their normal state. - 9. Turn your site back on, if you turned it off earlier. - - -Debug information display level ------------------------------------ - -Debug information display level is enabled at a different level of users: to all users, to members or to admins only. -The configuration can be set in /xoops_data/configs/xoopsconfig.php -As a default, the display level is set for Admin only. - -Files integrity check ------------------------------------ - -The full XOOPS package is released with a script able to check if all the system files have been correctly uploaded to the server. To use it, follow these instructions: - - 1. Upload the checksum.php and checksum.md5 files located in the XOOPS package root to your XOOPS server folder (putting them next to mainfile.php). - 2. Execute checksum.php with your browser - 3. If necessary, re-upload the missing or corrupted system files - 4. Remove checksum.php and checksum.md5 from your server - - -Modules ------------------------------------ - -This release contains only the "system-related modules". You are invited to browse the XOOPS modules repository to if you need additional functionality. Note: as a new repository is being built, the current repository is not up-to-date, PLEASE VISIT INDIVIDUAL DEVELOPERS' WEBSITES TO MAKE SURE YOU ARE USING LATEST VERSION OF MODULES. - - -How to contribute ------------------------------------ -Bug report: http://sourceforge.net/tracker/?group_id=41586&atid=430840 -Patch and enhancement: http://sourceforge.net/tracker/?group_id=41586&atid=430842 -Feature design: http://sourceforge.net/tracker/?group_id=41586&atid=430843 -Release announcement: https://lists.sourceforge.net/lists/listinfo/xoops-announcement - - -XOOPS Development Team -January 22nd, 2013 \ No newline at end of file +XOOPS 2.5.6 Final + +The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.6 Final. + +This release is focused on making XOOPS 2.5.6 compatible with PHP 5.4.x, and on security enhancements + +See the Changelog for more details. + +System requirements +----------------------------------- + +PHP: +Any PHP version >= 5.2 (PHP 5.3+ is strongly recommended) + +MySQL: +MySQL server 5.0+ + +Web server: +Any server supporting the required PHP version (Apache highly recommended) + + +Downloading XOOPS +----------------------------------- + +You can get this release package from the [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS_2.5.6/]Sourceforge repository[/url]. +There are .zip, .7z, and .gz archives provided. + + +Installing XOOPS (new installation) +----------------------------------- + + 1. Copy the content of the htdocs/ folder where it can be accessed by your server + 2. Ensure that directories: + - uploads/, + - uploads/avatars/ + - uploads/images/ + - uploads/ranks/ + - uploads/smilies/ + - xoops_lib/modules/protector/configs/ + and files: + - mainfile.php and + - include/license.php + are writable by the web server + 3. For security considerations, you are encouraged to move directories "/xoops_lib" (for XOOPS libraries) and "/xoops_data" (for XOOPS data) out of Document Root, and change the folder names. + 4. Make the directory xoops_data/ writable; Create (if not already present) and make the directories xoops_data/caches/, xoops_data/caches/xoops_cache/, xoops_data/caches/smarty_cache/ and xoops_data/caches/smarty_compile/ writable. + 5. Access the folder where you installed the htdocs/ files using your web browser to launch the installation wizard + + +Installing Protector in XOOPS +----------------------------------- +We also highly recommend the installation of the PROTECTOR module which will bring additional security protection and logging capabilities to your site. + + +Upgrading from a previous version +----------------------------------- + +Upgrading from 2.5.x: +----------------------------------- + 1. Get the right update package from the sourceforge file repository + 2. Overwrite files in XOOPS directory on your server with the content of /htdocs + * make sure that you copy the content of /xoops_lib to whatever directory you keep it on the server now (it should be your current XOOPS_TRUST_PATH directory), then delete the /xoops_lib directory. There can NOT be two directories with the content of /xoops_lib + 3. Update the "System" module from the modules administration interface, as well as "Profile", "PM", and "Protector", as they have new GUI. + 4) Clear caches, using the Admin's Maintenance function + +Upgrading from versions older than 2.5.0: +------------------------------------------ + Following are instructions for upgrading from XOOPS 2.4.5 to 2.5 provided by John Healy: + 0. Verify the system requirements, in particular the version of PHP. Backup your XOOPS database and site directory. (There are several ways to do these actions, which are discussed elsewhere.) Turning your site off is optional. + Change the permissions on mainfile.php and /include/license.php to be writable, for example: + File Normal For upgrade + mainfile.php 400 700 + /include/license.php 444 777 + Get the correct update package from the SourceForge file repository. + 1. In the upgrade package folder, move the "upgrade" folder inside the "htdocs" folder, if it's not already there. Remove the install folder from the "htdocs" folder, if it's there. Remove the mainfile.php file from the "htdocs" folder, if it's there. + If you've moved the xoops_data and xoops_lib folders outside your site's root directory, move these folders out of the "htdocs" folder in the upgrade package folder. + 2. Delete the /modules/system directory on your current XOOPS site (to get rid of any old unnecessary files). + 3. Overwrite the files in the XOOPS directory on your current XOOPS site with the content of "htdocs" folder of the upgrade package. (There are several ways to do this action, which are discussed elsewhere.) + As noted above, if relocated, overwrite the files in your current xoops_data and xoops_lib with the content of those in the upgrade package. + 4. If you have Protector previously installed, open the "mainfile.php" file , and remove the Pre-check and Post-check lines shown below (if they exist): + include XOOPS_TRUST_PATH.'/modules/protector/include/precheck.inc.php' ; + include XOOPS_TRUST_PATH.'/modules/protector/include/postcheck.inc.php' ; + 5. At your site's address (URL), login as administrator. Access <your.site.url>/upgrade/ with a browser, and follow the instructions (and any for updating your XOOPS database). After all updates have been applied (green checkmarks), note the link in the Updater to update the "system" module, and do so. + 6. Delete the "upgrade" folder from your site's "htdocs" directory. + 7. Update (reload) other modules, especially "Profile", "PM", and "Protector," if necessary. + 8. Change permissions on the files noted above back to their normal state. + 9. Turn your site back on, if you turned it off earlier. + + +Debug information display level +----------------------------------- + +Debug information display level is enabled at a different level of users: to all users, to members or to admins only. +The configuration can be set in /xoops_data/configs/xoopsconfig.php +As a default, the display level is set for Admin only. + +Files integrity check +----------------------------------- + +The full XOOPS package is released with a script able to check if all the system files have been correctly uploaded to the server. To use it, follow these instructions: + + 1. Upload the checksum.php and checksum.md5 files located in the XOOPS package root to your XOOPS server folder (putting them next to mainfile.php). + 2. Execute checksum.php with your browser + 3. If necessary, re-upload the missing or corrupted system files + 4. Remove checksum.php and checksum.md5 from your server + + +Modules +----------------------------------- + +This release contains only the "system-related modules". You are invited to browse the XOOPS modules repository to if you need additional functionality. Note: as a new repository is being built, the current repository is not up-to-date, PLEASE VISIT INDIVIDUAL DEVELOPERS' WEBSITES TO MAKE SURE YOU ARE USING LATEST VERSION OF MODULES. + + +How to contribute +----------------------------------- +Bug report: http://sourceforge.net/tracker/?group_id=41586&atid=430840 +Patch and enhancement: http://sourceforge.net/tracker/?group_id=41586&atid=430842 +Feature design: http://sourceforge.net/tracker/?group_id=41586&atid=430843 +Release announcement: https://lists.sourceforge.net/lists/listinfo/xoops-announcement + + +XOOPS Development Team +April 21, 2013 \ No newline at end of file |
From: <be...@us...> - 2013-04-26 21:00:43
|
Revision: 11460 http://sourceforge.net/p/xoops/svn/11460 Author: beckmi Date: 2013-04-26 21:00:39 +0000 (Fri, 26 Apr 2013) Log Message: ----------- - fixing $GLOBAL in jquery.php (Zyspec) - improving protection against spam by turning off registration's 1st step saving (timgno) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/include/install.php XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-04-26 19:25:57 UTC (rev 11459) +++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt 2013-04-26 21:00:39 UTC (rev 11460) @@ -6,6 +6,8 @@ Bugfixes: - updated English translations (Cesag,Mamba) - extra check for $noHtml in XoopsEditorHandler->get (luciorota) +- fixing $GLOBAL in jquery.php (Zyspec) +- improving protection against spam by turning off registration's 1st step saving (timgno) =============================== 2013/03/25: Version 2.5.6 RC1 Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/include/install.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/include/install.php 2013-04-26 19:25:57 UTC (rev 11459) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/profile/include/install.php 2013-04-26 21:00:39 UTC (rev 11460) @@ -25,7 +25,7 @@ xoops_loadLanguage('user'); // Create registration steps - profile_install_addStep(_PROFILE_MI_STEP_BASIC, '', 1, 1); + profile_install_addStep(_PROFILE_MI_STEP_BASIC, '', 1, 0); profile_install_addStep(_PROFILE_MI_STEP_COMPLEMENTARY, '', 2, 1); // Create categories Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php 2013-04-26 19:25:57 UTC (rev 11459) +++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/tplsets/jquery.php 2013-04-26 21:00:39 UTC (rev 11460) @@ -38,7 +38,7 @@ @$op = "default"; } -$GLOBAL['xoopsLogger']->usePopup = true; +$GLOBALS['xoopsLogger']->usePopup = true; switch ($op) { // Display tree folder |