From 04900d4154f6cf8c13d6e6ab65df49186a55b365 Mon Sep 17 00:00:00 2001 From: azett Date: Sun, 6 Sep 2020 11:12:22 +0200 Subject: [PATCH 01/46] Optional parameter bug fixed. Deprecated curly braces syntax fixed. Thanks for reporting both, Matthias :) --- fp-includes/core/core.theme.php | 5 +- fp-plugins/bbcode/inc/stringparser.class.php | 1066 ++++++++++-------- 2 files changed, 580 insertions(+), 491 deletions(-) diff --git a/fp-includes/core/core.theme.php b/fp-includes/core/core.theme.php index 0592811..a835e27 100644 --- a/fp-includes/core/core.theme.php +++ b/fp-includes/core/core.theme.php @@ -383,7 +383,10 @@ function theme_def_feed_comments_link($str, $feed, $id) { return BLOG_BASEURL . "?x=entry:$id;comments:1;feed:{$feed}"; } -function theme_comments_feed_link($feed = 'rss2', $id) { +function theme_comments_feed_link($feed, $id) { + if (empty($feed)) { + $feed = 'rss2'; + } return apply_filters('post_comments_feed_link', '', $feed, $id); } diff --git a/fp-plugins/bbcode/inc/stringparser.class.php b/fp-plugins/bbcode/inc/stringparser.class.php index 476b872..1f1fd98 100755 --- a/fp-plugins/bbcode/inc/stringparser.class.php +++ b/fp-plugins/bbcode/inc/stringparser.class.php @@ -5,56 +5,60 @@ * These classes provide the means to parse any kind of string into a tree-like * memory structure. It would e.g. be possible to create an HTML parser based * upon this class. - * + * * Version: 0.3.3 * * @author Christian Seiler * @copyright Christian Seiler 2004-2008 * @package stringparser - * - * The MIT License - * - * Copyright (c) 2004-2009 Christian Seiler - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * + * The MIT License + * + * Copyright (c) 2004-2009 Christian Seiler + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. */ /** * String parser mode: Search for the next character + * * @see StringParser::_parserMode */ -define ('STRINGPARSER_MODE_SEARCH', 1); +define('STRINGPARSER_MODE_SEARCH', 1); /** * String parser mode: Look at each character of the string + * * @see StringParser::_parserMode */ -define ('STRINGPARSER_MODE_LOOP', 2); +define('STRINGPARSER_MODE_LOOP', 2); /** * Filter type: Prefilter + * * @see StringParser::addFilter, StringParser::_prefilters */ -define ('STRINGPARSER_FILTER_PRE', 1); +define('STRINGPARSER_FILTER_PRE', 1); /** * Filter type: Postfilter + * * @see StringParser::addFilter, StringParser::_postfilters */ -define ('STRINGPARSER_FILTER_POST', 2); +define('STRINGPARSER_FILTER_POST', 2); /** * Generic string parser class @@ -64,6 +68,7 @@ define ('STRINGPARSER_FILTER_POST', 2); * @package stringparser */ class StringParser { + /** * String parser mode * @@ -84,42 +89,47 @@ class StringParser { * @see STRINGPARSER_MODE_SEARCH, STRINGPARSER_MODE_LOOP */ var $_parserMode = STRINGPARSER_MODE_SEARCH; - + /** * Raw text + * * @access protected * @var string */ var $_text = ''; - + /** * Parse stack + * * @access protected * @var array */ - var $_stack = array (); - + var $_stack = array(); + /** * Current position in raw text + * * @access protected * @var integer */ var $_cpos = -1; - + /** * Root node + * * @access protected * @var mixed */ var $_root = null; - + /** * Length of the text + * * @access protected * @var integer */ var $_length = -1; - + /** * Flag if this object is already parsing a text * @@ -130,7 +140,7 @@ class StringParser { * @var boolean */ var $_parsing = false; - + /** * Strict mode * @@ -140,14 +150,15 @@ class StringParser { * @var boolean */ var $strict = false; - + /** * Characters or strings to look for + * * @access protected * @var array */ - var $_charactersSearch = array (); - + var $_charactersSearch = array(); + /** * Characters currently allowed * @@ -164,36 +175,40 @@ class StringParser { * @access protected * @var array */ - var $_charactersAllowed = array (); - + var $_charactersAllowed = array(); + /** * Current parser status + * * @access protected * @var int */ var $_status = 0; - + /** * Prefilters + * * @access protected * @var array */ - var $_prefilters = array (); - + var $_prefilters = array(); + /** * Postfilters + * * @access protected * @var array */ - var $_postfilters = array (); - + var $_postfilters = array(); + /** * Recently reparsed? + * * @access protected * @var bool */ var $_recentlyReparsed = false; - + /** * Constructor * @@ -201,108 +216,112 @@ class StringParser { */ function __construct() { } - - function StringParser () { + + function StringParser() { } - + /** * Add a filter * * @access public - * @param int $type The type of the filter - * @param mixed $callback The callback to call + * @param int $type + * The type of the filter + * @param mixed $callback + * The callback to call * @return bool * @see STRINGPARSER_FILTER_PRE, STRINGPARSER_FILTER_POST */ - function addFilter ($type, $callback) { + function addFilter($type, $callback) { // make sure the function is callable - if (!is_callable ($callback)) { + if (!is_callable($callback)) { return false; } - + switch ($type) { case STRINGPARSER_FILTER_PRE: - $this->_prefilters[] = $callback; + $this->_prefilters [] = $callback; break; case STRINGPARSER_FILTER_POST: - $this->_postfilters[] = $callback; + $this->_postfilters [] = $callback; break; default: return false; } - + return true; } - + /** * Remove all filters * * @access public - * @param int $type The type of the filter or 0 for all + * @param int $type + * The type of the filter or 0 for all * @return bool * @see STRINGPARSER_FILTER_PRE, STRINGPARSER_FILTER_POST */ - function clearFilters ($type = 0) { + function clearFilters($type = 0) { switch ($type) { case 0: - $this->_prefilters = array (); - $this->_postfilters = array (); + $this->_prefilters = array(); + $this->_postfilters = array(); break; case STRINGPARSER_FILTER_PRE: - $this->_prefilters = array (); + $this->_prefilters = array(); break; case STRINGPARSER_FILTER_POST: - $this->_postfilters = array (); + $this->_postfilters = array(); break; default: return false; } return true; } - + /** * This function parses the text * * @access public - * @param string $text The text to parse + * @param string $text + * The text to parse * @return mixed Either the root object of the tree if no output method - * is defined, the tree reoutput to e.g. a string or false - * if an internal error occured, such as a parse error if - * in strict mode or the object is already parsing a text. + * is defined, the tree reoutput to e.g. a string or false + * if an internal error occured, such as a parse error if + * in strict mode or the object is already parsing a text. */ - function parse ($text) { + function parse($text) { if ($this->_parsing) { return false; } $this->_parsing = true; - $this->_text = $this->_applyPrefilters ($text); + $this->_text = $this->_applyPrefilters($text); $this->_output = null; - $this->_length = strlen ($this->_text); + $this->_length = strlen($this->_text); $this->_cpos = 0; - unset ($this->_stack); - $this->_stack = array (); - if (is_object ($this->_root)) { - StringParser_Node::destroyNode ($this->_root); + unset($this->_stack); + $this->_stack = array(); + if (is_object($this->_root)) { + StringParser_Node::destroyNode($this->_root); } - unset ($this->_root); - $this->_root = new StringParser_Node_Root (); - $this->_stack[0] = $this->_root; - - $this->_parserInit (); - + unset($this->_root); + $this->_root = new StringParser_Node_Root(); + $this->_stack [0] = $this->_root; + + $this->_parserInit(); + $finished = false; - + while (!$finished) { switch ($this->_parserMode) { case STRINGPARSER_MODE_SEARCH: - $res = $this->_searchLoop (); + $res = $this->_searchLoop(); if (!$res) { $this->_parsing = false; return false; } break; case STRINGPARSER_MODE_LOOP: - $res = $this->_loop (); + $res = $this->_loop(); if (!$res) { $this->_parsing = false; return false; @@ -312,14 +331,14 @@ class StringParser { $this->_parsing = false; return false; } - - $res = $this->_closeRemainingBlocks (); + + $res = $this->_closeRemainingBlocks(); if (!$res) { if ($this->strict) { $this->_parsing = false; return false; } else { - $res = $this->_reparseAfterCurrentBlock (); + $res = $this->_reparseAfterCurrentBlock(); if (!$res) { $this->_parsing = false; return false; @@ -329,104 +348,106 @@ class StringParser { } $finished = true; } - - $res = $this->_modifyTree (); - + + $res = $this->_modifyTree(); + if (!$res) { $this->_parsing = false; return false; } - - $res = $this->_outputTree (); - + + $res = $this->_outputTree(); + if (!$res) { $this->_parsing = false; return false; } - - if (is_null ($this->_output)) { + + if (is_null($this->_output)) { $root = $this->_root; - unset ($this->_root); + unset($this->_root); $this->_root = null; - while (count ($this->_stack)) { - unset ($this->_stack[count($this->_stack)-1]); + while (count($this->_stack)) { + unset($this->_stack [count($this->_stack) - 1]); } - $this->_stack = array (); + $this->_stack = array(); $this->_parsing = false; return $root; } - - $res = StringParser_Node::destroyNode ($this->_root); + + $res = StringParser_Node::destroyNode($this->_root); if (!$res) { $this->_parsing = false; return false; } - unset ($this->_root); + unset($this->_root); $this->_root = null; - while (count ($this->_stack)) { - unset ($this->_stack[count($this->_stack)-1]); + while (count($this->_stack)) { + unset($this->_stack [count($this->_stack) - 1]); } - $this->_stack = array (); - + $this->_stack = array(); + $this->_parsing = false; return $this->_output; } - + /** * Apply prefilters * * It is possible to specify prefilters for the parser to do some * manipulating of the string beforehand. */ - function _applyPrefilters ($text) { + function _applyPrefilters($text) { foreach ($this->_prefilters as $filter) { - if (is_callable ($filter)) { - $ntext = call_user_func ($filter, $text); - if (is_string ($ntext)) { + if (is_callable($filter)) { + $ntext = call_user_func($filter, $text); + if (is_string($ntext)) { $text = $ntext; } } } return $text; } - + /** * Apply postfilters * * It is possible to specify postfilters for the parser to do some * manipulating of the string afterwards. */ - function _applyPostfilters ($text) { + function _applyPostfilters($text) { foreach ($this->_postfilters as $filter) { - if (is_callable ($filter)) { - $ntext = call_user_func ($filter, $text); - if (is_string ($ntext)) { + if (is_callable($filter)) { + $ntext = call_user_func($filter, $text); + if (is_string($ntext)) { $text = $ntext; } } } return $text; } - + /** * Abstract method: Manipulate the tree + * * @access protected * @return bool */ - function _modifyTree () { + function _modifyTree() { return true; } - + /** * Abstract method: Output tree + * * @access protected * @return bool */ - function _outputTree () { + function _outputTree() { // this could e.g. call _applyPostfilters return true; } - + /** * Restart parsing after current block * @@ -436,24 +457,24 @@ class StringParser { * @access protected * @return bool */ - function _reparseAfterCurrentBlock () { + function _reparseAfterCurrentBlock() { // this should definitely not happen! - if (($stack_count = count ($this->_stack)) < 2) { + if (($stack_count = count($this->_stack)) < 2) { return false; } - $topelem = $this->_stack[$stack_count-1]; - + $topelem = $this->_stack [$stack_count - 1]; + $node_parent = $topelem->_parent; // remove the child from the tree - $res = $node_parent->removeChild ($topelem, false); + $res = $node_parent->removeChild($topelem, false); if (!$res) { return false; } - $res = $this->_popNode (); + $res = $this->_popNode(); if (!$res) { return false; } - + // now try to get the position of the object if ($topelem->occurredAt < 0) { return false; @@ -461,87 +482,94 @@ class StringParser { // HACK: could it be necessary to set a different status // if yes, how should this be achieved? Another member of // StringParser_Node? - $this->_setStatus (0); - $res = $this->_appendText ($this->_text{$topelem->occurredAt}); + $this->_setStatus(0); + $res = $this->_appendText($this->_text [$topelem->occurredAt]); if (!$res) { return false; } - + $this->_cpos = $topelem->occurredAt + 1; $this->_recentlyReparsed = true; - + return true; } - + /** * Abstract method: Close remaining blocks + * * @access protected */ - function _closeRemainingBlocks () { + function _closeRemainingBlocks() { // everything closed - if (count ($this->_stack) == 1) { + if (count($this->_stack) == 1) { return true; } // not everything closed if ($this->strict) { return false; } - while (count ($this->_stack) > 1) { - $res = $this->_popNode (); + while (count($this->_stack) > 1) { + $res = $this->_popNode(); if (!$res) { return false; } } return true; } - + /** * Abstract method: Initialize the parser + * * @access protected */ - function _parserInit () { - $this->_setStatus (0); + function _parserInit() { + $this->_setStatus(0); } - + /** * Abstract method: Set a specific status + * * @access protected */ - function _setStatus ($status) { + function _setStatus($status) { if ($status != 0) { return false; } - $this->_charactersSearch = array (); - $this->_charactersAllowed = array (); + $this->_charactersSearch = array(); + $this->_charactersAllowed = array(); $this->_status = $status; return true; } - + /** * Abstract method: Handle status + * * @access protected - * @param int $status The current status - * @param string $needle The needle that was found + * @param int $status + * The current status + * @param string $needle + * The needle that was found * @return bool */ - function _handleStatus ($status, $needle) { - $this->_appendText ($needle); - $this->_cpos += strlen ($needle); + function _handleStatus($status, $needle) { + $this->_appendText($needle); + $this->_cpos += strlen($needle); return true; } - + /** * Search mode loop + * * @access protected * @return bool */ - function _searchLoop () { + function _searchLoop() { $i = 0; while (1) { // make sure this is false! $this->_recentlyReparsed = false; - - list ($needle, $offset) = $this->_strpos ($this->_charactersSearch, $this->_cpos); + + list ($needle, $offset) = $this->_strpos($this->_charactersSearch, $this->_cpos); // parser ends here if ($needle === false) { // original status 0 => no problem @@ -553,25 +581,25 @@ class StringParser { return false; } // break up parsing operation of current node - $res = $this->_reparseAfterCurrentBlock (); + $res = $this->_reparseAfterCurrentBlock(); if (!$res) { return false; } continue; } // get subtext - $subtext = substr ($this->_text, $this->_cpos, $offset - $this->_cpos); - $res = $this->_appendText ($subtext); + $subtext = substr($this->_text, $this->_cpos, $offset - $this->_cpos); + $res = $this->_appendText($subtext); if (!$res) { return false; } $this->_cpos = $offset; - $res = $this->_handleStatus ($this->_status, $needle); + $res = $this->_handleStatus($this->_status, $needle); if (!$res && $this->strict) { return false; } if (!$res) { - $res = $this->_appendText ($this->_text{$this->_cpos}); + $res = $this->_appendText($this->_text [$this->_cpos]); if (!$res) { return false; } @@ -582,114 +610,118 @@ class StringParser { $this->_recentlyReparsed = false; continue; } - $this->_cpos += strlen ($needle); + $this->_cpos += strlen($needle); } - + // get subtext - if ($this->_cpos < strlen ($this->_text)) { - $subtext = substr ($this->_text, $this->_cpos); - $res = $this->_appendText ($subtext); + if ($this->_cpos < strlen($this->_text)) { + $subtext = substr($this->_text, $this->_cpos); + $res = $this->_appendText($subtext); if (!$res) { return false; } } - + return true; } - + /** * Loop mode loop * * @access protected * @return bool */ - function _loop () { + function _loop() { // HACK: This method ist not yet implemented correctly, the code below // DOES NOT WORK! Do not use! - return false; /* - while ($this->_cpos < $this->_length) { - $needle = $this->_strDetect ($this->_charactersSearch, $this->_cpos); - - if ($needle === false) { - // not found => see if character is allowed - if (!in_array ($this->_text{$this->_cpos}, $this->_charactersAllowed)) { - if ($strict) { - return false; - } - // ignore - continue; - } - // lot's of FIXMES - $res = $this->_appendText ($this->_text{$this->_cpos}); - if (!$res) { - return false; - } - } - - // get subtext - $subtext = substr ($this->_text, $offset, $offset - $this->_cpos); - $res = $this->_appendText ($subtext); - if (!$res) { - return false; - } - $this->_cpos = $subtext; - $res = $this->_handleStatus ($this->_status, $needle); - if (!$res && $strict) { - return false; - } - } - // original status 0 => no problem - if (!$this->_status) { - return true; - } - // not in original status? strict mode? - if ($this->strict) { - return false; - } - // break up parsing operation of current node - $res = $this->_reparseAfterCurrentBlock (); - if (!$res) { - return false; - } - // this will not cause an infinite loop because - // _reparseAfterCurrentBlock will increase _cpos by one! - return $this->_loop (); - */ + * while ($this->_cpos < $this->_length) { + * $needle = $this->_strDetect ($this->_charactersSearch, $this->_cpos); + * + * if ($needle === false) { + * // not found => see if character is allowed + * if (!in_array ($this->_text{$this->_cpos}, $this->_charactersAllowed)) { + * if ($strict) { + * return false; + * } + * // ignore + * continue; + * } + * // lot's of FIXMES + * $res = $this->_appendText ($this->_text{$this->_cpos}); + * if (!$res) { + * return false; + * } + * } + * + * // get subtext + * $subtext = substr ($this->_text, $offset, $offset - $this->_cpos); + * $res = $this->_appendText ($subtext); + * if (!$res) { + * return false; + * } + * $this->_cpos = $subtext; + * $res = $this->_handleStatus ($this->_status, $needle); + * if (!$res && $strict) { + * return false; + * } + * } + * // original status 0 => no problem + * if (!$this->_status) { + * return true; + * } + * // not in original status? strict mode? + * if ($this->strict) { + * return false; + * } + * // break up parsing operation of current node + * $res = $this->_reparseAfterCurrentBlock (); + * if (!$res) { + * return false; + * } + * // this will not cause an infinite loop because + * // _reparseAfterCurrentBlock will increase _cpos by one! + * return $this->_loop (); + */ } - + /** * Abstract method Append text depending on current status + * * @access protected - * @param string $text The text to append + * @param string $text + * The text to append * @return bool On success, the function returns true, else false */ - function _appendText ($text) { - if (!strlen ($text)) { + function _appendText($text) { + if (!strlen($text)) { return true; } // default: call _appendToLastTextChild - return $this->_appendToLastTextChild ($text); + return $this->_appendToLastTextChild($text); } - + /** * Append text to last text child of current top parser stack node + * * @access protected - * @param string $text The text to append + * @param string $text + * The text to append * @return bool On success, the function returns true, else false */ - function _appendToLastTextChild ($text) { - $scount = count ($this->_stack); + function _appendToLastTextChild($text) { + $scount = count($this->_stack); if ($scount == 0) { return false; } - return $this->_stack[$scount-1]->appendToLastTextChild ($text); + return $this->_stack [$scount - 1]->appendToLastTextChild($text); } - + /** * Searches {@link StringParser::_text _text} for every needle that is - * specified by using the {@link PHP_MANUAL#strpos strpos} function. It + * specified by using the {@link PHP_MANUAL#strpos strpos} function. + * It * returns an associative array with the key 'needle' * pointing at the string that was found first and the key * 'offset' pointing at the offset at which the string was @@ -703,60 +735,67 @@ class StringParser { * @return array * @see StringParser::_text */ - function _strpos ($needles, $offset) { + function _strpos($needles, $offset) { $cur_needle = false; $cur_offset = -1; - - if ($offset < strlen ($this->_text)) { + + if ($offset < strlen($this->_text)) { foreach ($needles as $needle) { - $n_offset = strpos ($this->_text, $needle, $offset); + $n_offset = strpos($this->_text, $needle, $offset); if ($n_offset !== false && ($n_offset < $cur_offset || $cur_offset < 0)) { $cur_needle = $needle; $cur_offset = $n_offset; } } } - - return array ($cur_needle, $cur_offset, 'needle' => $cur_needle, 'offset' => $cur_offset); + + return array( + $cur_needle, + $cur_offset, + 'needle' => $cur_needle, + 'offset' => $cur_offset + ); } - + /** * Detects a string at the current position * * @access protected - * @param array $needles The strings that are to be detected - * @param int $offset The current offset + * @param array $needles + * The strings that are to be detected + * @param int $offset + * The current offset * @return mixed The string that was detected or the needle */ - function _strDetect ($needles, $offset) { + function _strDetect($needles, $offset) { foreach ($needles as $needle) { - $l = strlen ($needle); - if (substr ($this->_text, $offset, $l) == $needle) { + $l = strlen($needle); + if (substr($this->_text, $offset, $l) == $needle) { return $needle; } } return false; } - - + /** * Adds a node to the current parse stack * * @access protected - * @param object $node The node that is to be added + * @param object $node + * The node that is to be added * @return bool True on success, else false. * @see StringParser_Node, StringParser::_stack */ - function _pushNode (&$node) { - $stack_count = count ($this->_stack); - $max_node = $this->_stack[$stack_count-1]; - if (!$max_node->appendChild ($node)) { + function _pushNode(&$node) { + $stack_count = count($this->_stack); + $max_node = $this->_stack [$stack_count - 1]; + if (!$max_node->appendChild($node)) { return false; } - $this->_stack[$stack_count] = $node; + $this->_stack [$stack_count] = $node; return true; } - + /** * Removes a node from the current parse stack * @@ -764,68 +803,77 @@ class StringParser { * @return bool True on success, else false. * @see StringParser_Node, StringParser::_stack */ - function _popNode () { - $stack_count = count ($this->_stack); - unset ($this->_stack[$stack_count-1]); + function _popNode() { + $stack_count = count($this->_stack); + unset($this->_stack [$stack_count - 1]); return true; } - + /** * Execute a method on the top element * * @access protected * @return mixed */ - function _topNode () { - $args = func_get_args (); - if (!count ($args)) { + function _topNode() { + $args = func_get_args(); + if (!count($args)) { return; // oops? } - $method = array_shift ($args); - $stack_count = count ($this->_stack); - $method = array (&$this->_stack[$stack_count-1], $method); - if (!is_callable ($method)) { + $method = array_shift($args); + $stack_count = count($this->_stack); + $method = array( + &$this->_stack [$stack_count - 1], + $method + ); + if (!is_callable($method)) { return; // oops? } - return call_user_func_array ($method, $args); + return call_user_func_array($method, $args); } - + /** * Get a variable of the top element * * @access protected * @return mixed */ - function _topNodeVar ($var) { - $stack_count = count ($this->_stack); - return $this->_stack[$stack_count-1]->$var; + function _topNodeVar($var) { + $stack_count = count($this->_stack); + return $this->_stack [$stack_count - 1]->$var; } + } /** * Node type: Unknown node + * * @see StringParser_Node::_type */ -define ('STRINGPARSER_NODE_UNKNOWN', 0); +define('STRINGPARSER_NODE_UNKNOWN', 0); /** * Node type: Root node + * * @see StringParser_Node::_type */ -define ('STRINGPARSER_NODE_ROOT', 1); +define('STRINGPARSER_NODE_ROOT', 1); /** * Node type: Text node + * * @see StringParser_Node::_type */ -define ('STRINGPARSER_NODE_TEXT', 2); +define('STRINGPARSER_NODE_TEXT', 2); /** - * Global value that is a counter of string parser node ids. Compare it to a + * Global value that is a counter of string parser node ids. + * Compare it to a * sequence in databases. + * * @var int */ -$GLOBALS['__STRINGPARSER_NODE_ID'] = 0; +$GLOBALS ['__STRINGPARSER_NODE_ID'] = 0; /** * Generic string parser node class @@ -839,9 +887,10 @@ $GLOBALS['__STRINGPARSER_NODE_ID'] = 0; * @package stringparser */ class StringParser_Node { + /** * The type of this node. - * + * * There are three standard node types: root node, text node and unknown * node. All node types are integer constants. Any node type of a * subclass must be at least 32 to allow future developements. @@ -852,7 +901,7 @@ class StringParser_Node { * @see STRINGPARSER_NODE_UNKNOWN */ var $_type = STRINGPARSER_NODE_UNKNOWN; - + /** * The node ID * @@ -867,7 +916,7 @@ class StringParser_Node { * @see StringParser_Node::_children */ var $_id = -1; - + /** * The parent of this node. * @@ -878,7 +927,7 @@ class StringParser_Node { * @see StringParser_Node::_children */ var $_parent = null; - + /** * The children of this node. * @@ -889,8 +938,8 @@ class StringParser_Node { * @var array * @see StringParser_Node::_parent */ - var $_children = array (); - + var $_children = array(); + /** * Occured at * @@ -901,7 +950,7 @@ class StringParser_Node { * @var int */ var $occurredAt = -1; - + /** * Constructor * @@ -909,15 +958,16 @@ class StringParser_Node { * assigns it. * * @access public - * @param int $occurredAt The position in the text where this node - * occurred at. If not determinable, it is -1. + * @param int $occurredAt + * The position in the text where this node + * occurred at. If not determinable, it is -1. * @global __STRINGPARSER_NODE_ID */ - function __construct ($occurredAt = -1) { - $this->_id = $GLOBALS['__STRINGPARSER_NODE_ID']++; + function __construct($occurredAt = -1) { + $this->_id = $GLOBALS ['__STRINGPARSER_NODE_ID']++; $this->occurredAt = $occurredAt; } - + /** * Type of the node * @@ -926,70 +976,73 @@ class StringParser_Node { * @access public * @return int */ - function type () { + function type() { return $this->_type; } - + /** * Prepend a node * * @access public - * @param object $node The node to be prepended. + * @param object $node + * The node to be prepended. * @return bool On success, the function returns true, else false. */ - function prependChild (&$node) { - if (!is_object ($node)) { + function prependChild(&$node) { + if (!is_object($node)) { return false; } - + // root nodes may not be children of other nodes! if ($node->_type == STRINGPARSER_NODE_ROOT) { return false; } - + // if node already has a parent if ($node->_parent !== false) { // remove node from there $parent = $node->_parent; - if (!$parent->removeChild ($node, false)) { + if (!$parent->removeChild($node, false)) { return false; } - unset ($parent); + unset($parent); } - - $index = count ($this->_children) - 1; + + $index = count($this->_children) - 1; // move all nodes to a new index while ($index >= 0) { // save object - $object = $this->_children[$index]; + $object = $this->_children [$index]; // we have to unset it because else it will be // overridden in in the loop - unset ($this->_children[$index]); + unset($this->_children [$index]); // put object to new position - $this->_children[$index+1] = $object; + $this->_children [$index + 1] = $object; $index--; } - $this->_children[0] = $node; + $this->_children [0] = $node; return true; } - + /** * Append text to last text child + * * @access public - * @param string $text The text to append + * @param string $text + * The text to append * @return bool On success, the function returns true, else false */ - function appendToLastTextChild ($text) { - $ccount = count ($this->_children); - if ($ccount == 0 || $this->_children[$ccount-1]->_type != STRINGPARSER_NODE_TEXT) { - $ntextnode = new StringParser_Node_Text ($text); - return $this->appendChild ($ntextnode); + function appendToLastTextChild($text) { + $ccount = count($this->_children); + if ($ccount == 0 || $this->_children [$ccount - 1]->_type != STRINGPARSER_NODE_TEXT) { + $ntextnode = new StringParser_Node_Text($text); + return $this->appendChild($ntextnode); } else { - $this->_children[$ccount-1]->appendText ($text); + $this->_children [$ccount - 1]->appendText($text); return true; } } - + /** * Append a node to the children * @@ -998,140 +1051,145 @@ class StringParser_Node { * property of the node that is to be appended. * * @access public - * @param object $node The node that is to be appended. + * @param object $node + * The node that is to be appended. * @return bool On success, the function returns true, else false. */ - function appendChild (&$node) { - if (!is_object ($node)) { + function appendChild(&$node) { + if (!is_object($node)) { return false; } - + // root nodes may not be children of other nodes! if ($node->_type == STRINGPARSER_NODE_ROOT) { return false; } - + // if node already has a parent if ($node->_parent !== null) { // remove node from there $parent = $node->_parent; - if (!$parent->removeChild ($node, false)) { + if (!$parent->removeChild($node, false)) { return false; } - unset ($parent); + unset($parent); } - + // append it to current node - $new_index = count ($this->_children); - $this->_children[$new_index] = $node; + $new_index = count($this->_children); + $this->_children [$new_index] = $node; $node->_parent = $this; return true; } - + /** * Insert a node before another node * * @access public - * @param object $node The node to be inserted. - * @param object $reference The reference node where the new node is - * to be inserted before. + * @param object $node + * The node to be inserted. + * @param object $reference + * The reference node where the new node is + * to be inserted before. * @return bool On success, the function returns true, else false. */ - function insertChildBefore (&$node, &$reference) { - if (!is_object ($node)) { + function insertChildBefore(&$node, &$reference) { + if (!is_object($node)) { return false; } - + // root nodes may not be children of other nodes! if ($node->_type == STRINGPARSER_NODE_ROOT) { return false; } - + // is the reference node a child? - $child = $this->_findChild ($reference); - + $child = $this->_findChild($reference); + if ($child === false) { return false; } - + // if node already has a parent if ($node->_parent !== null) { // remove node from there $parent = $node->_parent; - if (!$parent->removeChild ($node, false)) { + if (!$parent->removeChild($node, false)) { return false; } - unset ($parent); + unset($parent); } - - $index = count ($this->_children) - 1; + + $index = count($this->_children) - 1; // move all nodes to a new index while ($index >= $child) { // save object - $object = $this->_children[$index]; + $object = $this->_children [$index]; // we have to unset it because else it will be // overridden in in the loop - unset ($this->_children[$index]); + unset($this->_children [$index]); // put object to new position - $this->_children[$index+1] = $object; + $this->_children [$index + 1] = $object; $index--; } - $this->_children[$child] = $node; + $this->_children [$child] = $node; return true; } - + /** * Insert a node after another node * * @access public - * @param object $node The node to be inserted. - * @param object $reference The reference node where the new node is - * to be inserted after. + * @param object $node + * The node to be inserted. + * @param object $reference + * The reference node where the new node is + * to be inserted after. * @return bool On success, the function returns true, else false. */ - function insertChildAfter (&$node, &$reference) { - if (!is_object ($node)) { + function insertChildAfter(&$node, &$reference) { + if (!is_object($node)) { return false; } - + // root nodes may not be children of other nodes! if ($node->_type == STRINGPARSER_NODE_ROOT) { return false; } - + // is the reference node a child? - $child = $this->_findChild ($reference); - + $child = $this->_findChild($reference); + if ($child === false) { return false; } - + // if node already has a parent if ($node->_parent !== false) { // remove node from there $parent = $node->_parent; - if (!$parent->removeChild ($node, false)) { + if (!$parent->removeChild($node, false)) { return false; } - unset ($parent); + unset($parent); } - - $index = count ($this->_children) - 1; + + $index = count($this->_children) - 1; // move all nodes to a new index while ($index >= $child + 1) { // save object - $object = $this->_children[$index]; + $object = $this->_children [$index]; // we have to unset it because else it will be // overridden in in the loop - unset ($this->_children[$index]); + unset($this->_children [$index]); // put object to new position - $this->_children[$index+1] = $object; + $this->_children [$index + 1] = $object; $index--; } - $this->_children[$child + 1] = $node; + $this->_children [$child + 1] = $node; return true; } - + /** * Remove a child node * @@ -1141,18 +1199,20 @@ class StringParser_Node { * return false. * * @access public - * @param mixed $child The child to destroy; either an integer - * specifying the index of the child or a reference - * to the child itself. - * @param bool $destroy Destroy the child afterwards. + * @param mixed $child + * The child to destroy; either an integer + * specifying the index of the child or a reference + * to the child itself. + * @param bool $destroy + * Destroy the child afterwards. * @return bool On success, the function returns true, else false. */ - function removeChild (&$child, $destroy = false) { - if (is_object ($child)) { + function removeChild(&$child, $destroy = false) { + if (is_object($child)) { // if object: get index $object = $child; - unset ($child); - $child = $this->_findChild ($object); + unset($child); + $child = $this->_findChild($object); if ($child === false) { return false; } @@ -1161,97 +1221,98 @@ class StringParser_Node { $save = $child; unset($child); $child = $save; - + // else: get object - if (!isset($this->_children[$child])) { + if (!isset($this->_children [$child])) { return false; } - $object = $this->_children[$child]; + $object = $this->_children [$child]; } - + // store count for later use - $ccount = count ($this->_children); - + $ccount = count($this->_children); + // index out of bounds - if (!is_int ($child) || $child < 0 || $child >= $ccount) { + if (!is_int($child) || $child < 0 || $child >= $ccount) { return false; } - + // inkonsistency - if ($this->_children[$child]->_parent === null || - $this->_children[$child]->_parent->_id != $this->_id) { + if ($this->_children [$child]->_parent === null || $this->_children [$child]->_parent->_id != $this->_id) { return false; } - + // $object->_parent = null would equal to $this = null // as $object->_parent is a reference to $this! // because of this, we have to unset the variable to remove // the reference and then redeclare the variable - unset ($object->_parent); $object->_parent = null; - + unset($object->_parent); + $object->_parent = null; + // we have to unset it because else it will be overridden in // in the loop - unset ($this->_children[$child]); - + unset($this->_children [$child]); + // move all remaining objects one index higher while ($child < $ccount - 1) { // save object - $obj = $this->_children[$child+1]; + $obj = $this->_children [$child + 1]; // we have to unset it because else it will be // overridden in in the loop - unset ($this->_children[$child+1]); + unset($this->_children [$child + 1]); // put object to new position - $this->_children[$child] = $obj; + $this->_children [$child] = $obj; // UNSET THE OBJECT! - unset ($obj); + unset($obj); $child++; } - + if ($destroy) { - return StringParser_Node::destroyNode ($object); - unset ($object); + return StringParser_Node::destroyNode($object); + unset($object); } return true; } - + /** * Get the first child of this node * * @access public * @return mixed */ - function &firstChild () { + function &firstChild() { $ret = null; - if (!count ($this->_children)) { + if (!count($this->_children)) { return $ret; } - return $this->_children[0]; + return $this->_children [0]; } - + /** * Get the last child of this node * * @access public * @return mixed */ - function &lastChild () { + function &lastChild() { $ret = null; - $c = count ($this->_children); + $c = count($this->_children); if (!$c) { return $ret; } - return $this->_children[$c-1]; + return $this->_children [$c - 1]; } - + /** * Destroy a node * * @access public * @static - * @param object $node The node to destroy + * @param object $node + * The node to destroy * @return bool True on success, else false. */ - static function destroyNode (&$node) { + static function destroyNode(&$node) { if ($node === null) { return false; } @@ -1260,31 +1321,31 @@ class StringParser_Node { $parent = $node->_parent; // directly return that result because the removeChild // method will call destroyNode again - return $parent->removeChild ($node, true); + return $parent->removeChild($node, true); } - + // node has children - while (count ($node->_children)) { + while (count($node->_children)) { $child = 0; // remove first child until no more children remain - if (!$node->removeChild ($child, true)) { + if (!$node->removeChild($child, true)) { return false; } unset($child); } - + // now call the nodes destructor - if (!$node->_destroy ()) { + if (!$node->_destroy()) { return false; } - + // now just unset it and prey that there are no more references // to this node - unset ($node); - + unset($node); + return true; } - + /** * Destroy this node * @@ -1292,11 +1353,11 @@ class StringParser_Node { * @access protected * @return bool True on success, else false. */ - function _destroy () { + function _destroy() { return true; } - - /** + + /** * Find a child node * * This function searches for a node in the own children and returns @@ -1304,130 +1365,142 @@ class StringParser_Node { * node. * * @access protected - * @param mixed $child The node to look for. + * @param mixed $child + * The node to look for. * @return mixed The index of the child node on success, else false. */ - function _findChild (&$child) { - if (!is_object ($child)) { + function _findChild(&$child) { + if (!is_object($child)) { return false; } - - $ccount = count ($this->_children); - for ($i = 0; $i < $ccount; $i++) { - if ($this->_children[$i]->_id == $child->_id) { + + $ccount = count($this->_children); + for($i = 0; $i < $ccount; $i++) { + if ($this->_children [$i]->_id == $child->_id) { return $i; } } - + return false; } - - /** + + /** * Checks equality of this node and another node * * @access public - * @param mixed $node The node to be compared with + * @param mixed $node + * The node to be compared with * @return bool True if the other node equals to this node, else false. */ - function equals (&$node) { + function equals(&$node) { return ($this->_id == $node->_id); } - + /** * Determines whether a criterium matches this node * * @access public - * @param string $criterium The criterium that is to be checked - * @param mixed $value The value that is to be compared + * @param string $criterium + * The criterium that is to be checked + * @param mixed $value + * The value that is to be compared * @return bool True if this node matches that criterium */ - function matchesCriterium ($criterium, $value) { + function matchesCriterium($criterium, $value) { return false; } - + /** * Search for nodes with a certain criterium * * This may be used to implement getElementsByTagName etc. * * @access public - * @param string $criterium The criterium that is to be checked - * @param mixed $value The value that is to be compared + * @param string $criterium + * The criterium that is to be checked + * @param mixed $value + * The value that is to be compared * @return array All subnodes that match this criterium */ - function &getNodesByCriterium ($criterium, $value) { - $nodes = array (); + function &getNodesByCriterium($criterium, $value) { + $nodes = array(); $node_ctr = 0; - for ($i = 0; $i < count ($this->_children); $i++) { - if ($this->_children[$i]->matchesCriterium ($criterium, $value)) { - $nodes[$node_ctr++] = $this->_children[$i]; + for($i = 0; $i < count($this->_children); $i++) { + if ($this->_children [$i]->matchesCriterium($criterium, $value)) { + $nodes [$node_ctr++] = $this->_children [$i]; } - $subnodes = $this->_children[$i]->getNodesByCriterium ($criterium, $value); - if (count ($subnodes)) { - $subnodes_count = count ($subnodes); - for ($j = 0; $j < $subnodes_count; $j++) { - $nodes[$node_ctr++] = $subnodes[$j]; - unset ($subnodes[$j]); + $subnodes = $this->_children [$i]->getNodesByCriterium($criterium, $value); + if (count($subnodes)) { + $subnodes_count = count($subnodes); + for($j = 0; $j < $subnodes_count; $j++) { + $nodes [$node_ctr++] = $subnodes [$j]; + unset($subnodes [$j]); } } - unset ($subnodes); + unset($subnodes); } return $nodes; } - + /** * Search for nodes with a certain criterium and return the count * * Similar to getNodesByCriterium * * @access public - * @param string $criterium The criterium that is to be checked - * @param mixed $value The value that is to be compared + * @param string $criterium + * The criterium that is to be checked + * @param mixed $value + * The value that is to be compared * @return int The number of subnodes that match this criterium */ - function getNodeCountByCriterium ($criterium, $value) { + function getNodeCountByCriterium($criterium, $value) { $node_ctr = 0; - for ($i = 0; $i < count ($this->_children); $i++) { - if ($this->_children[$i]->matchesCriterium ($criterium, $value)) { + for($i = 0; $i < count($this->_children); $i++) { + if ($this->_children [$i]->matchesCriterium($criterium, $value)) { $node_ctr++; } - $subnodes = $this->_children[$i]->getNodeCountByCriterium ($criterium, $value); + $subnodes = $this->_children [$i]->getNodeCountByCriterium($criterium, $value); $node_ctr += $subnodes; } return $node_ctr; } - + /** * Dump nodes * * This dumps a tree of nodes * * @access public - * @param string $prefix The prefix that is to be used for indentation - * @param string $linesep The line separator - * @param int $level The initial level of indentation + * @param string $prefix + * The prefix that is to be used for indentation + * @param string $linesep + * The line separator + * @param int $level + * The initial level of indentation * @return string */ - function dump ($prefix = " ", $linesep = "\n", $level = 0) { - $str = str_repeat ($prefix, $level) . $this->_id . ": " . $this->_dumpToString () . $linesep; - for ($i = 0; $i < count ($this->_children); $i++) { - $str .= $this->_children[$i]->dump ($prefix, $linesep, $level + 1); + function dump($prefix = " ", $linesep = "\n", $level = 0) { + $str = str_repeat($prefix, $level) . $this->_id . ": " . $this->_dumpToString() . $linesep; + for($i = 0; $i < count($this->_children); $i++) { + $str .= $this->_children [$i]->dump($prefix, $linesep, $level + 1); } return $str; } - + /** * Dump this node to a string * * @access protected * @return string */ - function _dumpToString () { + function _dumpToString() { if ($this->_type == STRINGPARSER_NODE_ROOT) { return "root"; } - return (string)$this->_type; + return (string) $this->_type; } + } /** @@ -1436,9 +1509,10 @@ class StringParser_Node { * @package stringparser */ class StringParser_Node_Root extends StringParser_Node { + /** * The type of this node. - * + * * This node is a root node. * * @access protected @@ -1446,6 +1520,7 @@ class StringParser_Node_Root extends StringParser_Node { * @see STRINGPARSER_NODE_ROOT */ var $_type = STRINGPARSER_NODE_ROOT; + } /** @@ -1454,9 +1529,10 @@ class StringParser_Node_Root extends StringParser_Node { * @package stringparser */ class StringParser_Node_Text extends StringParser_Node { + /** * The type of this node. - * + * * This node is a text node. * * @access protected @@ -1464,84 +1540,94 @@ class StringParser_Node_Text extends StringParser_Node { * @see STRINGPARSER_NODE_TEXT */ var $_type = STRINGPARSER_NODE_TEXT; - + /** * Node flags - * + * * @access protected * @var array */ - var $_flags = array (); - + var $_flags = array(); + /** * The content of this node + * * @access public * @var string */ var $content = ''; - + /** * Constructor * * @access public - * @param string $content The initial content of this element - * @param int $occurredAt The position in the text where this node - * occurred at. If not determinable, it is -1. + * @param string $content + * The initial content of this element + * @param int $occurredAt + * The position in the text where this node + * occurred at. If not determinable, it is -1. * @see StringParser_Node_Text::content */ - function __construct ($content, $occurredAt = -1) { - parent::__construct ($occurredAt); + function __construct($content, $occurredAt = -1) { + parent::__construct($occurredAt); $this->content = $content; } - + /** * Append text to content * * @access public - * @param string $text The text to append + * @param string $text + * The text to append * @see StringParser_Node_Text::content */ - function appendText ($text) { + function appendText($text) { $this->content .= $text; } - + /** * Set a flag * * @access public - * @param string $name The name of the flag - * @param mixed $value The value of the flag + * @param string $name + * The name of the flag + * @param mixed $value + * The value of the flag */ - function setFlag ($name, $value) { - $this->_flags[$name] = $value; + function setFlag($name, $value) { + $this->_flags [$name] = $value; return true; } - + /** * Get Flag * * @access public - * @param string $flag The requested flag - * @param string $type The requested type of the return value - * @param mixed $default The default return value + * @param string $flag + * The requested flag + * @param string $type + * The requested type of the return value + * @param mixed $default + * The default return value */ - function getFlag ($flag, $type = 'mixed', $default = null) { - if (!isset ($this->_flags[$flag])) { + function getFlag($flag, $type = 'mixed', $default = null) { + if (!isset($this->_flags [$flag])) { return $default; } - $return = $this->_flags[$flag]; + $return = $this->_flags [$flag]; if ($type != 'mixed') { - settype ($return, $type); + settype($return, $type); } return $return; } - + /** * Dump this node to a string */ - function _dumpToString () { - return "text \"".substr (preg_replace ('/\s+/', ' ', $this->content), 0, 40)."\" [f:".preg_replace ('/\s+/', ' ', join(':', array_keys ($this->_flags)))."]"; + function _dumpToString() { + return "text \"" . substr(preg_replace('/\s+/', ' ', $this->content), 0, 40) . "\" [f:" . preg_replace('/\s+/', ' ', join(':', array_keys($this->_flags))) . "]"; } + } ?> From 27622c0c50f3f87a6c07d543fe3c4e57202dde14 Mon Sep 17 00:00:00 2001 From: azett Date: Sun, 6 Sep 2020 11:28:12 +0200 Subject: [PATCH 02/46] Leggero v1 is now responsive, thanks again Matthias! :) --- fp-interface/themes/leggero/header.tpl | 6 +- .../leggero/leggero-v2/imgs/backshade.png | Bin 0 -> 979 bytes .../themes/leggero/leggero/res/column.css | 18 ++-- .../themes/leggero/leggero/res/common.css | 77 ++++++++++++------ .../themes/leggero/leggero/res/style.css | 69 +++++++++++++++- 5 files changed, 135 insertions(+), 35 deletions(-) create mode 100644 fp-interface/themes/leggero/leggero-v2/imgs/backshade.png diff --git a/fp-interface/themes/leggero/header.tpl b/fp-interface/themes/leggero/header.tpl index 2975d1a..6298c13 100755 --- a/fp-interface/themes/leggero/header.tpl +++ b/fp-interface/themes/leggero/header.tpl @@ -1,10 +1,10 @@ - + {$flatpress.title|tag:wp_title:'«'} - - + + {action hook=wp_head} diff --git a/fp-interface/themes/leggero/leggero-v2/imgs/backshade.png b/fp-interface/themes/leggero/leggero-v2/imgs/backshade.png new file mode 100644 index 0000000000000000000000000000000000000000..9be237f3f2ad9dcd5cb32aa60fee59f2cd17caf6 GIT binary patch literal 979 zcmV;^11$WBP)9*I}OWQw~_z=02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00TQoL_t(&-tAaRjvPA-BMsmG zl5-Gdp}$>u$R>*yxPcy2SF0pTA}RIo=jTWGgV(|zzMkPTe1^~P89u{*)sXBT+5XlY z0@xD3_=*AqfCOXaQUHie9?x?)_X}ZxO!xNYJRB{;BJ4r{L_!SX8EFG?Ec!)10rS@C z$BOGpuDq|zF0DMgN3chP4GZFy!QP-+d93JB=56PQJ8TI6 z5bX$zUh`^4<+oaBoHYW|Yl0%eD#Lozo*H50`3O2ZS~8erNVjdZ^JEBGE4;vl$;wa7 zV}xLJ16d4f+iG{}WIUfHRyFT(?ML#g4GsP@SzOA!o;NQTF#)lu<*$rT?O&{CM#BJGJ$j;cz9tUVijFp(8u5xiysFAXQQ zW$9;BF*Qggzh@rRvhGL^u!KnQg#HMQYLAMk8_#O469gws zlasZ1R#({8ty;Ny2;RG{Tt?Qw)$cTtY=*3_E`frMW-dI|ToJcLH5Bz0t#C_I=B9)A8-0Pu0f_>BKLG~#R;?{zx*7`uoRs}a z8i)Wop-KcpM{JYBRxH?;&?bm#j@{v-UTuV2-+2xp-((Ag3=% zOVs2HPjz#&N_zi7eumHR89u{j_za)nGyI Date: Sun, 6 Sep 2020 12:22:55 +0200 Subject: [PATCH 03/46] Uploader checks for forbidden files more carefully. And: #56 fixed. Thanks again, Matthias! --- admin/panels/uploader/admin.uploader.php | 195 +++++++++++++++++++---- fp-includes/core/core.users.php | 2 +- 2 files changed, 166 insertions(+), 31 deletions(-) diff --git a/admin/panels/uploader/admin.uploader.php b/admin/panels/uploader/admin.uploader.php index 30ec9c9..0d16c3a 100755 --- a/admin/panels/uploader/admin.uploader.php +++ b/admin/panels/uploader/admin.uploader.php @@ -19,7 +19,7 @@ class admin_uploader extends AdminPanel { var $actions = array( 'default' => true ); - + } class admin_uploader_default extends AdminPanelAction { @@ -35,73 +35,208 @@ class admin_uploader_default extends AdminPanelAction { function onupload() { $success = false; - + + /* + * first check if user is logged in + * to prevent remote admin.uploader.php script execution + * + * By testing the admin/main.php made the redirect job + * By direct URL call PHP throw a visible error -> AdminPanel class not found! + * + * 2019-11-23 - laborix + */ + if (!user_loggedin()) { + utils_redirect("login.php"); + die(); + } + if (!file_exists(IMAGES_DIR)) fs_mkdir(IMAGES_DIR); - + if (!file_exists(ATTACHS_DIR)) fs_mkdir(ATTACHS_DIR); - + /* + * Blacklist entries from OWASP and + * https://stackoverflow.com/questions/4166762/php-image-upload-security-check-list + * + * 2019-11-23 - laborix + */ + $blacklist_extensions = array( + 'htaccess', + 'phtml', + 'php', + 'php3', + 'php4', + 'php5', + 'php6', + 'php7', + 'phps', + 'cgi', + 'exe', + 'pl', + 'asp', + 'aspx', + 'shtml', + 'shtm', + 'fcgi', + 'fpl', + 'jsp', + 'htm', + 'html', + 'wml' + ); + $imgs = array( '.jpg', '.gif', '.png', '.jpeg' ); - $forbidden = array( - '.php', - '.php3', - '.php4', - '.php5', - '.php7', - '.phtml' - ); - + // intentionally // I've not put BMPs - + $uploaded_files = array(); - + foreach ($_FILES ["upload"] ["error"] as $key => $error) { - + if ($error == UPLOAD_ERR_OK) { $tmp_name = $_FILES ["upload"] ["tmp_name"] [$key]; $name = $_FILES ["upload"] ["name"] [$key]; - + $dir = ATTACHS_DIR; - - $ext = strtolower(strrchr($name, '.')); - - if (in_array($ext, $forbidden)) { - $success = false; - continue; + + /* + * second check extension list + * https://stackoverflow.com/questions/4166762/php-image-upload-security-check-list + * + * 2019-11-24 - laborix + */ + + $uploadfilename = strtolower($tmp_name); + + $isForbidden = false; + $deeptest = array(); + $extcount = 0; + $deeptest = explode('.', $uploadfilename); + $extcount = count($deeptest); + + if ($extcount == 1) { + /* + * none extension like .jpg or something else + * + * possible filename = simple-file-without-extension - linux like ok + */ + $isForbidden = false; + } elseif ($extcount == 2) { + /* + * Only one possible extension + * + * possible filename = 1.jpg + * possible filename = admin.uploader.php + * possible filename = .htaccess + * and so on... + */ + $check_ext1 = ""; + $check_ext1 = trim($deeptest [1], "\x00..\x1F"); + if (in_array($check_ext1, $blacklist_extensions)) { + $isForbidden = true; + } else { + $isForbidden = false; + } + } elseif ($extcount > 2) { + /* + * Chekc only the last two possible extensions + * + * Hint: OWASP - Unrestricted File Upload + * + * In Apache, a php file might be executed using the + * double extension technique such as "file.php.jpg" + * when ".jpg" is allowed. + * + * possible filename = 1.PhP.jpg + * possible filename = admin.uploader.php.JPg + * and so on... + */ + $check_ext1 = ""; + $check_ext2 = ""; + $check_ext1 = trim($deeptest [$extcount - 1], "\x00..\x1F"); + if (in_array($check_ext1, $blacklist_extensions)) { + $isForbidden = true; + } else { + $isForbidden = false; + } + /* Test only if first extension check are not in the blacklist */ + if (!$isForbidden) { + $check_ext2 = trim($deeptest [$extcount - 2], "\x00..\x1F"); + if (in_array($check_ext2, $blacklist_extensions)) { + $isForbidden = true; + } else { + $isForbidden = false; + } + } } + /* + * If one blacklisted extension found then + * return with -1 = An error occurred while trying to upload. + */ + if ($isForbidden) { + $this->smarty->assign('success', $success ? 1 : -1); + sess_add('admin_uploader_files', $uploaded_files); + return -1; + } + + /* + * third check extension + * if someone upload a .php file as .gif, .jpg or .txt + * if someone upload a .html file as .gif, .jpg or .txt + * + * 2019-11-24 - laborix + */ + + if (version_compare(PHP_VERSION, '5.3.0') < 0) + return -1; + if (!function_exists('finfo_open')) + return -1; + + $finfo = finfo_open(FILEINFO_MIME_TYPE); + $mime = finfo_file($finfo, $tmp_name); + finfo_close($finfo); + + if (($mime == "text/x-php") || ($mime == "text/html")) { + $this->smarty->assign('success', $success ? 1 : -1); + sess_add('admin_uploader_files', $uploaded_files); + return -1; + } + + $ext = strtolower(strrchr($name, '.')); + if (in_array($ext, $imgs)) { $dir = IMAGES_DIR; } - + $name = sanitize_title(substr($name, 0, -strlen($ext))) . $ext; - + $target = "$dir/$name"; @umask(022); $success = move_uploaded_file($tmp_name, $target); @chmod($target, 0766); - + $uploaded_files [] = $name; - + // one failure will make $success == false :) $success &= $success; } } - + if ($uploaded_files) { $this->smarty->assign('success', $success ? 1 : -1); sess_add('admin_uploader_files', $uploaded_files); } - + return 1; } - + } ?> diff --git a/fp-includes/core/core.users.php b/fp-includes/core/core.users.php index 04a9e70..f2a6b22 100755 --- a/fp-includes/core/core.users.php +++ b/fp-includes/core/core.users.php @@ -41,7 +41,7 @@ function user_login($userid, $pwd, $params = null) { $user = user_get($userid); - if (user_pwd($userid, $pwd) == $user ['password']) { + if (isset($user) && user_pwd($userid, $pwd) == $user ['password']) { $loggedin = true; From 27214a5997350e5f505549dda0e1adefb61e46ff Mon Sep 17 00:00:00 2001 From: barryhughes Date: Fri, 11 Sep 2020 11:34:39 -0700 Subject: [PATCH 04/46] Migrate from create_func to native anon func | #67 --- fp-includes/core/core.system.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fp-includes/core/core.system.php b/fp-includes/core/core.system.php index 9bbfc65..287d3c2 100755 --- a/fp-includes/core/core.system.php +++ b/fp-includes/core/core.system.php @@ -216,8 +216,10 @@ function system_geterr($module = '') { /* delayed print */ function system_dpr($action, $content) { $p = print_r($content, 1); - $f = create_function('', "echo '
$p
';"); - add_action($action, $f); + + add_action($action, function() use ($p) { + echo "
$p
"; + }); } ?> From 091dc53c3b53db43390984f017a9be2936173220 Mon Sep 17 00:00:00 2001 From: azett Date: Tue, 15 Sep 2020 13:31:03 +0200 Subject: [PATCH 05/46] Reworked German language files by Detlef - thanks a lot! --- fp-interface/lang/de-de/lang.admin.entry.php | 14 +++++++------- fp-interface/lang/de-de/lang.admin.plugin.php | 4 ++-- fp-interface/lang/de-de/lang.admin.static.php | 6 +++--- fp-interface/lang/de-de/lang.admin.uploader.php | 2 +- fp-interface/lang/de-de/lang.admin.widgets.php | 4 ++-- fp-interface/lang/de-de/lang.comments.php | 2 +- fp-interface/lang/de-de/lang.default.php | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fp-interface/lang/de-de/lang.admin.entry.php b/fp-interface/lang/de-de/lang.admin.entry.php index 0b6b33e..696dfe0 100644 --- a/fp-interface/lang/de-de/lang.admin.entry.php +++ b/fp-interface/lang/de-de/lang.admin.entry.php @@ -60,7 +60,7 @@ 1 => 'Beitrag wurde erfolgreich gespeichert', -1 => 'Ein Fehler ist beim Speichern des Beitrags aufgetreten', 2 => 'Beitrag wurde erfolgreich gelöscht', - -2 => 'Ein Fehler ist beim löschen des Beitrags aufgetreten', + -2 => 'Ein Fehler ist beim löschen des Beitrags aufgetreten', ); @@ -75,7 +75,7 @@ -2 => 'Ein Fehler ist aufgetreten: Der Beitrag wurde nicht gespeichert; eventuell ist der Index beschädigt', -3 => 'Ein Fehler ist aufgetreten: Der Beitrag wurde zur Sicherheit als Entwurf abgelegt', -4 => 'Ein Fehler ist aufgetreten: Der Beitrag wurde zur Sicherheit als Entwurf abgelegt; möglicherweise ist der Index beschädigt worden', - 'draft'=> 'Du bearbeitest gerade einen Beitrag im Entwurfs Modus' + 'draft'=> 'Du bearbeitest gerade einen Beitrag im Entwurfs-Modus' ); /* comments */ @@ -83,7 +83,7 @@ $lang['admin']['entry']['commentlist'] = array( 'head' => "Kommentare für den Beitrag: ", - 'descr' => 'Bitte Kommentar auswählen, das gelöscht werden soll', + 'descr' => 'Bitte Kommentar auswählen, der gelöscht werden soll', 'sel' => 'Sel', 'content' => 'Inhalt', 'date' => 'Datum', @@ -93,7 +93,7 @@ 'actions' => 'Aktion', 'act_edit' => 'Bearbeiten', 'act_del' => 'Löschen', - 'act_del_confirm' => 'Willst du dieses Kommentar wirklich löschen?', + 'act_del_confirm' => 'Willst du diesen Kommentar wirklich löschen?', 'nocomments' => 'Dieser Beitrag enthält zur Zeit keine Kommentare.', @@ -108,7 +108,7 @@ $lang['admin']['entry']['commedit'] = array( - 'head' => "Bearbeite das Kommentar für Beitrag", + 'head' => "Bearbeite den Kommentar für Beitrag", 'content' => 'Kommentarinhalt', 'date' => 'Datum', 'author' => 'Autor', @@ -123,7 +123,7 @@ $lang['admin']['entry']['commedit']['msgs'] = array( - 1 => 'Das Kommentar wurde geändert', + 1 => 'Der Kommentar wurde geändert', -1 => 'Ein Fehler ist beim Ändern des Kommentars aufgetreten', ); @@ -147,7 +147,7 @@ $lang['admin']['entry']['cats'] = array( 'head' => 'Kategorien verwalten', - 'descr' => '

Jede Kategorie sollte im Schema "Kategorie Name: id_nummer" angelegt werden. Die "id_nummer" ist eindeutig den Beiträgen zugeordnet, darf nicht mehr verändert werden und muss größer 0 sein. Der Kategorie Name hingegen kann auch später noch umbenannt werden.

Ein späteres Umstellen der Kategorienreihenfolge ist zu jeder Zeit möglich. Mit Bindestriche kann man Unterkategorien anlegen.

+ 'descr' => '

Jede Kategorie sollte im Schema "Kategorie Name :id_nummer" angelegt werden. Die "id_nummer" ist eindeutig den Beiträgen zugeordnet, darf nicht mehr verändert werden und muss größer 0 sein. Der Kategoriename hingegen kann auch später noch geändert werden.

Ein späteres Umstellen der Kategorienreihenfolge ist zu jeder Zeit möglich. Mit Bindestrichen kann man Unterkategorien anlegen.

Beispiel:

diff --git a/fp-interface/lang/de-de/lang.admin.plugin.php b/fp-interface/lang/de-de/lang.admin.plugin.php
index d076f75..3dab68c 100644
--- a/fp-interface/lang/de-de/lang.admin.plugin.php
+++ b/fp-interface/lang/de-de/lang.admin.plugin.php
@@ -13,7 +13,7 @@
 		'disable'	=> 'Deaktivieren',
 		'descr'		=> 'Diese Verwaltung ermöglicht es Plugins zu aktivieren oder deaktivieren, die die Funktionalität von Flatpress sehr flexibel gestalten.

'. '

Um ein neues Plugin in Flatpress zu integrieren, muss dieses Plugin in das Verzeichnis fp-plugins/ '. - 'hochgeladen werden. Ist ein Name und eine Beschreibung im neuen Plugin an entsprechender Stelle vorhanden, dann werden diese Texte hier mit angezeigt.', + 'geladen werden. Ist ein Name und eine Beschreibung im neuen Plugin an entsprechender Stelle vorhanden, dann werden diese Texte hier mit angezeigt.', 'name' => 'Name', 'description'=>'Beschreibung', 'author' => 'Autor', @@ -23,7 +23,7 @@ $lang['admin']['plugin']['default']['msgs'] = array( 1 => 'Konfiguration gespeichert', - -1 => 'Ein Fehler ist beim speichern aufgetreten. Eventuell stimmt die Syntax des Plugins nicht.', + -1 => 'Ein Fehler ist beim Speichern aufgetreten. Eventuell stimmt die Syntax des Plugins nicht.', ); /* system errors */ diff --git a/fp-interface/lang/de-de/lang.admin.static.php b/fp-interface/lang/de-de/lang.admin.static.php index 553875a..b7e29c4 100644 --- a/fp-interface/lang/de-de/lang.admin.static.php +++ b/fp-interface/lang/de-de/lang.admin.static.php @@ -27,9 +27,9 @@ $lang['admin']['static']['list']['msgs'] = array( 1 => 'Statische Seite erfolgreich gespeichert', - -1 => 'Ein Fehler ist beim speichern der Seite aufgetreten', + -1 => 'Ein Fehler ist beim Speichern der Seite aufgetreten', 2 => 'Seite wurde erfolgreich gelöscht', - -2 => 'Ein Fehler ist beim löschen der Seite aufgetreten', + -2 => 'Ein Fehler ist beim Löschen der Seite aufgetreten', ); /* write panel */ @@ -37,7 +37,7 @@ $lang['admin']['static']['write'] = array( 'head' => 'Statische Seite erstellen', - 'descr' => 'Bearbeiten der Parameter um diese Seite zu erstellen', + 'descr' => 'Bearbeiten der Parameter, um diese Seite zu erstellen', 'fieldset1' => 'Bearbeiten', 'subject' => 'Titel (*):', 'content' => 'Inhalt (*):', diff --git a/fp-interface/lang/de-de/lang.admin.uploader.php b/fp-interface/lang/de-de/lang.admin.uploader.php index d0cc97e..01eb186 100644 --- a/fp-interface/lang/de-de/lang.admin.uploader.php +++ b/fp-interface/lang/de-de/lang.admin.uploader.php @@ -19,7 +19,7 @@ $lang['admin']['uploader']['browse'] = array( 'head' => 'Durchsuchen', - 'descr' => 'Datei(en) auswählen zum hochladen.', + 'descr' => 'Datei(en) auswählen zum Hochladen.', 'fset1' => 'Durchsuchen', 'submit' => 'Hochladen', diff --git a/fp-interface/lang/de-de/lang.admin.widgets.php b/fp-interface/lang/de-de/lang.admin.widgets.php index 14cd9ff..a642020 100644 --- a/fp-interface/lang/de-de/lang.admin.widgets.php +++ b/fp-interface/lang/de-de/lang.admin.widgets.php @@ -25,14 +25,14 @@ 'themewdgsdescr' => 'In diesem Theme stehen folgende Widgets zur Verfügung', 'oldwdgs' => 'Andere Widget Sets', 'oldwdgsdescr' =>'Das folgende Widget Set scheint zu keinem der oben gelisteten '. - 'Widget Sets zu gehören. Eventuell ist war es ein Teil eines anderen Themes.', + 'Widget Sets zu gehören. Eventuell ist es Teil eines anderen Themes.', 'submit' => 'Änderungen speichern', ); $lang['admin']['widgets']['default']['stdsets'] = array( - 'top' => 'Top Leiste', + 'top' => 'Kopfleiste', 'bottom' => 'Fussleiste', 'left' => 'Linke Leiste', 'right' => 'Rechte Leiste', diff --git a/fp-interface/lang/de-de/lang.comments.php b/fp-interface/lang/de-de/lang.comments.php index 88e22e5..e5559b6 100644 --- a/fp-interface/lang/de-de/lang.comments.php +++ b/fp-interface/lang/de-de/lang.comments.php @@ -3,7 +3,7 @@ $lang['comments']['mail'] = << 'In Kategorien suchen', 'catdescr' => 'Es muss mindestens eine Kategorie angegeben werden.', - 'fset4' => 'Suche starten', + 'fset4' => 'Suche starten', 'submit' => 'Suche starten', 'headres' => 'Suchergebnisse', @@ -64,7 +64,7 @@ $lang['entry']['flags'] = array(); $lang['entry']['flags']['long'] = array( - 'draft' => 'Beitrag als Entwurf speichern: wird erst sichtbar nachdem er veröffentlicht wurde.', + 'draft' => 'Beitrag als Entwurf speichern: wird erst sichtbar, wenn er veröffentlicht wird.', //'static' => 'Static entry: normally hidden, to reach the entry put ?page=title-of-the-entry in url (experimental)', 'commslock' => 'Kommentare sperren: Keine Kommentare für diesen Beitrag zulassen.' ); @@ -116,7 +116,7 @@ 'email' => 'E-Mail Adresse (wird nicht veröffentlicht):', 'www' => 'Website (optional):', 'cookie' => 'Daten für das nächste Mal merken', - 'fieldset2' => 'Ein Kommentar schreiben', + 'fieldset2' => 'Einen Kommentar schreiben', 'comment' => 'Kommentar:', 'fieldset3' => 'Senden', 'submit' => 'Abschicken', @@ -130,7 +130,7 @@ 'name' => 'Bitte einen Namen eingeben', 'email' => 'Bitte eine gültige E-Mail Adresse eingeben', 'www' => 'Bitte eine gültige URL eingeben', - 'comment' => 'Bitte ein Kommentar schreiben', + 'comment' => 'Bitte einen Kommentar schreiben', ); $lang['date']['month'] = array( From adc500f191b7d963120772e72c89a3e019499a73 Mon Sep 17 00:00:00 2001 From: azett Date: Sun, 18 Oct 2020 11:49:34 +0200 Subject: [PATCH 06/46] New image attribute "loading" added. Default is "lazy", which results in better loading performance of the page. --- fp-plugins/bbcode/plugin.bbcode.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fp-plugins/bbcode/plugin.bbcode.php b/fp-plugins/bbcode/plugin.bbcode.php index 86d7502..2b6a2d3 100644 --- a/fp-plugins/bbcode/plugin.bbcode.php +++ b/fp-plugins/bbcode/plugin.bbcode.php @@ -244,6 +244,17 @@ function do_bbcode_img($action, $attributes, $content, $params, $node_object) { )); } + // Calculating the "loading" attribute of the image. + // For details, see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#attr-loading + // -> "lazy" is default (see https://developer.mozilla.org/en-US/docs/Web/Performance/Lazy_loading) + $loadingValue = 'lazy'; + // Use img attribute value if explicitly set + if (isset($attributes ['loading'])) { + $loadingValue = $attributes ['loading']; + } + $loading = ' loading="' . $loadingValue . '"'; + + // JS for popup if (isset($attributes ['popup']) && ($attributes ['popup'])) { $pop_width = $orig_w ? $orig_w : 800; $pop_height = $orig_h ? $orig_h : 600; @@ -251,8 +262,7 @@ function do_bbcode_img($action, $attributes, $content, $params, $node_object) { // Plugin hook, here lightbox attachs $popup = apply_filters('bbcode_img_popup', $popup, $absolutepath); - $popup_start = $attributes ['popup'] == 'true' ? '' : ''; + $popup_start = $attributes ['popup'] == 'true' ? '' : ''; $popup_end = $attributes ['popup'] == 'true' ? '' : ''; } $img_width = $width ? ' width="' . $width . '"' : ''; @@ -260,9 +270,11 @@ function do_bbcode_img($action, $attributes, $content, $params, $node_object) { if (isset($attributes ['float'])) { $float = ($attributes ['float'] == 'left' || $attributes ['float'] == 'right') ? ' class="float' . $attributes ['float'] . '"' : ' class="center"'; } - $src = $thumbpath ? (BLOG_BASEURL . $thumbpath) : $absolutepath; // $attributes['default']) + $src = $thumbpath ? (BLOG_BASEURL . $thumbpath) : $absolutepath; $pop = $popup_start ? '' : ' title="' . $title . '" '; - return $popup_start . '' . $alt . '' . $popup_end; + + // Finally: Put together the whole img tag with all its attributes and return it + return $popup_start . '' . $alt . '' . $popup_end; } /** From 6830a2b0e81dd3134231e961edc46e27ca0745fd Mon Sep 17 00:00:00 2001 From: Arvid Zimmermann Date: Sat, 24 Oct 2020 19:55:51 +0200 Subject: [PATCH 07/46] Added original contributors of default plugins --- CONTRIBUTORS.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 7e67932..a26eb33 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -4,13 +4,15 @@ FlatPress wouldn't be the great blogging system it is without the help of many v If you think someone's missing here, please let us know. ## The team -FlatPress was initially developed by [Edoardo Vacchi (NoWhereMan)](http://www.nowhereland.it "nowhereland.it"). Edoardo was supported by [Hydra](http://hydra.clans.it/ "hydra.clans.it"), [drudo](https://drudotec.wordpress.com/ "drudotec.wordpress.com"), giulio, [alcor](http://alcor.altervista.org/ "alcor.altervista.org"), and [Tychondriax](http://tychondriax.altervista.org/blog/ "tychondriax.altervista.org").
+FlatPress was initially developed by [Edoardo Vacchi (NoWhereMan)](https://github.com/evacchi "github.com/evacchi"). Edoardo was supported by [Hydra](http://hydra.clans.it/ "hydra.clans.it"), [drudo](https://drudotec.wordpress.com/ "drudotec.wordpress.com"), giulio, [alcor](http://alcor.altervista.org/ "alcor.altervista.org"), and [Tychondriax](http://tychondriax.altervista.org/blog/ "tychondriax.altervista.org").

Since 2018, FlatPress is taken care of by [Arvid Zimmermann](https://arvidzimmermann.de "arvidzimmermann.de"). ## Coding -- [Julian Rademacher](https://moortaube.de/) filed some useful pull requests (and donated his Twitter account [@FlatPress](https://twitter.com/FlatPress)). -- [Matthias Mauch](http://www.aadmm.org/)'s [FP-Patch](http://www.aadmm.org/fp-patch/) initially brought FlatPress to PHP 7. +- Piero VDFN introduced the plugins Comment Center, jQuery, and LightBox2. +- [Fabrix.xm](https://kirgroup.com/) contributed the Media Manager and Last Comments Admin. +- The SEO Meta Tag Info plugin was built by Don Prince. +- [Matthias Mauch](http://www.aadmm.org/)'s [FP-Patch](http://www.aadmm.org/fp-patch/) initially brought FlatPress to PHP 7. Also, he regularly tests FlatPress against new PHP versions. ## Translation - Brazilian Portuguese: randy @@ -19,3 +21,6 @@ Since 2018, FlatPress is taken care of by [Arvid Zimmermann](https://arvidzimmer - German: [Matthias Mauch (laborix)](http://www.aadmm.org/) - Greek: An unknown, since deleted GitHub user :( - Japanese: [NORTH HILL WORK STUDIO](https://nhws.localinfo.jp/) + +## Other contributions +- [Julian Rademacher](https://moortaube.de/) generously donated his Twitter account [@FlatPress](https://twitter.com/FlatPress). Also thanks for your useful pull requests! From c2accdedcc07a607fb8b3b811ae812c28fd8db47 Mon Sep 17 00:00:00 2001 From: azett Date: Sat, 24 Oct 2020 20:42:59 +0200 Subject: [PATCH 08/46] Description and authors of all default plugins reworked. (Original plugin authors are mentioned in CONTRIBUTORS.md from now on.) --- .../plugin.accessibleantispam.php | 140 ++-- fp-plugins/adminarea/plugin.adminarea.php | 8 +- fp-plugins/akismet/plugin.akismet.php | 85 +- fp-plugins/archives/plugin.archives.php | 151 ++-- fp-plugins/bbcode/plugin.bbcode.php | 10 +- fp-plugins/blockparser/plugin.blockparser.php | 8 +- fp-plugins/calendar/plugin.calendar.php | 46 +- fp-plugins/categories/plugin.categories.php | 30 +- .../commentcenter/plugin.commentcenter.php | 4 +- fp-plugins/favicon/plugin.favicon.php | 25 +- fp-plugins/footnotes/plugin.footnotes.php | 10 +- fp-plugins/jquery/plugin.jquery.php | 32 +- .../lastcomments/plugin.lastcomments.php | 197 +++-- .../plugin.lastcommentsadmin.php | 65 +- fp-plugins/lastentries/plugin.lastentries.php | 83 +- fp-plugins/lightbox2/plugin.lightbox2.php | 46 +- .../mediamanager/plugin.mediamanager.php | 60 +- fp-plugins/postviews/plugin.postviews.php | 45 +- fp-plugins/prettyurls/plugin.prettyurls.php | 777 +++++++++--------- fp-plugins/qspam/plugin.qspam.php | 85 +- fp-plugins/readmore/plugin.readmore.php | 10 +- fp-plugins/searchbox/plugin.searchbox.php | 8 +- fp-plugins/thumb/plugin.thumb.php | 116 +-- 23 files changed, 1011 insertions(+), 1030 deletions(-) diff --git a/fp-plugins/accessibleantispam/plugin.accessibleantispam.php b/fp-plugins/accessibleantispam/plugin.accessibleantispam.php index 1fe73c7..86fc524 100755 --- a/fp-plugins/accessibleantispam/plugin.accessibleantispam.php +++ b/fp-plugins/accessibleantispam/plugin.accessibleantispam.php @@ -1,22 +1,20 @@ append('error', $lang['plugin']['accessibleantispam']['error']); + + $smarty->append('error', $lang ['plugin'] ['accessibleantispam'] ['error']); } - - if ( AASPAM_DEBUG && $f=@fopen(AASPAM_LOG, 'a') ) { - $arr['aaspam-q'] = $_POST['aaspam']; - $arr['aaspam-a'] = $v; - $arr['SUCCESS'] = $ret; - - $s = date('r'). "|" . session_id().'|'.utils_kimplode($arr)."\r\n"; - @fwrite($f, $s); - @fclose($f); - } - - + + if (AASPAM_DEBUG && $f = @fopen(AASPAM_LOG, 'a')) { + $arr ['aaspam-q'] = $_POST ['aaspam']; + $arr ['aaspam-a'] = $v; + $arr ['SUCCESS'] = $ret; + + $s = date('r') . "|" . session_id() . '|' . utils_kimplode($arr) . "\r\n"; + @fwrite($f, $s); + @fclose($f); + } + return $ret; } function plugin_aaspam_comment_form() { - + // we get a random arithmetic operation // between sum, subtraction and multiplication; - + // we intentionally left out division because // it can lead to situations like division by zero // or floating point numbers + $myop = array_rand($ops = array( + '+', + '-', + '*' + )); + $op = $ops [$myop]; - $myop = array_rand($ops=array('+','-','*')); - $op=$ops[$myop]; - // we get two random integers between 1 and 10 $v1 = mt_rand(1, 10); - // we rand $v2 until it differs from $v1 - // (otherwise result for subtractions is zero) - while (($v2 = mt_rand(1, 10))==$v1); - + // we rand $v2 until it differs from $v1 + // (otherwise result for subtractions is zero) + while (($v2 = mt_rand(1, 10)) == $v1) + ; + // if operation is subtraction // the higher number must always come first // or you'll get a negative integer - if ($v2>$v1 && $op=='-') { + if ($v2 > $v1 && $op == '-') { $tmp = $v1; $v1 = $v2; $v2 = $tmp; - } // execute the operation - switch($op) { - case '+' : - $v = $v1+$v2; + switch ($op) { + case '+': + $v = $v1 + $v2; break; - case '-' : - $v = $v1-$v2; + case '-': + $v = $v1 - $v2; break; - case '*' : - $v = $v1*$v2; + case '*': + $v = $v1 * $v2; break; - } - + } - sess_add('aaspam', $v); - + // load plugin strings // they're located under plugin.PLUGINNAME/lang/LANGID/ $lang = lang_load('plugin:accessibleantispam'); - - $langstrings =& $lang['plugin']['accessibleantispam']; - + + $langstrings = & $lang ['plugin'] ['accessibleantispam']; + // get the correct question depending on the operation - switch($op) { - case '+' : - $question = $langstrings['sum']; + switch ($op) { + case '+': + $question = $langstrings ['sum']; break; - case '-' : - $question = $langstrings['sub']; + case '-': + $question = $langstrings ['sub']; break; - case '*' : - $question = $langstrings['prod']; + case '*': + $question = $langstrings ['prod']; break; - } - + } + // format the question with numbers at the proper positions $question = sprintf($question, $v1, $v2); - - if ( AASPAM_DEBUG && $f=@fopen(AASPAM_LOG, 'a') ) { - $arr['aaspam-q'] = $v; - @fwrite($f, date('r'). '|'.session_id() .'|'. utils_kimplode($arr)."\r\n"); + + if (AASPAM_DEBUG && $f = @fopen(AASPAM_LOG, 'a')) { + $arr ['aaspam-q'] = $v; + @fwrite($f, date('r') . '|' . session_id() . '|' . utils_kimplode($arr) . "\r\n"); @fclose($f); } - + // echoes the question and the form part echo <<
-

-STR; - +


+

+ STR; } - ?> diff --git a/fp-plugins/adminarea/plugin.adminarea.php b/fp-plugins/adminarea/plugin.adminarea.php index 5d8d10c..f446f9e 100644 --- a/fp-plugins/adminarea/plugin.adminarea.php +++ b/fp-plugins/adminarea/plugin.adminarea.php @@ -2,11 +2,11 @@ /* * Plugin Name: AdminArea - * Plugin URI: http://www.nowhereland.it/ - * Description: AdminArea plugin. Part of the standard distribution ;) - * Author: NoWhereMan + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: AdminArea plugin. Part of the standard distribution. * Version: 1.0 - * Author URI: http://www.nowhereland.it/ */ function plugin_adminarea_widget() { diff --git a/fp-plugins/akismet/plugin.akismet.php b/fp-plugins/akismet/plugin.akismet.php index 20d4401..890bb51 100644 --- a/fp-plugins/akismet/plugin.akismet.php +++ b/fp-plugins/akismet/plugin.akismet.php @@ -1,14 +1,12 @@ setAuthor($contents['name']); - $akismet->setAuthorEmail(isset($contents['email'])? $contents['email'] : ''); - $akismet->setAuthorURL(isset($contents['url'])? $contents['url'] : ''); - $akismet->setContent($contents['content']); - - if ($v= $akismet->isSpam()){ - global $smarty; - $smarty->assign('error', array('ERROR: Comment is invalid')); + if (!$bool) return false; - } + + global $fp_config; + + $akismet = new Akismet($fp_config ['general'] ['www'], plugin_getoptions('akismet', 'apikey')); + $akismet->setAuthor($contents ['name']); + $akismet->setAuthorEmail(isset($contents ['email']) ? $contents ['email'] : ''); + $akismet->setAuthorURL(isset($contents ['url']) ? $contents ['url'] : ''); + $akismet->setContent($contents ['content']); + + if ($v = $akismet->isSpam()) { + global $smarty; + $smarty->assign('error', array( + 'ERROR: Comment is invalid' + )); + return false; + } return true; } -if (class_exists('AdminPanelAction')){ +if (class_exists('AdminPanelAction')) { + + class admin_plugin_akismet extends AdminPanelAction { - class admin_plugin_akismet extends AdminPanelAction { - var $langres = 'plugin:akismet'; - + function setup() { $this->smarty->assign('admin_resource', "plugin:akismet/admin.plugin.akismet"); } - + function main() { $akismetconf = plugin_getoptions('akismet'); $this->smarty->assign('akismetconf', $akismetconf); } - + function onsubmit() { global $fp_config; - - if ($_POST['wp-apikey']){ - - plugin_addoption('akismet', 'apikey', $_POST['wp-apikey']); + + if ($_POST ['wp-apikey']) { + + plugin_addoption('akismet', 'apikey', $_POST ['wp-apikey']); plugin_saveoptions('akismet'); - + $this->smarty->assign('success', 1); } else { - $this->smarty->assign('success', -1); + $this->smarty->assign('success', -1); } - + return 2; } - + } admin_addpanelaction('plugin', 'akismet', true); - } diff --git a/fp-plugins/archives/plugin.archives.php b/fp-plugins/archives/plugin.archives.php index d00061d..760fd37 100644 --- a/fp-plugins/archives/plugin.archives.php +++ b/fp-plugins/archives/plugin.archives.php @@ -1,86 +1,84 @@ _directory === $directory) { - // add year to the list (do not closes li, because - // we may have nested elements) - $this->_year = $file; - $lnk = get_year_link($file); - $this->_htmllist[$this->_year] = "
  • 20$file"; - return 1; - } elseif (is_dir($f)) { - $this->_months[] = $file; - return 0; - } + + var $_directory = CONTENT_DIR; + + var $_list = array(); + + var $_htmllist = array(); + + var $_months = array(); + + var $_year = ''; + + function _checkFile($directory, $file) { + $f = "$directory/$file"; + + if (ctype_digit($file)) { + if ($this->_directory === $directory) { + // add year to the list (do not closes li, because + // we may have nested elements) + $this->_year = $file; + $lnk = get_year_link($file); + $this->_htmllist [$this->_year] = "
  • 20$file"; + return 1; + } elseif (is_dir($f)) { + $this->_months [] = $file; + return 0; } } - - function _exitingDir($directory = null, $file=null) { - - $y = $this->_year; - - if ($mos =& $this->_months) { - sort($mos); - $list = ''; - $linearlist = array(); - foreach($mos as $mth) { - $lnk = get_month_link($y, $mth); - $the_month = theme_date_format( mktime(0, 0, 0, $mth, 1, 0 ), '%B'); - $list = "
  • ". - $the_month - .'
  • ' . $list; - $linearlist["$the_month 20{$this->_year}"] = $lnk; - } - $list = '
      ' . $list . '
    '; + } + + function _exitingDir($directory = null, $file = null) { + $y = $this->_year; + + if ($mos = & $this->_months) { + sort($mos); + $list = ''; + $linearlist = array(); + foreach ($mos as $mth) { + $lnk = get_month_link($y, $mth); + $the_month = theme_date_format(mktime(0, 0, 0, $mth, 1, 0), '%B'); + $list = "
  • " . $the_month . '
  • ' . $list; + $linearlist ["$the_month 20{$this->_year}"] = $lnk; } - - $mos = array(); - - // we close year's li - $this->_list[$y] = $linearlist; - $this->_htmllist[$y] .= $list . ''; + $list = '
      ' . $list . '
    '; } - function getList() { - krsort($this->_list); - return $this->_list; - } - - function getHtmlList() { - krsort($this->_htmllist); - return implode($this->_htmllist); - } - - + $mos = array(); + + // we close year's li + $this->_list [$y] = $linearlist; + $this->_htmllist [$y] .= $list . ''; + } + + function getList() { + krsort($this->_list); + return $this->_list; + } + + function getHtmlList() { + krsort($this->_htmllist); + return implode($this->_htmllist); + } + } - function plugin_archives_head() { - global $PLUGIN_ARCHIVES_MONTHLIST; - $PLUGIN_ARCHIVES_MONTHLIST = new plugin_archives_monthlist; + $PLUGIN_ARCHIVES_MONTHLIST = new plugin_archives_monthlist(); echo "\n\n"; - foreach($PLUGIN_ARCHIVES_MONTHLIST->getList() as $y => $months) { + foreach ($PLUGIN_ARCHIVES_MONTHLIST->getList() as $y => $months) { foreach ($months as $ttl => $link) echo "\n"; } @@ -90,19 +88,14 @@ function plugin_archives_head() { add_filter('wp_head', 'plugin_archives_head'); function plugin_archives_widget() { - lang_load('plugin:archives'); global $lang, $PLUGIN_ARCHIVES_MONTHLIST; - - + return array( - 'subject' => $lang['plugin']['archives']['subject'], - - 'content' => ($list = $PLUGIN_ARCHIVES_MONTHLIST->getHtmlList()) ? - '
      ' . $list . '
    ' - : - "

    {$lang['plugin']['archives']['no_posts']}

    " - ); + 'subject' => $lang ['plugin'] ['archives'] ['subject'], + + 'content' => ($list = $PLUGIN_ARCHIVES_MONTHLIST->getHtmlList()) ? '
      ' . $list . '
    ' : "

    {$lang['plugin']['archives']['no_posts']}

    " + ); } register_widget('archives', 'Archives', 'plugin_archives_widget'); diff --git a/fp-plugins/bbcode/plugin.bbcode.php b/fp-plugins/bbcode/plugin.bbcode.php index 2b6a2d3..8da1d52 100644 --- a/fp-plugins/bbcode/plugin.bbcode.php +++ b/fp-plugins/bbcode/plugin.bbcode.php @@ -1,11 +1,11 @@ BBCode markup; provides automatic integration with lightbox. - * Author: Hydra, NoWhereMan - * Author URI: http://flatpress.sf.net + * Version: 1.6 + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Allows using BBCode markup; provides automatic integration with lightbox. Part of the standard distribution. */ require (plugin_getdir('bbcode') . '/inc/stringparser_bbcode.class.php'); require (plugin_getdir('bbcode') . '/panels/admin.plugin.panel.bbcode.php'); diff --git a/fp-plugins/blockparser/plugin.blockparser.php b/fp-plugins/blockparser/plugin.blockparser.php index 3947524..ccc463b 100644 --- a/fp-plugins/blockparser/plugin.blockparser.php +++ b/fp-plugins/blockparser/plugin.blockparser.php @@ -2,12 +2,12 @@ /* * Plugin Name: BlockParser - * Plugin URI: http://www.nowhereland.it/ * Type: Block - * Description: BlockParser plugin. Part of the standard distribution ;) This allow you to use simple non-plugin custom blocks :) - * Author: NoWhereMan real_nowhereman at user dot sf dot net * Version: 1.0 - * Author URI: http://www.nowhereland.it/ + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Allows you to use simple non-plugin custom blocks. Part of the standard distribution. */ // define('BLOCKS_DIR', CONTENT_DIR . 'blocks/'); diff --git a/fp-plugins/calendar/plugin.calendar.php b/fp-plugins/calendar/plugin.calendar.php index 86a3cc0..a8cb584 100755 --- a/fp-plugins/calendar/plugin.calendar.php +++ b/fp-plugins/calendar/plugin.calendar.php @@ -3,11 +3,11 @@ /* * Plugin Name: Calendar * Version: 1.1 - * Plugin URI: http://flatpress.sf.net * Type: Block - * Description: Adds a Calendar block level element - * Author: NoWhereMan - * Author URI: http://flatpress.sf.net + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Adds a calendar widget. Part of the standard distribution. */ // PHP Calendar (version 2.3), written by Keith Devens @@ -19,17 +19,17 @@ function generate_calendar($year, $month, $days = array(), $day_name_length = 3, // remember that mktime will automatically correct if invalid dates are entered // for instance, mktime(0,0,0,12,32,1997) will be the date for Jan 1, 1998 // this provides a built in "rounding" feature to generate_calendar() - + $day_names = array(); // generate all the day names according to the current locale for($n = 0, $t = (3 + $first_day) * 86400; $n < 7; $n++, $t += 86400) // January 4, 1970 was a Sunday $day_names [$n] = ucfirst(date_strformat('%A', $t)); // %A means full textual day name - + list ($month, $year, $month_name, $weekday) = explode(',', date_strformat('%m,%Y,%B,%w', $first_of_month)); $weekday = ($weekday + 7 - $first_day) % 7; // adjust for $first_day $title = htmlentities(ucfirst($month_name)) . ' ' . $year; // note that some locales don't capitalize month and day names - + // Begin calendar. Uses a real . See http://diveintomark.org/archives/2002/07/03 - + // PHP7 compatibility: Since $pn is never passed, we do not need to create "previous" and "next" elements. $p = ''; $n = ''; @@ -37,16 +37,16 @@ function generate_calendar($year, $month, $days = array(), $day_name_length = 3, // @list($p, $pl) = each($pn); @list($n, $nl) = each($pn); #previous and next links, if applicable // if($p) $p = ''.($pl ? ''.$p.'' : $p).' '; // if($n) $n = ' '.($nl ? ''.$n.'' : $n).''; - + $calendar = '' . "\n" . '\n"; - + if ($day_name_length) { // if the day names should be shown ($day_name_length > 0) // if day_name_length is >3, the full name of the day will be printed foreach ($day_names as $d) $calendar .= ''; $calendar .= "\n"; } - + if ($weekday > 0) $calendar .= ''; // initial 'empty' days for($day = 1, $days_in_month = gmdate('t', $first_of_month); $day <= $days_in_month; $day++, $weekday++) { @@ -64,49 +64,49 @@ function generate_calendar($year, $month, $days = array(), $day_name_length = 3, } if ($weekday != 7) $calendar .= ''; // remaining "empty" days - + return $calendar . "\n
    ' . $p . ($month_href ? '' . $title . '' : $title) . $n . "
    ' . htmlentities($day_name_length < 4 ? substr($d, 0, $day_name_length) : $d) . '
      
    \n"; } function plugin_calendar_widget() { global $fp_params; - + $y = isset($fp_params ['y']) ? $fp_params ['y'] : date('y'); $m = isset($fp_params ['m']) ? $fp_params ['m'] : date('m'); - + global $fpdb; - + $q = new FPDB_Query(array( 'fullparse' => false, 'y' => $y, 'm' => $m, 'count' => -1 ), null); - + $days = array(); - + while ($q->hasmore($queryId)) { - + list ($id, $entry) = $q->getEntry($queryId); $date = date_from_id($id); $d = (int) $date ['d']; - + $days [$d] = array( get_day_link($y, $m, str_pad($d, 2, '0', STR_PAD_LEFT)), 'linked-day' ); - + $count++; } - + // load plugin strings // they're located under plugin.PLUGINNAME/lang/LANGID/ $lang = lang_load('plugin:calendar'); - + $widget = array(); $widget ['subject'] = $lang ['plugin'] ['calendar'] ['subject']; $widget ['content'] = '
    • ' . generate_calendar($y, $m, $days) . '
    '; - + return $widget; } diff --git a/fp-plugins/categories/plugin.categories.php b/fp-plugins/categories/plugin.categories.php index 4425057..25b4446 100755 --- a/fp-plugins/categories/plugin.categories.php +++ b/fp-plugins/categories/plugin.categories.php @@ -1,34 +1,32 @@ assign('categories_showcount', false); - + // load plugin strings // they're located under plugin.PLUGINNAME/lang/LANGID/ $lang = lang_load('plugin:categories'); - - $entry['subject'] = $lang['plugin']['categories']['subject']; - $entry['content'] = $smarty->fetch('plugin:categories/widget'); + + $entry ['subject'] = $lang ['plugin'] ['categories'] ['subject']; + $entry ['content'] = $smarty->fetch('plugin:categories/widget'); return $entry; } diff --git a/fp-plugins/commentcenter/plugin.commentcenter.php b/fp-plugins/commentcenter/plugin.commentcenter.php index 33f6b68..a15ba3d 100644 --- a/fp-plugins/commentcenter/plugin.commentcenter.php +++ b/fp-plugins/commentcenter/plugin.commentcenter.php @@ -4,9 +4,9 @@ * Plugin Name: Comment Center * Version: 1.1.2 * Plugin URI: https://www.flatpress.org - * Description: Manage your blog's comments: Set policies, publish or reject comments. - * Author: FlatPress (credits to Piero VDFN) + * Author: FlatPress * Author URI: https://www.flatpress.org + * Description: Manage your blog's comments: Set policies, publish or reject comments. Part of the standard distribution. */ /** diff --git a/fp-plugins/favicon/plugin.favicon.php b/fp-plugins/favicon/plugin.favicon.php index 6e949d7..c1e4cde 100755 --- a/fp-plugins/favicon/plugin.favicon.php +++ b/fp-plugins/favicon/plugin.favicon.php @@ -1,21 +1,20 @@ '; + echo ''; } - + add_action('wp_head', 'plugin_favicon_head'); - + ?> diff --git a/fp-plugins/footnotes/plugin.footnotes.php b/fp-plugins/footnotes/plugin.footnotes.php index 47a1d27..f7dda8c 100755 --- a/fp-plugins/footnotes/plugin.footnotes.php +++ b/fp-plugins/footnotes/plugin.footnotes.php @@ -1,11 +1,11 @@ jQuery locally. -Author: Piero VDFN -Author URI: http://www.vdfn.altervista.org/ -JQuery and JQueryUI version bump by Arvid Zimmermann -*/ - -## Original author: NoWhereMan (http://www.nowhereland.it) + * Plugin Name: jQuery + * Version: 2.0.1 + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Provides jQuery locally. Part of the standard distribution. + */ +// # Original author: NoWhereMan (http://www.nowhereland.it) add_action('wp_head', 'plugin_jquery_head', 0); - function plugin_jquery_head() { - - $pdir=plugin_geturl('jquery'); + $pdir = plugin_geturl('jquery'); echo << - - - -JSUTILS; + + + + + JSUTILS; } ?> diff --git a/fp-plugins/lastcomments/plugin.lastcomments.php b/fp-plugins/lastcomments/plugin.lastcomments.php index 1f6c72e..e15d462 100644 --- a/fp-plugins/lastcomments/plugin.lastcomments.php +++ b/fp-plugins/lastcomments/plugin.lastcomments.php @@ -1,32 +1,30 @@ '; - + // cimangi Aggiunta traduzione stringhe // load plugin strings @@ -36,48 +34,47 @@ function plugin_lastcomments_widget() { if ($count = count($list)) { while ($arr = array_pop($list)) { theme_comments_filters($arr, $id); - - - $q = new FPDB_Query(array('id' => $arr['entry']), null); + + $q = new FPDB_Query(array( + 'id' => $arr ['entry'] + ), null); // first element of the array is dropped, as it is the ID, which // we already know - @list(, $entry) = $q->getEntry($query); - - if (!$entry){ + @list (, $entry) = $q->getEntry($query); + + if (!$entry) { $count--; - $update = true; + $update = true; continue; } - $content .= - "
  • + $content .= "
  • {$arr['content']} -

    {$arr['name']} - {$entry['subject']}

    +

    {$arr['name']} - {$entry['subject']}

  • \n"; } - $subject = $lang['plugin']['lastcomments']['last'] . ' ' . $count . ' '. $lang['plugin']['lastcomments']['comments']; + $subject = $lang ['plugin'] ['lastcomments'] ['last'] . ' ' . $count . ' ' . $lang ['plugin'] ['lastcomments'] ['comments']; } - + if (!$count) { if ($update) fs_delete(LASTCOMMENTS_CACHE_FILE); - $content .= '
  • ' . $lang['plugin']['lastcomments']['no_comments'] .'
  • '; - $subject = $lang['plugin']['lastcomments']['no_new_comments']; - } - + $content .= '
  • ' . $lang ['plugin'] ['lastcomments'] ['no_comments'] . '
  • '; + $subject = $lang ['plugin'] ['lastcomments'] ['no_new_comments']; + } + $content .= ''; - $entry['subject'] = $subject; - $entry['content'] = $content; - + $entry ['subject'] = $subject; + $entry ['content'] = $content; + return $entry; } /** * function plugin_lastcomments_cache - * + * * comment cache is a reverse queue; we put * element on the top, and we delete elements * from bottom; this is because the output @@ -85,104 +82,102 @@ function plugin_lastcomments_widget() { * All this headache stuff just to say that * in the end the widget will show up elements ordered * from newer to older :P - * - * @param $entryid string entry id i.e. entryNNNNNN-NNNNNN - * @param $comment array where $comment[0] is $commentid i.e. commentNNNNNN-NNNNNN - * and $comment[1] is the actual content array + * + * @param $entryid string + * entry id i.e. entryNNNNNN-NNNNNN + * @param $comment array + * where $comment[0] is $commentid i.e. commentNNNNNN-NNNNNN + * and $comment[1] is the actual content array */ - - function plugin_lastcomments_cache($entryid, $comment) { // max num of chars per comment $CHOP_AT = 30; - - list($id, $content) = $comment; - + list ($id, $content) = $comment; + comment_clean($content); - - - if (false===($f = io_load_file(LASTCOMMENTS_CACHE_FILE))) { + + if (false === ($f = io_load_file(LASTCOMMENTS_CACHE_FILE))) { // no comments in cache - $list = array(); + $list = array(); } else { // if file exists and its correctly read, we get the stored list // (it is stored in encoded form) $list = unserialize($f); - - if (count($list)+1 > LASTCOMMENTS_MAX) { + + if (count($list) + 1 > LASTCOMMENTS_MAX) { // comments are more than allowed maximum: - // we delete the last in queue. + // we delete the last in queue. array_shift($list); } } - - if (strlen($content['content']) > $CHOP_AT) { - $string = substr($content['content'], 0, $CHOP_AT) . '...'; - } else {$string = $content['content'];} - - array_push($list, array('name'=>$content['name'], - 'content'=>$string, - 'id'=> $id, - 'entry'=> $entryid) - ); - + + if (strlen($content ['content']) > $CHOP_AT) { + $string = substr($content ['content'], 0, $CHOP_AT) . '...'; + } else { + $string = $content ['content']; + } + + array_push($list, array( + 'name' => $content ['name'], + 'content' => $string, + 'id' => $id, + 'entry' => $entryid + )); + return io_write_file(LASTCOMMENTS_CACHE_FILE, serialize($list)); - - } register_widget('lastcomments', 'LastComments', 'plugin_lastcomments_widget'); -function plugin_lastcomments_rss () { +function plugin_lastcomments_rss() { global $smarty; - - - if (false===($f = io_load_file(LASTCOMMENTS_CACHE_FILE))) { + + if (false === ($f = io_load_file(LASTCOMMENTS_CACHE_FILE))) { // no comments in cache - $list = array(); + $list = array(); } else { // if file exists and its correctly read, we get the stored list // (it is stored in encoded form) $list = unserialize($f); } - + $newlist = array(); - foreach($list as $c) { - $newlist[] = comment_parse($list['entryid'], $list['id']); + foreach ($list as $c) { + $newlist [] = comment_parse($list ['entryid'], $list ['id']); } - + $smarty->assign('lastcomments_list', $newlist); } /* - -function plugin_lastcomments_def_rss_link() { - return BLOG_BASEURL . "?feed=lastcomments-rss2"; -} - -function plugin_lastcomments_rss_link() { - return apply_filters('plugin_lastcomments_rss_link', ''); -} - -add_action('wp_head', 'plugin_lastcomments_rsshead'); -function plugin_lastcomments_rsshead() { - echo "\n\n"; -} - -add_action('init', 'plugin_lastcomments_rssinit'); -function plugin_lastcomments_rssinit() { - global $smarty; - - if (isset($_GET['feed']) && $_GET['feed']=='lastcomments-rss2') { - $smarty->display('plugin:lastcomments/plugin.lastcomments-feed'); - exit(); - } -} - -*/ + * + * function plugin_lastcomments_def_rss_link() { + * return BLOG_BASEURL . "?feed=lastcomments-rss2"; + * } + * + * function plugin_lastcomments_rss_link() { + * return apply_filters('plugin_lastcomments_rss_link', ''); + * } + * + * add_action('wp_head', 'plugin_lastcomments_rsshead'); + * function plugin_lastcomments_rsshead() { + * echo "\n\n"; + * } + * + * add_action('init', 'plugin_lastcomments_rssinit'); + * function plugin_lastcomments_rssinit() { + * global $smarty; + * + * if (isset($_GET['feed']) && $_GET['feed']=='lastcomments-rss2') { + * $smarty->display('plugin:lastcomments/plugin.lastcomments-feed'); + * exit(); + * } + * } + * + */ ?> diff --git a/fp-plugins/lastcommentsadmin/plugin.lastcommentsadmin.php b/fp-plugins/lastcommentsadmin/plugin.lastcommentsadmin.php index 647e4bfb..330a55c 100644 --- a/fp-plugins/lastcommentsadmin/plugin.lastcommentsadmin.php +++ b/fp-plugins/lastcommentsadmin/plugin.lastcommentsadmin.php @@ -1,65 +1,68 @@ smarty->assign('admin_resource', "plugin:lastcommentsadmin/admin.plugin.lastcommentsadmin"); } - + function main() { - if (!function_exists('plugin_lastcomments_cache')){ + if (!function_exists('plugin_lastcomments_cache')) { $this->smarty->assign('success', -2); } } - + function onsubmit($data = NULL) { global $fp_config; - - if (isset($_POST['lastcommentadmin_clear'])){ + + if (isset($_POST ['lastcommentadmin_clear'])) { fs_delete(LASTCOMMENTS_CACHE_FILE); $this->smarty->assign('success', 1); } - - if (isset($_POST['lastcommentadmin_rebuild'])){ + + if (isset($_POST ['lastcommentadmin_rebuild'])) { fs_delete(LASTCOMMENTS_CACHE_FILE); $coms = Array(); - - $q = new FPDB_Query(array('fullparse'=>false,'start'=>0,'count'=>-1), null); + + $q = new FPDB_Query(array( + 'fullparse' => false, + 'start' => 0, + 'count' => -1 + ), null); while ($q->hasmore()) { - list($id,$e) = $q->getEntry(); + list ($id, $e) = $q->getEntry(); $obj = new comment_indexer($id); - foreach($obj->getList() as $value){ - $coms[$value]=$id; + foreach ($obj->getList() as $value) { + $coms [$value] = $id; } ksort($coms); - $coms = array_slice($coms, -LASTCOMMENTS_MAX ); + $coms = array_slice($coms, -LASTCOMMENTS_MAX); } - foreach($coms as $cid=>$eid){ + foreach ($coms as $cid => $eid) { $c = comment_parse($eid, $cid); - plugin_lastcomments_cache($eid, array($cid, $c)); + plugin_lastcomments_cache($eid, array( + $cid, + $c + )); } $this->smarty->assign('success', 2); } - + return 2; } - + } admin_addpanelaction('plugin', 'lastcommentsadmin', true); - } \ No newline at end of file diff --git a/fp-plugins/lastentries/plugin.lastentries.php b/fp-plugins/lastentries/plugin.lastentries.php index 6a8fae8..1afd343 100755 --- a/fp-plugins/lastentries/plugin.lastentries.php +++ b/fp-plugins/lastentries/plugin.lastentries.php @@ -1,65 +1,68 @@ query("fullparse:false,start:0,count:$num"); - $fpdb->doquery($queryId); - - $fpdb->getQuery - */ - - $q = new FPDB_Query(array('fullparse'=>false,'start'=>0,'count'=>$num), null); - + * $queryId = $fpdb->query("fullparse:false,start:0,count:$num"); + * $fpdb->doquery($queryId); + * + * $fpdb->getQuery + */ + + $q = new FPDB_Query(array( + 'fullparse' => false, + 'start' => 0, + 'count' => $num + ), null); + $string = '
      '; - - + $count = 0; - + while ($q->hasmore()) { - - list($id, $entry) = $q->getEntry(); - + + list ($id, $entry) = $q->getEntry(); + $link = get_permalink($id); - - $string .='
    • '; + + $string .= '
    • '; $admin = BLOG_BASEURL . "admin.php?p=entry&entry="; if (user_loggedin()) // if loggedin prints a "edit" link - $string .= "[".$lang['plugin']['lastentries']['edit']."]"; + $string .= "[" . $lang ['plugin'] ['lastentries'] ['edit'] . "]"; $string .= "{$entry['subject']}
    • \n"; $count++; } - - if ($string == '
        '){ - $string .= '
      • '.$lang['plugin']['lastentries']['add_entry'].'
      • '; - $subject = $lang['plugin']['lastentries']['no_entries']; - } else $subject = $lang['plugin']['lastentries']['subject_before_count'] . $count . $lang['plugin']['lastentries']['subject_after_count']; - + + if ($string == '
          ') { + $string .= '
        • ' . $lang ['plugin'] ['lastentries'] ['add_entry'] . '
        • '; + $subject = $lang ['plugin'] ['lastentries'] ['no_entries']; + } else + $subject = $lang ['plugin'] ['lastentries'] ['subject_before_count'] . $count . $lang ['plugin'] ['lastentries'] ['subject_after_count']; + $string .= '
        '; $widget = array(); - $widget['subject'] = $subject; - $widget['content'] = $string; - + $widget ['subject'] = $subject; + $widget ['content'] = $string; + return $widget; } diff --git a/fp-plugins/lightbox2/plugin.lightbox2.php b/fp-plugins/lightbox2/plugin.lightbox2.php index ecb1660..1d5d8ea 100644 --- a/fp-plugins/lightbox2/plugin.lightbox2.php +++ b/fp-plugins/lightbox2/plugin.lightbox2.php @@ -1,47 +1,45 @@ SlimBox 2 requires jQuery (modified jsutils plugin) -Author: Piero VDFN -Author URI: http://www.vdfn.altervista.org/ -*/ -## Original author: NoWhereMan (http://www.nowhereland.it) +/* + * Plugin Name: LightBox2 + * Version: 2.0 + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Lightbox overlays using SlimBox 2 requires jQuery (modified jsutils plugin). Part of the standard distribution. + */ + +// # Original author: NoWhereMan (http://www.nowhereland.it) // if PLUGINS_DIR is not fp-plugins please edit res/lightbox.js - function plugin_lightbox2_setup() { - return function_exists('plugin_jquery_head')? 1:-1; + return function_exists('plugin_jquery_head') ? 1 : -1; } function plugin_lightbox2_head() { - - $pdir=plugin_geturl('lightbox2'); + $pdir = plugin_geturl('lightbox2'); echo << - - -LBOXHEAD; + + + + LBOXHEAD; } add_action('wp_head', 'plugin_lightbox2_head'); function plugin_lightbox2_footer() { - - $pdir=plugin_geturl('lightbox2'); + $pdir = plugin_geturl('lightbox2'); echo << - - -LBOXHEAD; + + + + LBOXHEAD; } add_action('wp_footer', 'plugin_lightbox2_footer'); function plugin_lightbox2_hook($popup, $abspath) { global $lightbox_rel; // the other $popup is just dropped - return $lightbox_rel? "rel=\"lightbox[$lightbox_rel]\"" : ' rel="lightbox"'; + return $lightbox_rel ? "rel=\"lightbox[$lightbox_rel]\"" : ' rel="lightbox"'; } add_action('bbcode_img_popup', 'plugin_lightbox2_hook', 5, 2); diff --git a/fp-plugins/mediamanager/plugin.mediamanager.php b/fp-plugins/mediamanager/plugin.mediamanager.php index 2734f53..b20be00 100644 --- a/fp-plugins/mediamanager/plugin.mediamanager.php +++ b/fp-plugins/mediamanager/plugin.mediamanager.php @@ -1,60 +1,55 @@ hasMore()) { - list($id, $e) = $q->getEntry(); - if (isset($e['content'])){ - foreach($fupd as $id){ - if (is_null($files[$id]['usecount'])) $files[$id]['usecount']=0; - if ($files[$id]['type']=='gallery'){ - $searchterm="[gallery=images/".$files[$id]['name']; + list ($id, $e) = $q->getEntry(); + if (isset($e ['content'])) { + foreach ($fupd as $id) { + if (is_null($files [$id] ['usecount'])) + $files [$id] ['usecount'] = 0; + if ($files [$id] ['type'] == 'gallery') { + $searchterm = "[gallery=images/" . $files [$id] ['name']; } else { - $searchterm=$files[$id]['type']."/".$files[$id]['name']; + $searchterm = $files [$id] ['type'] . "/" . $files [$id] ['name']; } - if (strpos($e['content'], $searchterm) !== false) $files[$id]['usecount']++; + if (strpos($e ['content'], $searchterm) !== false) + $files [$id] ['usecount']++; } } } - $usecount=array(); - foreach($files as $info){ - $usecount[$info['name']]=$info['usecount']; + $usecount = array(); + foreach ($files as $info) { + $usecount [$info ['name']] = $info ['usecount']; } plugin_addoption('mediamanager', 'usecount', $usecount); plugin_saveoptions('mediamanager'); } +if (class_exists('AdminPanelAction')) { -if (class_exists('AdminPanelAction')){ - - - include(plugin_getdir('mediamanager') .'/panels/panel.mediamanager.file.php'); - - + include (plugin_getdir('mediamanager') . '/panels/panel.mediamanager.file.php'); } - - /* invalidate count on entry save and delete */ -function mediamanager_invalidatecount($arg){ +function mediamanager_invalidatecount($arg) { plugin_addoption('mediamanager', 'usecount', array()); plugin_saveoptions('mediamanager'); return $arg; @@ -62,5 +57,4 @@ function mediamanager_invalidatecount($arg){ add_filter('delete_post', 'mediamanager_invalidatecount', 1); add_filter('content_save_pre', 'mediamanager_invalidatecount', 1); - ?> diff --git a/fp-plugins/postviews/plugin.postviews.php b/fp-plugins/postviews/plugin.postviews.php index ba60b60..b5a2bbe 100644 --- a/fp-plugins/postviews/plugin.postviews.php +++ b/fp-plugins/postviews/plugin.postviews.php @@ -1,25 +1,24 @@ getQuery(); $calc = $q->single; - - $v = plugin_postviews_calc($id, $calc); - - $smarty->assign('views', $v); + $v = plugin_postviews_calc($id, $calc); + + $smarty->assign('views', $v); } - - ?> diff --git a/fp-plugins/prettyurls/plugin.prettyurls.php b/fp-plugins/prettyurls/plugin.prettyurls.php index 6c3858c..8e33283 100644 --- a/fp-plugins/prettyurls/plugin.prettyurls.php +++ b/fp-plugins/prettyurls/plugin.prettyurls.php @@ -1,12 +1,12 @@ categories) - return; - + + function categories($force = true) { + if ($this->categories) + return; + if ($force || !file_exists(PRETTYURLS_CATS)) { $d = entry_categories_get('defs'); $list = array(); - foreach ($d as $k=>$v) { - $list[$k] = sanitize_title($v); + foreach ($d as $k => $v) { + $list [$k] = sanitize_title($v); } io_write_file(PRETTYURLS_CATS, serialize($list)); } else { @@ -62,216 +62,194 @@ class Plugin_PrettyURLs { } $this->categories = $list; } - - + function md5($id, $title) { $date = date_from_id($id); - return md5($date['y'].$date['m'].$date['d'].$title); + return md5($date ['y'] . $date ['m'] . $date ['d'] . $title); } - - function permalink($str, $id) { global $fpdb, $post; if (PRETTYURLS_TITLES) - $title = sanitize_title($post['subject']); - else + $title = sanitize_title($post ['subject']); + else $title = $id; $date = date_from_id($id); - // yeah, hackish, I know... - - return $this->baseurl . "20{$date['y']}/{$date['m']}/{$date['d']}/$title/"; + // yeah, hackish, I know... + + return $this->baseurl . "20{$date['y']}/{$date['m']}/{$date['d']}/$title/"; } - + function commentlink($str, $id) { $link = $this->permalink($str, $id); return $link . "comments/"; } - + function feedlink($str, $type) { - return $this->baseurl . "feed/{$type}/"; - + return $this->baseurl . "feed/{$type}/"; } - + function commentsfeedlink($str, $type, $id) { $link = $this->commentlink($str, $id); - return $link . "feed/{$type}/"; + return $link . "feed/{$type}/"; } - function staticlink($str, $id) { - return $this->baseurl . "$id/"; + return $this->baseurl . "$id/"; } - function categorylink($str, $catid) { if (PRETTYURLS_TITLES) { - if (@$this->categories[$catid]) - return $this->baseurl . "category/{$this->categories[$catid]}/"; - else return $str; + if (@$this->categories [$catid]) + return $this->baseurl . "category/{$this->categories[$catid]}/"; + else + return $str; } else { - return $this->baseurl . "category/{$catid}/"; + return $this->baseurl . "category/{$catid}/"; } } - - + function yearlink($str, $y) { - return $this->baseurl . "20$y/"; + return $this->baseurl . "20$y/"; } - + function monthlink($str, $y, $m) { return $this->yearlink($str, $y) . "$m/"; } - + function daylink($str, $y, $m, $d) { return $this->monthlink($str, $y, $m) . "$d/"; } - - + function cache_create() { - $this->index = array(); /* - $o =& entry_init(); - - $entries = $o->getList(); + * $o =& entry_init(); + * + * $entries = $o->getList(); */ - $o = new FPDB_Query(array('start'=>0,'count'=>-1,'fullparse'=>false), null); - - - #foreach ($entries as $id => $contents) { + $o = new FPDB_Query(array( + 'start' => 0, + 'count' => -1, + 'fullparse' => false + ), null); + + // foreach ($entries as $id => $contents) { while ($o->hasMore()) { - list($id, $contents) = $o->getEntry(); + list ($id, $contents) = $o->getEntry(); $date = date_from_id($id); - echo $contents['subject'], "\n"; - $md5 = md5(sanitize_title($contents['subject'])); - $this->index[$date['y']][$date['m']][$date['d']][$md5] = $id; + echo $contents ['subject'], "\n"; + $md5 = md5(sanitize_title($contents ['subject'])); + $this->index [$date ['y']] [$date ['m']] [$date ['d']] [$md5] = $id; } - #} - + // } + $this->cache_save(); io_write_file(PRETTYURLS_CACHE, 'dummy'); - } - - - function handle_categories($matches) { - - - if (!$this->categories) + if (!$this->categories) return; - - if (PRETTYURLS_TITLES) { - if ($c = array_search($matches[1], $this->categories)) - $this->fp_params['cat'] = $c; - else return $matches[0]; - } else { - $this->fp_params['cat'] = $matches[1]; - } - - } - - /* - named matches are not supported here - */ - - function handle_date($matches) { - - $this->fp_params['y'] = $matches[1]; - if (isset($matches[3])) $this->fp_params['m'] = $matches[3] ; - if (isset($matches[5])) $this->fp_params['d'] = $matches[5]; - - $this->date_handled = true; - - } - - - function handle_static($matches) { - $this->fp_params['page'] = $matches[1]; - $this->status = 2; - } - - function handle_entry($matches) { - - if (PRETTYURLS_TITLES) { - - #isset($this->index[ - if ($this->cache_get($this->fp_params['y'],$this->fp_params['m'], $this->fp_params['d'], md5($matches[1]))) { - $this->fp_params['entry'] = $this->index[$this->fp_params['y']][$this->fp_params['m']][$this->fp_params['d']][md5($matches[1])]; - } else { - // a bit hackish: we make up a fake url when there is no match, - // so that at the higher level the system will 404... - $this->fp_params['entry'] = 'a'; - } - } else { - $this->fp_params['entry'] = $matches[1]; - } - + if (PRETTYURLS_TITLES) { + if ($c = array_search($matches [1], $this->categories)) + $this->fp_params ['cat'] = $c; + else + return $matches [0]; + } else { + $this->fp_params ['cat'] = $matches [1]; + } } - - function handle_page($matches) { - $this->fp_params['paged'] = $matches[1]; + + /* + * named matches are not supported here + */ + function handle_date($matches) { + $this->fp_params ['y'] = $matches [1]; + if (isset($matches [3])) + $this->fp_params ['m'] = $matches [3]; + if (isset($matches [5])) + $this->fp_params ['d'] = $matches [5]; + + $this->date_handled = true; + } + + function handle_static($matches) { + $this->fp_params ['page'] = $matches [1]; $this->status = 2; } - - - function handle_comment($matches) { - $this->fp_params['comments'] = true; - } - - function handle_feed($matches) { - - $this->fp_params['feed'] = isset($matches[2])? $matches[2]:'rss2'; + + function handle_entry($matches) { + if (PRETTYURLS_TITLES) { + + // isset($this->index[ + if ($this->cache_get($this->fp_params ['y'], $this->fp_params ['m'], $this->fp_params ['d'], md5($matches [1]))) { + $this->fp_params ['entry'] = $this->index [$this->fp_params ['y']] [$this->fp_params ['m']] [$this->fp_params ['d']] [md5($matches [1])]; + } else { + // a bit hackish: we make up a fake url when there is no match, + // so that at the higher level the system will 404... + $this->fp_params ['entry'] = 'a'; + } + } else { + $this->fp_params ['entry'] = $matches [1]; + } } + function handle_page($matches) { + $this->fp_params ['paged'] = $matches [1]; + $this->status = 2; + } + + function handle_comment($matches) { + $this->fp_params ['comments'] = true; + } + + function handle_feed($matches) { + $this->fp_params ['feed'] = isset($matches [2]) ? $matches [2] : 'rss2'; + } function get_url() { $baseurl = BLOG_BASEURL; $opt = plugin_getoptions('prettyurls', 'mode'); - $url = substr($_SERVER['REQUEST_URI'], strlen(BLOG_ROOT)-1); + $url = substr($_SERVER ['REQUEST_URI'], strlen(BLOG_ROOT) - 1); - $urllenght = strlen($url); - - if (isset($_SERVER['PATH_INFO'])) { - $pathinfo = $_SERVER['PATH_INFO']; - } else { - $pathinfo = ''; - } + $urllenght = strlen($url); - switch($opt) { + if (isset($_SERVER ['PATH_INFO'])) { + $pathinfo = $_SERVER ['PATH_INFO']; + } else { + $pathinfo = ''; + } + + switch ($opt) { case null: case 0: - $opt = file_exists(ABS_PATH . '.htaccess') ? 3 : 1; + $opt = file_exists(ABS_PATH . '.htaccess') ? 3 : 1; case 1: - $baseurl .= 'index.php/'; - if ($urllenght < 2) { - $url = "/"; - } else { - // $url = $_SERVER['PATH_INFO']; - $url = $pathinfo; - } + $baseurl .= 'index.php/'; + if ($urllenght < 2) { + $url = "/"; + } else { + // $url = $_SERVER['PATH_INFO']; + $url = $pathinfo; + } break; case 2: - $baseurl .= '?u=/'; - $url = @$_GET['u']; + $baseurl .= '?u=/'; + $url = @$_GET ['u']; /* case 3: do nothing, it's BLOG_BASEURL */ } $this->baseurl = $baseurl; $this->mode = $opt; - return $url; - + return $url; } - - /* * here is where the real work is done. * @@ -285,40 +263,34 @@ class Plugin_PrettyURLs { * so that FlatPress can find it where it is expected * */ - - function cache_init() { - global $fp_params; - - $this->fp_params =& $fp_params; + + $this->fp_params = & $fp_params; $url = $this->get_url(); - + if (PRETTYURLS_TITLES) { - #if ($f = io_load_file(PRETTYURLS_CACHE)) - $this->index = array(); #unserialize($f); - + // if ($f = io_load_file(PRETTYURLS_CACHE)) + $this->index = array(); // unserialize($f); + if (!file_exists(PRETTYURLS_CACHE)) $this->cache_create(); - $this->categories(false); } if (!defined('MOD_INDEX')) return; - - -// # this is not working if you reach flatpress via symlink -// # unless you don't edit manually defaults.php -// if (strpos($_SERVER['REQUEST_URI'], BLOG_ROOT)!==false) { -// $url = $_SERVER['REQUEST_URI']; -// $del = BLOG_ROOT; -// if (strpos($url, 'index.php')!==false) -// $del = $del . 'index.php/'; -// $url = substr($url, strlen($del)-1); -// } + // # this is not working if you reach flatpress via symlink + // # unless you don't edit manually defaults.php + // if (strpos($_SERVER['REQUEST_URI'], BLOG_ROOT)!==false) { + // $url = $_SERVER['REQUEST_URI']; + // $del = BLOG_ROOT; + // if (strpos($url, 'index.php')!==false) + // $del = $del . 'index.php/'; + // $url = substr($url, strlen($del)-1); + // } // removes querystrings if (false !== $i = strpos($url, '?')) @@ -328,330 +300,363 @@ class Plugin_PrettyURLs { if (false !== $i = strpos($url, '#')) $url = substr($url, 0, $i); - - if (strrpos($url, '/') != (strlen($url)-1)) { + if (strrpos($url, '/') != (strlen($url) - 1)) { $url .= '/'; } - - if ($url=='/') + if ($url == '/') return; - - - //date - $url = preg_replace_callback( - '!^/[0-9]{2}(?P[0-9]{2})(/(?P[0-9]{2})(/(?P[0-9]{2}))?)?!', - array(&$this, 'handle_date'), - $url - ); - - - if (!$this->date_handled){ + // date + $url = preg_replace_callback('!^/[0-9]{2}(?P[0-9]{2})(/(?P[0-9]{2})(/(?P[0-9]{2}))?)?!', array( + &$this, + 'handle_date' + ), $url); + + if (!$this->date_handled) { // static page - $url = preg_replace_callback('|^/([a-zA-Z0-9_-]+)/$|', array(&$this, 'handle_static'), $url); + $url = preg_replace_callback('|^/([a-zA-Z0-9_-]+)/$|', array( + &$this, + 'handle_static' + ), $url); if ($this->status == 2) return $this->check_url($url); } - - - $url = preg_replace_callback('{category/([^/]+)/}', array(&$this, 'handle_categories'), $url); - - - $url = preg_replace_callback('|page/([0-9]+)/$|', array(&$this, 'handle_page'), $url); + + $url = preg_replace_callback('{category/([^/]+)/}', array( + &$this, + 'handle_categories' + ), $url); + + $url = preg_replace_callback('|page/([0-9]+)/$|', array( + &$this, + 'handle_page' + ), $url); if ($this->status == 2) - return $this->check_url($url); - - if ($this->date_handled){ - $url = preg_replace_callback('|^/([^/]+)|', array(&$this, 'handle_entry'), $url); + return $this->check_url($url); + + if ($this->date_handled) { + $url = preg_replace_callback('|^/([^/]+)|', array( + &$this, + 'handle_entry' + ), $url); // if status = 2 - /* - utils_error(404); - */ - - $url = preg_replace_callback('|^/comments|', array(&$this, 'handle_comment'), $url); + /* + * utils_error(404); + */ + + $url = preg_replace_callback('|^/comments|', array( + &$this, + 'handle_comment' + ), $url); } - - - $url = preg_replace_callback('|^/feed(/([^/]*))?|', array(&$this, 'handle_feed'), $url); - + + $url = preg_replace_callback('|^/feed(/([^/]*))?|', array( + &$this, + 'handle_feed' + ), $url); + $this->check_url($url); - } function check_url($url) { if (!empty($url) && $url != '/') { - $this->fp_params = array('entry'=>'entry000000-000000'); + $this->fp_params = array( + 'entry' => 'entry000000-000000' + ); $url = apply_filters('prettyurls_unhandled_url', $url); } } function cache_delete_elem($id, $date) { - - # is this a title change? - if (false !== ($ids = $this->cache_get( $date['y'] , $date['m'] , $date['d'] ))) + + // is this a title change? + if (false !== ($ids = $this->cache_get($date ['y'], $date ['m'], $date ['d']))) $hash = array_search($id, $ids); else return; - + if ($hash) { - unset($this->index[ $date['y'] ] [ $date['m'] ][ $date['d'] ][ $hash ]); - - if (empty($this->index[ $date['y'] ] [ $date['m'] ][ $date['d'] ])) { - unset($this->index[ $date['y'] ] [ $date['m'] ][ $date['d'] ]); - - if (empty($this->index[ $date['y'] ] [ $date['m'] ])) { - unset($this->index[ $date['y'] ] [ $date['m'] ]); - - if (empty($this->index[ $date['y'] ])) { - unset($this->index[ $date['y'] ]); + unset($this->index [$date ['y']] [$date ['m']] [$date ['d']] [$hash]); + + if (empty($this->index [$date ['y']] [$date ['m']] [$date ['d']])) { + unset($this->index [$date ['y']] [$date ['m']] [$date ['d']]); + + if (empty($this->index [$date ['y']] [$date ['m']])) { + unset($this->index [$date ['y']] [$date ['m']]); + + if (empty($this->index [$date ['y']])) { + unset($this->index [$date ['y']]); } - } - } - } $this->cache_save(); - - } - - function cache_add($id, $arr) { - - $date = date_from_id($id); - $title = sanitize_title($arr['subject']); - - $this->cache_delete_elem($id, $date); - - $this->index[ $date['y'] ] [ $date['m'] ][ $date['d'] ][ md5($title) ] = $id; - - $this->cache_save(); - - - return true; - } - function cache_get($y,$m,$d=null,$h=null) { - if (!isset($this->index[$y][$m])) { - $s = @io_load_file(PRETTYURLS_CACHE.$y.$m); - $this->index[$y][$m] = $s? unserialize($s) : false; + function cache_add($id, $arr) { + $date = date_from_id($id); + $title = sanitize_title($arr ['subject']); + + $this->cache_delete_elem($id, $date); + + $this->index [$date ['y']] [$date ['m']] [$date ['d']] [md5($title)] = $id; + + $this->cache_save(); + + return true; + } + + function cache_get($y, $m, $d = null, $h = null) { + if (!isset($this->index [$y] [$m])) { + $s = @io_load_file(PRETTYURLS_CACHE . $y . $m); + $this->index [$y] [$m] = $s ? unserialize($s) : false; } if (is_null($d)) - return $this->index[$y][$m]; + return $this->index [$y] [$m]; if (is_null($h)) - return isset($this->index[$y][$m][$d])? $this->index[$y][$m][$d] : false; + return isset($this->index [$y] [$m] [$d]) ? $this->index [$y] [$m] [$d] : false; - if (isset($this->index[$y][$m][$d])) - return isset($this->index[$y][$m][$d][$h]); + if (isset($this->index [$y] [$m] [$d])) + return isset($this->index [$y] [$m] [$d] [$h]); else return false; } - + function cache_delete($id) { $date = date_from_id($id); $this->cache_delete_elem($id, $date); $this->cache_save(); - } function cache_save() { if ($this->index) { foreach ($this->index as $year => $months) { foreach ($months as $month => $days) - io_write_file(PRETTYURLS_CACHE.$year.$month, serialize($days)); + io_write_file(PRETTYURLS_CACHE . $year . $month, serialize($days)); } - } - + return true; - } function nextprevlink($nextprev, $v) { - - global $fpdb; - $q =& $fpdb->getQuery(); - - list($caption, $id) = call_user_func(array(&$q, 'get'.$nextprev)); - + global $fpdb; + $q = & $fpdb->getQuery(); + + list ($caption, $id) = call_user_func(array( + &$q, + 'get' . $nextprev + )); + if (!$id) return array(); - - + if ($q->single) { $date = date_from_id($id); if (PRETTYURLS_TITLES) $title = sanitize_title($caption); - else $title = $id; - $url = $this->baseurl . "20{$date['y']}/{$date['m']}/{$date['d']}/$title/"; - - if ($v>0) - $caption = $caption . ' » '; + else + $title = $id; + $url = $this->baseurl . "20{$date['y']}/{$date['m']}/{$date['d']}/$title/"; + + if ($v > 0) + $caption = $caption . ' » '; else $caption = ' « ' . $caption; - - return array($caption,$url); - + + return array( + $caption, + $url + ); } - - + // else, we build a complete url - + /* todo: clean up this mess... which means cleaning up the mess above. oh, my! */ - - $l = $this->baseurl ; - - - if ( ( is_numeric($cid = @$this->fp_params['category']) ) || - is_numeric($cid = @$this->fp_params['cat']) ) + + $l = $this->baseurl; + + if ((is_numeric($cid = @$this->fp_params ['category'])) || is_numeric($cid = @$this->fp_params ['cat'])) $l = $this->categorylink($l, $cid); - - if (isset($this->fp_params['y']) && $this->fp_params['y']) { - $l .= '20'. $this->fp_params['y'] . '/'; - - if (isset($this->fp_params['m']) && $this->fp_params['m']) { - $l .= $this->fp_params['m'] . '/'; - - if (isset($this->fp_params['d']) && $this->fp_params['d']) - $l .= $this->fp_params['d'] . '/'; - + + if (isset($this->fp_params ['y']) && $this->fp_params ['y']) { + $l .= '20' . $this->fp_params ['y'] . '/'; + + if (isset($this->fp_params ['m']) && $this->fp_params ['m']) { + $l .= $this->fp_params ['m'] . '/'; + + if (isset($this->fp_params ['d']) && $this->fp_params ['d']) + $l .= $this->fp_params ['d'] . '/'; } - } - + $page = 1; - - if (isset($this->fp_params['paged']) && $this->fp_params['paged']>1) $page = $this->fp_params['paged']; - + + if (isset($this->fp_params ['paged']) && $this->fp_params ['paged'] > 1) + $page = $this->fp_params ['paged']; + $page += $v; - + if ($page > 0) { $l .= 'page/' . $page . '/'; } - - - return array($caption,$l); - - - } - - - -} - global $plugin_prettyurls; - $plugin_prettyurls = new Plugin_PrettyURLs; - $plugin_prettyurls->categories(); - - - if (!defined('MOD_ADMIN_PANEL')){ - - if (!function_exists('get_nextpage_link')) : - + return array( + $caption, + $l + ); + } + +} + +global $plugin_prettyurls; +$plugin_prettyurls = new Plugin_PrettyURLs(); +$plugin_prettyurls->categories(); + +if (!defined('MOD_ADMIN_PANEL')) { + + if (!function_exists('get_nextpage_link')) : + function get_nextpage_link() { global $plugin_prettyurls; return $plugin_prettyurls->nextprevlink('NextPage', 1); } + function get_prevpage_link() { global $plugin_prettyurls; - return $plugin_prettyurls->nextprevlink('PrevPage',-1); + return $plugin_prettyurls->nextprevlink('PrevPage', -1); } endif; - - } - - - add_filter('post_link', array(&$plugin_prettyurls,'permalink'), 0, 2); - add_filter('comments_link', array(&$plugin_prettyurls, 'commentlink'), 0, 2); - add_filter('feed_link', array(&$plugin_prettyurls, 'feedlink'), 0, 2); - add_filter('post_comments_feed_link', array(&$plugin_prettyurls, 'commentsfeedlink'), 0, 3); - add_filter('category_link', array(&$plugin_prettyurls,'categorylink'), 0, 2); - add_filter('page_link', array(&$plugin_prettyurls, 'staticlink'), 0, 2); - - // date related functions - add_filter('year_link', array(&$plugin_prettyurls,'yearlink'), 0, 2); - add_filter('month_link', array(&$plugin_prettyurls,'monthlink'), 0, 3); - add_filter('day_link', array(&$plugin_prettyurls,'daylink'), 0, 4); +} - if (PRETTYURLS_TITLES) { - add_filter('publish_post', array(&$plugin_prettyurls, 'cache_add'), 5, 2); - add_filter('delete_post', array(&$plugin_prettyurls, 'cache_delete')); - add_action('update_categories', array(&$plugin_prettyurls, 'categories')); - } +add_filter('post_link', array( + &$plugin_prettyurls, + 'permalink' +), 0, 2); +add_filter('comments_link', array( + &$plugin_prettyurls, + 'commentlink' +), 0, 2); +add_filter('feed_link', array( + &$plugin_prettyurls, + 'feedlink' +), 0, 2); +add_filter('post_comments_feed_link', array( + &$plugin_prettyurls, + 'commentsfeedlink' +), 0, 3); +add_filter('category_link', array( + &$plugin_prettyurls, + 'categorylink' +), 0, 2); +add_filter('page_link', array( + &$plugin_prettyurls, + 'staticlink' +), 0, 2); - add_filter('init', array(&$plugin_prettyurls, 'cache_init')); +// date related functions +add_filter('year_link', array( + &$plugin_prettyurls, + 'yearlink' +), 0, 2); +add_filter('month_link', array( + &$plugin_prettyurls, + 'monthlink' +), 0, 3); +add_filter('day_link', array( + &$plugin_prettyurls, + 'daylink' +), 0, 4); -if (class_exists('AdminPanelAction')){ +if (PRETTYURLS_TITLES) { + add_filter('publish_post', array( + &$plugin_prettyurls, + 'cache_add' + ), 5, 2); + add_filter('delete_post', array( + &$plugin_prettyurls, + 'cache_delete' + )); + add_action('update_categories', array( + &$plugin_prettyurls, + 'categories' + )); +} + +add_filter('init', array( + &$plugin_prettyurls, + 'cache_init' +)); + +if (class_exists('AdminPanelAction')) { + + class admin_plugin_prettyurls extends AdminPanelAction { - class admin_plugin_prettyurls extends AdminPanelAction { - var $langres = 'plugin:prettyurls'; - var $_config = array('mode'=>0); - + + var $_config = array( + 'mode' => 0 + ); + function setup() { $this->smarty->assign('admin_resource', "plugin:prettyurls/admin.plugin.prettyurls"); - $this->_config['mode'] = plugin_getoptions('prettyurls', 'mode'); + $this->_config ['mode'] = plugin_getoptions('prettyurls', 'mode'); $this->smarty->assign('pconfig', $this->_config); $blogroot = BLOG_ROOT; $f = ABS_PATH . '.htaccess'; $txt = io_load_file($f); if (!$txt) { - -$txt =<< -RewriteEngine On -RewriteBase {$blogroot} -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule . {$blogroot}index.php [L] - -STR; + $txt = << + RewriteEngine On + RewriteBase {$blogroot} + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . {$blogroot}index.php [L] + + STR; } - - - $this->smarty->assign('cantsave', - ( !is_writable(ABS_PATH) || (file_exists($f) && !is_writable($f)) ) - ); - $this->smarty->assign('htaccess', $txt); + + $this->smarty->assign('cantsave', (!is_writable(ABS_PATH) || (file_exists($f) && !is_writable($f)))); + $this->smarty->assign('htaccess', $txt); } - - - + function onsubmit($data = null) { global $fp_config; - if (isset($_POST['saveopt'])) { - $this->_config['mode'] = (int) $_POST['mode'] ; - plugin_addoption('prettyurls', 'mode', $this->_config['mode']); - if( plugin_saveoptions() ) + if (isset($_POST ['saveopt'])) { + $this->_config ['mode'] = (int) $_POST ['mode']; + plugin_addoption('prettyurls', 'mode', $this->_config ['mode']); + if (plugin_saveoptions()) $this->smarty->assign('success', 2); - else $this->smarty->assign('success', -2); + else + $this->smarty->assign('success', -2); } - - if (isset($_POST['htaccess-submit'])) { - if (!empty($_POST['htaccess']) && io_write_file(ABS_PATH.'.htaccess', $_POST['htaccess'])){ - $this->smarty->assign('success', 1); - } else { - $this->smarty->assign('success', -1); - } + + if (isset($_POST ['htaccess-submit'])) { + if (!empty($_POST ['htaccess']) && io_write_file(ABS_PATH . '.htaccess', $_POST ['htaccess'])) { + $this->smarty->assign('success', 1); + } else { + $this->smarty->assign('success', -1); + } } - + return 2; } - + } admin_addpanelaction('plugin', 'prettyurls', true); - } ?> diff --git a/fp-plugins/qspam/plugin.qspam.php b/fp-plugins/qspam/plugin.qspam.php index 8ed5abd..bc514e4 100755 --- a/fp-plugins/qspam/plugin.qspam.php +++ b/fp-plugins/qspam/plugin.qspam.php @@ -1,20 +1,23 @@ = $qscfg['number']) { + if ($count >= $qscfg ['number']) { global $smarty; $lang = lang_load('plugin:qspam'); - $smarty->assign('error', array($lang['plugin']['qspam']['error'])); + $smarty->assign('error', array( + $lang ['plugin'] ['qspam'] ['error'] + )); return false; } return true; } add_action('comment_validate', 'plugin_qspam_validate', 5, 2); -if (class_exists('AdminPanelAction')){ +if (class_exists('AdminPanelAction')) { + /** * Provides an admin panel entry for QuickSpam setup. */ class admin_plugin_qspam extends AdminPanelAction { + var $langres = 'plugin:qspam'; - + /** * Initializes this panel. */ function setup() { $this->smarty->assign('admin_resource', "plugin:qspam/admin.plugin.qspam"); } - + /** * Setups the default panel. */ function main() { $qscfg = plugin_getoptions('qspam'); - $qscfg['wordlist'] = isset($qscfg['wordlist']) && is_array($qscfg['wordlist']) - ? implode("\n", $qscfg['wordlist']) - : ''; - $qscfg['number'] = isset($qscfg['number']) - ? $qscfg['number'] - : 1; + $qscfg ['wordlist'] = isset($qscfg ['wordlist']) && is_array($qscfg ['wordlist']) ? implode("\n", $qscfg ['wordlist']) : ''; + $qscfg ['number'] = isset($qscfg ['number']) ? $qscfg ['number'] : 1; $this->smarty->assign('qscfg', $qscfg); } - + /** * Will be executed when the QSF configuration is send. * * @return int */ function onsubmit($data = null) { - if ($_POST['qs-wordlist']){ - $wordlist = isset($_POST['qs-wordlist']) - ? stripslashes($_POST['qs-wordlist']) - : ''; + if ($_POST ['qs-wordlist']) { + $wordlist = isset($_POST ['qs-wordlist']) ? stripslashes($_POST ['qs-wordlist']) : ''; $wordlist = str_replace("\r", "\n", $wordlist); // DMKE: Works neither recursive correct nor in a loop... *grrr* - #$wordlist = str_replace("\n\n", "\n", $wordlist); + // $wordlist = str_replace("\n\n", "\n", $wordlist); $wordlist = explode("\n", $wordlist); - $wordlist = array_filter($wordlist, array($this, '_array_filter')); - $number = isset($_POST['qs-number']) && is_numeric($_POST['qs-number']) - ? (int)$_POST['qs-number'] - : 1; + $wordlist = array_filter($wordlist, array( + $this, + '_array_filter' + )); + $number = isset($_POST ['qs-number']) && is_numeric($_POST ['qs-number']) ? (int) $_POST ['qs-number'] : 1; plugin_addoption('qspam', 'wordlist', $wordlist); plugin_addoption('qspam', 'number', $number); plugin_saveoptions('qspam'); $this->smarty->assign('success', 1); } else { - $this->smarty->assign('success', -1); + $this->smarty->assign('success', -1); } return 2; } - + /** - * Array filter callback function. Culls empty array values. + * Array filter callback function. + * Culls empty array values. * Life is hell ._. * * @param string $str @@ -114,6 +118,7 @@ if (class_exists('AdminPanelAction')){ function _array_filter($str) { return strlen(trim($str)) > 0; } + } admin_addpanelaction('plugin', 'qspam', true); } diff --git a/fp-plugins/readmore/plugin.readmore.php b/fp-plugins/readmore/plugin.readmore.php index 4008cc8..0cb7869 100755 --- a/fp-plugins/readmore/plugin.readmore.php +++ b/fp-plugins/readmore/plugin.readmore.php @@ -2,11 +2,11 @@ /* * Plugin Name: ReadMore - * Plugin URI: http://www.nowhereland.it/ - * Description: ReadMore plugin. Chops a lengthy entry and appends a "read more" link :) - * Author: NoWhereMan - * Version: 0.703 - * Author URI: http://www.nowhereland.it/ + * Version: 1.0 + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Chops lengthy entries in the overview and appends a "read more" link. Part of the standard distribution. */ // $MODE specifies when you want to chop your entry diff --git a/fp-plugins/searchbox/plugin.searchbox.php b/fp-plugins/searchbox/plugin.searchbox.php index 4e2453c..126ed5b 100755 --- a/fp-plugins/searchbox/plugin.searchbox.php +++ b/fp-plugins/searchbox/plugin.searchbox.php @@ -2,10 +2,10 @@ /* * Plugin Name: SearchBox * Version: 1.0 - * Plugin URI: http://flatpress.sf.net - * Description: SearchBox which interfaces with standard search function - * Author: NoWhereMan - * Author URI: http://flatpress.sf.net + * Plugin URI: https://www.flatpress.org + * Author: FlatPress + * Author URI: https://www.flatpress.org + * Description: Adds a search box widget. Part of the standard distribution. */ define('SEARCHBOX_BIG', false); diff --git a/fp-plugins/thumb/plugin.thumb.php b/fp-plugins/thumb/plugin.thumb.php index ade2a72..bf735b9 100755 --- a/fp-plugins/thumb/plugin.thumb.php +++ b/fp-plugins/thumb/plugin.thumb.php @@ -1,28 +1,24 @@ Date: Sat, 24 Oct 2020 21:04:24 +0200 Subject: [PATCH 09/46] Data of commenters are not stored in cookies any more. Con: Regular commenters have to enter their data for each comment. Pro: No more cookie-related hassle with GDPR. --- comments.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/comments.php b/comments.php index ae7dcd8..ec49d39 100644 --- a/comments.php +++ b/comments.php @@ -143,18 +143,11 @@ function comment_validate() { $arr ['version'] = system_ver(); $arr ['name'] = $name; - if (!$loggedin) - setcookie('comment_author_' . COOKIEHASH, $arr ['name'], time() + 30000000, COOKIEPATH, COOKIE_DOMAIN); - if ($email) { ($arr ['email'] = $email); - if (!$loggedin) - setcookie('comment_author_email_' . COOKIEHASH, $arr ['email'], time() + 30000000, COOKIEPATH, COOKIE_DOMAIN); } if ($url) { ($arr ['url'] = ($url)); - if (!$loggedin) - setcookie('comment_author_url_' . COOKIEHASH, $arr ['url'], time() + 30000000, COOKIEPATH, COOKIE_DOMAIN); } $arr ['content'] = $content; @@ -241,13 +234,6 @@ function commentform() { $smarty->assign('values', $_POST); } } - - // Cookies - $smarty->assign('cookie', array( - 'name' => @$_COOKIE ['comment_author_' . COOKIEHASH], - 'email' => @$_COOKIE ['comment_author_email_' . COOKIEHASH], - 'url' => @$_COOKIE ['comment_author_url_' . COOKIEHASH] - )); } ?> From 78a8fe4679db318a287feeb310d61659904173ad Mon Sep 17 00:00:00 2001 From: Arvid Zimmermann Date: Sat, 24 Oct 2020 22:12:21 +0200 Subject: [PATCH 10/46] Added v1.2 description so far --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df08cd2..2772c13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +# Under development: FlatPress 1.2 +## General +- FlatPress now runs smoothly with PHP 7.4 +- Performance: Lazy loading for images +- GDPR compatibility: Data of commenters are not stored in cookies any more +- SEO: Added sitemap for search engines ([details](https://forum.flatpress.org/viewtopic.php?f=4&t=126)) +- Leggero V2 is default theme (see [#57](https://github.com/flatpressblog/flatpress/issues/57)) +- Leggero v1 is now responsive +- Updated Smarty to release 2.6.31 +- Added [CONTRIBUTORS.md](https://github.com/flatpressblog/flatpress/blob/master/CONTRIBUTORS.md) +## Plugins +- BBCode plugin: Enhanced \[video\] element accepts video URLs from YouTube, Vimeo and Facebook +- BBCode plugin: Added "mail" tag (replaces the Protected Mail Links plugin) +- BBCode plugin: Added image attribute "loading", default is "lazy" +- BBCode plugin: Selectboxes of attachments and images in the editor toolbar are sorted by name +- Protected Mail Links plugin removed +- CommentCenter plugin is part of the FP standard distribution +- PrettyUrls and Comment Center are activated by default, LastComments and LastCommentsAdmin are not +## Security +- Overhauled v0.812.2 fix for local file inclusion vulnerability ([more details](http://www.guanting.com/security/exploit/information/27269.html)) +- Comments are sanitized properly (see [#62](https://github.com/flatpressblog/flatpress/issues/62)) +- Uploader checks for forbidden files more carefully +## Bugfixes +- Mail adresses are accepted in a broader range (see [#48](https://github.com/flatpressblog/flatpress/issues/48)) +- HTTPS URLs in the contact form are now handled correctly (see [#55](https://github.com/flatpressblog/flatpress/issues/55)) +- Fixed redirects after login +- Fixed "syntax error, unexpected '\['" bug under PHP 5.3, reported [here](https://forum.flatpress.org/viewtopic.php?f=2&t=131) +- Setup sets date and FP version for the freshly created static pages +- Annoying translation error in German language pack fixed +- Installer did not work properly with HTTPS (see [#52](https://github.com/flatpressblog/flatpress/issues/52)) +## Translations +- Added French language pack by Marc Thibeault and Dimitri Soufflet, reworked by Gee +- Added Jananese Language Pack by [NORTH HILL WORK STUDIO](https://nhws.localinfo.jp/) +- Added Brazilian Portuguese language pack by randy +- Added Italian language pack by Giacomo Margarito +- Reworked German language pack by Detlef + # 2019-02-22: [FlatPress 1.1 "Da capo"](https://github.com/flatpressblog/flatpress/releases/tag/1.1) ## General - Languages added: Greek, German, Czech (feel free to send in *your* language packs!) From fd6d940b89d71cc22af8f387387404a43bf2b6d5 Mon Sep 17 00:00:00 2001 From: Arvid Zimmermann Date: Sat, 24 Oct 2020 22:17:48 +0200 Subject: [PATCH 11/46] #52 wasn't a FP bugfix --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2772c13..614965d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,6 @@ - Fixed "syntax error, unexpected '\['" bug under PHP 5.3, reported [here](https://forum.flatpress.org/viewtopic.php?f=2&t=131) - Setup sets date and FP version for the freshly created static pages - Annoying translation error in German language pack fixed -- Installer did not work properly with HTTPS (see [#52](https://github.com/flatpressblog/flatpress/issues/52)) ## Translations - Added French language pack by Marc Thibeault and Dimitri Soufflet, reworked by Gee - Added Jananese Language Pack by [NORTH HILL WORK STUDIO](https://nhws.localinfo.jp/) From b08512630c83ef3bf212ab2dc8ab5e3454f698ae Mon Sep 17 00:00:00 2001 From: Arvid Zimmermann Date: Sat, 24 Oct 2020 22:18:35 +0200 Subject: [PATCH 12/46] Typo -.- --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 614965d..ea6124a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ - Annoying translation error in German language pack fixed ## Translations - Added French language pack by Marc Thibeault and Dimitri Soufflet, reworked by Gee -- Added Jananese Language Pack by [NORTH HILL WORK STUDIO](https://nhws.localinfo.jp/) +- Added Japanese Language Pack by [NORTH HILL WORK STUDIO](https://nhws.localinfo.jp/) - Added Brazilian Portuguese language pack by randy - Added Italian language pack by Giacomo Margarito - Reworked German language pack by Detlef From 92aa7d395e9014d8bf72242be166168831aaa9f7 Mon Sep 17 00:00:00 2001 From: azett Date: Sun, 25 Oct 2020 06:43:27 +0100 Subject: [PATCH 13/46] Leggero now with HTML5 doctype --- fp-interface/themes/leggero/header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fp-interface/themes/leggero/header.tpl b/fp-interface/themes/leggero/header.tpl index 6298c13..b5b1a58 100755 --- a/fp-interface/themes/leggero/header.tpl +++ b/fp-interface/themes/leggero/header.tpl @@ -1,4 +1,4 @@ - + {$flatpress.title|tag:wp_title:'«'} From 4542da31a0ca6e61c1e93b73d0437672a96fe48d Mon Sep 17 00:00:00 2001 From: Arvid Zimmermann Date: Sun, 25 Oct 2020 06:58:16 +0100 Subject: [PATCH 14/46] Little more 1.2 changelog bling bling --- CHANGELOG.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea6124a..5899cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,19 @@ # Under development: FlatPress 1.2 ## General -- FlatPress now runs smoothly with PHP 7.4 +- FlatPress now runs smoothly with PHP 7.4, prepared for PHP 8 - Performance: Lazy loading for images - GDPR compatibility: Data of commenters are not stored in cookies any more - SEO: Added sitemap for search engines ([details](https://forum.flatpress.org/viewtopic.php?f=4&t=126)) -- Leggero V2 is default theme (see [#57](https://github.com/flatpressblog/flatpress/issues/57)) +- Leggero v2 is default theme (see [#57](https://github.com/flatpressblog/flatpress/issues/57)) - Leggero v1 is now responsive - Updated Smarty to release 2.6.31 - Added [CONTRIBUTORS.md](https://github.com/flatpressblog/flatpress/blob/master/CONTRIBUTORS.md) ## Plugins -- BBCode plugin: Enhanced \[video\] element accepts video URLs from YouTube, Vimeo and Facebook -- BBCode plugin: Added "mail" tag (replaces the Protected Mail Links plugin) -- BBCode plugin: Added image attribute "loading", default is "lazy" -- BBCode plugin: Selectboxes of attachments and images in the editor toolbar are sorted by name +- BBCode plugin: + - Enhanced \[video\] element accepts video URLs for YouTube, Vimeo and Facebook + - Added "mail" tag (replaces the Protected Mail Links plugin) + - Added image attribute "loading", default is "lazy" + - Selectboxes of attachments and images in the editor toolbar are sorted by name - Protected Mail Links plugin removed - CommentCenter plugin is part of the FP standard distribution - PrettyUrls and Comment Center are activated by default, LastComments and LastCommentsAdmin are not @@ -24,7 +25,7 @@ - Mail adresses are accepted in a broader range (see [#48](https://github.com/flatpressblog/flatpress/issues/48)) - HTTPS URLs in the contact form are now handled correctly (see [#55](https://github.com/flatpressblog/flatpress/issues/55)) - Fixed redirects after login -- Fixed "syntax error, unexpected '\['" bug under PHP 5.3, reported [here](https://forum.flatpress.org/viewtopic.php?f=2&t=131) +- Fixed "syntax error, unexpected '\['" bug, reported [here](https://forum.flatpress.org/viewtopic.php?f=2&t=131) - Setup sets date and FP version for the freshly created static pages - Annoying translation error in German language pack fixed ## Translations From 38118e175ed4d356ee7d211567f4b8a2ae4e55b6 Mon Sep 17 00:00:00 2001 From: azett Date: Sun, 25 Oct 2020 07:32:26 +0100 Subject: [PATCH 15/46] jQuery plugin: Updated jQuery and jQueryUI to current versions --- fp-plugins/jquery/plugin.jquery.php | 4 +- .../jquery/res/jquery/1.10.2/jquery.min.js | 6 - .../res/jquery/3.5.1/jquery-3.5.1.min.js | 2 + .../res/jqueryui/1.10.3/jquery-ui.min.js | 12 - .../jquery/res/jqueryui/1.12.1/AUTHORS.txt | 333 +++++++ .../jquery/res/jqueryui/1.12.1/LICENSE.txt | 43 + .../jquery/res/jqueryui/1.12.1/index.html | 503 ++++++++++ .../res/jqueryui/1.12.1/jquery-ui.min.css | 6 + .../res/jqueryui/1.12.1/jquery-ui.min.js | 6 + .../jqueryui/1.12.1/jquery-ui.structure.css | 876 ++++++++++++++++++ .../1.12.1/jquery-ui.structure.min.css | 5 + .../jquery/res/jqueryui/1.12.1/package.json | 74 ++ 12 files changed, 1850 insertions(+), 20 deletions(-) delete mode 100644 fp-plugins/jquery/res/jquery/1.10.2/jquery.min.js create mode 100644 fp-plugins/jquery/res/jquery/3.5.1/jquery-3.5.1.min.js delete mode 100644 fp-plugins/jquery/res/jqueryui/1.10.3/jquery-ui.min.js create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/AUTHORS.txt create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/LICENSE.txt create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/index.html create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/jquery-ui.min.css create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/jquery-ui.min.js create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/jquery-ui.structure.css create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/jquery-ui.structure.min.css create mode 100644 fp-plugins/jquery/res/jqueryui/1.12.1/package.json diff --git a/fp-plugins/jquery/plugin.jquery.php b/fp-plugins/jquery/plugin.jquery.php index 68e334d..9da8b4b 100644 --- a/fp-plugins/jquery/plugin.jquery.php +++ b/fp-plugins/jquery/plugin.jquery.php @@ -15,8 +15,8 @@ function plugin_jquery_head() { $pdir = plugin_geturl('jquery'); echo << - - + + JSUTILS; } diff --git a/fp-plugins/jquery/res/jquery/1.10.2/jquery.min.js b/fp-plugins/jquery/res/jquery/1.10.2/jquery.min.js deleted file mode 100644 index 29b3a2c..0000000 --- a/fp-plugins/jquery/res/jquery/1.10.2/jquery.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license -//@ sourceMappingURL=jquery.min.map -*/ -(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,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]:N.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 x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.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(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.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?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},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||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.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||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.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 while(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,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="
        ",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.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)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.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+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===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]||at.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]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.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.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(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,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(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 xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.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?x.extend(e,r):r}},i={};return r.pipe=r.then,x.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=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
        a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
        t
        ",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.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%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
        ",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t -}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),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 x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.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=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.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,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){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,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.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 t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={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}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!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=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):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,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.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]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._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 x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.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(a in e)this.on(a,n,r,e[a],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=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.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,x(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=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
        ","
        "],area:[1,"",""],param:[1,"",""],thead:[1,"","
        "],tr:[2,"","
        "],col:[2,"","
        "],td:[3,"","
        "],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
        ","
        "]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._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++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.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)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); -u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("