diff --git a/action/add_comment.php b/action/add_comment.php index df75385..81c75db 100644 --- a/action/add_comment.php +++ b/action/add_comment.php @@ -40,7 +40,7 @@ $is_admin = false; /*----------*/ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $inputService = new InputService(); $mailService = new MailService($config['use_smtp'], $config['smtp_options']); $notificationService = new NotificationService($mailService); @@ -63,7 +63,7 @@ if (!empty($_POST['poll_admin'])) { if (!$poll) { $message = new Message('error', __('Error', 'This poll doesn\'t exist !')); -} else if ($poll && !$securityService->canAccessPoll($poll) && !$is_admin) { +} else if (!$is_admin && !$securityService->canAccessPoll($poll)) { $message = new Message('error', __('Password', 'Wrong password')); } else { $name = $inputService->filterName($_POST['name']); @@ -88,8 +88,10 @@ if (!$poll) { $smarty->error_reporting = E_ALL & ~E_NOTICE; $smarty->assign('comments', $comments); +$smarty->assign('poll_id', $poll_id); +$smarty->assign('admin_poll_id', $admin_poll_id); $comments_html = $smarty->fetch('part/comments_list.tpl'); $response = ['result' => $result, 'message' => $message, 'comments' => $comments_html]; -echo json_encode($response); +echo json_encode($response, JSON_THROW_ON_ERROR); diff --git a/action/send_edit_link_by_email_action.php b/action/send_edit_link_by_email_action.php index a2ac204..9f6cb23 100644 --- a/action/send_edit_link_by_email_action.php +++ b/action/send_edit_link_by_email_action.php @@ -29,7 +29,7 @@ include_once __DIR__ . '/../app/inc/init.php'; $logService = new LogService(); $sessionService = new SessionService(); $mailService = new MailService($config['use_smtp'], $config['smtp_options']); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $result = false; $message = null; @@ -45,7 +45,7 @@ if (!empty($_POST['poll'])) { $token = $sessionService->get("Common", SESSION_EDIT_LINK_TOKEN); $token_form_value = empty($_POST['token']) ? null : $_POST['token']; $editedVoteUniqueId = filter_input(INPUT_POST, 'editedVoteUniqueId', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]); -if (is_null($poll) || $config['use_smtp'] === false || is_null($token) || is_null($token_form_value) +if ($config['use_smtp'] === false || is_null($poll) || is_null($token) || is_null($token_form_value) || !$token->check($token_form_value) || is_null($editedVoteUniqueId)) { $message = new Message('error', __('Error', 'Something is going wrong...')); } @@ -91,4 +91,4 @@ $smarty->error_reporting = E_ALL & ~E_NOTICE; $response = ['result' => $result, 'message' => $message]; -echo json_encode($response); +echo json_encode($response, JSON_THROW_ON_ERROR); diff --git a/admin/check.php b/admin/check.php index 018f2e2..dca7b5f 100644 --- a/admin/check.php +++ b/admin/check.php @@ -20,7 +20,7 @@ use Framadate\Message; use Framadate\Utils; -define('ROOT_DIR', __DIR__ . '/../'); +const ROOT_DIR = __DIR__ . '/../'; /** * Checking for missing vendors. @@ -58,7 +58,7 @@ require_once ROOT_DIR . 'app/inc/i18n.php'; * @param Message $b * @return int */ -function compareCheckMessage(Message $a, Message $b) +function compareCheckMessage(Message $a, Message $b): int { $values = [ 'danger' => 0, @@ -90,7 +90,7 @@ $conf_filename = $inc_directory . 'config.php'; if (version_compare(PHP_VERSION, PHP_NEEDED_VERSION) >= 0) { $messages[] = new Message('info', __f('Check','PHP version %s is enough (needed at least PHP %s).', PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION, PHP_NEEDED_VERSION)); } else { - $messages[] = new Message('danger', __f('Check','Your PHP version (%s) is too old. This application needs at least PHP %s.', phpversion(), PHP_NEEDED_VERSION)); + $messages[] = new Message('danger', __f('Check','Your PHP version (%s) is too old. This application needs at least PHP %s.', PHP_VERSION, PHP_NEEDED_VERSION)); } // INTL extension @@ -120,7 +120,7 @@ if (!file_exists(ROOT_DIR . COMPILE_DIR)) { if (file_exists($conf_filename)) { $messages[] = new Message('info', __('Check','The config file exists.')); } elseif (is_writable($inc_directory)) { - $messages[] = new Message('info', __('Check','The config file directory (%s) is writable.', $inc_directory)); + $messages[] = new Message('info', __f('Check','The config file directory (%s) is writable.', $inc_directory)); } else { $messages[] = new Message('danger', __f('Check','The config file directory (%s) is not writable and the config file (%s) does not exists.', $inc_directory, $conf_filename)); } @@ -187,7 +187,7 @@ usort($messages, 'compareCheckMessage');
diff --git a/admin/migration.php b/admin/migration.php index 3948909..8a62396 100644 --- a/admin/migration.php +++ b/admin/migration.php @@ -17,6 +17,7 @@ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ +use Framadate\FramaDB; use Framadate\Migration\AddColumn_hidden_In_poll_For_0_9; use Framadate\Migration\AddColumn_receiveNewComments_For_0_9; use Framadate\Migration\AddColumn_uniqId_In_vote_For_0_9; @@ -57,7 +58,7 @@ $migrations = [ // --------------------------------------- // Check if MIGRATION_TABLE already exists -/** @var \Framadate\FramaDB $connect */ +/** @var FramaDB $connect */ $tables = $connect->allTables(); $pdo = $connect->getPDO(); $prefixedMigrationTable = Utils::table(MIGRATION_TABLE); diff --git a/admin/polls.php b/admin/polls.php index 06d3b45..8b93547 100644 --- a/admin/polls.php +++ b/admin/polls.php @@ -50,7 +50,7 @@ $poll_to_delete = null; /*----------*/ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $adminPollService = new AdminPollService($connect, $pollService, $logService); $superAdminService = new SuperAdminService(); $securityService = new SecurityService(); diff --git a/admin/purge.php b/admin/purge.php index 7593a9f..6c95e6f 100644 --- a/admin/purge.php +++ b/admin/purge.php @@ -34,14 +34,14 @@ $message = null; /*----------*/ $logService = new LogService(); -$purgeService = new PurgeService($connect, $logService); +$purgeService = new PurgeService($logService); $securityService = new SecurityService(); $inputService = new InputService(); /* POST */ /*-----*/ -$action = $inputService->filterName(isset($_POST['action']) ? $_POST['action'] : null); +$action = $inputService->filterName($_POST['action'] ?? null); /* PAGE */ /* ---- */ @@ -57,4 +57,4 @@ $smarty->assign('crsf', $securityService->getToken('admin')); $smarty->assign('title', __('Admin', 'Purge')); -$smarty->display('admin/purge.tpl'); \ No newline at end of file +$smarty->display('admin/purge.tpl'); diff --git a/adminstuds.php b/adminstuds.php index 1044438..03fc5d9 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -47,7 +47,7 @@ $editingVoteId = 0; /*----------*/ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $adminPollService = new AdminPollService($connect, $pollService, $logService); $inputService = new InputService(); $mailService = new MailService($config['use_smtp'], $config['smtp_options']); @@ -137,9 +137,10 @@ if (isset($_POST['update_poll_info'])) { break; } } elseif ($field === 'expiration_date') { - $expiration_date = $inputService->validateDate($_POST['expiration_date'], $pollService->minExpiryDate(), $pollService->maxExpiryDate()); - if ($expiration_date) { - $poll->end_date = $expiration_date->getTimestamp(); + $givenExpirationDate = $inputService->parseDate($_POST['expiration_date']); + $expiration_date = $inputService->validateDate($givenExpirationDate, $pollService->minExpiryDate(), $pollService->maxExpiryDate()); + if ($poll->end_date !== $expiration_date->format('Y-m-d H:i:s')) { + $poll->end_date = $expiration_date->format('Y-m-d H:i:s'); $updated = true; } } elseif ($field === 'name') { @@ -151,26 +152,26 @@ if (isset($_POST['update_poll_info'])) { $updated = true; } } elseif ($field === 'hidden') { - $hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false; + $hidden = isset($_POST['hidden']) && $inputService->filterBoolean($_POST['hidden']); if ($hidden !== $poll->hidden) { $poll->hidden = $hidden; $poll->results_publicly_visible = false; $updated = true; } } elseif ($field === 'removePassword') { - $removePassword = isset($_POST['removePassword']) ? $inputService->filterBoolean($_POST['removePassword']) : false; + $removePassword = isset($_POST['removePassword']) && $inputService->filterBoolean($_POST['removePassword']); if ($removePassword) { $poll->results_publicly_visible = false; $poll->password_hash = null; $updated = true; } } elseif ($field === 'password') { - $password = isset($_POST['password']) ? $_POST['password'] : null; + $password = $_POST['password'] ?? null; /** * Did the user choose results to be publicly visible ? */ - $resultsPubliclyVisible = isset($_POST['resultsPubliclyVisible']) ? $inputService->filterBoolean($_POST['resultsPubliclyVisible']) : false; + $resultsPubliclyVisible = isset($_POST['resultsPubliclyVisible']) && $inputService->filterBoolean($_POST['resultsPubliclyVisible']); /** * If there's one, save the password */ diff --git a/app/classes/Framadate/Choice.php b/app/classes/Framadate/Choice.php index e583e26..1ed69e9 100644 --- a/app/classes/Framadate/Choice.php +++ b/app/classes/Framadate/Choice.php @@ -24,34 +24,34 @@ class Choice * Name of the Choice */ private $name; - + /** * All availables slots for this Choice. */ private $slots; - + public function __construct($name='') { $this->name = $name; $this->slots = []; } - - public function addSlot($slot) + + public function addSlot($slot): void { $this->slots[] = $slot; } - - public function getName() + + public function getName(): string { return $this->name; } - - public function getSlots() + + public function getSlots(): array { return $this->slots; } - - static function compare(Choice $a, Choice $b) + + public static function compare(Choice $a, Choice $b): int { return strcmp($a->name, $b->name); } diff --git a/app/classes/Framadate/Editable.php b/app/classes/Framadate/Editable.php index c2314c3..5267136 100644 --- a/app/classes/Framadate/Editable.php +++ b/app/classes/Framadate/Editable.php @@ -23,14 +23,13 @@ namespace Framadate; * Class Editable * * Is used to specify the poll's edition permissions. - * @TODO : wait to use the SplEnum * * @package Framadate */ class Editable { // extends SplEnum const __default = self::EDITABLE_BY_ALL; - const NOT_EDITABLE = 0; - const EDITABLE_BY_ALL = 1; - const EDITABLE_BY_OWN = 2; -} \ No newline at end of file + public const NOT_EDITABLE = 0; + public const EDITABLE_BY_ALL = 1; + public const EDITABLE_BY_OWN = 2; +} diff --git a/app/classes/Framadate/Exception/AlreadyExistsException.php b/app/classes/Framadate/Exception/AlreadyExistsException.php index 86e73aa..7cfac6d 100644 --- a/app/classes/Framadate/Exception/AlreadyExistsException.php +++ b/app/classes/Framadate/Exception/AlreadyExistsException.php @@ -2,6 +2,4 @@ namespace Framadate\Exception; class AlreadyExistsException extends \Exception { - function __construct() { - } } diff --git a/app/classes/Framadate/Exception/ConcurrentEditionException.php b/app/classes/Framadate/Exception/ConcurrentEditionException.php index 70748b1..68752da 100644 --- a/app/classes/Framadate/Exception/ConcurrentEditionException.php +++ b/app/classes/Framadate/Exception/ConcurrentEditionException.php @@ -2,6 +2,4 @@ namespace Framadate\Exception; class ConcurrentEditionException extends \Exception { - function __construct() { - } } diff --git a/app/classes/Framadate/Exception/ConcurrentVoteException.php b/app/classes/Framadate/Exception/ConcurrentVoteException.php index 26b29ec..6a43ea8 100644 --- a/app/classes/Framadate/Exception/ConcurrentVoteException.php +++ b/app/classes/Framadate/Exception/ConcurrentVoteException.php @@ -7,6 +7,4 @@ namespace Framadate\Exception; * Thrown when a poll has a maximum votes constraint for options, and a vote happened since the poll was rendered */ class ConcurrentVoteException extends \Exception { - function __construct() { - } } diff --git a/app/classes/Framadate/Exception/MomentAlreadyExistsException.php b/app/classes/Framadate/Exception/MomentAlreadyExistsException.php index 287afd6..766af75 100644 --- a/app/classes/Framadate/Exception/MomentAlreadyExistsException.php +++ b/app/classes/Framadate/Exception/MomentAlreadyExistsException.php @@ -2,6 +2,4 @@ namespace Framadate\Exception; class MomentAlreadyExistsException extends \Exception { - function __construct() { - } } diff --git a/app/classes/Framadate/Exception/PollNotFoundException.php b/app/classes/Framadate/Exception/PollNotFoundException.php new file mode 100644 index 0000000..81fe48c --- /dev/null +++ b/app/classes/Framadate/Exception/PollNotFoundException.php @@ -0,0 +1,10 @@ +clearChoices(); } - public function clearChoices() { + public function clearChoices(): void + { $this->choices = []; } - public function addChoice(Choice $choice) + public function addChoice(Choice $choice): void { $this->choices[] = $choice; } @@ -106,8 +107,8 @@ class Form return $this->choices; } - public function sortChoices() + public function sortChoices(): void { - usort($this->choices, ['Framadate\Choice', 'compare']); + usort($this->choices, [Choice::class, 'compare']); } } diff --git a/app/classes/Framadate/FramaDB.php b/app/classes/Framadate/FramaDB.php index bed6327..5ae1973 100644 --- a/app/classes/Framadate/FramaDB.php +++ b/app/classes/Framadate/FramaDB.php @@ -23,19 +23,21 @@ use PDO; class FramaDB { /** * PDO Object, connection to database. + * @var PDO */ - private $pdo = null; + private $pdo; - function __construct($connection_string, $user, $password) { - $this->pdo = new \PDO($connection_string, $user, $password); - $this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_OBJ); - $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); + public function __construct(string $connection_string, string $user, string $password) { + $this->pdo = new PDO($connection_string, $user, $password); + $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ); + $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); } /** - * @return \PDO Connection to database + * @return PDO Connection to database */ - function getPDO() { + public function getPDO(): PDO + { return $this->pdo; } @@ -44,42 +46,50 @@ class FramaDB { * * @return array The array of table names */ - function allTables() { - $result = $this->pdo->query('SHOW TABLES'); - $schemas = $result->fetchAll(\PDO::FETCH_COLUMN); - - return $schemas; + public function allTables(): array + { + return $this->pdo->query('SHOW TABLES')->fetchAll(PDO::FETCH_COLUMN); } - function prepare($sql) { + /** + * @return \PDOStatement|false + */ + public function prepare(string $sql) { return $this->pdo->prepare($sql); } - function beginTransaction() { + public function beginTransaction(): void + { $this->pdo->beginTransaction(); } - function commit() { + public function commit(): void + { $this->pdo->commit(); } - function rollback() { + public function rollback(): void + { $this->pdo->rollback(); } - function errorCode() { + public function errorCode(): ?string { return $this->pdo->errorCode(); } - function errorInfo() { + public function errorInfo(): array + { return $this->pdo->errorInfo(); } - function query($sql) { + /** + * @return \PDOStatement|false + */ + public function query($sql) { return $this->pdo->query($sql); } - public function lastInsertId() { + public function lastInsertId(): string { return $this->pdo->lastInsertId(); } } diff --git a/app/classes/Framadate/Message.php b/app/classes/Framadate/Message.php index d8530d6..6fdeddf 100644 --- a/app/classes/Framadate/Message.php +++ b/app/classes/Framadate/Message.php @@ -1,38 +1,37 @@ -type = $type; - $this->message = $message; - $this->link = $link; - $this->linkTitle = $linkTitle; - $this->linkIcon = $linkIcon; + var $type; + var $message; + var $link; + var $linkTitle; + var $linkIcon; + var $includeTemplate; + + public function __construct($type, $message, $link=null, $linkTitle=null, $linkIcon=null, $includeTemplate=null) { + $this->type = $type; + $this->message = $message; + $this->link = $link; + $this->linkTitle = $linkTitle; + $this->linkIcon = $linkIcon; $this->includeTemplate = $includeTemplate; } -} - \ No newline at end of file +} diff --git a/app/classes/Framadate/Migration/AddColumn_ValueMax_In_poll_For_1_1.php b/app/classes/Framadate/Migration/AddColumn_ValueMax_In_poll_For_1_1.php index 8b1caa2..449a9fe 100644 --- a/app/classes/Framadate/Migration/AddColumn_ValueMax_In_poll_For_1_1.php +++ b/app/classes/Framadate/Migration/AddColumn_ValueMax_In_poll_For_1_1.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration adds the field Value_Max on the poll table. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.9 */ class AddColumn_ValueMax_In_poll_For_1_1 implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class AddColumn_ValueMax_In_poll_For_1_1 implements Migration { * * @return string The description of the migration class */ - function description() { + public function description():string { return 'Add column "ValueMax" in table "vote" for version 0.9'; } @@ -43,26 +44,27 @@ class AddColumn_ValueMax_In_poll_For_1_1 implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { return true; } /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->alterPollTable($pdo); return true; } - private function alterPollTable(\PDO $pdo) { + private function alterPollTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('poll') . '` ADD `ValueMax` TINYINT NULL;'); diff --git a/app/classes/Framadate/Migration/AddColumn_hidden_In_poll_For_0_9.php b/app/classes/Framadate/Migration/AddColumn_hidden_In_poll_For_0_9.php index f8c3eac..c14ac1e 100644 --- a/app/classes/Framadate/Migration/AddColumn_hidden_In_poll_For_0_9.php +++ b/app/classes/Framadate/Migration/AddColumn_hidden_In_poll_For_0_9.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration adds the field hidden on the poll table. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.9 */ class AddColumn_hidden_In_poll_For_0_9 implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,8 @@ class AddColumn_hidden_In_poll_For_0_9 implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string + { return 'Add column "hidden" in table "vote" for version 0.9'; } @@ -43,12 +45,13 @@ class AddColumn_hidden_In_poll_For_0_9 implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool + { $stmt = $pdo->query('SHOW TABLES'); - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if tables of v0.9 are presents $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables); @@ -58,16 +61,18 @@ class AddColumn_hidden_In_poll_For_0_9 implements Migration { /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool + { $this->alterPollTable($pdo); return true; } - private function alterPollTable(\PDO $pdo) { + private function alterPollTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('poll') . '` ADD `hidden` TINYINT( 1 ) NOT NULL DEFAULT "0"'); diff --git a/app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php b/app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php index 9863e26..4669cd6 100644 --- a/app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php +++ b/app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration adds the field receiveNewComments on the poll table. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.9 */ class AddColumn_receiveNewComments_For_0_9 implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,8 @@ class AddColumn_receiveNewComments_For_0_9 implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string + { return 'Add column "receiveNewComments" for version 0.9'; } @@ -43,12 +45,13 @@ class AddColumn_receiveNewComments_For_0_9 implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool + { $stmt = $pdo->query('SHOW TABLES'); - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if tables of v0.9 are presents $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables); @@ -58,16 +61,18 @@ class AddColumn_receiveNewComments_For_0_9 implements Migration { /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool + { $this->alterPollTable($pdo); return true; } - private function alterPollTable(\PDO $pdo) { + private function alterPollTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('poll') . '` ADD `receiveNewComments` TINYINT(1) DEFAULT \'0\' diff --git a/app/classes/Framadate/Migration/AddColumn_uniqId_In_vote_For_0_9.php b/app/classes/Framadate/Migration/AddColumn_uniqId_In_vote_For_0_9.php index 2da2e49..700918f 100644 --- a/app/classes/Framadate/Migration/AddColumn_uniqId_In_vote_For_0_9.php +++ b/app/classes/Framadate/Migration/AddColumn_uniqId_In_vote_For_0_9.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration adds the field uniqId on the vote table. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.9 */ class AddColumn_uniqId_In_vote_For_0_9 implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class AddColumn_uniqId_In_vote_For_0_9 implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string { return 'Add column "uniqId" in table "vote" for version 0.9'; } @@ -43,12 +44,12 @@ class AddColumn_uniqId_In_vote_For_0_9 implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { $stmt = $pdo->query('SHOW TABLES'); - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if tables of v0.9 are presents $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables); @@ -58,16 +59,17 @@ class AddColumn_uniqId_In_vote_For_0_9 implements Migration { /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->alterPollTable($pdo); return true; } - private function alterPollTable(\PDO $pdo) { + private function alterPollTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('vote') . '` ADD `uniqId` CHAR(16) NOT NULL diff --git a/app/classes/Framadate/Migration/AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9.php b/app/classes/Framadate/Migration/AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9.php index 93893a1..626c2a5 100644 --- a/app/classes/Framadate/Migration/AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9.php +++ b/app/classes/Framadate/Migration/AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration adds the fields password_hash and results_publicly_visible on the poll table. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.9 */ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 impl * * @return string The description of the migration class */ - function description() { + function description(): string { return 'Add columns "password_hash" and "results_publicly_visible" in table "vote" for version 0.9'; } @@ -43,12 +44,12 @@ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 impl * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { $stmt = $pdo->query('SHOW TABLES'); - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if tables of v0.9 are presents $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables); @@ -58,16 +59,17 @@ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 impl /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->alterPollTable($pdo); return true; } - private function alterPollTable(\PDO $pdo) { + private function alterPollTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('poll') . '` ADD `password_hash` VARCHAR(255) NULL DEFAULT NULL , diff --git a/app/classes/Framadate/Migration/Alter_Comment_table_adding_date.php b/app/classes/Framadate/Migration/Alter_Comment_table_adding_date.php index afc57a9..e04c6b5 100644 --- a/app/classes/Framadate/Migration/Alter_Comment_table_adding_date.php +++ b/app/classes/Framadate/Migration/Alter_Comment_table_adding_date.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration alter the comment table to add a date column. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 1.0 */ class Alter_Comment_table_adding_date implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class Alter_Comment_table_adding_date implements Migration { * * @return string The description of the migration class */ - function description() { + public function description():string { return 'Alter the comment table to add a date column.'; } @@ -43,26 +44,27 @@ class Alter_Comment_table_adding_date implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { return true; } /** * This methode is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->alterCommentTable($pdo); return true; } - private function alterCommentTable(\PDO $pdo) { + private function alterCommentTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('comment') . '` ADD `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ;'); diff --git a/app/classes/Framadate/Migration/Alter_Comment_table_for_name_length.php b/app/classes/Framadate/Migration/Alter_Comment_table_for_name_length.php index 1844c81..481b276 100644 --- a/app/classes/Framadate/Migration/Alter_Comment_table_for_name_length.php +++ b/app/classes/Framadate/Migration/Alter_Comment_table_for_name_length.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration alter the comment table to set a length to the name column. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 1.0 */ class Alter_Comment_table_for_name_length implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class Alter_Comment_table_for_name_length implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string { return 'Alter the comment table to set a length to the name column.'; } @@ -43,26 +44,27 @@ class Alter_Comment_table_for_name_length implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { return true; } /** * This methode is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->alterCommentTable($pdo); return true; } - private function alterCommentTable(\PDO $pdo) { + private function alterCommentTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('comment') . '` CHANGE `name` `name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ;'); diff --git a/app/classes/Framadate/Migration/Fix_MySQL_No_Zero_Date.php b/app/classes/Framadate/Migration/Fix_MySQL_No_Zero_Date.php index 6eae592..4bf0d6e 100644 --- a/app/classes/Framadate/Migration/Fix_MySQL_No_Zero_Date.php +++ b/app/classes/Framadate/Migration/Fix_MySQL_No_Zero_Date.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This migration sets Poll.end_date to NULL by default @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 1.1 */ class Fix_MySQL_No_Zero_Date implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class Fix_MySQL_No_Zero_Date implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string { return 'Sets Poll end_date to NULL by default (work around MySQL NO_ZERO_DATE)'; } @@ -43,17 +44,17 @@ class Fix_MySQL_No_Zero_Date implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true if the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { $stmt = $pdo->prepare("SELECT Column_Default from Information_Schema.Columns where Table_Name = ? AND Column_Name = ?;"); $stmt->bindValue(1, Utils::table('poll')); $stmt->bindValue(2, 'end_date'); $stmt->execute(); - $default = $stmt->fetch(\PDO::FETCH_COLUMN); + $default = $stmt->fetch(PDO::FETCH_COLUMN); - $driver_name = $pdo->getAttribute(\PDO::ATTR_DRIVER_NAME); + $driver_name = $pdo->getAttribute(PDO::ATTR_DRIVER_NAME); return $default !== null && $driver_name === 'mysql'; } @@ -61,10 +62,11 @@ class Fix_MySQL_No_Zero_Date implements Migration { /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database - * @return bool|void if the execution succeeded + * @param PDO $pdo The connection to database + * @return bool if the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $pdo->exec('ALTER TABLE ' . Utils::table('poll') . ' MODIFY end_date TIMESTAMP NULL DEFAULT NULL;'); + return true; } } diff --git a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php index 092de91..98f1076 100644 --- a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php +++ b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * Class From_0_0_to_0_8_Migration @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.8 */ class From_0_0_to_0_8_Migration implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class From_0_0_to_0_8_Migration implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string { return 'First installation of the Framadate application (v0.8)'; } @@ -43,12 +44,12 @@ class From_0_0_to_0_8_Migration implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { $stmt = $pdo->query('SHOW TABLES like \'' . TABLENAME_PREFIX . '%\''); //issue187 : pouvoir installer framadate dans une base contenant d'autres tables. - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if there is no tables but the MIGRATION_TABLE one $diff = array_diff($tables, [Utils::table(MIGRATION_TABLE)]); @@ -58,10 +59,10 @@ class From_0_0_to_0_8_Migration implements Migration { /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $pdo->exec(' CREATE TABLE IF NOT EXISTS `sondage` ( `id_sondage` char(16) NOT NULL, @@ -104,5 +105,6 @@ CREATE TABLE IF NOT EXISTS `user_studs` ( PRIMARY KEY (`id_users`), KEY `id_sondage` (`id_sondage`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;'); + return true; } } diff --git a/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php b/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php index bb8ab78..5bd506a 100644 --- a/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php +++ b/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php @@ -19,6 +19,7 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; /** * This class executes the aciton in database to migrate data from version 0.8 to 0.9. @@ -27,7 +28,7 @@ use Framadate\Utils; * @version 0.9 */ class From_0_8_to_0_9_Migration implements Migration { - function __construct() { + public function __construct() { } /** @@ -35,7 +36,7 @@ class From_0_8_to_0_9_Migration implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string { return 'From 0.8 to 0.9'; } @@ -43,12 +44,12 @@ class From_0_8_to_0_9_Migration implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the Migration should be executed. */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { $stmt = $pdo->query('SHOW TABLES'); - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if tables of v0.8 are presents $diff = array_diff(['sondage', 'sujet_studs', 'comments', 'user_studs'], $tables); @@ -58,10 +59,10 @@ class From_0_8_to_0_9_Migration implements Migration { /** * This method is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->createPollTable($pdo); $this->createCommentTable($pdo); $this->createSlotTable($pdo); @@ -79,7 +80,8 @@ class From_0_8_to_0_9_Migration implements Migration { return true; } - private function createPollTable(\PDO $pdo) { + private function createPollTable(PDO $pdo): void + { $pdo->exec(' CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` ( `id` CHAR(16) NOT NULL, @@ -100,7 +102,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` ( DEFAULT CHARSET = utf8'); } - private function migrateFromSondageToPoll(\PDO $pdo) { + private function migrateFromSondageToPoll(PDO $pdo): void + { $select = $pdo->query(' SELECT `id_sondage`, @@ -126,7 +129,7 @@ INSERT INTO `' . Utils::table('poll') . '` (`id`, `admin_id`, `title`, `description`, `admin_name`, `admin_mail`, `creation_date`, `end_date`, `format`, `editable`, `receiveNewVotes`, `active`) VALUE (?,?,?,?,?,?,?,?,?,?,?,?)'); - while ($row = $select->fetch(\PDO::FETCH_OBJ)) { + while ($row = $select->fetch(PDO::FETCH_OBJ)) { $insert->execute([ $row->id_sondage, $row->id_sondage_admin, @@ -144,7 +147,8 @@ VALUE (?,?,?,?,?,?,?,?,?,?,?,?)'); } } - private function createSlotTable(\PDO $pdo) { + private function createSlotTable(PDO $pdo): void + { $pdo->exec(' CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` ( `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -158,7 +162,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` ( DEFAULT CHARSET = utf8'); } - private function migrateFromSujetStudsToSlot(\PDO $pdo) { + private function migrateFromSujetStudsToSlot(PDO $pdo): void + { $stmt = $pdo->query('SELECT * FROM sujet_studs'); $sujets = $stmt->fetchAll(); $slots = []; @@ -180,7 +185,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` ( } } - private function createCommentTable(\PDO $pdo) { + private function createCommentTable(PDO $pdo): void + { $pdo->exec(' CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` ( `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -194,7 +200,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` ( DEFAULT CHARSET = utf8'); } - private function migrateFromCommentsToComment(\PDO $pdo) { + private function migrateFromCommentsToComment(PDO $pdo): void + { $select = $pdo->query(' SELECT `id_sondage`, @@ -206,7 +213,7 @@ SELECT INSERT INTO `' . Utils::table('comment') . '` (`poll_id`, `name`, `comment`) VALUE (?,?,?)'); - while ($row = $select->fetch(\PDO::FETCH_OBJ)) { + while ($row = $select->fetch(PDO::FETCH_OBJ)) { $insert->execute([ $row->id_sondage, $this->unescape($row->usercomment), @@ -215,7 +222,8 @@ VALUE (?,?,?)'); } } - private function createVoteTable(\PDO $pdo) { + private function createVoteTable(PDO $pdo): void + { $pdo->exec(' CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` ( `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -229,7 +237,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` ( DEFAULT CHARSET = utf8'); } - private function migrateFromUserStudsToVote(\PDO $pdo) { + private function migrateFromUserStudsToVote(PDO $pdo): void + { $select = $pdo->query(' SELECT `id_sondage`, @@ -241,7 +250,7 @@ SELECT INSERT INTO `' . Utils::table('vote') . '` (`poll_id`, `name`, `choices`) VALUE (?,?,?)'); - while ($row = $select->fetch(\PDO::FETCH_OBJ)) { + while ($row = $select->fetch(PDO::FETCH_OBJ)) { $insert->execute([ $row->id_sondage, $this->unescape($row->nom), @@ -250,7 +259,8 @@ VALUE (?,?,?)'); } } - private function transformSujetToSlot($sujet) { + private function transformSujetToSlot($sujet): array + { $slots = []; $ex = explode(',', $sujet->sujet); $isDatePoll = strpos($sujet->sujet, '@'); @@ -279,14 +289,16 @@ VALUE (?,?,?)'); return $slots; } - private function dropOldTables(\PDO $pdo) { + private function dropOldTables(PDO $pdo): void + { $pdo->exec('DROP TABLE `comments`'); $pdo->exec('DROP TABLE `sujet_studs`'); $pdo->exec('DROP TABLE `user_studs`'); $pdo->exec('DROP TABLE `sondage`'); } - private function unescape($value) { + private function unescape(string $value): string + { return stripslashes(html_entity_decode($value, ENT_QUOTES)); } } diff --git a/app/classes/Framadate/Migration/Generate_uniqId_for_old_votes.php b/app/classes/Framadate/Migration/Generate_uniqId_for_old_votes.php index fb81466..42cfacc 100644 --- a/app/classes/Framadate/Migration/Generate_uniqId_for_old_votes.php +++ b/app/classes/Framadate/Migration/Generate_uniqId_for_old_votes.php @@ -20,6 +20,7 @@ namespace Framadate\Migration; use Framadate\Security\Token; use Framadate\Utils; +use PDO; /** * This migration generate uniqId for all legacy votes. @@ -28,16 +29,16 @@ use Framadate\Utils; * @version 0.9 */ class Generate_uniqId_for_old_votes implements Migration { - function __construct() { + public function __construct() { } - function description() { + public function description(): string { return 'Generate "uniqId" in "vote" table for all legacy votes'; } - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { $stmt = $pdo->query('SHOW TABLES'); - $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); + $tables = $stmt->fetchAll(PDO::FETCH_COLUMN); // Check if tables of v0.9 are presents $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables); @@ -47,10 +48,10 @@ class Generate_uniqId_for_old_votes implements Migration { /** * This methode is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true is the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $pdo->beginTransaction(); $this->generateUniqIdsForEmptyOnes($pdo); $pdo->commit(); @@ -58,7 +59,8 @@ class Generate_uniqId_for_old_votes implements Migration { return true; } - private function generateUniqIdsForEmptyOnes($pdo) { + private function generateUniqIdsForEmptyOnes(PDO $pdo): void + { $select = $pdo->query(' SELECT `id` FROM `' . Utils::table('vote') . '` @@ -69,7 +71,7 @@ UPDATE `' . Utils::table('vote') . '` SET `uniqid` = :uniqid WHERE `id` = :id'); - while ($row = $select->fetch(\PDO::FETCH_OBJ)) { + while ($row = $select->fetch(PDO::FETCH_OBJ)) { $token = Token::getToken(16); $update->execute([ 'uniqid' => $token, diff --git a/app/classes/Framadate/Migration/Increase_pollId_size.php b/app/classes/Framadate/Migration/Increase_pollId_size.php index 37eec25..a350d7c 100644 --- a/app/classes/Framadate/Migration/Increase_pollId_size.php +++ b/app/classes/Framadate/Migration/Increase_pollId_size.php @@ -2,9 +2,10 @@ namespace Framadate\Migration; use Framadate\Utils; +use PDO; class Increase_pollId_size implements Migration { - function __construct() { + public function __construct() { } /** @@ -12,7 +13,7 @@ class Increase_pollId_size implements Migration { * * @return string The description of the migration class */ - function description() { + public function description(): string { return 'Increase the size of id column in poll table'; } @@ -20,45 +21,50 @@ class Increase_pollId_size implements Migration { * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true if the Migration should be executed */ - function preCondition(\PDO $pdo) { + public function preCondition(PDO $pdo): bool { return true; } /** * This methode is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true if the execution succeeded */ - function execute(\PDO $pdo) { + public function execute(PDO $pdo): bool { $this->alterCommentTable($pdo); $this->alterPollTable($pdo); $this->alterSlotTable($pdo); $this->alterVoteTable($pdo); + return true; } - private function alterCommentTable(\PDO $pdo) { + private function alterCommentTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('comment') . '` CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'); } - private function alterPollTable(\PDO $pdo) { + private function alterPollTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('poll') . '` CHANGE `id` `id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'); } - private function alterSlotTable(\PDO $pdo) { + private function alterSlotTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('slot') . '` CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'); } - private function alterVoteTable(\PDO $pdo) { + private function alterVoteTable(PDO $pdo): void + { $pdo->exec(' ALTER TABLE `' . Utils::table('vote') . '` CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;'); diff --git a/app/classes/Framadate/Migration/Migration.php b/app/classes/Framadate/Migration/Migration.php index c4bed57..1254f2e 100644 --- a/app/classes/Framadate/Migration/Migration.php +++ b/app/classes/Framadate/Migration/Migration.php @@ -18,29 +18,30 @@ */ namespace Framadate\Migration; +use PDO; + interface Migration { /** * This method should describe in english what is the purpose of the migration class. * * @return string The description of the migration class */ - function description(); + public function description(): string; /** * This method could check if the execute method should be called. * It is called before the execute method. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true if the Migration should be executed */ - function preCondition(\PDO $pdo); + public function preCondition(PDO $pdo): bool; /** * This methode is called only one time in the migration page. * - * @param \PDO $pdo The connection to database + * @param PDO $pdo The connection to database * @return bool true if the execution succeeded */ - function execute(\PDO $pdo); + public function execute(PDO $pdo): bool; } - \ No newline at end of file diff --git a/app/classes/Framadate/Migration/RPadVotes_from_0_8.php b/app/classes/Framadate/Migration/RPadVotes_from_0_8.php index 52599eb..2ff8883 100644 --- a/app/classes/Framadate/Migration/RPadVotes_from_0_8.php +++ b/app/classes/Framadate/Migration/RPadVotes_from_0_8.php @@ -4,16 +4,16 @@ * is not distributed with this file, you can obtain one at * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt * - * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ + * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphael DROZ * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft) * * ============================= * - * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence + * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt * - * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ + * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphael DROZ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ namespace Framadate\Migration; @@ -28,11 +28,11 @@ use Framadate\Utils; * @version 0.9 */ class RPadVotes_from_0_8 implements Migration { - function description() { + public function description(): string { return 'RPad votes from version 0.8.'; } - function preCondition(\PDO $pdo) { + public function preCondition(\PDO $pdo): bool { $stmt = $pdo->query('SHOW TABLES'); $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN); @@ -41,7 +41,7 @@ class RPadVotes_from_0_8 implements Migration { return count($diff) === 0; } - function execute(\PDO $pdo) { + public function execute(\PDO $pdo): bool { $pdo->beginTransaction(); $this->rpadVotes($pdo); $pdo->commit(); @@ -49,7 +49,8 @@ class RPadVotes_from_0_8 implements Migration { return true; } - private function rpadVotes($pdo) { + private function rpadVotes(\PDO $pdo): void + { $pdo->exec('UPDATE ' . Utils::table('vote') . ' fv INNER JOIN ( SELECT v.id, RPAD(v.choices, inn.slots_count, \'0\') new_choices @@ -63,4 +64,4 @@ INNER JOIN ( ) computed ON fv.id = computed.id SET fv.choices = computed.new_choices'); } -} \ No newline at end of file +} diff --git a/app/classes/Framadate/Repositories/AbstractRepository.php b/app/classes/Framadate/Repositories/AbstractRepository.php index 28a8b2f..6017fa6 100644 --- a/app/classes/Framadate/Repositories/AbstractRepository.php +++ b/app/classes/Framadate/Repositories/AbstractRepository.php @@ -13,31 +13,40 @@ abstract class AbstractRepository { * PollRepository constructor. * @param FramaDB $connect */ - function __construct(FramaDB $connect) { + public function __construct(FramaDB $connect) { $this->connect = $connect; } - public function beginTransaction() { + public function beginTransaction(): void + { $this->connect->beginTransaction(); } - public function commit() { + public function commit(): void + { $this->connect->commit(); } - function rollback() { + public function rollback(): void + { $this->connect->rollback(); } - public function prepare($sql) { + /** + * @return \PDOStatement|false + */ + public function prepare(string $sql) { return $this->connect->prepare($sql); } - function query($sql) { + /** + * @return \PDOStatement|false + */ + public function query($sql) { return $this->connect->query($sql); } - function lastInsertId() { + public function lastInsertId(): string { return $this->connect->lastInsertId(); } } diff --git a/app/classes/Framadate/Repositories/CommentRepository.php b/app/classes/Framadate/Repositories/CommentRepository.php index 262ed0a..573716f 100644 --- a/app/classes/Framadate/Repositories/CommentRepository.php +++ b/app/classes/Framadate/Repositories/CommentRepository.php @@ -1,15 +1,13 @@ prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id'); $prepared->execute([$poll_id]); @@ -19,18 +17,20 @@ class CommentRepository extends AbstractRepository { /** * Insert a new comment. * - * @param $poll_id - * @param $name - * @param $comment + * @param string $poll_id + * @param string $name + * @param string $comment * @return bool */ - function insert($poll_id, $name, $comment) { + public function insert(string $poll_id, string $name, string $comment): bool + { $prepared = $this->prepare('INSERT INTO `' . Utils::table('comment') . '` (poll_id, name, comment) VALUES (?,?,?)'); return $prepared->execute([$poll_id, $name, $comment]); } - function deleteById($poll_id, $comment_id) { + public function deleteById(string $poll_id, int $comment_id): bool + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?'); return $prepared->execute([$poll_id, $comment_id]); @@ -39,16 +39,18 @@ class CommentRepository extends AbstractRepository { /** * Delete all comments of a given poll. * - * @param $poll_id int The ID of the given poll. + * @param string $poll_id The ID of the given poll. * @return bool|null true if action succeeded. */ - function deleteByPollId($poll_id) { + public function deleteByPollId(string $poll_id): ?bool + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ?'); return $prepared->execute([$poll_id]); } - public function exists($poll_id, $name, $comment) { + public function exists(string $poll_id, string $name, string $comment): bool + { $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND name = ? AND comment = ?'); $prepared->execute([$poll_id, $name, $comment]); diff --git a/app/classes/Framadate/Repositories/PollRepository.php b/app/classes/Framadate/Repositories/PollRepository.php index 1cb6af6..0c7f8f6 100644 --- a/app/classes/Framadate/Repositories/PollRepository.php +++ b/app/classes/Framadate/Repositories/PollRepository.php @@ -6,11 +6,8 @@ use Framadate\Utils; use PDO; class PollRepository extends AbstractRepository { - function __construct(FramaDB $connect) { - parent::__construct($connect); - } - - public function insertPoll($poll_id, $admin_poll_id, $form) { + public function insertPoll(string $poll_id, string $admin_poll_id, $form): void + { $sql = 'INSERT INTO `' . Utils::table('poll') . '` (id, admin_id, title, description, admin_name, admin_mail, end_date, format, editable, receiveNewVotes, receiveNewComments, hidden, password_hash, results_publicly_visible,ValueMax) VALUES (?,?,?,?,?,?,FROM_UNIXTIME(?),?,?,?,?,?,?,?,?)'; @@ -18,7 +15,7 @@ class PollRepository extends AbstractRepository { $prepared->execute([$poll_id, $admin_poll_id, $form->title, $form->description, $form->admin_name, $form->admin_mail, $form->end_date, $form->format, ($form->editable>=0 && $form->editable<=2) ? $form->editable : 0, $form->receiveNewVotes ? 1 : 0, $form->receiveNewComments ? 1 : 0, $form->hidden ? 1 : 0, $form->password_hash, $form->results_publicly_visible ? 1 : 0,$form->ValueMax]); } - function findById($poll_id) { + public function findById(string $poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?'); $prepared->execute([$poll_id]); @@ -28,7 +25,7 @@ class PollRepository extends AbstractRepository { return $poll; } - public function findByAdminId($admin_poll_id) { + public function findByAdminId(string $admin_poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE admin_id = ?'); $prepared->execute([$admin_poll_id]); @@ -38,7 +35,8 @@ class PollRepository extends AbstractRepository { return $poll; } - public function existsById($poll_id) { + public function existsById(string $poll_id): bool + { $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE id = ?'); $prepared->execute([$poll_id]); @@ -46,7 +44,8 @@ class PollRepository extends AbstractRepository { return $prepared->rowCount() > 0; } - public function existsByAdminId($admin_poll_id) { + public function existsByAdminId(string $admin_poll_id): bool + { $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE admin_id = ?'); $prepared->execute([$admin_poll_id]); @@ -54,13 +53,15 @@ class PollRepository extends AbstractRepository { return $prepared->rowCount() > 0; } - function update($poll) { + public function update($poll): bool + { $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=?, hidden=?, password_hash=?, results_publicly_visible=? WHERE id = ?'); return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active ? 1 : 0, ($poll->editable>=0 && $poll->editable<=2) ? $poll->editable : 0, $poll->hidden ? 1 : 0, $poll->password_hash, $poll->results_publicly_visible ? 1 : 0, $poll->id]); } - function deleteById($poll_id) { + public function deleteById($poll_id): bool + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?'); return $prepared->execute([$poll_id]); @@ -71,7 +72,8 @@ class PollRepository extends AbstractRepository { * * @return array Array of old polls */ - public function findOldPolls() { + public function findOldPolls(): array + { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE DATE_ADD(`end_date`, INTERVAL ' . PURGE_DELAY . ' DAY) < NOW() AND `end_date` != 0 LIMIT 20'); $prepared->execute([]); @@ -86,50 +88,50 @@ class PollRepository extends AbstractRepository { * @param int $limit The number of entries to find * @return array The found polls */ - public function findAll($search, $start, $limit) { + public function findAll(array $search, int $start, int $limit): array + { // Polls - - $request = ""; - $request .= "SELECT p.*,"; + + $request = "SELECT p.*,"; $request .= " (SELECT count(1) FROM `" . Utils::table('vote') . "` v WHERE p.id=v.poll_id) votes"; $request .= " FROM `" . Utils::table('poll') . "` p"; $request .= " WHERE 1"; - + $values = []; - + if (!empty($search["poll"])) { $request .= " AND p.id LIKE :poll"; $values["poll"] = "{$search["poll"]}%"; } - + $fields = [ // key of $search => column name "title" => "title", "name" => "admin_name", "mail" => "admin_mail", ]; - + foreach ($fields as $searchKey => $columnName) { if (empty($search[$searchKey])) { continue; } - + $request .= " AND p.$columnName LIKE :$searchKey"; - $values[$searchKey] = "%{$search[$searchKey]}%"; + $values[$searchKey] = "%$search[$searchKey]%"; } - + $request .= " ORDER BY p.title ASC"; $request .= " LIMIT :start, :limit"; - + $prepared = $this->prepare($request); - + foreach ($values as $searchKey => $value) { $prepared->bindParam(":$searchKey", $value, PDO::PARAM_STR); } - + $prepared->bindParam(':start', $start, PDO::PARAM_INT); $prepared->bindParam(':limit', $limit, PDO::PARAM_INT); - + $prepared->execute(); return $prepared->fetchAll(); @@ -141,7 +143,8 @@ class PollRepository extends AbstractRepository { * @param string $mail Email address of the poll admin * @return array The list of matching polls */ - public function findAllByAdminMail($mail) { + public function findAllByAdminMail(string $mail): array + { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE admin_mail = :admin_mail'); $prepared->execute(['admin_mail' => $mail]); @@ -149,12 +152,13 @@ class PollRepository extends AbstractRepository { } /** - * Get the total number of polls in databse. + * Get the total number of polls in database. * - * @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...] + * @param array|null $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...] * @return int The number of polls */ - public function count($search = null) { + public function count(array $search = null): int + { // Total count $prepared = $this->prepare(' SELECT count(1) nb @@ -172,13 +176,7 @@ SELECT count(1) nb $prepared->bindParam(':name', $name, PDO::PARAM_STR); $prepared->execute(); - $count = $prepared->fetch(); - /*echo '---'; - print_r($count); - echo '---'; - exit;*/ - - return $count->nb; + return $prepared->fetch()->nb; } } diff --git a/app/classes/Framadate/Repositories/RepositoryFactory.php b/app/classes/Framadate/Repositories/RepositoryFactory.php index 810d391..0d9e1a2 100644 --- a/app/classes/Framadate/Repositories/RepositoryFactory.php +++ b/app/classes/Framadate/Repositories/RepositoryFactory.php @@ -31,14 +31,15 @@ class RepositoryFactory { /** * @param FramaDB $connect */ - static function init(FramaDB $connect) { + public static function init(FramaDB $connect): void { self::$connect = $connect; } /** * @return PollRepository The singleton of PollRepository */ - static function pollRepository() { + public static function pollRepository(): PollRepository + { if (self::$pollRepository === null) { self::$pollRepository = new PollRepository(self::$connect); } @@ -49,7 +50,8 @@ class RepositoryFactory { /** * @return SlotRepository The singleton of SlotRepository */ - static function slotRepository() { + public static function slotRepository(): SlotRepository + { if (self::$slotRepository === null) { self::$slotRepository = new SlotRepository(self::$connect); } @@ -60,7 +62,8 @@ class RepositoryFactory { /** * @return VoteRepository The singleton of VoteRepository */ - static function voteRepository() { + public static function voteRepository(): VoteRepository + { if (self::$voteRepository === null) { self::$voteRepository = new VoteRepository(self::$connect); } @@ -71,7 +74,8 @@ class RepositoryFactory { /** * @return CommentRepository The singleton of CommentRepository */ - static function commentRepository() { + public static function commentRepository(): CommentRepository + { if (self::$commentRepository === null) { self::$commentRepository = new CommentRepository(self::$connect); } diff --git a/app/classes/Framadate/Repositories/SlotRepository.php b/app/classes/Framadate/Repositories/SlotRepository.php index 4c9c40f..a59413e 100644 --- a/app/classes/Framadate/Repositories/SlotRepository.php +++ b/app/classes/Framadate/Repositories/SlotRepository.php @@ -4,16 +4,16 @@ * is not distributed with this file, you can obtain one at * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt * - * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ + * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphael DROZ * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft) * * ============================= * - * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence + * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt * - * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ + * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphael DROZ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ namespace Framadate\Repositories; @@ -22,17 +22,14 @@ use Framadate\FramaDB; use Framadate\Utils; class SlotRepository extends AbstractRepository { - function __construct(FramaDB $connect) { - parent::__construct($connect); - } - /** * Insert a bulk of slots. * - * @param int $poll_id + * @param string $poll_id * @param array $choices */ - public function insertSlots($poll_id, $choices) { + public function insertSlots(string $poll_id, array $choices): void + { $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?, ?, ?)'); foreach ($choices as $choice) { @@ -57,7 +54,10 @@ class SlotRepository extends AbstractRepository { } } - function listByPollId($poll_id) { + /** + * @return array|false + */ + public function listByPollId(string $poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? ORDER BY id'); $prepared->execute([$poll_id]); @@ -67,11 +67,11 @@ class SlotRepository extends AbstractRepository { /** * Find the slot into poll for a given datetime. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $datetime int The datetime of the slot * @return mixed Object The slot found, or null */ - function findByPollIdAndDatetime($poll_id, $datetime) { + public function findByPollIdAndDatetime(string $poll_id, $datetime) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND SUBSTRING_INDEX(title, \'@\', 1) = ?'); $prepared->execute([$poll_id, $datetime]); @@ -84,12 +84,13 @@ class SlotRepository extends AbstractRepository { /** * Insert a new slot into a given poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $title mixed The title of the slot * @param $moments mixed|null The moments joined with "," * @return bool true if action succeeded */ - function insert($poll_id, $title, $moments) { + public function insert(string $poll_id, string $title, ?string $moments): bool + { $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?,?,?)'); return $prepared->execute([$poll_id, $title, $moments]); @@ -98,12 +99,13 @@ class SlotRepository extends AbstractRepository { /** * Update a slot into a poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $datetime int The datetime of the slot to update * @param $newMoments mixed The new moments * @return bool|null true if action succeeded. */ - function update($poll_id, $datetime, $newMoments) { + public function update(string $poll_id, $datetime, $newMoments): ?bool + { $prepared = $this->prepare('UPDATE `' . Utils::table('slot') . '` SET moments = ? WHERE poll_id = ? AND title = ?'); return $prepared->execute([$newMoments, $poll_id, $datetime]); @@ -112,15 +114,17 @@ class SlotRepository extends AbstractRepository { /** * Delete a entire slot from a poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id int The ID of the poll * @param $datetime mixed The datetime of the slot */ - function deleteByDateTime($poll_id, $datetime) { + public function deleteByDateTime(string $poll_id, $datetime): void + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND title = ?'); $prepared->execute([$poll_id, $datetime]); } - function deleteByPollId($poll_id) { + public function deleteByPollId(string $poll_id): bool + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ?'); return $prepared->execute([$poll_id]); diff --git a/app/classes/Framadate/Repositories/VoteRepository.php b/app/classes/Framadate/Repositories/VoteRepository.php index cbbbd77..50f197f 100644 --- a/app/classes/Framadate/Repositories/VoteRepository.php +++ b/app/classes/Framadate/Repositories/VoteRepository.php @@ -5,24 +5,24 @@ use Framadate\FramaDB; use Framadate\Utils; class VoteRepository extends AbstractRepository { - function __construct(FramaDB $connect) { - parent::__construct($connect); - } - - function allUserVotesByPollId($poll_id) { + /** + * @return array|false + */ + public function allUserVotesByPollId(string $poll_id) { $prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id'); $prepared->execute([$poll_id]); return $prepared->fetchAll(); } - function insertDefault($poll_id, $insert_position) { + public function insertDefault(string $poll_id, int $insert_position): bool + { $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), " ", SUBSTRING(choices, ?)) WHERE poll_id = ?'); //#51 : default value for unselected vote return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]); } - function insert($poll_id, $name, $choices, $token) { + public function insert(string $poll_id, string $name, string $choices, string $token): \stdClass { $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices, uniqId) VALUES (?,?,?,?)'); $prepared->execute([$poll_id, $name, $choices, $token]); @@ -36,7 +36,8 @@ class VoteRepository extends AbstractRepository { return $newVote; } - function deleteById($poll_id, $vote_id) { + public function deleteById(string $poll_id, int $vote_id): bool + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND id = ?'); return $prepared->execute([$poll_id, $vote_id]); @@ -45,10 +46,11 @@ class VoteRepository extends AbstractRepository { /** * Delete all votes of a given poll. * - * @param $poll_id int The ID of the given poll. + * @param string $poll_id The ID of the given poll. * @return bool|null true if action succeeded. */ - function deleteByPollId($poll_id) { + public function deleteByPollId(string $poll_id): ?bool + { $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ?'); return $prepared->execute([$poll_id]); @@ -57,17 +59,19 @@ class VoteRepository extends AbstractRepository { /** * Delete all votes made on given moment index. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $index int The index of the vote into the poll * @return bool|null true if action succeeded. */ - function deleteByIndex($poll_id, $index) { + public function deleteByIndex(string $poll_id, int $index): ?bool + { $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTR(choices, 1, ?), SUBSTR(choices, ?)) WHERE poll_id = ?'); return $prepared->execute([$index, $index + 2, $poll_id]); } - function update($poll_id, $vote_id, $name, $choices) { + public function update(string $poll_id, string $vote_id, string $name, $choices): bool + { $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?'); return $prepared->execute([$choices, $name, $poll_id, $vote_id]); @@ -76,25 +80,27 @@ class VoteRepository extends AbstractRepository { /** * Check if name is already used for the given poll. * - * @param int $poll_id ID of the poll + * @param string $poll_id ID of the poll * @param string $name Name of the vote * @return bool true if vote already exists */ - public function existsByPollIdAndName($poll_id, $name) { + public function existsByPollIdAndName(string $poll_id, string $name): bool + { $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ?'); $prepared->execute([$poll_id, $name]); return $prepared->rowCount() > 0; } - + /** * Check if name is already used for the given poll and another vote. * - * @param int $poll_id ID of the poll + * @param string $poll_id ID of the poll * @param string $name Name of the vote * @param int $vote_id ID of the current vote * @return bool true if vote already exists */ - public function existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id) { + public function existsByPollIdAndNameAndVoteId(string $poll_id, string $name, int $vote_id): bool + { $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ? AND id != ?'); $prepared->execute([$poll_id, $name, $vote_id]); return $prepared->rowCount() > 0; diff --git a/app/classes/Framadate/Security/PasswordHasher.php b/app/classes/Framadate/Security/PasswordHasher.php index 0df489d..ee355e4 100644 --- a/app/classes/Framadate/Security/PasswordHasher.php +++ b/app/classes/Framadate/Security/PasswordHasher.php @@ -16,7 +16,7 @@ class PasswordHasher { * @param string $password the password to hash. * @return false|string the hashed password, or false on failure. The used algorithm, cost and salt are returned as part of the hash. */ - public static function hash($password) { + public static function hash(string $password) { return password_hash($password, PASSWORD_DEFAULT); } @@ -27,7 +27,8 @@ class PasswordHasher { * @param string $hash the hash to compare. * @return bool */ - public static function verify($password, $hash) { + public static function verify(string $password, string $hash): bool + { return password_verify($password, $hash); } -} \ No newline at end of file +} diff --git a/app/classes/Framadate/Security/Token.php b/app/classes/Framadate/Security/Token.php index 5998f2e..79917a3 100644 --- a/app/classes/Framadate/Security/Token.php +++ b/app/classes/Framadate/Security/Token.php @@ -2,31 +2,35 @@ namespace Framadate\Security; class Token { - const DEFAULT_LENGTH = 64; + public const DEFAULT_LENGTH = 64; private $time; private $value; private $length; private static $codeAlphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789'; - function __construct($length = self::DEFAULT_LENGTH) { + public function __construct($length = self::DEFAULT_LENGTH) { $this->length = $length; $this->time = time() + TOKEN_TIME; $this->value = $this->generate(); } - public function getTime() { + public function getTime(): int + { return $this->time; } - public function getValue() { + public function getValue(): string + { return $this->value; } - public function isGone() { + public function isGone(): bool + { return $this->time < time(); } - public function check($value) { + public function check($value): bool + { return $value === $this->value; } @@ -37,7 +41,8 @@ class Token { * @param bool $crypto_strong If passed, tells if the token is "cryptographically strong" or not. * @return string */ - public static function getToken($length = self::DEFAULT_LENGTH, &$crypto_strong = false) { + public static function getToken(int $length = self::DEFAULT_LENGTH, bool &$crypto_strong = false): string + { if (function_exists('openssl_random_pseudo_bytes')) { openssl_random_pseudo_bytes(1, $crypto_strong); // Fake use to see if the algorithm used was "cryptographically strong" return self::getSecureToken($length); @@ -45,7 +50,8 @@ class Token { return self::getUnsecureToken($length); } - public static function getUnsecureToken($length) { + public static function getUnsecureToken(int $length): string + { $string = ''; mt_srand(); for ($i = 0; $i < $length; $i++) { @@ -58,7 +64,8 @@ class Token { /** * @author http://stackoverflow.com/a/13733588 */ - public static function getSecureToken($length){ + public static function getSecureToken(int $length): string + { $token = ""; for($i=0;$i<$length;$i++){ $token .= self::$codeAlphabet[self::crypto_rand_secure(0,strlen(self::$codeAlphabet))]; @@ -66,25 +73,33 @@ class Token { return $token; } - private function generate() { + private function generate(): string + { return self::getToken($this->length); } /** * @author http://us1.php.net/manual/en/function.openssl-random-pseudo-bytes.php#104322 + * + * @param int $max + * + * @psalm-param 0 $min + * @psalm-param 0|positive-int $max */ - private static function crypto_rand_secure($min, $max) { + private static function crypto_rand_secure(int $min, $max): int { $range = $max - $min; - if ($range < 0) return $min; // not so random... + // not so random... + if ($range < 0) { + return $min; + } $log = log($range, 2); $bytes = (int) ($log / 8) + 1; // length in bytes $bits = (int) $log + 1; // length in bits $filter = (int) (1 << $bits) - 1; // set all lower bits to 1 do { $rnd = hexdec(bin2hex(openssl_random_pseudo_bytes($bytes))); - $rnd = $rnd & $filter; // discard irrelevant bits + $rnd &= $filter; // discard irrelevant bits } while ($rnd >= $range); return $min + $rnd; } } - \ No newline at end of file diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php index 9c4ee0c..7f6174b 100644 --- a/app/classes/Framadate/Services/AdminPollService.php +++ b/app/classes/Framadate/Services/AdminPollService.php @@ -21,7 +21,7 @@ class AdminPollService { private $voteRepository; private $commentRepository; - function __construct(FramaDB $connect, PollService $pollService, LogService $logService) { + public function __construct(FramaDB $connect, PollService $pollService, LogService $logService) { $this->connect = $connect; $this->pollService = $pollService; $this->logService = $logService; @@ -31,32 +31,34 @@ class AdminPollService { $this->commentRepository = RepositoryFactory::commentRepository(); } - function updatePoll($poll) { + public function updatePoll($poll): bool + { global $config; if ($poll->end_date > $poll->creation_date) { return $this->pollRepository->update($poll); - } + } return false; } /** * Delete a comment from a poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $comment_id int The ID of the comment * @return mixed true is action succeeded */ - function deleteComment($poll_id, $comment_id) { + public function deleteComment(string $poll_id, int $comment_id) { return $this->commentRepository->deleteById($poll_id, $comment_id); } /** * Remove all comments of a poll. * - * @param $poll_id int The ID a the poll + * @param string $poll_id The ID a the poll * @return bool|null true is action succeeded */ - function cleanComments($poll_id) { + public function cleanComments(string $poll_id): ?bool + { $this->logService->log("CLEAN_COMMENTS", "id:$poll_id"); return $this->commentRepository->deleteByPollId($poll_id); } @@ -64,21 +66,23 @@ class AdminPollService { /** * Delete a vote from a poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $vote_id int The ID of the vote - * @return mixed true is action succeeded + * @return bool true is action succeeded */ - function deleteVote($poll_id, $vote_id) { + public function deleteVote(string $poll_id, int $vote_id): bool + { return $this->voteRepository->deleteById($poll_id, $vote_id); } /** * Remove all votes of a poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @return bool|null true is action succeeded */ - function cleanVotes($poll_id) { + public function cleanVotes(string $poll_id): ?bool + { $this->logService->log('CLEAN_VOTES', 'id:' . $poll_id); return $this->voteRepository->deleteByPollId($poll_id); } @@ -86,10 +90,11 @@ class AdminPollService { /** * Delete the entire given poll. * - * @param $poll_id int The ID of the poll + * @param $poll_id string The ID of the poll * @return bool true is action succeeded */ - function deleteEntirePoll($poll_id) { + public function deleteEntirePoll(string $poll_id): bool + { $poll = $this->pollRepository->findById($poll_id); $this->logService->log('DELETE_POLL', "id:$poll->id, format:$poll->format, admin:$poll->admin_name, mail:$poll->admin_mail"); @@ -109,7 +114,8 @@ class AdminPollService { * @param object $slot The slot informations (datetime + moment) * @return bool true if action succeeded */ - public function deleteDateSlot($poll, $slot) { + public function deleteDateSlot(object $poll, object $slot): bool + { $this->logService->log('DELETE_SLOT', 'id:' . $poll->id . ', slot:' . json_encode($slot)); $datetime = $slot->title; @@ -120,7 +126,9 @@ class AdminPollService { // We can't delete the last slot if ($poll->format === 'D' && count($slots) === 1 && strpos($slots[0]->moments, ',') === false) { return false; - } elseif ($poll->format === 'A' && count($slots) === 1) { + } + + if ($poll->format === 'A' && count($slots) === 1) { return false; } @@ -157,7 +165,8 @@ class AdminPollService { return true; } - public function deleteClassicSlot($poll, $slot_title) { + public function deleteClassicSlot($poll, string $slot_title): bool + { $this->logService->log('DELETE_SLOT', 'id:' . $poll->id . ', slot:' . $slot_title); $slots = $this->pollService->allSlotsByPoll($poll); @@ -193,12 +202,13 @@ class AdminPollService { *
  • Create a new moment if a slot already exists for the given date
    • * * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @param $datetime int The datetime * @param $new_moment string The moment's name * @throws MomentAlreadyExistsException When the moment to add already exists in database */ - public function addDateSlot($poll_id, $datetime, $new_moment) { + public function addDateSlot(string $poll_id, int $datetime, string $new_moment): void + { $this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', datetime:' . $datetime . ', moment:' . $new_moment); $slots = $this->slotRepository->listByPollId($poll_id); @@ -235,17 +245,18 @@ class AdminPollService { *
  • Create a new slot if no one exists for the given title
    • * * - * @param $poll_id int The ID of the poll - * @param $title int The title + * @param string $poll_id The ID of the poll + * @param string $title The title * @throws MomentAlreadyExistsException When the moment to add already exists in database */ - public function addClassicSlot($poll_id, $title) { + public function addClassicSlot(string $poll_id, string $title): void + { $this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', title:' . $title); $slots = $this->slotRepository->listByPollId($poll_id); // Check if slot already exists - $titles = array_map(function ($slot) { + $titles = array_map(static function ($slot) { return $slot->title; }, $slots); if (in_array($title, $titles, true)) { @@ -274,7 +285,7 @@ class AdminPollService { * @param $datetime int The datetime of the new slot * @return \stdClass An object like this one: {insert:X, slot:Y} where Y can be null. */ - private function findInsertPosition($slots, $datetime) { + private function findInsertPosition(array $slots, int $datetime) { $result = new \stdClass(); $result->slot = null; $result->insert = 0; @@ -292,14 +303,15 @@ class AdminPollService { $result->insert += count($moments); $result->slot = $slot; break; - } elseif ($datetime < $rowDatetime) { + } + + if ($datetime < $rowDatetime) { // We have to insert before this slot break; - } - $result->insert += count($moments); + } + $result->insert += count($moments); } return $result; } } - \ No newline at end of file diff --git a/app/classes/Framadate/Services/ICalService.php b/app/classes/Framadate/Services/ICalService.php index c0e53ba..38e542f 100644 --- a/app/classes/Framadate/Services/ICalService.php +++ b/app/classes/Framadate/Services/ICalService.php @@ -19,37 +19,15 @@ namespace Framadate\Services; use DateTime; -use Framadate\Repositories\RepositoryFactory; +use Framadate\Utils; use Sabre\VObject; class ICalService { - /** - * @var NotificationService - */ - private $notificationService; - /** - * @var SessionService - */ - private $sessionService; - /** - * @var LogService - */ - private $logService; - - public function __construct(LogService $logService, NotificationService $notificationService, SessionService $sessionService) { - $this->logService = $logService; - $this->notificationService = $notificationService; - $this->sessionService = $sessionService; - $this->pollRepository = RepositoryFactory::pollRepository(); - $this->slotRepository = RepositoryFactory::slotRepository(); - $this->voteRepository = RepositoryFactory::voteRepository(); - $this->commentRepository = RepositoryFactory::commentRepository(); - } - /** * Creates an ical-File and initiates the download. If possible, the provided time is used, else an all day event is created. */ - public function getEvent($poll, string $start_day, string $start_time) { + public function getEvent($poll, string $start_day, string $start_time): void + { if(!$this->dayIsReadable($start_day)) { return; } @@ -83,7 +61,8 @@ class ICalService { /** * Calls getTimedEvent with one hour as a time slot, starting at $start_daytime */ - function getTimedEvent1Hour($poll, string $start_daytime) { + public function getTimedEvent1Hour($poll, string $start_daytime): string + { $end_daytime = date(DATE_ATOM, strtotime('+1 hours', strtotime($start_daytime))); return $this->getTimedEvent($poll, $start_daytime, $end_daytime); } @@ -91,13 +70,14 @@ class ICalService { /** * Generates the text for an ical event including the time */ - function getTimedEvent($poll, string $start_daytime, string $end_daytime) { + public function getTimedEvent($poll, string $start_daytime, string $end_daytime): string + { $vcalendar = new VObject\Component\VCalendar([ 'VEVENT' => [ 'SUMMARY' => $poll->title, 'DESCRIPTION' => $this->stripMD($poll->description), - 'DTSTART' => new \DateTime($start_daytime), - 'DTEND' => new \DateTime($end_daytime) + 'DTSTART' => new DateTime($start_daytime), + 'DTEND' => new DateTime($end_daytime) ], 'PRODID' => ICAL_PRODID ]); @@ -107,7 +87,8 @@ class ICalService { /** * Generates the text for an ical event if the time is not known */ - function getAllDayEvent($poll, string $day) { + public function getAllDayEvent($poll, string $day): string + { $vcalendar = new VObject\Component\VCalendar(); $vevent = $vcalendar->add('VEVENT'); $vevent->add('SUMMARY', $poll->title); @@ -121,9 +102,11 @@ class ICalService { /** * Creates a file and initiates the download + * @param string $title * @param string $ical_text */ - function provideFile(string $title, string $ical_text) { + public function provideFile(string $title, string $ical_text): void + { header('Content-Description: File Transfer'); header('Content-Disposition: attachment; filename=' . $this->stripTitle($title) . ICAL_ENDING); header('Expires: 0'); @@ -139,31 +122,35 @@ class ICalService { * @param string $time * @return string the corrected value, null if the format is unknown */ - function reviseTimeString(string $time) { + public function reviseTimeString(string $time): ?string + { // 24-hour clock / international format if (preg_match('/^\d\d(:)\d\d$/', $time)) { return $time; } // 12-hour clock / using am and pm - else if (preg_match('/^\d[0-2]?:?\d{0,2}\s?[aApP][mM]$/', $time)) { + + if (preg_match('/^\d[0-2]?:?\d{0,2}\s?[aApP][mM]$/', $time)) { return $this->formatTime($time); } // french format HHhMM or HHh - else if (preg_match('/^\d\d?[hH]\d?\d?$/', $time)) { + + if (preg_match('/^\d\d?[hH]\d?\d?$/', $time)) { return $this->formatTime(str_pad(str_ireplace("H", ":", $time), 5, "0")); } // Number only - else if (preg_match('/^\d{1,4}$/', $time)) { + + if (preg_match('/^\d{1,4}$/', $time)) { return $this->formatTime(str_pad(str_pad($time, 2, "0", STR_PAD_LEFT), 4, "0")); } return null; } /** - * @param string $time - * @return 1 if the day string can be parsed, 0 if not and false if an error occured + * @param string $day + * @return false|int 1 if the day string can be parsed, 0 if not and false if an error occured */ - function dayIsReadable(string $day) { + public function dayIsReadable(string $day) { return preg_match('/^\d{2}-\d{2}-\d{4}$/', $day); } @@ -171,21 +158,25 @@ class ICalService { * @param string $time * @return string date string in format H:i (e.g. 19:00) */ - function formatTime(string $time) { + public function formatTime(string $time): string + { return date("H:i", strtotime($time)); } /** * Converts MD Code to HTML, then strips HTML away */ - function stripMD(string $string) { - return strip_tags(smarty_modifier_markdown($string)); + public function stripMD(string $string): string + { + return strip_tags(Utils::markdown($string)); } /** * Strips a string so it's usable as a file name (only digits, letters and underline allowed) + * + * @return null|string */ - function stripTitle(string $string) { + public function stripTitle(string $string): ?string { return preg_replace('/[^a-z0-9_]+/', '-', strtolower($string)); } } diff --git a/app/classes/Framadate/Services/InputService.php b/app/classes/Framadate/Services/InputService.php index db7d477..44d71bc 100644 --- a/app/classes/Framadate/Services/InputService.php +++ b/app/classes/Framadate/Services/InputService.php @@ -17,25 +17,28 @@ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ namespace Framadate\Services; +use function __; use DateTime; use Egulias\EmailValidator\EmailValidator; use Egulias\EmailValidator\Validation\RFCValidation; +use o80\i18n\CantLoadDictionaryException; /** * This class helps to clean all inputs from the users or external services. */ class InputService { - function __construct() {} + public function __construct() {} /** * This method filter an array calling "filter_var" on each items. * Only items validated are added at their own indexes, the others are not returned. * @param array $arr The array to filter * @param int $type The type of filter to apply - * @param array|null $options The associative array of options + * @param array|int $options The associative array of options * @return array The filtered array */ - function filterArray(array $arr, $type, $options = null) { + public function filterArray(array $arr, int $type, $options = 0): array + { $newArr = []; foreach($arr as $id=>$item) { @@ -48,24 +51,32 @@ class InputService { return $newArr; } - function filterAllowedValues($value, array $allowedValues) { + public function filterAllowedValues($value, array $allowedValues) { return in_array($value, $allowedValues, true) ? $value : null; } - public function filterTitle($title) { + public function filterTitle($title): ?string + { return $this->returnIfNotBlank($title); } + /** + * @return false|string + */ public function filterId($id) { $filtered = filter_var($id, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]); return $filtered ? substr($filtered, 0, 64) : false; } - public function filterName($name) { + public function filterName($name): ?string + { $filtered = trim($name); return $this->returnIfNotBlank($filtered); } + /** + * @return false|string + */ public function filterMail($mail) { /////////////////////////////////////////////////////////////////////////////////////// // formatting @@ -89,53 +100,67 @@ class InputService { return $resultat; } - public function filterDescription($description) { - $description = str_replace("\r\n", "\n", $description); - return $description; + public function filterDescription($description): string { + return str_replace("\r\n", "\n", $description); } + /** + * @return false|string + */ public function filterMD5($control) { return filter_var($control, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => MD5_REGEX]]); } + /** + * @return false|int + */ public function filterInteger($int) { return filter_var($int, FILTER_VALIDATE_INT); } + /** + * @return false|int + */ public function filterValueMax($int) { return $this->filterInteger($int) >= 1 ? $this->filterInteger($int) : false; } - public function filterBoolean($boolean) { - return !!filter_var($boolean, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_TRUE_REGEX]]); + public function filterBoolean($boolean): bool + { + return (bool)filter_var($boolean, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_TRUE_REGEX]]); } + /** + * @return false|string + */ public function filterEditable($editable) { return filter_var($editable, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => EDITABLE_CHOICE_REGEX]]); } - public function filterComment($comment) { + public function filterComment($comment): ?string + { $comment = str_replace("\r\n", "\n", $comment); return $this->returnIfNotBlank($comment); } - public function validateDate(string $date, DateTime $maxDate, DateTime $minDate): DateTime { - $dDate = $this->parseDate($date); - if (!$dDate) return $maxDate; - if ($dDate < $minDate) { + public function validateDate(DateTime $date, DateTime $minDate, DateTime $maxDate): DateTime { + if ($date < $minDate) { return $minDate; - } elseif ($maxDate < $dDate) { + } + + if ($maxDate < $date) { return $maxDate; - } - return $dDate; + } + return $date; } /** + * @throws CantLoadDictionaryException * @return DateTime|false */ - private function parseDate(string $date) { - return DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $date)->setTime(0, 0, 0); + public function parseDate(string $date) { + return DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $date)->setTime(0, 0); } /** @@ -144,7 +169,8 @@ class InputService { * @param string $filtered The value * @return string|null */ - private function returnIfNotBlank($filtered) { + private function returnIfNotBlank(string $filtered): ?string + { if ($filtered) { $withoutSpaces = str_replace(' ', '', $filtered); if (!empty($withoutSpaces)) { diff --git a/app/classes/Framadate/Services/InstallService.php b/app/classes/Framadate/Services/InstallService.php index 8f9f668..62b2029 100644 --- a/app/classes/Framadate/Services/InstallService.php +++ b/app/classes/Framadate/Services/InstallService.php @@ -17,7 +17,10 @@ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ namespace Framadate\Services; +use function __f; +use Exception; use Framadate\Utils; +use PDO; use Smarty; /** @@ -40,15 +43,17 @@ class InstallService { 'migrationTable' => 'framadate_migration' ]; - function __construct() {} + public function __construct() {} - public function updateFields($data) { + public function updateFields($data): void + { foreach ($data as $field => $value) { $this->fields[$field] = $value; } } - public function install(Smarty &$smarty) { + public function install(Smarty &$smarty): array + { // Check values are present if (empty($this->fields['appName']) || empty($this->fields['appMail']) || empty($this->fields['defaultLanguage']) || empty($this->fields['dbConnectionString']) || empty($this->fields['dbUser'])) { return $this->error('MISSING_VALUES'); @@ -57,7 +62,7 @@ class InstallService { // Connect to database try { $connect = $this->connectTo($this->fields['dbConnectionString'], $this->fields['dbUser'], $this->fields['dbPassword']); - } catch(\Exception $e) { + } catch(Exception $e) { return $this->error('CANT_CONNECT_TO_DATABASE', $e->getMessage()); } @@ -75,16 +80,20 @@ class InstallService { * @param string $connectionString * @param string $user * @param string $password - * @return \PDO + * @return PDO */ - function connectTo($connectionString, $user, $password) { - $pdo = @new \PDO($connectionString, $user, $password); - $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_OBJ); - $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); + public function connectTo(string $connectionString, string $user, string $password): PDO + { + $pdo = @new PDO($connectionString, $user, $password); + $pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ); + $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); return $pdo; } - function writeConfiguration(Smarty &$smarty) { + /** + * @return false|int + */ + public function writeConfiguration(Smarty &$smarty) { foreach($this->fields as $field=>$value) { $smarty->assign($field, $value); } @@ -96,15 +105,17 @@ class InstallService { /** * @param $content + * @return false|int */ - function writeToFile($content) { + public function writeToFile(string $content) { return @file_put_contents(CONF_FILENAME, $content); } /** * @return array */ - function ok() { + public function ok(): array + { return [ 'status' => 'OK', 'msg' => __f('Installation', 'Ended', Utils::get_server_name()) @@ -112,10 +123,12 @@ class InstallService { } /** - * @param $msg + * @param string $msg + * @param string $details * @return array */ - function error($msg, $details = '') { + public function error(string $msg, string $details = ''): array + { return [ 'status' => 'ERROR', 'code' => $msg, @@ -123,7 +136,8 @@ class InstallService { ]; } - public function getFields() { + public function getFields(): array + { return $this->fields; } } diff --git a/app/classes/Framadate/Services/LogService.php b/app/classes/Framadate/Services/LogService.php index 9242df1..0328fbf 100644 --- a/app/classes/Framadate/Services/LogService.php +++ b/app/classes/Framadate/Services/LogService.php @@ -7,7 +7,7 @@ namespace Framadate\Services; * @package Framadate\Services */ class LogService { - function __construct() { + public function __construct() { } /** @@ -16,8 +16,8 @@ class LogService { * @param $tag string A tag is used to quickly found a message when reading log file * @param $message string some message */ - function log($tag, $message) { + public function log(string $tag, string $message): void + { error_log(date('Ymd His') . ' [' . $tag . '] ' . $message . "\n", 3, ROOT_DIR . LOG_FILE); } } - \ No newline at end of file diff --git a/app/classes/Framadate/Services/MailService.php b/app/classes/Framadate/Services/MailService.php index dddc2d8..042fd59 100644 --- a/app/classes/Framadate/Services/MailService.php +++ b/app/classes/Framadate/Services/MailService.php @@ -1,12 +1,13 @@ logService = new LogService(); $this->smtp_allowed = $smtp_allowed; if (true === is_array($smtp_options)) { @@ -22,11 +23,18 @@ class MailService { } } + /** + * @return false|string + */ public function isValidEmail($email) { return filter_var($email, FILTER_VALIDATE_EMAIL); } - public function send($to, $subject, $body, $msgKey = null) { + /** + * @throws Exception + */ + public function send(string $to, string $subject, string $body, ?string $msgKey = null): void + { if ($this->smtp_allowed === true && $this->canSendMsg($msgKey)) { $mail = new PHPMailer(true); $this->configureMailer($mail); @@ -45,7 +53,7 @@ class MailService { $mail->Subject = $subject; // Bodies - $body = $body . '

    ' . __('Mail', 'Thanks for your trust.') . '
    ' . NOMAPPLICATION . '
    ' . __('Mail', 'FOOTER'); + $body .= '

    ' . __('Mail', 'Thanks for your trust.') . '
    ' . NOMAPPLICATION . '
    ' . __('Mail', 'FOOTER'); $mail->isHTML(true); $mail->msgHTML($body, ROOT_DIR, true); @@ -61,19 +69,25 @@ class MailService { $this->logService->log('MAIL', 'Mail sent to: ' . $to . ', key: ' . $msgKey); // Store the mail sending date + $this->initializeSession(); $_SESSION[self::MAILSERVICE_KEY][$msgKey] = time(); } } - public function canSendMsg($msgKey) { + public function canSendMsg(?string $msgKey): bool + { if ($msgKey === null) { return true; } + $this->initializeSession(); + return !isset($_SESSION[self::MAILSERVICE_KEY][$msgKey]) || time() - $_SESSION[self::MAILSERVICE_KEY][$msgKey] > self::DELAY_BEFORE_RESEND; + } + + private function initializeSession(): void { if (!isset($_SESSION[self::MAILSERVICE_KEY])) { $_SESSION[self::MAILSERVICE_KEY] = []; } - return !isset($_SESSION[self::MAILSERVICE_KEY][$msgKey]) || time() - $_SESSION[self::MAILSERVICE_KEY][$msgKey] > self::DELAY_BEFORE_RESEND; } /** @@ -81,7 +95,8 @@ class MailService { * * @param PHPMailer $mailer */ - private function configureMailer(PHPMailer $mailer) { + private function configureMailer(PHPMailer $mailer): void + { $mailer->isSMTP(); $available_options = [ diff --git a/app/classes/Framadate/Services/NotificationService.php b/app/classes/Framadate/Services/NotificationService.php index c3d93a5..f616f55 100644 --- a/app/classes/Framadate/Services/NotificationService.php +++ b/app/classes/Framadate/Services/NotificationService.php @@ -3,19 +3,22 @@ namespace Framadate\Services; use \stdClass; -use Framadate\Services\MailService; +use function __; +use function __f; use Framadate\Utils; +use o80\i18n\CantLoadDictionaryException; +use PHPMailer\PHPMailer\Exception; class NotificationService { - const UPDATE_VOTE = 1; - const ADD_VOTE = 2; - const ADD_COMMENT = 3; - const UPDATE_POLL = 10; - const DELETED_POLL = 11; + public const UPDATE_VOTE = 1; + public const ADD_VOTE = 2; + public const ADD_COMMENT = 3; + public const UPDATE_POLL = 10; + public const DELETED_POLL = 11; private $mailService; - function __construct(MailService $mailService) { + public function __construct(MailService $mailService) { $this->mailService = $mailService; } @@ -25,8 +28,10 @@ class NotificationService { * @param $poll stdClass The poll * @param $name string The name user who triggered the notification * @param $type int cf: Constants on the top of this page + * @throws Exception|CantLoadDictionaryException */ - function sendUpdateNotification(stdClass $poll, $type, $name='') { + public function sendUpdateNotification($poll, int $type, string $name=''): void + { if (!isset($_SESSION['mail_sent'])) { $_SESSION['mail_sent'] = []; } @@ -36,7 +41,7 @@ class NotificationService { $isOtherType = $type !== self::UPDATE_VOTE && $type !== self::ADD_VOTE && $type !== self::ADD_COMMENT; if ($isVoteAndCanSendIt || $isCommentAndCanSendIt || $isOtherType) { - if (self::isParticipation($type)) { + if ($this->isParticipation($type)) { $translationString = 'Poll\'s participation: %s'; } else { $translationString = 'Notification of poll: %s'; @@ -74,11 +79,13 @@ class NotificationService { } $messageTypeKey = $type . '-' . $poll->id; - $this->mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey); + if ($poll->admin_mail) { + $this->mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey); + } } } - function isParticipation($type) + public function isParticipation(int $type): bool { return $type >= self::UPDATE_POLL; } diff --git a/app/classes/Framadate/Services/PollService.php b/app/classes/Framadate/Services/PollService.php index d7320b4..170f37d 100644 --- a/app/classes/Framadate/Services/PollService.php +++ b/app/classes/Framadate/Services/PollService.php @@ -20,16 +20,17 @@ namespace Framadate\Services; use DateInterval; use DateTime; +use Exception; use Framadate\Exception\AlreadyExistsException; use Framadate\Exception\ConcurrentEditionException; use Framadate\Exception\ConcurrentVoteException; +use Framadate\Exception\PollNotFoundException; use Framadate\Form; -use Framadate\FramaDB; use Framadate\Repositories\RepositoryFactory; use Framadate\Security\Token; +use stdClass; class PollService { - private $connect; private $logService; private $pollRepository; @@ -37,8 +38,7 @@ class PollService { private $voteRepository; private $commentRepository; - function __construct(FramaDB $connect, LogService $logService) { - $this->connect = $connect; + public function __construct(LogService $logService) { $this->logService = $logService; $this->pollRepository = RepositoryFactory::pollRepository(); $this->slotRepository = RepositoryFactory::slotRepository(); @@ -49,10 +49,10 @@ class PollService { /** * Find a poll from its ID. * - * @param $poll_id int The ID of the poll - * @return \stdClass|null The found poll, or null + * @param string $poll_id The ID of the poll + * @return stdClass|null The found poll, or null */ - function findById($poll_id) { + public function findById(string $poll_id) { if (preg_match(POLL_REGEX, $poll_id)) { return $this->pollRepository->findById($poll_id); } @@ -60,7 +60,7 @@ class PollService { return null; } - public function findByAdminId($admin_poll_id) { + public function findByAdminId(string $admin_poll_id) { if (preg_match(ADMIN_POLL_REGEX, $admin_poll_id)) { return $this->pollRepository->findByAdminId($admin_poll_id); } @@ -68,15 +68,15 @@ class PollService { return null; } - function allCommentsByPollId($poll_id) { + public function allCommentsByPollId(string $poll_id) { return $this->commentRepository->findAllByPollId($poll_id); } - function allVotesByPollId($poll_id) { + public function allVotesByPollId(string $poll_id) { return $this->voteRepository->allUserVotesByPollId($poll_id); } - function allSlotsByPoll($poll) { + public function allSlotsByPoll(stdClass $poll) { $slots = $this->slotRepository->listByPollId($poll->id); if ($poll->format === 'D') { $this->sortSlorts($slots); @@ -85,44 +85,45 @@ class PollService { } /** - * @param $poll_id - * @param $vote_id - * @param $name - * @param $choices - * @param $slots_hash + * @param string $poll_id + * @param int $vote_id + * @param string $name + * @param array $choices + * @param string $slots_hash * @throws AlreadyExistsException * @throws ConcurrentEditionException * @throws ConcurrentVoteException * @return bool */ - public function updateVote($poll_id, $vote_id, $name, $choices, $slots_hash) { + public function updateVote(string $poll_id, int $vote_id, string $name, array $choices, string $slots_hash): bool + { $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id); // Update vote - $choices = implode($choices); - return $this->voteRepository->update($poll_id, $vote_id, $name, $choices); + return $this->voteRepository->update($poll_id, $vote_id, $name, implode($choices)); } /** - * @param $poll_id - * @param $name - * @param $choices - * @param $slots_hash - * @throws AlreadyExistsException + * @param string $poll_id + * @param string $name + * @param array $choices + * @param string $slots_hash * @throws ConcurrentEditionException * @throws ConcurrentVoteException - * @return \stdClass + * @throws PollNotFoundException + * @throws AlreadyExistsException + * @return stdClass */ - function addVote($poll_id, $name, $choices, $slots_hash) { + public function addVote(string $poll_id, string $name, array $choices, string $slots_hash): stdClass + { $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name); // Insert new vote - $choices = implode($choices); - $token = $this->random(16); - return $this->voteRepository->insert($poll_id, $name, $choices, $token); + return $this->voteRepository->insert($poll_id, $name, implode($choices), $this->random(16)); } - function addComment($poll_id, $name, $comment) { + public function addComment($poll_id, $name, $comment): bool + { if ($this->commentRepository->exists($poll_id, $name, $comment)) { return true; } @@ -134,7 +135,8 @@ class PollService { * @param Form $form * @return array */ - function createPoll(Form $form) { + public function createPoll(Form $form): array + { // Generate poll IDs, loop while poll ID already exists if (empty($form->id)) { // User want us to generate an id for him @@ -160,16 +162,18 @@ class PollService { return [$poll_id, $admin_poll_id]; } - public function findAllByAdminMail($mail) { + public function findAllByAdminMail($mail): array + { return $this->pollRepository->findAllByAdminMail($mail); } /** * @param array $votes - * @param \stdClass $poll + * @param stdClass $poll * @return array */ - public function computeBestChoices($votes, $poll) { + public function computeBestChoices(array $votes, $poll): array + { if (0 === count($votes)) { return $this->computeEmptyBestChoices($poll); } @@ -195,10 +199,11 @@ class PollService { return $result; } - function splitSlots($slots) { + public function splitSlots($slots): array + { $splitted = []; foreach ($slots as $slot) { - $obj = new \stdClass(); + $obj = new stdClass(); $obj->day = $slot->title; $obj->moments = explode(',', $slot->moments); @@ -212,16 +217,18 @@ class PollService { * @param $slots array The slots to hash * @return string The hash */ - public function hashSlots($slots) { - return md5(array_reduce($slots, function($carry, $item) { + public function hashSlots(array $slots): string + { + return md5(array_reduce($slots, static function($carry, $item) { return $carry . $item->id . '@' . $item->moments . ';'; })); } - function splitVotes($votes) { + public function splitVotes(array $votes): array + { $splitted = []; foreach ($votes as $vote) { - $obj = new \stdClass(); + $obj = new stdClass(); $obj->id = $vote->id; $obj->name = $vote->name; $obj->uniqId = $vote->uniqId; @@ -234,6 +241,7 @@ class PollService { } /** + * @throws Exception * @return DateTime The max date allowed for expiry date */ public function maxExpiryDate(): DateTime { @@ -244,15 +252,16 @@ class PollService { /** * @return DateTime The min date allowed for expiry date */ - public function minExpiryDate() { + public function minExpiryDate(): DateTime + { return (new DateTime())->add(new DateInterval('P1D')); } /** * @return mixed */ - public function sortSlorts(&$slots) { - uasort($slots, function ($a, $b) { + public function sortSlorts(array &$slots): array { + uasort($slots, static function ($a, $b) { if ($a->title === $b->title) { return 0; } @@ -262,10 +271,10 @@ class PollService { } /** - * @param \stdClass $poll + * @param stdClass $poll * @return array */ - private function computeEmptyBestChoices($poll) + private function computeEmptyBestChoices($poll): array { $result = ['y' => [], 'inb' => []]; // if there is no votes, calculates the number of slot @@ -275,7 +284,7 @@ class PollService { if ($poll->format === 'A') { // poll format classic - for ($i = 0; $i < count($slots); $i++) { + for ($i = 0, $iMax = count($slots); $i < $iMax; $i++) { $result['y'][] = 0; $result['inb'][] = 0; } @@ -285,7 +294,7 @@ class PollService { $slots = $this->splitSlots($slots); foreach ($slots as $slot) { - for ($i = 0; $i < count($slot->moments); $i++) { + for ($i = 0, $iMax = count($slot->moments); $i < $iMax; $i++) { $result['y'][] = 0; $result['inb'][] = 0; } @@ -294,23 +303,26 @@ class PollService { return $result; } - private function random($length) { + private function random(int $length): string + { return Token::getToken($length); } /** - * @param $choices - * @param $poll_id - * @param $slots_hash - * @param $name - * @param string $vote_id + * @param array $choices + * @param string $poll_id + * @param string $slots_hash + * @param string $name + * @param bool|int $vote_id * @throws AlreadyExistsException - * @throws ConcurrentVoteException * @throws ConcurrentEditionException + * @throws ConcurrentVoteException + * @throws PollNotFoundException */ - private function checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id = FALSE) { + private function checkVoteConstraints(array $choices, string $poll_id, string $slots_hash, string $name, $vote_id = false): void + { // Check if vote already exists with the same name - if (FALSE === $vote_id) { + if (false === $vote_id) { $exists = $this->voteRepository->existsByPollIdAndName($poll_id, $name); } else { $exists = $this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id); @@ -322,6 +334,10 @@ class PollService { $poll = $this->findById($poll_id); + if (!$poll) { + throw new PollNotFoundException(); + } + // Check that no-one voted in the meantime and it conflicts the maximum votes constraint $this->checkMaxVotes($choices, $poll, $poll_id); @@ -336,7 +352,8 @@ class PollService { * @param $slots_hash string The hash sent by the user * @throws ConcurrentEditionException Thrown when hashes are differents */ - private function checkThatSlotsDidntChanged($poll, $slots_hash) { + private function checkThatSlotsDidntChanged(stdClass $poll, string $slots_hash): void + { $slots = $this->allSlotsByPoll($poll); if ($slots_hash !== $this->hashSlots($slots)) { throw new ConcurrentEditionException(); @@ -347,11 +364,12 @@ class PollService { * This method checks if the votes doesn't conflicts the maximum votes constraint * * @param $user_choice - * @param \stdClass $poll + * @param stdClass $poll * @param string $poll_id * @throws ConcurrentVoteException */ - private function checkMaxVotes($user_choice, $poll, $poll_id) { + private function checkMaxVotes(array $user_choice, $poll, string $poll_id): void + { $votes = $this->allVotesByPollId($poll_id); if (count($votes) <= 0) { return; diff --git a/app/classes/Framadate/Services/PurgeService.php b/app/classes/Framadate/Services/PurgeService.php index 7b59b7a..95ddef6 100644 --- a/app/classes/Framadate/Services/PurgeService.php +++ b/app/classes/Framadate/Services/PurgeService.php @@ -15,7 +15,7 @@ class PurgeService { private $voteRepository; private $commentRepository; - function __construct(FramaDB $connect, LogService $logService) { + public function __construct(LogService $logService) { $this->logService = $logService; $this->pollRepository = RepositoryFactory::pollRepository(); $this->slotRepository = RepositoryFactory::slotRepository(); @@ -26,9 +26,10 @@ class PurgeService { /** * This methode purges all old polls (the ones with end_date in past). * - * @return bool true is action succeeded + * @return int number of purged polls */ - function purgeOldPolls() { + public function purgeOldPolls(): int + { $oldPolls = $this->pollRepository->findOldPolls(); $count = count($oldPolls); @@ -50,10 +51,11 @@ class PurgeService { /** * This methode delete all data about a poll. * - * @param $poll_id int The ID of the poll + * @param string $poll_id The ID of the poll * @return bool true is action succeeded */ - function purgePollById($poll_id) { + public function purgePollById(string $poll_id): bool + { $done = true; $this->pollRepository->beginTransaction(); @@ -71,4 +73,3 @@ class PurgeService { return $done; } } - \ No newline at end of file diff --git a/app/classes/Framadate/Services/SecurityService.php b/app/classes/Framadate/Services/SecurityService.php index f641052..e27e572 100644 --- a/app/classes/Framadate/Services/SecurityService.php +++ b/app/classes/Framadate/Services/SecurityService.php @@ -5,7 +5,7 @@ use Framadate\Security\PasswordHasher; use Framadate\Security\Token; class SecurityService { - function __construct() { + public function __construct() { } /** @@ -18,9 +18,10 @@ class SecurityService { * * * @param $tokan_name string The name of the CSRF token - * @return Token The token + * @return string The token */ - function getToken($tokan_name) { + function getToken(string $tokan_name): string + { if (!isset($_SESSION['tokens'])) { $_SESSION['tokens'] = []; } @@ -38,7 +39,8 @@ class SecurityService { * @param $csrf string Value to check * @return bool true if the token is well checked */ - public function checkCsrf($tokan_name, $csrf) { + public function checkCsrf(string $tokan_name, string $csrf): bool + { $checked = $_SESSION['tokens'][$tokan_name]->getValue() === $csrf; if($checked) { @@ -54,17 +56,18 @@ class SecurityService { * @param $poll \stdClass The poll which we seek access * @return bool true if the current session can access this poll */ - public function canAccessPoll($poll) { + public function canAccessPoll($poll): bool + { if (is_null($poll->password_hash)) { return true; } $this->ensureSessionPollSecurityIsCreated(); - $currentPassword = isset($_SESSION['poll_security'][$poll->id]) ? $_SESSION['poll_security'][$poll->id] : null; + $currentPassword = $_SESSION['poll_security'][$poll->id] ?? null; if (!empty($currentPassword) && PasswordHasher::verify($currentPassword, $poll->password_hash)) { return true; - } + } unset($_SESSION['poll_security'][$poll->id]); return false; } @@ -75,17 +78,18 @@ class SecurityService { * @param $poll \stdClass The poll which we seek access * @param $password string the password to compare */ - public function submitPollAccess($poll, $password) { + public function submitPollAccess($poll, string $password): void + { if (!empty($password)) { $this->ensureSessionPollSecurityIsCreated(); $_SESSION['poll_security'][$poll->id] = $password; } } - private function ensureSessionPollSecurityIsCreated() { + private function ensureSessionPollSecurityIsCreated(): void + { if (!isset($_SESSION['poll_security'])) { $_SESSION['poll_security'] = []; } } } - \ No newline at end of file diff --git a/app/classes/Framadate/Services/SessionService.php b/app/classes/Framadate/Services/SessionService.php index 128e918..0543e18 100644 --- a/app/classes/Framadate/Services/SessionService.php +++ b/app/classes/Framadate/Services/SessionService.php @@ -17,12 +17,7 @@ class SessionService { $this->initSectionIfNeeded($section); - $returnValue = $defaultValue; - if (isset($_SESSION[$section][$key])) { - $returnValue = $_SESSION[$section][$key]; - } - - return $returnValue; + return $_SESSION[$section][$key] ?? $defaultValue; } /** @@ -32,7 +27,8 @@ class SessionService { * @param $key * @param $value */ - public function set($section, $key, $value) { + public function set($section, $key, $value): void + { assert(!empty($key)); assert(!empty($section)); @@ -47,16 +43,18 @@ class SessionService { * @param $section * @param $key */ - public function remove($section, $key) { + public function remove($section, $key): void + { assert(!empty($key)); assert(!empty($section)); unset($_SESSION[$section][$key]); } - private function initSectionIfNeeded($section) { + private function initSectionIfNeeded($section): void + { if (!isset($_SESSION[$section])) { $_SESSION[$section] = []; } } -} \ No newline at end of file +} diff --git a/app/classes/Framadate/Services/SuperAdminService.php b/app/classes/Framadate/Services/SuperAdminService.php index ecc3b5c..5e434bd 100644 --- a/app/classes/Framadate/Services/SuperAdminService.php +++ b/app/classes/Framadate/Services/SuperAdminService.php @@ -11,7 +11,7 @@ use Framadate\Repositories\RepositoryFactory; class SuperAdminService { private $pollRepository; - function __construct() { + public function __construct() { $this->pollRepository = RepositoryFactory::pollRepository(); } @@ -23,7 +23,8 @@ class SuperAdminService { * @param int $limit The limit size * @return array ['polls' => The {$limit} polls, 'count' => Entries found by the query, 'total' => Total count] */ - public function findAllPolls($search, $page, $limit) { + public function findAllPolls(array $search, int $page, int $limit): array + { $start = $page * $limit; $polls = $this->pollRepository->findAll($search, $start, $limit); $count = $this->pollRepository->count($search); @@ -32,4 +33,3 @@ class SuperAdminService { return ['polls' => $polls, 'count' => $count, 'total' => $total]; } } - \ No newline at end of file diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php index a1d480b..72d01ff 100644 --- a/app/classes/Framadate/Utils.php +++ b/app/classes/Framadate/Utils.php @@ -24,13 +24,13 @@ class Utils { /** * @return string Server name */ - public static function get_server_name() { + public static function get_server_name(): string + { $scheme = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')) ? 'https' : 'http'; $port = in_array($_SERVER['SERVER_PORT'], ['80', '443'], true) ? '' : ':' . $_SERVER['SERVER_PORT']; $dirname = dirname($_SERVER['SCRIPT_NAME']); $dirname = $dirname === '\\' ? '/' : $dirname . '/'; - $dirname = str_replace('/admin', '', $dirname); - $dirname = str_replace('/action', '', $dirname); + $dirname = str_replace(['/admin', '/action'], '', $dirname); $server_name = (defined('APP_URL') ? APP_URL : $_SERVER['SERVER_NAME']) . $port . $dirname; return $scheme . '://' . preg_replace('#//+#', '/', $server_name); @@ -38,9 +38,10 @@ class Utils { /** * @param string $title + * * @deprecated */ - public static function print_header($title = '') { + public static function print_header($title = ''): void { global $locale; echo ' @@ -60,7 +61,7 @@ class Utils { - + '; if ('en' !== $locale) { @@ -81,16 +82,17 @@ class Utils { /** * Function allowing to generate poll's url - * @param string $id The poll's id - * @param bool $admin True to generate an admin URL, false for a public one - * @param string $vote_id (optional) The vote's unique id - * @param null $action - * @param null $action_value - * @return string The poll's URL. + * @param string $id The poll's id + * @param bool $admin True to generate an admin URL, false for a public one + * @param string $vote_id (optional) The vote's unique id + * @param string|null $action + * @param string|null $action_value + * @return string The poll's URL. */ - public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) { + public static function getUrlSondage(string $id, bool $admin = false, string $vote_id = '', string $action = null, string $action_value = null): string + { // URL-Encode $action_value - $action_value = $action_value ? Utils::base64url_encode($action_value) : null; + $action_value = $action_value ? self::base64url_encode($action_value) : null; if (URL_PROPRE) { if ($admin === true) { @@ -132,17 +134,20 @@ class Utils { * * @param mixed $object The object to print. */ - public static function debug($object) { + public static function debug($object): void + { echo '
    ';
         print_r($object);
         echo '
    '; } - public static function table($tableName) { + public static function table(string $tableName): string + { return TABLENAME_PREFIX . $tableName; } - public static function markdown($md, $clear=false, $line=true) { + public static function markdown(string $md, bool $clear=false, bool $line=true): string + { $parseDown = new Parsedown(); $parseDown @@ -155,7 +160,7 @@ class Utils { } else { $md = preg_replace_callback( '#( ){2,}#', - function ($m) { + static function ($m) { return str_repeat(' ', strlen($m[0])); }, $md @@ -168,39 +173,38 @@ class Utils { return $clear ? $text : $html; } - public static function htmlEscape($html) { + public static function htmlEscape(string $html): string { return htmlentities($html, ENT_HTML5 | ENT_QUOTES); } - public static function htmlMailEscape($html) { + public static function htmlMailEscape(string $html): string + { return htmlspecialchars($html, ENT_HTML5 | ENT_QUOTES); } - public static function csvEscape($text) { - $escaped = str_replace('"', '""', $text); - $escaped = str_replace("\r\n", '', $escaped); - $escaped = str_replace("\n", '', $escaped); + public static function csvEscape(string $text): string + { + $escaped = str_replace(['"', "\r\n", "\n"], ['""', '', ''], $text); $escaped = preg_replace("/^(=|\+|\-|\@)/", "'$1", $escaped); return '"' . $escaped . '"'; } - public static function cleanFilename($title) { + public static function cleanFilename(string $title): string { $cleaned = preg_replace('[^a-zA-Z0-9._-]', '_', $title); - $cleaned = preg_replace(' {2,}', ' ', $cleaned); - - return $cleaned; + return preg_replace(' {2,}', ' ', $cleaned); } - public static function fromPostOrDefault($postKey, $default = '') { + public static function fromPostOrDefault(string $postKey, ?string $default = '') { return !empty($_POST[$postKey]) ? $_POST[$postKey] : $default; } - public static function base64url_encode($input) { + public static function base64url_encode(string $input): string + { return rtrim(strtr(base64_encode($input), '+/', '-_'), '='); } - public static function base64url_decode($input) { + public static function base64url_decode(string $input): string { return base64_decode(str_pad(strtr($input, '-_', '+/'), strlen($input) % 4, '=', STR_PAD_RIGHT), true); } } diff --git a/app/inc/i18n.php b/app/inc/i18n.php index 14a28cb..928ac28 100644 --- a/app/inc/i18n.php +++ b/app/inc/i18n.php @@ -18,12 +18,14 @@ */ // Prepare I18N instance -$i18n = \o80\i18n\I18N::instance(); +use o80\i18n\I18N; + +$i18n = I18N::instance(); $i18n->setDefaultLang(DEFAULT_LANGUAGE); $i18n->setPath(__DIR__ . '/../../locale'); -// Change langauge when user asked for it -if (isset($_POST['lang']) && is_string($_POST['lang']) && in_array($_POST['lang'], array_keys($ALLOWED_LANGUAGES), true)) { +// Change language when user asked for it +if (isset($_POST['lang']) && is_string($_POST['lang']) && array_key_exists($_POST['lang'], $ALLOWED_LANGUAGES)) { $_SESSION['lang'] = $_POST['lang']; } @@ -38,7 +40,7 @@ $date_format['txt_day'] = __('Date', 'DAY'); $date_format['txt_date'] = __('Date', 'DATE'); $date_format['txt_month_year'] = __('Date', 'MONTH_YEAR'); $date_format['txt_datetime_short'] = __('Date', 'DATETIME'); -if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { //%e can't be used on Windows platform, use %#d instead +if (PHP_OS_FAMILY === 'Windows') { //%e can't be used on Windows platform, use %#d instead foreach ($date_format as $k => $v) { $date_format[$k] = preg_replace('#(?getMessage(); + } } else { define('NOMAPPLICATION', 'Framadate'); define('DEFAULT_LANGUAGE', 'fr'); diff --git a/app/inc/smarty.php b/app/inc/smarty.php index db17c51..7c5f259 100644 --- a/app/inc/smarty.php +++ b/app/inc/smarty.php @@ -50,9 +50,10 @@ if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE']) { $smarty->compile_check = false; } -function smarty_function_poll_url($params, Smarty_Internal_Template $template) { +function smarty_function_poll_url($params, Smarty_Internal_Template $template): string +{ $poll_id = filter_var($params['id'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]); - $admin = (isset($params['admin']) && $params['admin']) ? true : false; + $admin = isset($params['admin']) && $params['admin']; $action = (isset($params['action']) && !empty($params['action'])) ? Utils::htmlEscape($params['action']) : false; $action_value = (isset($params['action_value']) && !empty($params['action_value'])) ? $params['action_value'] : false; $vote_unique_id = isset($params['vote_id']) ? filter_var($params['vote_id'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]) : ''; @@ -62,30 +63,40 @@ function smarty_function_poll_url($params, Smarty_Internal_Template $template) { return Utils::getUrlSondage($poll_id, $admin, $vote_unique_id, $action, $action_value); } -function smarty_modifier_markdown($md, $clear = false, $inline=true) { +function smarty_modifier_markdown(string $md, bool $clear = false, bool $inline=true): string +{ return Utils::markdown($md, $clear, $inline); } -function smarty_modifier_resource($link) { +function smarty_modifier_resource(string $link): string +{ return Utils::get_server_name() . $link; } -function smarty_modifier_addslashes_single_quote($string) { +function smarty_modifier_addslashes_single_quote(string $string): string +{ return addcslashes($string, '\\\''); } -function smarty_modifier_addslashes($string) { +function smarty_modifier_addslashes(string $string): string +{ return addslashes($string); } -function smarty_modifier_html($html) { +function smarty_modifier_html(?string $html): string +{ + if (!$html) { + return ''; + } return Utils::htmlEscape($html); } -function smarty_modifier_html_special_chars($html) { +function smarty_modifier_html_special_chars(string $html): string +{ return Utils::htmlMailEscape($html); } -function smarty_modifier_datepicker_path($lang) { +function smarty_modifier_datepicker_path(string $lang): string +{ $i = 0; while (!is_file(path_for_datepicker_locale($lang)) && $i < 3) { $lang_arr = explode('-', $lang); @@ -94,12 +105,13 @@ function smarty_modifier_datepicker_path($lang) { } else { $lang = 'en'; } - $i += 1; + ++$i; } return 'js/locales/bootstrap-datepicker.' . $lang . '.js'; } -function smarty_modifier_locale_2_lang($locale) { +function smarty_modifier_locale_2_lang(string $locale): string +{ $lang_arr = explode('-', $locale); if ($lang_arr && count($lang_arr) > 1) { return $lang_arr[0]; @@ -107,6 +119,7 @@ function smarty_modifier_locale_2_lang($locale) { return $locale; } -function path_for_datepicker_locale($lang) { +function path_for_datepicker_locale(string $lang): string +{ return __DIR__ . '/../../js/locales/bootstrap-datepicker.' . $lang . '.js'; } diff --git a/app/tests/Framadate/FramaTestCase.php b/app/tests/Framadate/FramaTestCase.php index 6210a31..7195049 100644 --- a/app/tests/Framadate/FramaTestCase.php +++ b/app/tests/Framadate/FramaTestCase.php @@ -4,11 +4,12 @@ namespace Framadate; use PHPUnit\Framework\TestCase; abstract class FramaTestCase extends TestCase { - protected function getTestResourcePath($resourcepath) { + protected function getTestResourcePath(string $resourcepath): string + { return __DIR__ . '/../resources/' . $resourcepath; } - protected function readTestResource($resourcepath) { + protected function readTestResource(string $resourcepath) { return file_get_contents($this->getTestResourcePath($resourcepath)); } diff --git a/app/tests/Framadate/Services/InputServiceUnitTest.php b/app/tests/Framadate/Services/InputServiceUnitTest.php index 8857951..bcd9680 100644 --- a/app/tests/Framadate/Services/InputServiceUnitTest.php +++ b/app/tests/Framadate/Services/InputServiceUnitTest.php @@ -5,7 +5,8 @@ use Framadate\FramaTestCase; class InputServiceUnitTest extends FramaTestCase { - public function liste_emails() { + public function liste_emails(): array + { return [ // valids addresses "valid address" => ["example@example.com", "example@example.com"], @@ -23,7 +24,8 @@ class InputServiceUnitTest extends FramaTestCase /** * @dataProvider liste_emails */ - public function test_filterMail($email, $expected) { + public function test_filterMail($email, $expected): void + { $inputService = new InputService(); $filtered = $inputService->filterMail($email); diff --git a/app/tests/Framadate/Services/MailServiceUnitTest.php b/app/tests/Framadate/Services/MailServiceUnitTest.php index f70e687..7246d3c 100644 --- a/app/tests/Framadate/Services/MailServiceUnitTest.php +++ b/app/tests/Framadate/Services/MailServiceUnitTest.php @@ -4,9 +4,10 @@ namespace Framadate\Services; use Framadate\FramaTestCase; class MailServiceUnitTest extends FramaTestCase { - const MSG_KEY = '666'; + public const MSG_KEY = '666'; - public function test_should_send_a_2nd_mail_after_a_good_interval() { + public function test_should_send_a_2nd_mail_after_a_good_interval(): void + { // Given $mailService = new MailService(true); $_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time() - 1000]; @@ -15,10 +16,11 @@ class MailServiceUnitTest extends FramaTestCase { $canSendMsg = $mailService->canSendMsg(self::MSG_KEY); // Then - $this->assertSame(true, $canSendMsg); + $this->assertTrue($canSendMsg); } - public function test_should_not_send_2_mails_in_a_short_interval() { + public function test_should_not_send_2_mails_in_a_short_interval(): void + { // Given $mailService = new MailService(true); $_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time()]; @@ -27,6 +29,6 @@ class MailServiceUnitTest extends FramaTestCase { $canSendMsg = $mailService->canSendMsg(self::MSG_KEY); // Then - $this->assertSame(false, $canSendMsg); + $this->assertFalse($canSendMsg); } } diff --git a/bandeaux.php b/bandeaux.php index 869aace..e1d460a 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -54,14 +54,14 @@ function bandeau_titre($titre) } } -function liste_lang() +function liste_lang(): string { global $ALLOWED_LANGUAGES; global $locale; $str = ''; foreach ($ALLOWED_LANGUAGES as $k => $v ) { - if (substr($k,0,2)===$locale) { + if (strpos($k, $locale) === 0) { $str .= '' . "\n" ; } else { $str .= '' . "\n" ; diff --git a/buildlang.php b/buildlang.php index 9677f40..4afe6f9 100644 --- a/buildlang.php +++ b/buildlang.php @@ -10,8 +10,8 @@ include_once __DIR__ . '/app/inc/init.php'; $goodLang = $_GET['good']; $otherLang = $_GET['other']; - $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true); - $other = json_decode(file_get_contents(__DIR__ . '/locale/' . $otherLang . '.json'), true); + $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true, 512, JSON_THROW_ON_ERROR); + $other = json_decode(file_get_contents(__DIR__ . '/locale/' . $otherLang . '.json'), true, 512, JSON_THROW_ON_ERROR); foreach ($good as $sectionName => $section) { foreach ($section as $key => $value) { @@ -19,15 +19,15 @@ include_once __DIR__ . '/app/inc/init.php'; } } - echo json_encode($good, JSON_PRETTY_PRINT | ~(JSON_ERROR_UTF8 | JSON_HEX_QUOT | JSON_HEX_APOS)); + echo json_encode($good, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT | ~(JSON_ERROR_UTF8 | JSON_HEX_QUOT | JSON_HEX_APOS)); - function getFromOther($other, $goodKey, $default, $otherLang) { + function getFromOther($other, $goodKey, $default, $otherLang): string { foreach ($other as $sectionName => $section) { foreach ($section as $key => $value) { if ( strtolower($key) === strtolower($goodKey) || + stripos($key, strtolower($goodKey)) === 0 || strtolower(trim($key)) === strtolower($goodKey) || - strtolower(substr($key, 0, strlen($key) - 1)) === strtolower($goodKey) || strtolower(trim(substr(trim($key), 0, strlen($key) - 1))) === strtolower($goodKey) ) { return $value; diff --git a/compare.php b/compare.php index aaa7067..57d16a4 100644 --- a/compare.php +++ b/compare.php @@ -10,8 +10,8 @@ include_once __DIR__ . '/app/inc/init.php'; $goodLang = $_GET['good']; $testLang = $_GET['test']; - $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true); - $test = json_decode(file_get_contents(__DIR__ . '/locale/' . $testLang . '.json'), true); + $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true, 512, JSON_THROW_ON_ERROR); + $test = json_decode(file_get_contents(__DIR__ . '/locale/' . $testLang . '.json'), true, 512, JSON_THROW_ON_ERROR); $diffSection = false; @@ -46,8 +46,8 @@ include_once __DIR__ . '/app/inc/init.php'; } } - if (!$diffSection and array_keys($good[$sectionName]) !== array_keys($test[$sectionName])) { - $diff[$sectionName]['order_good'] = array_keys($good[$sectionName]); + if (!$diffSection and array_keys($section) !== array_keys($test[$sectionName])) { + $diff[$sectionName]['order_good'] = array_keys($section); $diff[$sectionName]['order_test'] = array_keys($test[$sectionName]); } } diff --git a/composer.json b/composer.json index ec738ee..abe47d1 100644 --- a/composer.json +++ b/composer.json @@ -62,6 +62,7 @@ "require": { "php": ">=7.3.0", "ext-pdo": "*", + "ext-json": "*", "smarty/smarty": "^4.0", "o80/i18n": "dev-develop", "phpmailer/phpmailer": "~6.2", @@ -73,8 +74,15 @@ }, "require-dev": { "phpunit/phpunit": "^9", - "friendsofphp/php-cs-fixer": "^3.2" + "friendsofphp/php-cs-fixer": "^3.2", + "vimeo/psalm": "^4.15" }, + "repositories": [ + { + "type": "git", + "url": "https://framagit.org/framasoft/framadate/o80-i18n" + } + ], "autoload": { "psr-4": { "Framadate\\": "app/classes/Framadate/" diff --git a/composer.lock b/composer.lock index 6d65232..98aafbc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fac62d4321ada86d9ed4b66d6e160df4", + "content-hash": "4cab1ad093ed4a0fc4a2ae861ba5bc5a", "packages": [ { "name": "doctrine/lexer", @@ -256,20 +256,17 @@ "version": "dev-develop", "source": { "type": "git", - "url": "git@github.com:olivierperez/o80-i18n.git", - "reference": "ef98bd7bd733d23729999ac148f79ea1d7b9008c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/olivierperez/o80-i18n/zipball/ef98bd7bd733d23729999ac148f79ea1d7b9008c", - "reference": "ef98bd7bd733d23729999ac148f79ea1d7b9008c", - "shasum": "" + "url": "https://framagit.org/framasoft/framadate/o80-i18n", + "reference": "7b59cf9b2bc47b1084ac7e754d41ca595ff6c33d" }, "require": { - "php": ">=5.3.0" + "ext-intl": "*", + "ext-json": "*", + "php": ">=7.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.5" + "friendsofphp/php-cs-fixer": "^3.4", + "phpunit/phpunit": "^9.5.10" }, "default-branch": true, "type": "library", @@ -278,7 +275,20 @@ "o80\\": "src/o80" } }, - "notification-url": "https://packagist.org/downloads/", + "scripts": { + "cs:check": [ + "php-cs-fixer fix --dry-run --diff" + ], + "cs:fix": [ + "php-cs-fixer fix" + ], + "lint": [ + "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -not -path './tests/integration/vendor/*' -print0 | xargs -0 -n1 php -l" + ], + "test": [ + "phpunit --bootstrap tests/bootstrap.php tests" + ] + }, "license": [ "Apache License 2.0" ], @@ -296,7 +306,7 @@ "internationalization", "php" ], - "time": "2020-10-05T17:26:16+00:00" + "time": "2021-12-20T15:31:54+00:00" }, { "name": "phpmailer/phpmailer", @@ -382,12 +392,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "b9421ed9de7b2a5f54f637a064dcd31922a82405" + "reference": "fff53639bf1fa25f311c3e54932ac8c827f9a343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b9421ed9de7b2a5f54f637a064dcd31922a82405", - "reference": "b9421ed9de7b2a5f54f637a064dcd31922a82405", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/fff53639bf1fa25f311c3e54932ac8c827f9a343", + "reference": "fff53639bf1fa25f311c3e54932ac8c827f9a343", "shasum": "" }, "conflict": { @@ -617,7 +627,7 @@ "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6-beta", "rainlab/debugbar-plugin": "<3.1", - "remdex/livehelperchat": "<=2", + "remdex/livehelperchat": "<=3.90", "rmccue/requests": ">=1.6,<1.8", "robrichards/xmlseclibs": "<3.0.4", "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", @@ -806,7 +816,7 @@ "type": "tidelift" } ], - "time": "2021-12-16T20:16:03+00:00" + "time": "2021-12-17T20:13:17+00:00" }, { "name": "sabre/uri", @@ -1353,6 +1363,245 @@ } ], "packages-dev": [ + { + "name": "amphp/amp", + "version": "v2.6.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/amp.git", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^7 | ^8 | ^9", + "psalm/phar": "^3.11@dev", + "react/promise": "^2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Amp\\": "lib" + }, + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "http://amphp.org/amp", + "keywords": [ + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.6.1" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-09-23T18:43:08+00:00" + }, + { + "name": "amphp/byte-stream", + "version": "v1.8.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/byte-stream.git", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.4", + "friendsofphp/php-cs-fixer": "^2.3", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "psalm/phar": "^3.11.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Amp\\ByteStream\\": "lib" + }, + "files": [ + "lib/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-03-30T17:13:30+00:00" + }, + { + "name": "composer/package-versions-deprecated", + "version": "1.11.99.4", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "b174585d1fe49ceed21928a945138948cb394600" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", + "reference": "b174585d1fe49ceed21928a945138948cb394600", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7 || ^8" + }, + "replace": { + "ocramius/package-versions": "1.11.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "support": { + "issues": "https://github.com/composer/package-versions-deprecated/issues", + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-09-13T08:41:34+00:00" + }, { "name": "composer/pcre", "version": "1.0.0", @@ -1571,6 +1820,43 @@ ], "time": "2021-12-08T13:07:32+00:00" }, + { + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", + "source": { + "type": "git", + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "XdgBaseDir\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, + "time": "2019-12-04T15:06:13+00:00" + }, { "name": "doctrine/annotations", "version": "1.13.2", @@ -1712,6 +1998,107 @@ ], "time": "2020-11-10T18:47:58+00:00" }, + { + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.2.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "shasum": "" + }, + "require": { + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "A more advanced JSONRPC implementation", + "support": { + "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues", + "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1" + }, + "time": "2021-06-11T22:34:44+00:00" + }, + { + "name": "felixfbecker/language-server-protocol", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpstan/phpstan": "*", + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "LanguageServerProtocol\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "PHP classes for the Language Server Protocol", + "keywords": [ + "language", + "microsoft", + "php", + "server" + ], + "support": { + "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1" + }, + "time": "2021-02-22T14:02:09+00:00" + }, { "name": "friendsofphp/php-cs-fixer", "version": "v3.4.0", @@ -1859,6 +2246,57 @@ ], "time": "2020-11-13T09:40:50+00:00" }, + { + "name": "netresearch/jsonmapper", + "version": "v4.0.0", + "source": { + "type": "git", + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "squizlabs/php_codesniffer": "~3.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "JsonMapper": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "OSL-3.0" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" + } + ], + "description": "Map nested JSON structures onto PHP classes", + "support": { + "email": "cweiske@cweiske.de", + "issues": "https://github.com/cweiske/jsonmapper/issues", + "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0" + }, + "time": "2020-12-01T19:48:11+00:00" + }, { "name": "nikic/php-parser", "version": "v4.13.2", @@ -1915,6 +2353,59 @@ }, "time": "2021-11-30T19:35:32+00:00" }, + { + "name": "openlss/lib-array2xml", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/nullivex/lib-array2xml.git", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "LSS": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Bryan Tong", + "email": "bryan@nullivex.com", + "homepage": "https://www.nullivex.com" + }, + { + "name": "Tony Butler", + "email": "spudz76@gmail.com", + "homepage": "https://www.nullivex.com" + } + ], + "description": "Array2XML conversion library credit to lalit.org", + "homepage": "https://www.nullivex.com", + "keywords": [ + "array", + "array conversion", + "xml", + "xml conversion" + ], + "support": { + "issues": "https://github.com/nullivex/lib-array2xml/issues", + "source": "https://github.com/nullivex/lib-array2xml/tree/master" + }, + "time": "2019-03-29T20:06:56+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.3", @@ -5237,6 +5728,112 @@ ], "time": "2021-07-28T10:34:58+00:00" }, + { + "name": "vimeo/psalm", + "version": "v4.15.0", + "source": { + "type": "git", + "url": "https://github.com/vimeo/psalm.git", + "reference": "a1b5e489e6fcebe40cb804793d964e99fc347820" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/a1b5e489e6fcebe40cb804793d964e99fc347820", + "reference": "a1b5e489e6fcebe40cb804793d964e99fc347820", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.4.2", + "amphp/byte-stream": "^1.5", + "composer/package-versions-deprecated": "^1.8.0", + "composer/semver": "^1.4 || ^2.0 || ^3.0", + "composer/xdebug-handler": "^1.1 || ^2.0", + "dnoegel/php-xdg-base-dir": "^0.1.1", + "ext-ctype": "*", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "felixfbecker/advanced-json-rpc": "^3.0.3", + "felixfbecker/language-server-protocol": "^1.5", + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "nikic/php-parser": "^4.13", + "openlss/lib-array2xml": "^1.0", + "php": "^7.1|^8", + "sebastian/diff": "^3.0 || ^4.0", + "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0", + "webmozart/path-util": "^2.3" + }, + "provide": { + "psalm/psalm": "self.version" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.2", + "brianium/paratest": "^4.0||^6.0", + "ext-curl": "*", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpdocumentor/reflection-docblock": "^5", + "phpmyadmin/sql-parser": "5.1.0||dev-master", + "phpspec/prophecy": ">=1.9.0", + "phpunit/phpunit": "^9.0", + "psalm/plugin-phpunit": "^0.16", + "slevomat/coding-standard": "^7.0", + "squizlabs/php_codesniffer": "^3.5", + "symfony/process": "^4.3 || ^5.0 || ^6.0", + "weirdan/prophecy-shim": "^1.0 || ^2.0" + }, + "suggest": { + "ext-curl": "In order to send data to shepherd", + "ext-igbinary": "^2.0.5 is required, used to serialize caching data" + }, + "bin": [ + "psalm", + "psalm-language-server", + "psalm-plugin", + "psalm-refactor", + "psalter" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev", + "dev-3.x": "3.x-dev", + "dev-2.x": "2.x-dev", + "dev-1.x": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psalm\\": "src/Psalm/" + }, + "files": [ + "src/functions.php", + "src/spl_object_id.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Brown" + } + ], + "description": "A static analysis tool for finding errors in PHP applications", + "keywords": [ + "code", + "inspection", + "php" + ], + "support": { + "issues": "https://github.com/vimeo/psalm/issues", + "source": "https://github.com/vimeo/psalm/tree/v4.15.0" + }, + "time": "2021-12-07T11:25:29+00:00" + }, { "name": "webmozart/assert", "version": "1.10.0", @@ -5294,6 +5891,57 @@ "source": "https://github.com/webmozarts/assert/tree/1.10.0" }, "time": "2021-03-09T10:59:23+00:00" + }, + { + "name": "webmozart/path-util", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/path-util.git", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "webmozart/assert": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\PathUtil\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", + "support": { + "issues": "https://github.com/webmozart/path-util/issues", + "source": "https://github.com/webmozart/path-util/tree/2.3.0" + }, + "abandoned": "symfony/filesystem", + "time": "2015-12-17T08:42:14+00:00" } ], "aliases": [], @@ -5307,7 +5955,8 @@ "prefer-lowest": false, "platform": { "php": ">=7.3.0", - "ext-pdo": "*" + "ext-pdo": "*", + "ext-json": "*" }, "platform-dev": [], "platform-overrides": { diff --git a/create_classic_poll.php b/create_classic_poll.php index 8acb076..fe30725 100644 --- a/create_classic_poll.php +++ b/create_classic_poll.php @@ -30,9 +30,9 @@ include_once __DIR__ . '/app/inc/init.php'; /* Service */ /*---------*/ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $mailService = new MailService($config['use_smtp'], $config['smtp_options']); -$purgeService = new PurgeService($connect, $logService); +$purgeService = new PurgeService($logService); $sessionService = new SessionService(); $inputService = new InputService(); @@ -45,7 +45,7 @@ if (is_file('bandeaux_local.php')) { $form = unserialize($_SESSION['form']); // Step 1/4 : error if $_SESSION from info_sondage are not valid -if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ? empty($form->admin_mail) : false)) { +if (empty($form->title) || empty($form->admin_name) || ($config['use_smtp'] && empty($form->admin_mail))) { $smarty->assign('title', __('Error', 'Error!')); $smarty->assign('error', __('Error', 'You haven\'t filled the first section of the poll creation.')); $smarty->display('error.tpl'); @@ -64,8 +64,8 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ? // Step 4 : Data prepare before insert in DB if (isset($_POST['confirmation'])) { // Define expiration date - $expiration_date = $inputService->validateDate($_POST['expiration_date'], $pollService->minExpiryDate(), $pollService->maxExpiryDate()); - $form->end_date = $expiration_date->getTimestamp(); + $expiration_date = $inputService->parseDate($_POST['enddate']); + $form->end_date = $inputService->validateDate($expiration_date, $pollService->minExpiryDate(), $pollService->maxExpiryDate())->getTimestamp(); // Insert poll in database $ids = $pollService->createPoll($form); @@ -123,7 +123,7 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ? preg_match_all('/\[!\[(.*?)\]\((.*?)\)\]\((.*?)\)/', $choice->getName(), $md_a_img); // Markdown [![alt](src)](href) preg_match_all('/!\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_img); // Markdown ![alt](src) preg_match_all('/\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_a); // Markdown [text](href) - if (isset($md_a_img[2][0]) && $md_a_img[2][0] !== '' && isset($md_a_img[3][0]) && $md_a_img[3][0] !== '') { // [![alt](src)](href) + if (isset($md_a_img[2][0], $md_a_img[3][0]) && $md_a_img[2][0] !== '' && $md_a_img[3][0] !== '') { // [![alt](src)](href) $li_subject_text = (isset($md_a_img[1][0]) && $md_a_img[1][0] !== '') ? stripslashes($md_a_img[1][0]) : __('Generic', 'Choice') . ' ' . ($i + 1); $li_subject_html = '' . $li_subject_text . ''; } elseif (isset($md_img[2][0]) && $md_img[2][0] !== '') { // ![alt](src) @@ -175,7 +175,7 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ? $choices = $form->getChoices(); $nb_choices = max(count($choices), 5); for ($i = 0; $i < $nb_choices; $i++) { - $choice = isset($choices[$i]) ? $choices[$i] : new Choice(); + $choice = $choices[$i] ?? new Choice(); echo '
    diff --git a/create_date_poll.php b/create_date_poll.php index bef3c84..8fc6064 100644 --- a/create_date_poll.php +++ b/create_date_poll.php @@ -30,9 +30,9 @@ include_once __DIR__ . '/app/inc/init.php'; /* Service */ /*---------*/ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $mailService = new MailService($config['use_smtp'], $config['smtp_options']); -$purgeService = new PurgeService($connect, $logService); +$purgeService = new PurgeService($logService); $inputService = new InputService(); $sessionService = new SessionService(); @@ -52,7 +52,7 @@ if (isset($form->format) && $form->format !== 'D') { $form->clearChoices(); } -if (!isset($form->title) || !isset($form->admin_name) || ($config['use_smtp'] && !isset($form->admin_mail))) { +if (!isset($form->title, $form->admin_name) || ($config['use_smtp'] && !isset($form->admin_mail))) { $step = 1; } else if (!empty($_POST['confirmation'])) { $step = 4; @@ -107,7 +107,7 @@ switch ($step) { // Handle Step2 submission if (!empty($_POST['days'])) { // Remove empty dates - $_POST['days'] = array_filter($_POST['days'], function ($d) { + $_POST['days'] = array_filter($_POST['days'], static function ($d) { return !empty($d); }); @@ -135,7 +135,7 @@ switch ($step) { $i++; } - for ($i = 0; $i < count($_POST['days']); $i++) { + for ($i = 0, $iMax = count($_POST['days']); $i < $iMax; $i++) { $day = $_POST['days'][$i]; if (!empty($day)) { @@ -146,7 +146,7 @@ switch ($step) { $form->addChoice($choice); $schedules = $inputService->filterArray($moments[$i], FILTER_DEFAULT); - for ($j = 0; $j < count($schedules); $j++) { + for ($j = 0, $jMax = count($schedules); $j < $jMax; $j++) { if (!empty($schedules[$j])) { $choice->addSlot(strip_tags($schedules[$j])); } @@ -188,8 +188,8 @@ switch ($step) { // Step 4 : Data prepare before insert in DB // Define expiration date - $expiration_date = $inputService->validateDate($_POST['enddate'], $pollService->minExpiryDate(), $pollService->maxExpiryDate()); - $form->end_date = $expiration_date->getTimestamp(); + $expiration_date = $inputService->parseDate($_POST['enddate']); + $form->end_date = $inputService->validateDate($expiration_date, $pollService->minExpiryDate(), $pollService->maxExpiryDate())->getTimestamp(); // Insert poll in database $ids = $pollService->createPoll($form); diff --git a/create_poll.php b/create_poll.php index c4894d6..8eaf800 100644 --- a/create_poll.php +++ b/create_poll.php @@ -42,8 +42,8 @@ if ($form === null && !($form instanceof Form)) { } // Type de sondage -if (isset($_GET['type']) && $_GET['type'] === 'date' || - isset($_POST['type']) && $_POST['type'] === 'date' +if ((isset($_GET['type']) && $_GET['type'] === 'date') || + (isset($_POST['type']) && $_POST['type'] === 'date') ) { $poll_type = 'date'; $form->choix_sondage = $poll_type; @@ -57,21 +57,21 @@ $goToStep2 = filter_input(INPUT_POST, GO_TO_STEP_2, FILTER_VALIDATE_REGEXP, ['op if ($goToStep2) { $title = $inputService->filterTitle($_POST['title']); - $use_ValueMax = isset($_POST['use_ValueMax']) ? $inputService->filterBoolean($_POST['use_ValueMax']) : false; + $use_ValueMax = isset($_POST['use_ValueMax']) && $inputService->filterBoolean($_POST['use_ValueMax']); $ValueMax = $use_ValueMax === true ? $inputService->filterValueMax($_POST['ValueMax']) : null; - $use_customized_url = isset($_POST['use_customized_url']) ? $inputService->filterBoolean($_POST['use_customized_url']) : false; + $use_customized_url = isset($_POST['use_customized_url']) && $inputService->filterBoolean($_POST['use_customized_url']); $customized_url = $use_customized_url === true ? $inputService->filterId($_POST['customized_url']) : null; $name = mb_substr($inputService->filterName($_POST['name']), 0, 32); $mail = $config['use_smtp'] === true ? $inputService->filterMail($_POST['mail']) : null; $description = $inputService->filterDescription($_POST['description']); $editable = $inputService->filterEditable($_POST['editable']); - $receiveNewVotes = isset($_POST['receiveNewVotes']) ? $inputService->filterBoolean($_POST['receiveNewVotes']) : false; - $receiveNewComments = isset($_POST['receiveNewComments']) ? $inputService->filterBoolean($_POST['receiveNewComments']) : false; - $hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false; + $receiveNewVotes = isset($_POST['receiveNewVotes']) && $inputService->filterBoolean($_POST['receiveNewVotes']); + $receiveNewComments = isset($_POST['receiveNewComments']) && $inputService->filterBoolean($_POST['receiveNewComments']); + $hidden = isset($_POST['hidden']) && $inputService->filterBoolean($_POST['hidden']); $use_password = filter_input(INPUT_POST, 'use_password', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]); - $password = isset($_POST['password']) ? $_POST['password'] : null; - $password_repeat = isset($_POST['password_repeat']) ? $_POST['password_repeat'] : null; + $password = $_POST['password'] ?? null; + $password_repeat = $_POST['password_repeat'] ?? null; $results_publicly_visible = filter_input(INPUT_POST, 'results_publicly_visible', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]); // On initialise également les autres variables @@ -235,7 +235,7 @@ if (!empty($_POST[GO_TO_STEP_2])) { if ($error_on_customized_url) { $errors['customized_url']['aria'] = 'aria-describeby="customized_url" '; $errors['customized_url']['class'] = ' has-error'; - $errors['customized_url']['msg'] = isset($error_on_customized_url_msg) ? $error_on_customized_url_msg : __('Error', "Something is wrong with the format: customized urls should only consist of alphanumeric characters and hyphens."); + $errors['customized_url']['msg'] = $error_on_customized_url_msg ?? __('Error', "Something is wrong with the format: customized urls should only consist of alphanumeric characters and hyphens."); } if ($error_on_description) { diff --git a/exportcsv.php b/exportcsv.php index 5f07e1d..090cbc9 100644 --- a/exportcsv.php +++ b/exportcsv.php @@ -35,7 +35,7 @@ $poll = null; /*----------*/ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $securityService = new SecurityService(); /* PAGE */ @@ -110,7 +110,7 @@ foreach ($votes as $vote) { $text = __('Generic', 'Yes'); break; default: - $text = 'unkown'; + $text = __('Generic', 'Unknown'); } echo Utils::csvEscape($text); echo ','; diff --git a/find_polls.php b/find_polls.php index fdfc3ca..79660c5 100644 --- a/find_polls.php +++ b/find_polls.php @@ -27,7 +27,7 @@ include_once __DIR__ . '/app/inc/init.php'; /* SERVICES */ /* -------- */ $logService = new LogService(); -$pollService = new PollService($connect, $logService); +$pollService = new PollService($logService); $mailService = new MailService($config['use_smtp'], $config['smtp_options']); /* PAGE */ diff --git a/index.php b/index.php index 0052b98..d691be9 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,6 @@ 1?n-1:0),o=1;o/gm),U=a(/^data-[\-\w.\u00B7-\uFFFF]/),j=a(/^aria-[\-\w]+$/),P=a(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),B=a(/^(?:\w+script|data):/i),W=a(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),G="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};function q(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t0&&void 0!==arguments[0]?arguments[0]:K(),n=function(t){return e(t)};if(n.version="2.2.7",n.removed=[],!t||!t.document||9!==t.document.nodeType)return n.isSupported=!1,n;var r=t.document,o=t.document,a=t.DocumentFragment,l=t.HTMLTemplateElement,c=t.Node,s=t.Element,u=t.NodeFilter,f=t.NamedNodeMap,x=void 0===f?t.NamedNodeMap||t.MozNamedAttrMap:f,Y=t.Text,X=t.Comment,$=t.DOMParser,Z=t.trustedTypes,J=s.prototype,Q=k(J,"cloneNode"),ee=k(J,"nextSibling"),te=k(J,"childNodes"),ne=k(J,"parentNode");if("function"==typeof l){var re=o.createElement("template");re.content&&re.content.ownerDocument&&(o=re.content.ownerDocument)}var oe=V(Z,r),ie=oe&&ze?oe.createHTML(""):"",ae=o,le=ae.implementation,ce=ae.createNodeIterator,se=ae.getElementsByTagName,ue=ae.createDocumentFragment,fe=r.importNode,me={};try{me=S(o).documentMode?o.documentMode:{}}catch(e){}var de={};n.isSupported="function"==typeof ne&&le&&void 0!==le.createHTMLDocument&&9!==me;var pe=z,ge=H,he=U,ye=j,ve=B,be=W,Te=P,Ae=null,xe=w({},[].concat(q(R),q(_),q(D),q(N),q(L))),we=null,Se=w({},[].concat(q(M),q(F),q(C),q(I))),ke=null,Re=null,_e=!0,De=!0,Ee=!1,Ne=!1,Oe=!1,Le=!1,Me=!1,Fe=!1,Ce=!1,Ie=!0,ze=!1,He=!0,Ue=!0,je=!1,Pe={},Be=w({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),We=null,Ge=w({},["audio","video","img","source","image","track"]),qe=null,Ke=w({},["alt","class","for","id","label","name","pattern","placeholder","summary","title","value","style","xmlns"]),Ve=null,Ye=o.createElement("form"),Xe=function(e){Ve&&Ve===e||(e&&"object"===(void 0===e?"undefined":G(e))||(e={}),e=S(e),Ae="ALLOWED_TAGS"in e?w({},e.ALLOWED_TAGS):xe,we="ALLOWED_ATTR"in e?w({},e.ALLOWED_ATTR):Se,qe="ADD_URI_SAFE_ATTR"in e?w(S(Ke),e.ADD_URI_SAFE_ATTR):Ke,We="ADD_DATA_URI_TAGS"in e?w(S(Ge),e.ADD_DATA_URI_TAGS):Ge,ke="FORBID_TAGS"in e?w({},e.FORBID_TAGS):{},Re="FORBID_ATTR"in e?w({},e.FORBID_ATTR):{},Pe="USE_PROFILES"in e&&e.USE_PROFILES,_e=!1!==e.ALLOW_ARIA_ATTR,De=!1!==e.ALLOW_DATA_ATTR,Ee=e.ALLOW_UNKNOWN_PROTOCOLS||!1,Ne=e.SAFE_FOR_TEMPLATES||!1,Oe=e.WHOLE_DOCUMENT||!1,Fe=e.RETURN_DOM||!1,Ce=e.RETURN_DOM_FRAGMENT||!1,Ie=!1!==e.RETURN_DOM_IMPORT,ze=e.RETURN_TRUSTED_TYPE||!1,Me=e.FORCE_BODY||!1,He=!1!==e.SANITIZE_DOM,Ue=!1!==e.KEEP_CONTENT,je=e.IN_PLACE||!1,Te=e.ALLOWED_URI_REGEXP||Te,Ne&&(De=!1),Ce&&(Fe=!0),Pe&&(Ae=w({},[].concat(q(L))),we=[],!0===Pe.html&&(w(Ae,R),w(we,M)),!0===Pe.svg&&(w(Ae,_),w(we,F),w(we,I)),!0===Pe.svgFilters&&(w(Ae,D),w(we,F),w(we,I)),!0===Pe.mathMl&&(w(Ae,N),w(we,C),w(we,I))),e.ADD_TAGS&&(Ae===xe&&(Ae=S(Ae)),w(Ae,e.ADD_TAGS)),e.ADD_ATTR&&(we===Se&&(we=S(we)),w(we,e.ADD_ATTR)),e.ADD_URI_SAFE_ATTR&&w(qe,e.ADD_URI_SAFE_ATTR),Ue&&(Ae["#text"]=!0),Oe&&w(Ae,["html","head","body"]),Ae.table&&(w(Ae,["tbody"]),delete ke.tbody),i&&i(e),Ve=e)},$e=w({},["mi","mo","mn","ms","mtext"]),Ze=w({},["foreignobject","desc","title","annotation-xml"]),Je=w({},_);w(Je,D),w(Je,E);var Qe=w({},N);w(Qe,O);var et="http://www.w3.org/1998/Math/MathML",tt="http://www.w3.org/2000/svg",nt="http://www.w3.org/1999/xhtml",rt=function(e){var t=ne(e);t&&t.tagName||(t={namespaceURI:nt,tagName:"template"});var n=g(e.tagName),r=g(t.tagName);if(e.namespaceURI===tt)return t.namespaceURI===nt?"svg"===n:t.namespaceURI===et?"svg"===n&&("annotation-xml"===r||$e[r]):Boolean(Je[n]);if(e.namespaceURI===et)return t.namespaceURI===nt?"math"===n:t.namespaceURI===tt?"math"===n&&Ze[r]:Boolean(Qe[n]);if(e.namespaceURI===nt){if(t.namespaceURI===tt&&!Ze[r])return!1;if(t.namespaceURI===et&&!$e[r])return!1;var o=w({},["title","style","font","a","script"]);return!Qe[n]&&(o[n]||!Je[n])}return!1},ot=function(e){p(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){try{e.outerHTML=ie}catch(t){e.remove()}}},it=function(e,t){try{p(n.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){p(n.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!we[e])if(Fe||Ce)try{ot(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},at=function(e){var t=void 0,n=void 0;if(Me)e=""+e;else{var r=h(e,/^[\r\n\t ]+/);n=r&&r[0]}var i=oe?oe.createHTML(e):e;try{t=(new $).parseFromString(i,"text/html")}catch(e){}if(!t||!t.documentElement){var a=(t=le.createHTMLDocument("")).body;a.parentNode.removeChild(a.parentNode.firstElementChild),a.outerHTML=i}return e&&n&&t.body.insertBefore(o.createTextNode(n),t.body.childNodes[0]||null),se.call(t,Oe?"html":"body")[0]},lt=function(e){return ce.call(e.ownerDocument||e,e,u.SHOW_ELEMENT|u.SHOW_COMMENT|u.SHOW_TEXT,(function(){return u.FILTER_ACCEPT}),!1)},ct=function(e){return!(e instanceof Y||e instanceof X)&&!("string"==typeof e.nodeName&&"string"==typeof e.textContent&&"function"==typeof e.removeChild&&e.attributes instanceof x&&"function"==typeof e.removeAttribute&&"function"==typeof e.setAttribute&&"string"==typeof e.namespaceURI&&"function"==typeof e.insertBefore)},st=function(e){return"object"===(void 0===c?"undefined":G(c))?e instanceof c:e&&"object"===(void 0===e?"undefined":G(e))&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName},ut=function(e,t,r){de[e]&&m(de[e],(function(e){e.call(n,t,r,Ve)}))},ft=function(e){var t=void 0;if(ut("beforeSanitizeElements",e,null),ct(e))return ot(e),!0;if(h(e.nodeName,/[\u0080-\uFFFF]/))return ot(e),!0;var r=g(e.nodeName);if(ut("uponSanitizeElement",e,{tagName:r,allowedTags:Ae}),!st(e.firstElementChild)&&(!st(e.content)||!st(e.content.firstElementChild))&&T(/<[/\w]/g,e.innerHTML)&&T(/<[/\w]/g,e.textContent))return ot(e),!0;if(!Ae[r]||ke[r]){if(Ue&&!Be[r]){var o=ne(e),i=te(e);if(i&&o)for(var a=i.length-1;a>=0;--a)o.insertBefore(Q(i[a],!0),ee(e))}return ot(e),!0}return e instanceof s&&!rt(e)?(ot(e),!0):"noscript"!==r&&"noembed"!==r||!T(/<\/no(script|embed)/i,e.innerHTML)?(Ne&&3===e.nodeType&&(t=e.textContent,t=y(t,pe," "),t=y(t,ge," "),e.textContent!==t&&(p(n.removed,{element:e.cloneNode()}),e.textContent=t)),ut("afterSanitizeElements",e,null),!1):(ot(e),!0)},mt=function(e,t,n){if(He&&("id"===t||"name"===t)&&(n in o||n in Ye))return!1;if(De&&T(he,t));else if(_e&&T(ye,t));else{if(!we[t]||Re[t])return!1;if(qe[t]);else if(T(Te,y(n,be,"")));else if("src"!==t&&"xlink:href"!==t&&"href"!==t||"script"===e||0!==v(n,"data:")||!We[e]){if(Ee&&!T(ve,y(n,be,"")));else if(n)return!1}else;}return!0},dt=function(e){var t=void 0,r=void 0,o=void 0,i=void 0;ut("beforeSanitizeAttributes",e,null);var a=e.attributes;if(a){var l={attrName:"",attrValue:"",keepAttr:!0,allowedAttributes:we};for(i=a.length;i--;){var c=t=a[i],s=c.name,u=c.namespaceURI;if(r=b(t.value),o=g(s),l.attrName=o,l.attrValue=r,l.keepAttr=!0,l.forceKeepAttr=void 0,ut("uponSanitizeAttribute",e,l),r=l.attrValue,!l.forceKeepAttr&&(it(s,e),l.keepAttr))if(T(/\/>/i,r))it(s,e);else{Ne&&(r=y(r,pe," "),r=y(r,ge," "));var f=e.nodeName.toLowerCase();if(mt(f,o,r))try{u?e.setAttributeNS(u,s,r):e.setAttribute(s,r),d(n.removed)}catch(e){}}}ut("afterSanitizeAttributes",e,null)}},pt=function e(t){var n=void 0,r=lt(t);for(ut("beforeSanitizeShadowDOM",t,null);n=r.nextNode();)ut("uponSanitizeShadowNode",n,null),ft(n)||(n.content instanceof a&&e(n.content),dt(n));ut("afterSanitizeShadowDOM",t,null)};return n.sanitize=function(e,o){var i=void 0,l=void 0,s=void 0,u=void 0,f=void 0;if(e||(e="\x3c!--\x3e"),"string"!=typeof e&&!st(e)){if("function"!=typeof e.toString)throw A("toString is not a function");if("string"!=typeof(e=e.toString()))throw A("dirty is not a string, aborting")}if(!n.isSupported){if("object"===G(t.toStaticHTML)||"function"==typeof t.toStaticHTML){if("string"==typeof e)return t.toStaticHTML(e);if(st(e))return t.toStaticHTML(e.outerHTML)}return e}if(Le||Xe(o),n.removed=[],"string"==typeof e&&(je=!1),je);else if(e instanceof c)1===(l=(i=at("\x3c!----\x3e")).ownerDocument.importNode(e,!0)).nodeType&&"BODY"===l.nodeName||"HTML"===l.nodeName?i=l:i.appendChild(l);else{if(!Fe&&!Ne&&!Oe&&-1===e.indexOf("<"))return oe&&ze?oe.createHTML(e):e;if(!(i=at(e)))return Fe?null:ie}i&&Me&&ot(i.firstChild);for(var m=lt(je?e:i);s=m.nextNode();)3===s.nodeType&&s===u||ft(s)||(s.content instanceof a&&pt(s.content),dt(s),u=s);if(u=null,je)return e;if(Fe){if(Ce)for(f=ue.call(i.ownerDocument);i.firstChild;)f.appendChild(i.firstChild);else f=i;return Ie&&(f=fe.call(r,f,!0)),f}var d=Oe?i.outerHTML:i.innerHTML;return Ne&&(d=y(d,pe," "),d=y(d,ge," ")),oe&&ze?oe.createHTML(d):d},n.setConfig=function(e){Xe(e),Le=!0},n.clearConfig=function(){Ve=null,Le=!1},n.isValidAttribute=function(e,t,n){Ve||Xe({});var r=g(e),o=g(t);return mt(r,o,n)},n.addHook=function(e,t){"function"==typeof t&&(de[e]=de[e]||[],p(de[e],t))},n.removeHook=function(e){de[e]&&d(de[e])},n.removeHooks=function(e){de[e]&&(de[e]=[])},n.removeAllHooks=function(){de={}},n}()})); -//# sourceMappingURL=purify.min.js.map diff --git a/js/jquery-1.12.4.js b/js/jquery-1.12.4.js deleted file mode 100644 index 7fc60fc..0000000 --- a/js/jquery-1.12.4.js +++ /dev/null @@ -1,11008 +0,0 @@ -/*! - * jQuery JavaScript Library v1.12.4 - * http://jquery.com/ - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2016-05-20T17:17Z - */ - -(function( global, factory ) { - - if ( typeof module === "object" && typeof module.exports === "object" ) { - // For CommonJS and CommonJS-like environments where a proper `window` - // is present, execute the factory and get jQuery. - // For environments that do not have a `window` with a `document` - // (such as Node.js), expose a factory as module.exports. - // This accentuates the need for the creation of a real `window`. - // e.g. var jQuery = require("jquery")(window); - // See ticket #14549 for more info. - module.exports = global.document ? - factory( global, true ) : - function( w ) { - if ( !w.document ) { - throw new Error( "jQuery requires a window with a document" ); - } - return factory( w ); - }; - } else { - factory( global ); - } - -// Pass this if window is not defined yet -}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { - -// Support: Firefox 18+ -// Can't be in strict mode, several libs including ASP.NET trace -// the stack via arguments.caller.callee and Firefox dies if -// you try to trace through "use strict" call chains. (#13335) -//"use strict"; -var deletedIds = []; - -var document = window.document; - -var slice = deletedIds.slice; - -var concat = deletedIds.concat; - -var push = deletedIds.push; - -var indexOf = deletedIds.indexOf; - -var class2type = {}; - -var toString = class2type.toString; - -var hasOwn = class2type.hasOwnProperty; - -var support = {}; - - - -var - version = "1.12.4", - - // Define a local copy of jQuery - jQuery = function( selector, context ) { - - // The jQuery object is actually just the init constructor 'enhanced' - // Need init if jQuery is called (just allow error to be thrown if not included) - return new jQuery.fn.init( selector, context ); - }, - - // Support: Android<4.1, IE<9 - // Make sure we trim BOM and NBSP - rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, - - // Matches dashed string for camelizing - rmsPrefix = /^-ms-/, - rdashAlpha = /-([\da-z])/gi, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function( all, letter ) { - return letter.toUpperCase(); - }; - -jQuery.fn = jQuery.prototype = { - - // The current version of jQuery being used - jquery: version, - - constructor: jQuery, - - // Start with an empty selector - selector: "", - - // The default length of a jQuery object is 0 - length: 0, - - toArray: function() { - return slice.call( this ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num != null ? - - // Return just the one element from the set - ( num < 0 ? this[ num + this.length ] : this[ num ] ) : - - // Return all the elements in a clean array - slice.call( this ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - - // Build a new jQuery matched element set - var ret = jQuery.merge( this.constructor(), elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - ret.context = this.context; - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - each: function( callback ) { - return jQuery.each( this, callback ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map( this, function( elem, i ) { - return callback.call( elem, i, elem ); - } ) ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ) ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - eq: function( i ) { - var len = this.length, - j = +i + ( i < 0 ? len : 0 ); - return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); - }, - - end: function() { - return this.prevObject || this.constructor(); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: deletedIds.sort, - splice: deletedIds.splice -}; - -jQuery.extend = jQuery.fn.extend = function() { - var src, copyIsArray, copy, name, options, clone, - target = arguments[ 0 ] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - - // skip the boolean and the target - target = arguments[ i ] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction( target ) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( i === length ) { - target = this; - i--; - } - - for ( ; i < length; i++ ) { - - // Only deal with non-null/undefined values - if ( ( options = arguments[ i ] ) != null ) { - - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject( copy ) || - ( copyIsArray = jQuery.isArray( copy ) ) ) ) { - - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray( src ) ? src : []; - - } else { - clone = src && jQuery.isPlainObject( src ) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend( { - - // Unique for each copy of jQuery on the page - expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function( msg ) { - throw new Error( msg ); - }, - - noop: function() {}, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return jQuery.type( obj ) === "function"; - }, - - isArray: Array.isArray || function( obj ) { - return jQuery.type( obj ) === "array"; - }, - - isWindow: function( obj ) { - /* jshint eqeqeq: false */ - return obj != null && obj == obj.window; - }, - - isNumeric: function( obj ) { - - // parseFloat NaNs numeric-cast false positives (null|true|false|"") - // ...but misinterprets leading-number strings, particularly hex literals ("0x...") - // subtraction forces infinities to NaN - // adding 1 corrects loss of precision from parseFloat (#15100) - var realStringObj = obj && obj.toString(); - return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0; - }, - - isEmptyObject: function( obj ) { - var name; - for ( name in obj ) { - return false; - } - return true; - }, - - isPlainObject: function( obj ) { - var key; - - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - try { - - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call( obj, "constructor" ) && - !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { - return false; - } - } catch ( e ) { - - // IE8,9 Will throw exceptions on certain host objects #9897 - return false; - } - - // Support: IE<9 - // Handle iteration over inherited properties before own properties. - if ( !support.ownFirst ) { - for ( key in obj ) { - return hasOwn.call( obj, key ); - } - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - for ( key in obj ) {} - - return key === undefined || hasOwn.call( obj, key ); - }, - - type: function( obj ) { - if ( obj == null ) { - return obj + ""; - } - return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call( obj ) ] || "object" : - typeof obj; - }, - - // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context - globalEval: function( data ) { - if ( data && jQuery.trim( data ) ) { - - // We use execScript on Internet Explorer - // We use an anonymous function so that context is window - // rather than jQuery in Firefox - ( window.execScript || function( data ) { - window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation - } )( data ); - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - }, - - each: function( obj, callback ) { - var length, i = 0; - - if ( isArrayLike( obj ) ) { - length = obj.length; - for ( ; i < length; i++ ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } else { - for ( i in obj ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } - - return obj; - }, - - // Support: Android<4.1, IE<9 - trim: function( text ) { - return text == null ? - "" : - ( text + "" ).replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArrayLike( Object( arr ) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - var len; - - if ( arr ) { - if ( indexOf ) { - return indexOf.call( arr, elem, i ); - } - - len = arr.length; - i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; - - for ( ; i < len; i++ ) { - - // Skip accessing in sparse arrays - if ( i in arr && arr[ i ] === elem ) { - return i; - } - } - } - - return -1; - }, - - merge: function( first, second ) { - var len = +second.length, - j = 0, - i = first.length; - - while ( j < len ) { - first[ i++ ] = second[ j++ ]; - } - - // Support: IE<9 - // Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists) - if ( len !== len ) { - while ( second[ j ] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, invert ) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - callbackInverse = !callback( elems[ i ], i ); - if ( callbackInverse !== callbackExpect ) { - matches.push( elems[ i ] ); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var length, value, - i = 0, - ret = []; - - // Go through the array, translating each of the items to their new values - if ( isArrayLike( elems ) ) { - length = elems.length; - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - } - - // Flatten any nested arrays - return concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - var args, proxy, tmp; - - if ( typeof context === "string" ) { - tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - args = slice.call( arguments, 2 ); - proxy = function() { - return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || jQuery.guid++; - - return proxy; - }, - - now: function() { - return +( new Date() ); - }, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support -} ); - -// JSHint would error on this code due to the Symbol not being defined in ES5. -// Defining this global in .jshintrc would create a danger of using the global -// unguarded in another place, it seems safer to just disable JSHint for these -// three lines. -/* jshint ignore: start */ -if ( typeof Symbol === "function" ) { - jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ]; -} -/* jshint ignore: end */ - -// Populate the class2type map -jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), -function( i, name ) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -} ); - -function isArrayLike( obj ) { - - // Support: iOS 8.2 (not reproducible in simulator) - // `in` check used to prevent JIT error (gh-2145) - // hasOwn isn't used here due to false negatives - // regarding Nodelist length in IE - var length = !!obj && "length" in obj && obj.length, - type = jQuery.type( obj ); - - if ( type === "function" || jQuery.isWindow( obj ) ) { - return false; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj; -} -var Sizzle = -/*! - * Sizzle CSS Selector Engine v2.2.1 - * http://sizzlejs.com/ - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2015-10-17 - */ -(function( window ) { - -var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - } - return 0; - }, - - // General-purpose constants - MAX_NEGATIVE = 1 << 31, - - // Instance methods - hasOwn = ({}).hasOwnProperty, - arr = [], - pop = arr.pop, - push_native = arr.push, - push = arr.push, - slice = arr.slice, - // Use a stripped-down indexOf as it's faster than native - // http://jsperf.com/thor-indexof-vs-for/5 - indexOf = function( list, elem ) { - var i = 0, - len = list.length; - for ( ; i < len; i++ ) { - if ( list[i] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - - // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + - "*\\]", - - pseudos = ":(" + identifier + ")(?:\\((" + - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp( whitespace + "+", "g" ), - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), - - rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + identifier + ")" ), - "CLASS": new RegExp( "^\\.(" + identifier + ")" ), - "TAG": new RegExp( "^(" + identifier + "|[*])" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + - whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - rescape = /'|\\/g, - - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), - funescape = function( _, escaped, escapedWhitespace ) { - var high = "0x" + escaped - 0x10000; - // NaN means non-codepoint - // Support: Firefox<24 - // Workaround erroneous numeric interpretation of +"0x" - return high !== high || escapedWhitespace ? - escaped : - high < 0 ? - // BMP codepoint - String.fromCharCode( high + 0x10000 ) : - // Supplemental Plane codepoint (surrogate pair) - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function() { - setDocument(); - }; - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - (arr = slice.call( preferredDoc.childNodes )), - preferredDoc.childNodes - ); - // Support: Android<4.0 - // Detect silently failing push.apply - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - push_native.apply( target, slice.call(els) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - // Can't trust NodeList.length - while ( (target[j++] = els[i++]) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var m, i, elem, nid, nidselect, match, groups, newSelector, - newContext = context && context.ownerDocument, - - // nodeType defaults to 9, since context defaults to document - nodeType = context ? context.nodeType : 9; - - results = results || []; - - // Return early from calls with invalid selector or context - if ( typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - - return results; - } - - // Try to shortcut find operations (as opposed to filters) in HTML documents - if ( !seed ) { - - if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { - setDocument( context ); - } - context = context || document; - - if ( documentIsHTML ) { - - // If the selector is sufficiently simple, try using a "get*By*" DOM method - // (excepting DocumentFragment context, where the methods don't exist) - if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { - - // ID selector - if ( (m = match[1]) ) { - - // Document context - if ( nodeType === 9 ) { - if ( (elem = context.getElementById( m )) ) { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - - // Element context - } else { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( newContext && (elem = newContext.getElementById( m )) && - contains( context, elem ) && - elem.id === m ) { - - results.push( elem ); - return results; - } - } - - // Type selector - } else if ( match[2] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Class selector - } else if ( (m = match[3]) && support.getElementsByClassName && - context.getElementsByClassName ) { - - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // Take advantage of querySelectorAll - if ( support.qsa && - !compilerCache[ selector + " " ] && - (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - - if ( nodeType !== 1 ) { - newContext = context; - newSelector = selector; - - // qSA looks outside Element context, which is not what we want - // Thanks to Andrew Dupont for this workaround technique - // Support: IE <=8 - // Exclude object elements - } else if ( context.nodeName.toLowerCase() !== "object" ) { - - // Capture the context ID, setting it first if necessary - if ( (nid = context.getAttribute( "id" )) ) { - nid = nid.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", (nid = expando) ); - } - - // Prefix every selector in the list - groups = tokenize( selector ); - i = groups.length; - nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']"; - while ( i-- ) { - groups[i] = nidselect + " " + toSelector( groups[i] ); - } - newSelector = groups.join( "," ); - - // Expand context for sibling selectors - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || - context; - } - - if ( newSelector ) { - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch ( qsaError ) { - } finally { - if ( nid === expando ) { - context.removeAttribute( "id" ); - } - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {function(string, object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key + " " ) > Expr.cacheLength ) { - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return (cache[ key + " " ] = value); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result - */ -function assert( fn ) { - var div = document.createElement("div"); - - try { - return !!fn( div ); - } catch (e) { - return false; - } finally { - // Remove from its parent by default - if ( div.parentNode ) { - div.parentNode.removeChild( div ); - } - // release memory in IE - div = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split("|"), - i = arr.length; - - while ( i-- ) { - Expr.attrHandle[ arr[i] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - ( ~b.sourceIndex || MAX_NEGATIVE ) - - ( ~a.sourceIndex || MAX_NEGATIVE ); - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( (cur = cur.nextSibling) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction(function( argument ) { - argument = +argument; - return markFunction(function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ (j = matchIndexes[i]) ] ) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); -} - -/** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ -function testContext( context ) { - return context && typeof context.getElementsByTagName !== "undefined" && context; -} - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ -isXML = Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, parent, - doc = node ? node.ownerDocument || node : preferredDoc; - - // Return early if doc is invalid or already selected - if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Update global variables - document = doc; - docElem = document.documentElement; - documentIsHTML = !isXML( document ); - - // Support: IE 9-11, Edge - // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) - if ( (parent = document.defaultView) && parent.top !== parent ) { - // Support: IE 11 - if ( parent.addEventListener ) { - parent.addEventListener( "unload", unloadHandler, false ); - - // Support: IE 9 - 10 only - } else if ( parent.attachEvent ) { - parent.attachEvent( "onunload", unloadHandler ); - } - } - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert(function( div ) { - div.className = "i"; - return !div.getAttribute("className"); - }); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert(function( div ) { - div.appendChild( document.createComment("") ); - return !div.getElementsByTagName("*").length; - }); - - // Support: IE<9 - support.getElementsByClassName = rnative.test( document.getElementsByClassName ); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert(function( div ) { - docElem.appendChild( div ).id = expando; - return !document.getElementsByName || !document.getElementsByName( expando ).length; - }); - - // ID find and filter - if ( support.getById ) { - Expr.find["ID"] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var m = context.getElementById( id ); - return m ? [ m ] : []; - } - }; - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute("id") === attrId; - }; - }; - } else { - // Support: IE6/7 - // getElementById is not reliable as a find shortcut - delete Expr.find["ID"]; - - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && - elem.getAttributeNode("id"); - return node && node.value === attrId; - }; - }; - } - - // Tag - Expr.find["TAG"] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( tag ); - - // DocumentFragment nodes don't have gEBTN - } else if ( support.qsa ) { - return context.querySelectorAll( tag ); - } - } : - - function( tag, context ) { - var elem, - tmp = [], - i = 0, - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( (elem = results[i++]) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See http://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( (support.qsa = rnative.test( document.querySelectorAll )) ) { - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function( div ) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - docElem.appendChild( div ).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( div.querySelectorAll("[msallowcapture^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ - if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { - rbuggyQSA.push("~="); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibing-combinator selector` fails - if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { - rbuggyQSA.push(".#.+[+~]"); - } - }); - - assert(function( div ) { - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = document.createElement("input"); - input.setAttribute( "type", "hidden" ); - div.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( div.querySelectorAll("[name=d]").length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector) )) ) { - - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( div, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully self-exclusive - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - )); - } : - function( a, b ) { - if ( b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if ( compare ) { - return compare; - } - - // Calculate position if both inputs belong to the same document - compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? - a.compareDocumentPosition( b ) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if ( compare & 1 || - (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - - // Choose the first element that is related to our preferred document - if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { - return -1; - } - if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function( a, b ) { - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Parentless nodes are either documents or disconnected - if ( !aup || !bup ) { - return a === document ? -1 : - b === document ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( (cur = cur.parentNode) ) { - ap.unshift( cur ); - } - cur = b; - while ( (cur = cur.parentNode) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[i] === bp[i] ) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[i], bp[i] ) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return document; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - if ( support.matchesSelector && documentIsHTML && - !compilerCache[ expr + " " ] && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch (e) {} - } - - return Sizzle( expr, document, null, [ elem ] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - // Set document vars if needed - if ( ( context.ownerDocument || context ) !== document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( (elem = results[i++]) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - // If no nodeType, this is expected to be an array - while ( (node = elem[i++]) ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1].slice( 0, 3 ) === "nth" ) { - // nth-* requires argument - if ( !match[3] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); - match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); - - // other types prohibit arguments - } else if ( match[3] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[6] && match[2]; - - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[3] ) { - match[2] = match[4] || match[5] || ""; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - match[0] = match[0].slice( 0, excess ); - match[2] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { return true; } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && - classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); - }); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, what, argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, context, xml ) { - var cache, uniqueCache, outerCache, node, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType, - diff = false; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( (node = node[ dir ]) ) { - if ( ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1 ) { - - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - - // Seek `elem` from a previously-cached index - - // ...in a gzip-friendly way - node = parent; - outerCache = node[ expando ] || (node[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - (outerCache[ node.uniqueID ] = {}); - - cache = uniqueCache[ type ] || []; - nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; - diff = nodeIndex && cache[ 2 ]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( (node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop()) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - } else { - // Use previously-cached element index if available - if ( useCache ) { - // ...in a gzip-friendly way - node = elem; - outerCache = node[ expando ] || (node[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - (outerCache[ node.uniqueID ] = {}); - - cache = uniqueCache[ type ] || []; - nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; - diff = nodeIndex; - } - - // xml :nth-child(...) - // or :nth-last-child(...) or :nth(-last)?-of-type(...) - if ( diff === false ) { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { - - if ( ( ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1 ) && - ++diff ) { - - // Cache the index of each encountered element - if ( useCache ) { - outerCache = node[ expando ] || (node[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - (outerCache[ node.uniqueID ] = {}); - - uniqueCache[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - // Don't keep the element (issue #299) - input[0] = null; - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - text = text.replace( runescape, funescape ); - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - // lang value must be a valid identifier - if ( !ridentifier.test(lang || "") ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( (elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); - return false; - }; - }), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeType < 6 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); - }, - - // Position-in-collection - "first": createPositionalPseudo(function() { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -tokenize = Sizzle.tokenize = function( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - // Don't consume trailing commas as valid - soFar = soFar.slice( match[0].length ) || soFar; - } - groups.push( (tokens = []) ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace( rtrim, " " ) - }); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - (match = preFilters[ type ]( match ))) ) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -}; - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[i].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var oldCache, uniqueCache, outerCache, - newCache = [ dirruns, doneName ]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching - if ( xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || (elem[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {}); - - if ( (oldCache = uniqueCache[ dir ]) && - oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { - - // Assign to newCache so results back-propagate to previous elements - return (newCache[ 2 ] = oldCache[ 2 ]); - } else { - // Reuse newcache so results back-propagate to previous elements - uniqueCache[ dir ] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { - return true; - } - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results ); - } - return results; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( (elem = temp[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - // Restore matcherIn since elem is not yet a final match - temp.push( (matcherIn[i] = elem) ); - } - } - postFinder( null, (matcherOut = []), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - // Avoid hanging onto element (issue #299) - checkContext = null; - return ret; - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; - } else { - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, outermost ) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), - len = elems.length; - - if ( outermost ) { - outermostContext = context === document || context || outermost; - } - - // Add elements passing elementMatchers directly to results - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for ( ; i !== len && (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - if ( !context && elem.ownerDocument !== document ) { - setDocument( elem ); - xml = !documentIsHTML; - } - while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context || document, xml) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // `i` is now the count of elements visited above, and adding it to `matchedCount` - // makes the latter nonnegative. - matchedCount += i; - - // Apply set filters to unmatched elements - // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` - // equals `i`), unless we didn't visit _any_ elements in the above loop because we have - // no element matchers and no seed. - // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that - // case, which will result in a "00" `matchedCount` that differs from `i` but is also - // numerically zero. - if ( bySet && i !== matchedCount ) { - j = 0; - while ( (matcher = setMatchers[j++]) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !match ) { - match = tokenize( selector ); - } - i = match.length; - while ( i-- ) { - cached = matcherFromTokens( match[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; -}; - -/** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ -select = Sizzle.select = function( selector, context, results, seed ) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize( (selector = compiled.selector || selector) ); - - results = results || []; - - // Try to minimize operations if there is only one selector in the list and no seed - // (the latter of which guarantees us context) - if ( match.length === 1 ) { - - // Reduce context if the leading compound selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[ tokens[1].type ] ) { - - context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; - if ( !context ) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if ( compiled ) { - context = context.parentNode; - } - - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( runescape, funescape ), - rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - ( compiled || compile( selector, match ) )( - seed, - context, - !documentIsHTML, - results, - !context || rsibling.test( selector ) && testContext( context.parentNode ) || context - ); - return results; -}; - -// One-time assignments - -// Sort stability -support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - -// Support: Chrome 14-35+ -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = !!hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( document.createElement("div") ) & 1; -}); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert(function( div ) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#" ; -}) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - }); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; -}) ) { - addHandle( "value", function( elem, name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - }); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert(function( div ) { - return div.getAttribute("disabled") == null; -}) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return elem[ name ] === true ? name.toLowerCase() : - (val = elem.getAttributeNode( name )) && val.specified ? - val.value : - null; - } - }); -} - -return Sizzle; - -})( window ); - - - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[ ":" ] = jQuery.expr.pseudos; -jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - - -var dir = function( elem, dir, until ) { - var matched = [], - truncate = until !== undefined; - - while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); - } - } - return matched; -}; - - -var siblings = function( n, elem ) { - var matched = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); - } - } - - return matched; -}; - - -var rneedsContext = jQuery.expr.match.needsContext; - -var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ ); - - - -var risSimple = /^.[^:#\[\.,]*$/; - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - /* jshint -W018 */ - return !!qualifier.call( elem, i, elem ) !== not; - } ); - - } - - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - } ); - - } - - if ( typeof qualifier === "string" ) { - if ( risSimple.test( qualifier ) ) { - return jQuery.filter( qualifier, elements, not ); - } - - qualifier = jQuery.filter( qualifier, elements ); - } - - return jQuery.grep( elements, function( elem ) { - return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not; - } ); -} - -jQuery.filter = function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : - jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - } ) ); -}; - -jQuery.fn.extend( { - find: function( selector ) { - var i, - ret = [], - self = this, - len = self.length; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter( function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - } ) ); - } - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - filter: function( selector ) { - return this.pushStack( winnow( this, selector || [], false ) ); - }, - not: function( selector ) { - return this.pushStack( winnow( this, selector || [], true ) ); - }, - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - } -} ); - - -// Initialize a jQuery object - - -// A central reference to the root jQuery(document) -var rootjQuery, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - init = jQuery.fn.init = function( selector, context, root ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // init accepts an alternate rootjQuery - // so migrate can support jQuery.sub (gh-2101) - root = root || rootjQuery; - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector.charAt( 0 ) === "<" && - selector.charAt( selector.length - 1 ) === ">" && - selector.length >= 3 ) { - - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && ( match[ 1 ] || !context ) ) { - - // HANDLE: $(html) -> $(array) - if ( match[ 1 ] ) { - context = context instanceof jQuery ? context[ 0 ] : context; - - // scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge( this, jQuery.parseHTML( - match[ 1 ], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - - // Properties of context are called as methods if possible - if ( jQuery.isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[ 2 ] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[ 2 ] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[ 0 ] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || root ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this.context = this[ 0 ] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return typeof root.ready !== "undefined" ? - root.ready( selector ) : - - // Execute immediately if ready is not present - selector( jQuery ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }; - -// Give the init function the jQuery prototype for later instantiation -init.prototype = jQuery.fn; - -// Initialize central reference -rootjQuery = jQuery( document ); - - -var rparentsprev = /^(?:parents|prev(?:Until|All))/, - - // methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.fn.extend( { - has: function( target ) { - var i, - targets = jQuery( target, this ), - len = targets.length; - - return this.filter( function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( this, targets[ i ] ) ) { - return true; - } - } - } ); - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - matched = [], - pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( ; i < l; i++ ) { - for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { - - // Always skip document fragments - if ( cur.nodeType < 11 && ( pos ? - pos.index( cur ) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector( cur, selectors ) ) ) { - - matched.push( cur ); - break; - } - } - } - - return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; - } - - // index in selector - if ( typeof elem === "string" ) { - return jQuery.inArray( this[ 0 ], jQuery( elem ) ); - } - - // Locate the position of the desired element - return jQuery.inArray( - - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[ 0 ] : elem, this ); - }, - - add: function( selector, context ) { - return this.pushStack( - jQuery.uniqueSort( - jQuery.merge( this.get(), jQuery( selector, context ) ) - ) - ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter( selector ) - ); - } -} ); - -function sibling( cur, dir ) { - do { - cur = cur[ dir ]; - } while ( cur && cur.nodeType !== 1 ); - - return cur; -} - -jQuery.each( { - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return siblings( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return siblings( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - if ( this.length > 1 ) { - - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - ret = jQuery.uniqueSort( ret ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - } - - return this.pushStack( ret ); - }; -} ); -var rnotwhite = ( /\S+/g ); - - - -// Convert String-formatted options into Object-formatted ones -function createOptions( options ) { - var object = {}; - jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { - object[ flag ] = true; - } ); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - createOptions( options ) : - jQuery.extend( {}, options ); - - var // Flag to know if list is currently firing - firing, - - // Last fire value for non-forgettable lists - memory, - - // Flag to know if list was already fired - fired, - - // Flag to prevent firing - locked, - - // Actual callback list - list = [], - - // Queue of execution data for repeatable lists - queue = [], - - // Index of currently firing callback (modified by add/remove as needed) - firingIndex = -1, - - // Fire callbacks - fire = function() { - - // Enforce single-firing - locked = options.once; - - // Execute callbacks for all pending executions, - // respecting firingIndex overrides and runtime changes - fired = firing = true; - for ( ; queue.length; firingIndex = -1 ) { - memory = queue.shift(); - while ( ++firingIndex < list.length ) { - - // Run callback and check for early termination - if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && - options.stopOnFalse ) { - - // Jump to end and forget the data so .add doesn't re-fire - firingIndex = list.length; - memory = false; - } - } - } - - // Forget the data if we're done with it - if ( !options.memory ) { - memory = false; - } - - firing = false; - - // Clean up if we're done firing for good - if ( locked ) { - - // Keep an empty list if we have data for future add calls - if ( memory ) { - list = []; - - // Otherwise, this object is spent - } else { - list = ""; - } - } - }, - - // Actual Callbacks object - self = { - - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - - // If we have memory from a past run, we should fire after adding - if ( memory && !firing ) { - firingIndex = list.length - 1; - queue.push( memory ); - } - - ( function add( args ) { - jQuery.each( args, function( _, arg ) { - if ( jQuery.isFunction( arg ) ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) { - - // Inspect recursively - add( arg ); - } - } ); - } )( arguments ); - - if ( memory && !firing ) { - fire(); - } - } - return this; - }, - - // Remove a callback from the list - remove: function() { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - - // Handle firing indexes - if ( index <= firingIndex ) { - firingIndex--; - } - } - } ); - return this; - }, - - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? - jQuery.inArray( fn, list ) > -1 : - list.length > 0; - }, - - // Remove all callbacks from the list - empty: function() { - if ( list ) { - list = []; - } - return this; - }, - - // Disable .fire and .add - // Abort any current/pending executions - // Clear all callbacks and values - disable: function() { - locked = queue = []; - list = memory = ""; - return this; - }, - disabled: function() { - return !list; - }, - - // Disable .fire - // Also disable .add unless we have memory (since it would have no effect) - // Abort any pending executions - lock: function() { - locked = true; - if ( !memory ) { - self.disable(); - } - return this; - }, - locked: function() { - return !!locked; - }, - - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( !locked ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - queue.push( args ); - if ( !firing ) { - fire(); - } - } - return this; - }, - - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - -jQuery.extend( { - - Deferred: function( func ) { - var tuples = [ - - // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ], - [ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ], - [ "notify", "progress", jQuery.Callbacks( "memory" ) ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - then: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - return jQuery.Deferred( function( newDefer ) { - jQuery.each( tuples, function( i, tuple ) { - var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; - - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[ 1 ] ]( function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .progress( newDefer.notify ) - .done( newDefer.resolve ) - .fail( newDefer.reject ); - } else { - newDefer[ tuple[ 0 ] + "With" ]( - this === promise ? newDefer.promise() : this, - fn ? [ returned ] : arguments - ); - } - } ); - } ); - fns = null; - } ).promise(); - }, - - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 3 ]; - - // promise[ done | fail | progress ] = list.add - promise[ tuple[ 1 ] ] = list.add; - - // Handle state - if ( stateString ) { - list.add( function() { - - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - } - - // deferred[ resolve | reject | notify ] - deferred[ tuple[ 0 ] ] = function() { - deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments ); - return this; - }; - deferred[ tuple[ 0 ] + "With" ] = list.fireWith; - } ); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( subordinate /* , ..., subordinateN */ ) { - var i = 0, - resolveValues = slice.call( arguments ), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || - ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - - // the master Deferred. - // If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function( i, contexts, values ) { - return function( value ) { - contexts[ i ] = this; - values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; - if ( values === progressValues ) { - deferred.notifyWith( contexts, values ); - - } else if ( !( --remaining ) ) { - deferred.resolveWith( contexts, values ); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // add listeners to Deferred subordinates; treat others as resolved - if ( length > 1 ) { - progressValues = new Array( length ); - progressContexts = new Array( length ); - resolveContexts = new Array( length ); - for ( ; i < length; i++ ) { - if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { - resolveValues[ i ].promise() - .progress( updateFunc( i, progressContexts, progressValues ) ) - .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ); - } else { - --remaining; - } - } - } - - // if we're not waiting on anything, resolve the master - if ( !remaining ) { - deferred.resolveWith( resolveContexts, resolveValues ); - } - - return deferred.promise(); - } -} ); - - -// The deferred used on DOM ready -var readyList; - -jQuery.fn.ready = function( fn ) { - - // Add the callback - jQuery.ready.promise().done( fn ); - - return this; -}; - -jQuery.extend( { - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - jQuery( document ).off( "ready" ); - } - } -} ); - -/** - * Clean-up method for dom ready events - */ -function detach() { - if ( document.addEventListener ) { - document.removeEventListener( "DOMContentLoaded", completed ); - window.removeEventListener( "load", completed ); - - } else { - document.detachEvent( "onreadystatechange", completed ); - window.detachEvent( "onload", completed ); - } -} - -/** - * The ready event handler and self cleanup method - */ -function completed() { - - // readyState === "complete" is good enough for us to call the dom ready in oldIE - if ( document.addEventListener || - window.event.type === "load" || - document.readyState === "complete" ) { - - detach(); - jQuery.ready(); - } -} - -jQuery.ready.promise = function( obj ) { - if ( !readyList ) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called - // after the browser event has already occurred. - // Support: IE6-10 - // Older IE sometimes signals "interactive" too soon - if ( document.readyState === "complete" || - ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { - - // Handle it asynchronously to allow scripts the opportunity to delay ready - window.setTimeout( jQuery.ready ); - - // Standards-based browsers support DOMContentLoaded - } else if ( document.addEventListener ) { - - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed ); - - // If IE event model is used - } else { - - // Ensure firing before onload, maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", completed ); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", completed ); - - // If IE and not a frame - // continually check to see if the document is ready - var top = false; - - try { - top = window.frameElement == null && document.documentElement; - } catch ( e ) {} - - if ( top && top.doScroll ) { - ( function doScrollCheck() { - if ( !jQuery.isReady ) { - - try { - - // Use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - top.doScroll( "left" ); - } catch ( e ) { - return window.setTimeout( doScrollCheck, 50 ); - } - - // detach all dom ready events - detach(); - - // and execute any waiting functions - jQuery.ready(); - } - } )(); - } - } - } - return readyList.promise( obj ); -}; - -// Kick off the DOM ready check even if the user does not -jQuery.ready.promise(); - - - - -// Support: IE<9 -// Iteration over object's inherited properties before its own -var i; -for ( i in jQuery( support ) ) { - break; -} -support.ownFirst = i === "0"; - -// Note: most support tests are defined in their respective modules. -// false until the test is run -support.inlineBlockNeedsLayout = false; - -// Execute ASAP in case we need to set body.style.zoom -jQuery( function() { - - // Minified: var a,b,c,d - var val, div, body, container; - - body = document.getElementsByTagName( "body" )[ 0 ]; - if ( !body || !body.style ) { - - // Return for frameset docs that don't have a body - return; - } - - // Setup - div = document.createElement( "div" ); - container = document.createElement( "div" ); - container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px"; - body.appendChild( container ).appendChild( div ); - - if ( typeof div.style.zoom !== "undefined" ) { - - // Support: IE<8 - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1"; - - support.inlineBlockNeedsLayout = val = div.offsetWidth === 3; - if ( val ) { - - // Prevent IE 6 from affecting layout for positioned elements #11048 - // Prevent IE from shrinking the body in IE 7 mode #12869 - // Support: IE<8 - body.style.zoom = 1; - } - } - - body.removeChild( container ); -} ); - - -( function() { - var div = document.createElement( "div" ); - - // Support: IE<9 - support.deleteExpando = true; - try { - delete div.test; - } catch ( e ) { - support.deleteExpando = false; - } - - // Null elements to avoid leaks in IE. - div = null; -} )(); -var acceptData = function( elem ) { - var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ], - nodeType = +elem.nodeType || 1; - - // Do not set data on non-element DOM nodes because it will not be cleared (#8335). - return nodeType !== 1 && nodeType !== 9 ? - false : - - // Nodes accept data unless otherwise specified; rejection can be conditional - !noData || noData !== true && elem.getAttribute( "classid" ) === noData; -}; - - - - -var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /([A-Z])/g; - -function dataAttr( elem, key, data ) { - - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - - var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch ( e ) {} - - // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); - - } else { - data = undefined; - } - } - - return data; -} - -// checks a cache object for emptiness -function isEmptyDataObject( obj ) { - var name; - for ( name in obj ) { - - // if the public data object is empty, the private is still empty - if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) { - continue; - } - if ( name !== "toJSON" ) { - return false; - } - } - - return true; -} - -function internalData( elem, name, data, pvt /* Internal Use Only */ ) { - if ( !acceptData( elem ) ) { - return; - } - - var ret, thisCache, - internalKey = jQuery.expando, - - // We have to handle DOM nodes and JS objects differently because IE6-7 - // can't GC object references properly across the DOM-JS boundary - isNode = elem.nodeType, - - // Only DOM nodes need the global jQuery cache; JS object data is - // attached directly to the object so GC can occur automatically - cache = isNode ? jQuery.cache : elem, - - // Only defining an ID for JS objects if its cache already exists allows - // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey; - - // Avoid doing any more work than we need to when trying to get data on an - // object that has no data at all - if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) && - data === undefined && typeof name === "string" ) { - return; - } - - if ( !id ) { - - // Only DOM nodes need a new unique ID for each element since their data - // ends up in the global cache - if ( isNode ) { - id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++; - } else { - id = internalKey; - } - } - - if ( !cache[ id ] ) { - - // Avoid exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - cache[ id ] = isNode ? {} : { toJSON: jQuery.noop }; - } - - // An object can be passed to jQuery.data instead of a key/value pair; this gets - // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ] = jQuery.extend( cache[ id ], name ); - } else { - cache[ id ].data = jQuery.extend( cache[ id ].data, name ); - } - } - - thisCache = cache[ id ]; - - // jQuery data() is stored in a separate object inside the object's internal data - // cache in order to avoid key collisions between internal data and user-defined - // data. - if ( !pvt ) { - if ( !thisCache.data ) { - thisCache.data = {}; - } - - thisCache = thisCache.data; - } - - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; - } - - // Check for both converted-to-camel and non-converted data property names - // If a data property was specified - if ( typeof name === "string" ) { - - // First Try to find as-is property data - ret = thisCache[ name ]; - - // Test for null|undefined property data - if ( ret == null ) { - - // Try to find the camelCased property - ret = thisCache[ jQuery.camelCase( name ) ]; - } - } else { - ret = thisCache; - } - - return ret; -} - -function internalRemoveData( elem, name, pvt ) { - if ( !acceptData( elem ) ) { - return; - } - - var thisCache, i, - isNode = elem.nodeType, - - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, - id = isNode ? elem[ jQuery.expando ] : jQuery.expando; - - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } - - if ( name ) { - - thisCache = pvt ? cache[ id ] : cache[ id ].data; - - if ( thisCache ) { - - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { - - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { - - // split the camel cased version by spaces unless a key with the spaces exists - name = jQuery.camelCase( name ); - if ( name in thisCache ) { - name = [ name ]; - } else { - name = name.split( " " ); - } - } - } else { - - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = name.concat( jQuery.map( name, jQuery.camelCase ) ); - } - - i = name.length; - while ( i-- ) { - delete thisCache[ name[ i ] ]; - } - - // If there is no data left in the cache, we want to continue - // and let the cache object itself get destroyed - if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) { - return; - } - } - } - - // See jQuery.data for more information - if ( !pvt ) { - delete cache[ id ].data; - - // Don't destroy the parent cache unless the internal data object - // had been the only thing left in it - if ( !isEmptyDataObject( cache[ id ] ) ) { - return; - } - } - - // Destroy the cache - if ( isNode ) { - jQuery.cleanData( [ elem ], true ); - - // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) - /* jshint eqeqeq: false */ - } else if ( support.deleteExpando || cache != cache.window ) { - /* jshint eqeqeq: true */ - delete cache[ id ]; - - // When all else fails, undefined - } else { - cache[ id ] = undefined; - } -} - -jQuery.extend( { - cache: {}, - - // The following elements (space-suffixed to avoid Object.prototype collisions) - // throw uncatchable exceptions if you attempt to set expando properties - noData: { - "applet ": true, - "embed ": true, - - // ...but Flash objects (which have this classid) *can* handle expandos - "object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" - }, - - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); - }, - - data: function( elem, name, data ) { - return internalData( elem, name, data ); - }, - - removeData: function( elem, name ) { - return internalRemoveData( elem, name ); - }, - - // For internal use only. - _data: function( elem, name, data ) { - return internalData( elem, name, data, true ); - }, - - _removeData: function( elem, name ) { - return internalRemoveData( elem, name, true ); - } -} ); - -jQuery.fn.extend( { - data: function( key, value ) { - var i, name, data, - elem = this[ 0 ], - attrs = elem && elem.attributes; - - // Special expections of .data basically thwart jQuery.access, - // so implement the relevant behavior ourselves - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = jQuery.data( elem ); - - if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { - i = attrs.length; - while ( i-- ) { - - // Support: IE11+ - // The attrs elements can be null (#14894) - if ( attrs[ i ] ) { - name = attrs[ i ].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.slice( 5 ) ); - dataAttr( elem, name, data[ name ] ); - } - } - } - jQuery._data( elem, "parsedAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each( function() { - jQuery.data( this, key ); - } ); - } - - return arguments.length > 1 ? - - // Sets one value - this.each( function() { - jQuery.data( this, key, value ); - } ) : - - // Gets one value - // Try to fetch any internally stored data first - elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined; - }, - - removeData: function( key ) { - return this.each( function() { - jQuery.removeData( this, key ); - } ); - } -} ); - - -jQuery.extend( { - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = jQuery._data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || jQuery.isArray( data ) ) { - queue = jQuery._data( elem, type, jQuery.makeArray( data ) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // not intended for public consumption - generates a queueHooks object, - // or returns the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return jQuery._data( elem, key ) || jQuery._data( elem, key, { - empty: jQuery.Callbacks( "once memory" ).add( function() { - jQuery._removeData( elem, type + "queue" ); - jQuery._removeData( elem, key ); - } ) - } ); - } -} ); - -jQuery.fn.extend( { - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[ 0 ], type ); - } - - return data === undefined ? - this : - this.each( function() { - var queue = jQuery.queue( this, type, data ); - - // ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - } ); - }, - dequeue: function( type ) { - return this.each( function() { - jQuery.dequeue( this, type ); - } ); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while ( i-- ) { - tmp = jQuery._data( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -} ); - - -( function() { - var shrinkWrapBlocksVal; - - support.shrinkWrapBlocks = function() { - if ( shrinkWrapBlocksVal != null ) { - return shrinkWrapBlocksVal; - } - - // Will be changed later if needed. - shrinkWrapBlocksVal = false; - - // Minified: var b,c,d - var div, body, container; - - body = document.getElementsByTagName( "body" )[ 0 ]; - if ( !body || !body.style ) { - - // Test fired too early or in an unsupported environment, exit. - return; - } - - // Setup - div = document.createElement( "div" ); - container = document.createElement( "div" ); - container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px"; - body.appendChild( container ).appendChild( div ); - - // Support: IE6 - // Check if elements with layout shrink-wrap their children - if ( typeof div.style.zoom !== "undefined" ) { - - // Reset CSS: box-sizing; display; margin; border - div.style.cssText = - - // Support: Firefox<29, Android 2.3 - // Vendor-prefix box-sizing - "-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" + - "box-sizing:content-box;display:block;margin:0;border:0;" + - "padding:1px;width:1px;zoom:1"; - div.appendChild( document.createElement( "div" ) ).style.width = "5px"; - shrinkWrapBlocksVal = div.offsetWidth !== 3; - } - - body.removeChild( container ); - - return shrinkWrapBlocksVal; - }; - -} )(); -var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; - -var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); - - -var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; - -var isHidden = function( elem, el ) { - - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || - !jQuery.contains( elem.ownerDocument, elem ); - }; - - - -function adjustCSS( elem, prop, valueParts, tween ) { - var adjusted, - scale = 1, - maxIterations = 20, - currentValue = tween ? - function() { return tween.cur(); } : - function() { return jQuery.css( elem, prop, "" ); }, - initial = currentValue(), - unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), - - // Starting value computation is required for potential unit mismatches - initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && - rcssNum.exec( jQuery.css( elem, prop ) ); - - if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { - - // Trust units reported by jQuery.css - unit = unit || initialInUnit[ 3 ]; - - // Make sure we update the tween properties later on - valueParts = valueParts || []; - - // Iteratively approximate from a nonzero starting point - initialInUnit = +initial || 1; - - do { - - // If previous iteration zeroed out, double until we get *something*. - // Use string for doubling so we don't accidentally see scale as unchanged below - scale = scale || ".5"; - - // Adjust and apply - initialInUnit = initialInUnit / scale; - jQuery.style( elem, prop, initialInUnit + unit ); - - // Update scale, tolerating zero or NaN from tween.cur() - // Break the loop if scale is unchanged or perfect, or if we've just had enough. - } while ( - scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations - ); - } - - if ( valueParts ) { - initialInUnit = +initialInUnit || +initial || 0; - - // Apply relative offset (+=/-=) if specified - adjusted = valueParts[ 1 ] ? - initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : - +valueParts[ 2 ]; - if ( tween ) { - tween.unit = unit; - tween.start = initialInUnit; - tween.end = adjusted; - } - } - return adjusted; -} - - -// Multifunctional method to get and set values of a collection -// The value/s can optionally be executed if it's a function -var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - length = elems.length, - bulk = key == null; - - // Sets many values - if ( jQuery.type( key ) === "object" ) { - chainable = true; - for ( i in key ) { - access( elems, fn, i, key[ i ], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !jQuery.isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < length; i++ ) { - fn( - elems[ i ], - key, - raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) ) - ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - length ? fn( elems[ 0 ], key ) : emptyGet; -}; -var rcheckableType = ( /^(?:checkbox|radio)$/i ); - -var rtagName = ( /<([\w:-]+)/ ); - -var rscriptType = ( /^$|\/(?:java|ecma)script/i ); - -var rleadingWhitespace = ( /^\s+/ ); - -var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" + - "details|dialog|figcaption|figure|footer|header|hgroup|main|" + - "mark|meter|nav|output|picture|progress|section|summary|template|time|video"; - - - -function createSafeFragment( document ) { - var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); - - if ( safeFrag.createElement ) { - while ( list.length ) { - safeFrag.createElement( - list.pop() - ); - } - } - return safeFrag; -} - - -( function() { - var div = document.createElement( "div" ), - fragment = document.createDocumentFragment(), - input = document.createElement( "input" ); - - // Setup - div.innerHTML = "
    a"; - - // IE strips leading whitespace when .innerHTML is used - support.leadingWhitespace = div.firstChild.nodeType === 3; - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - support.tbody = !div.getElementsByTagName( "tbody" ).length; - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - support.htmlSerialize = !!div.getElementsByTagName( "link" ).length; - - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - support.html5Clone = - document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav>"; - - // Check if a disconnected checkbox will retain its checked - // value of true after appended to the DOM (IE6/7) - input.type = "checkbox"; - input.checked = true; - fragment.appendChild( input ); - support.appendChecked = input.checked; - - // Make sure textarea (and checkbox) defaultValue is properly cloned - // Support: IE6-IE11+ - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; - - // #11217 - WebKit loses check when the name is after the checked attribute - fragment.appendChild( div ); - - // Support: Windows Web Apps (WWA) - // `name` and `type` must use .setAttribute for WWA (#14901) - input = document.createElement( "input" ); - input.setAttribute( "type", "radio" ); - input.setAttribute( "checked", "checked" ); - input.setAttribute( "name", "t" ); - - div.appendChild( input ); - - // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3 - // old WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Support: IE<9 - // Cloned elements keep attachEvent handlers, we use addEventListener on IE9+ - support.noCloneEvent = !!div.addEventListener; - - // Support: IE<9 - // Since attributes and properties are the same in IE, - // cleanData must set properties to undefined rather than use removeAttribute - div[ jQuery.expando ] = 1; - support.attributes = !div.getAttribute( jQuery.expando ); -} )(); - - -// We have to close these tags to support XHTML (#13200) -var wrapMap = { - option: [ 1, "" ], - legend: [ 1, "
    ", "
    " ], - area: [ 1, "", "" ], - - // Support: IE8 - param: [ 1, "", "" ], - thead: [ 1, "", "
    " ], - tr: [ 2, "", "
    " ], - col: [ 2, "", "
    " ], - td: [ 3, "", "
    " ], - - // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, - // unless wrapped in a div with non-breaking characters in front of it. - _default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
    ", "
    " ] -}; - -// Support: IE8-IE9 -wrapMap.optgroup = wrapMap.option; - -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - - -function getAll( context, tag ) { - var elems, elem, - i = 0, - found = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName( tag || "*" ) : - typeof context.querySelectorAll !== "undefined" ? - context.querySelectorAll( tag || "*" ) : - undefined; - - if ( !found ) { - for ( found = [], elems = context.childNodes || context; - ( elem = elems[ i ] ) != null; - i++ - ) { - if ( !tag || jQuery.nodeName( elem, tag ) ) { - found.push( elem ); - } else { - jQuery.merge( found, getAll( elem, tag ) ); - } - } - } - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], found ) : - found; -} - - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var elem, - i = 0; - for ( ; ( elem = elems[ i ] ) != null; i++ ) { - jQuery._data( - elem, - "globalEval", - !refElements || jQuery._data( refElements[ i ], "globalEval" ) - ); - } -} - - -var rhtml = /<|&#?\w+;/, - rtbody = / from table fragments - if ( !support.tbody ) { - - // String was a , *may* have spurious - elem = tag === "table" && !rtbody.test( elem ) ? - tmp.firstChild : - - // String was a bare or - wrap[ 1 ] === "
    " && !rtbody.test( elem ) ? - tmp : - 0; - - j = elem && elem.childNodes.length; - while ( j-- ) { - if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) && - !tbody.childNodes.length ) { - - elem.removeChild( tbody ); - } - } - } - - jQuery.merge( nodes, tmp.childNodes ); - - // Fix #12392 for WebKit and IE > 9 - tmp.textContent = ""; - - // Fix #12392 for oldIE - while ( tmp.firstChild ) { - tmp.removeChild( tmp.firstChild ); - } - - // Remember the top-level container for proper cleanup - tmp = safe.lastChild; - } - } - } - - // Fix #11356: Clear elements from fragment - if ( tmp ) { - safe.removeChild( tmp ); - } - - // Reset defaultChecked for any radios and checkboxes - // about to be appended to the DOM in IE 6/7 (#8060) - if ( !support.appendChecked ) { - jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked ); - } - - i = 0; - while ( ( elem = nodes[ i++ ] ) ) { - - // Skip elements already in the context collection (trac-4087) - if ( selection && jQuery.inArray( elem, selection ) > -1 ) { - if ( ignored ) { - ignored.push( elem ); - } - - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( safe.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( ( elem = tmp[ j++ ] ) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - tmp = null; - - return safe; -} - - -( function() { - var i, eventName, - div = document.createElement( "div" ); - - // Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events) - for ( i in { submit: true, change: true, focusin: true } ) { - eventName = "on" + i; - - if ( !( support[ i ] = eventName in window ) ) { - - // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) - div.setAttribute( eventName, "t" ); - support[ i ] = div.attributes[ eventName ].expando === false; - } - } - - // Null elements to avoid leaks in IE. - div = null; -} )(); - - -var rformElems = /^(?:input|select|textarea)$/i, - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -// Support: IE9 -// See #13393 for more info -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -function on( elem, types, selector, data, fn, one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - on( elem, type, selector, data, types[ type ], one ); - } - return elem; - } - - if ( data == null && fn == null ) { - - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return elem; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return elem.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - } ); -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - var tmp, events, t, handleObjIn, - special, eventHandle, handleObj, - handlers, type, namespaces, origType, - elemData = jQuery._data( elem ); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if ( !elemData ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !( events = elemData.events ) ) { - events = elemData.events = {}; - } - if ( !( eventHandle = elemData.handle ) ) { - eventHandle = elemData.handle = function( e ) { - - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && - ( !e || jQuery.event.triggered !== e.type ) ? - jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : - undefined; - }; - - // Add elem as a property of the handle fn to prevent a memory leak - // with IE non-native events - eventHandle.elem = elem; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[ t ] ) || []; - type = origType = tmp[ 1 ]; - namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend( { - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join( "." ) - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !( handlers = events[ type ] ) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || - special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - var j, handleObj, tmp, - origCount, t, events, - special, handlers, type, - namespaces, origType, - elemData = jQuery.hasData( elem ) && jQuery._data( elem ); - - if ( !elemData || !( events = elemData.events ) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[ t ] ) || []; - type = origType = tmp[ 1 ]; - namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[ 2 ] && - new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || - selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || - special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - delete elemData.handle; - - // removeData also checks for emptiness and clears the expando if empty - // so use it instead of delete - jQuery._removeData( elem, "events" ); - } - }, - - trigger: function( event, data, elem, onlyHandlers ) { - var handle, ontype, cur, - bubbleType, special, tmp, i, - eventPath = [ elem || document ], - type = hasOwn.call( event, "type" ) ? event.type : event, - namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : []; - - cur = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf( "." ) > -1 ) { - - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split( "." ); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf( ":" ) < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join( "." ); - event.rnamespace = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === ( elem.ownerDocument || document ) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) { - - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && - jQuery._data( cur, "handle" ); - - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && handle.apply && acceptData( cur ) ) { - event.result = handle.apply( cur, data ); - if ( event.result === false ) { - event.preventDefault(); - } - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( - ( !special._default || - special._default.apply( eventPath.pop(), data ) === false - ) && acceptData( elem ) - ) { - - // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction() check here because IE6/7 fails that test. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - try { - elem[ type ](); - } catch ( e ) { - - // IE<9 dies on focus/blur to hidden element (#1486,#12518) - // only reproducible on winXP IE8 native, not IE9 in IE8 mode - } - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event ); - - var i, j, ret, matched, handleObj, - handlerQueue = [], - args = slice.call( arguments ), - handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[ 0 ] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( ( handleObj = matched.handlers[ j++ ] ) && - !event.isImmediatePropagationStopped() ) { - - // Triggered event must either 1) have no namespace, or 2) have namespace(s) - // a subset or equal to those in the bound event (both can have no namespace). - if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || - handleObj.handler ).apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( ( event.result = ret ) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var i, matches, sel, handleObj, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Support (at least): Chrome, IE9 - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // - // Support: Firefox<=42+ - // Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343) - if ( delegateCount && cur.nodeType && - ( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) { - - /* jshint eqeqeq: false */ - for ( ; cur != this; cur = cur.parentNode || this ) { - /* jshint eqeqeq: true */ - - // Don't check non-elements (#13208) - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) { - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matches[ sel ] === undefined ) { - matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) > -1 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matches[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push( { elem: cur, handlers: matches } ); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( delegateCount < handlers.length ) { - handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } ); - } - - return handlerQueue; - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[ type ]; - - if ( !fixHook ) { - this.fixHooks[ type ] = fixHook = - rmouseEvent.test( type ) ? this.mouseHooks : - rkeyEvent.test( type ) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = new jQuery.Event( originalEvent ); - - i = copy.length; - while ( i-- ) { - prop = copy[ i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Support: IE<9 - // Fix target property (#1925) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Support: Safari 6-8+ - // Target should not be a text node (#504, #13143) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // Support: IE<9 - // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) - event.metaKey = !!event.metaKey; - - return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + - "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split( " " ), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: ( "button buttons clientX clientY fromElement offsetX offsetY " + - "pageX pageY screenX screenY toElement" ).split( " " ), - filter: function( event, original ) { - var body, eventDoc, doc, - button = original.button, - fromElement = original.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + - ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + - ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? - original.toElement : - fromElement; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - special: { - load: { - - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - - // Fire native event if possible so blur/focus sequence is correct - trigger: function() { - if ( this !== safeActiveElement() && this.focus ) { - try { - this.focus(); - return false; - } catch ( e ) { - - // Support: IE<9 - // If we error on focus to hidden element (#1486, #12518), - // let .trigger() run the handlers - } - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function() { - if ( this === safeActiveElement() && this.blur ) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - - // For checkbox, fire native event so checked state will be right - trigger: function() { - if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function( event ) { - return jQuery.nodeName( event.target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if ( event.result !== undefined && event.originalEvent ) { - event.originalEvent.returnValue = event.result; - } - } - } - }, - - // Piggyback on a donor event to simulate a different one - simulate: function( type, elem, event ) { - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true - - // Previously, `originalEvent: {}` was set here, so stopPropagation call - // would not be triggered on donor event, since in our own - // jQuery.event.stopPropagation function we had a check for existence of - // originalEvent.stopPropagation method, so, consequently it would be a noop. - // - // Guard for simulated events was moved to jQuery.event.stopPropagation function - // since `originalEvent` should point to the original event for the - // constancy with other events and for more focused logic - } - ); - - jQuery.event.trigger( e, null, elem ); - - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - - // This "if" is needed for plain objects - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle ); - } - } : - function( elem, type, handle ) { - var name = "on" + type; - - if ( elem.detachEvent ) { - - // #8545, #7054, preventing memory leaks for custom events in IE6-8 - // detachEvent needed property on element, by name of that event, - // to properly expose it to GC - if ( typeof elem[ name ] === "undefined" ) { - elem[ name ] = null; - } - - elem.detachEvent( name, handle ); - } - }; - -jQuery.Event = function( src, props ) { - - // Allow instantiation without the 'new' keyword - if ( !( this instanceof jQuery.Event ) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - - // Support: IE < 9, Android < 4.0 - src.returnValue === false ? - returnTrue : - returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - constructor: jQuery.Event, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - if ( !e ) { - return; - } - - // If preventDefault exists, run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - - // Support: IE - // Otherwise set the returnValue property of the original event to false - } else { - e.returnValue = false; - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - - if ( !e || this.isSimulated ) { - return; - } - - // If stopPropagation exists, run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - - // Support: IE - // Set the cancelBubble property of the original event to true - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if ( e && e.stopImmediatePropagation ) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -// so that event delegation works in jQuery. -// Do the same for pointerenter/pointerleave and pointerover/pointerout -// -// Support: Safari 7 only -// Safari sends mouseenter too often; see: -// https://code.google.com/p/chromium/issues/detail?id=470258 -// for the description of the bug (it existed in older Chrome versions as well). -jQuery.each( { - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mouseenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -} ); - -// IE submit delegation -if ( !support.submit ) { - - jQuery.event.special.submit = { - setup: function() { - - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Lazy-add a submit handler when a descendant form may potentially be submitted - jQuery.event.add( this, "click._submit keypress._submit", function( e ) { - - // Node name check avoids a VML-related crash in IE (#9807) - var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? - - // Support: IE <=8 - // We use jQuery.prop instead of elem.form - // to allow fixing the IE8 delegated submit issue (gh-2332) - // by 3rd party polyfills/workarounds. - jQuery.prop( elem, "form" ) : - undefined; - - if ( form && !jQuery._data( form, "submit" ) ) { - jQuery.event.add( form, "submit._submit", function( event ) { - event._submitBubble = true; - } ); - jQuery._data( form, "submit", true ); - } - } ); - - // return undefined since we don't need an event listener - }, - - postDispatch: function( event ) { - - // If form was submitted by the user, bubble the event up the tree - if ( event._submitBubble ) { - delete event._submitBubble; - if ( this.parentNode && !event.isTrigger ) { - jQuery.event.simulate( "submit", this.parentNode, event ); - } - } - }, - - teardown: function() { - - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Remove delegated handlers; cleanData eventually reaps submit handlers attached above - jQuery.event.remove( this, "._submit" ); - } - }; -} - -// IE change delegation and checkbox/radio fix -if ( !support.change ) { - - jQuery.event.special.change = { - - setup: function() { - - if ( rformElems.test( this.nodeName ) ) { - - // IE doesn't fire change on a check/radio until blur; trigger it on click - // after a propertychange. Eat the blur-change in special.change.handle. - // This still fires onchange a second time for check/radio after blur. - if ( this.type === "checkbox" || this.type === "radio" ) { - jQuery.event.add( this, "propertychange._change", function( event ) { - if ( event.originalEvent.propertyName === "checked" ) { - this._justChanged = true; - } - } ); - jQuery.event.add( this, "click._change", function( event ) { - if ( this._justChanged && !event.isTrigger ) { - this._justChanged = false; - } - - // Allow triggered, simulated change events (#11500) - jQuery.event.simulate( "change", this, event ); - } ); - } - return false; - } - - // Delegated event; lazy-add a change handler on descendant inputs - jQuery.event.add( this, "beforeactivate._change", function( e ) { - var elem = e.target; - - if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) { - jQuery.event.add( elem, "change._change", function( event ) { - if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { - jQuery.event.simulate( "change", this.parentNode, event ); - } - } ); - jQuery._data( elem, "change", true ); - } - } ); - }, - - handle: function( event ) { - var elem = event.target; - - // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || - ( elem.type !== "radio" && elem.type !== "checkbox" ) ) { - - return event.handleObj.handler.apply( this, arguments ); - } - }, - - teardown: function() { - jQuery.event.remove( this, "._change" ); - - return !rformElems.test( this.nodeName ); - } - }; -} - -// Support: Firefox -// Firefox doesn't have focus(in | out) events -// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787 -// -// Support: Chrome, Safari -// focus(in | out) events fire after focus & blur events, -// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order -// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857 -if ( !support.focusin ) { - jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - var doc = this.ownerDocument || this, - attaches = jQuery._data( doc, fix ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); - } - jQuery._data( doc, fix, ( attaches || 0 ) + 1 ); - }, - teardown: function() { - var doc = this.ownerDocument || this, - attaches = jQuery._data( doc, fix ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); - jQuery._removeData( doc, fix ); - } else { - jQuery._data( doc, fix, attaches ); - } - } - }; - } ); -} - -jQuery.fn.extend( { - - on: function( types, selector, data, fn ) { - return on( this, types, selector, data, fn ); - }, - one: function( types, selector, data, fn ) { - return on( this, types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? - handleObj.origType + "." + handleObj.namespace : - handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each( function() { - jQuery.event.remove( this, types, fn, selector ); - } ); - }, - - trigger: function( type, data ) { - return this.each( function() { - jQuery.event.trigger( type, data, this ); - } ); - }, - triggerHandler: function( type, data ) { - var elem = this[ 0 ]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } - } -} ); - - -var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, - rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ), - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi, - - // Support: IE 10-11, Edge 10240+ - // In IE/Edge using regex groups here causes severe slowdowns. - // See https://connect.microsoft.com/IE/feedback/details/1736512/ - rnoInnerhtml = /\s*$/g, - safeFragment = createSafeFragment( document ), - fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) ); - -// Support: IE<8 -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName( "tbody" )[ 0 ] || - elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) : - elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - var match = rscriptTypeMasked.exec( elem.type ); - if ( match ) { - elem.type = match[ 1 ]; - } else { - elem.removeAttribute( "type" ); - } - return elem; -} - -function cloneCopyEvent( src, dest ) { - if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) { - return; - } - - var type, i, l, - oldData = jQuery._data( src ), - curData = jQuery._data( dest, oldData ), - events = oldData.events; - - if ( events ) { - delete curData.handle; - curData.events = {}; - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - - // make the cloned public data object a copy from the original - if ( curData.data ) { - curData.data = jQuery.extend( {}, curData.data ); - } -} - -function fixCloneNodeIssues( src, dest ) { - var nodeName, e, data; - - // We do not need to do anything for non-Elements - if ( dest.nodeType !== 1 ) { - return; - } - - nodeName = dest.nodeName.toLowerCase(); - - // IE6-8 copies events bound via attachEvent when using cloneNode. - if ( !support.noCloneEvent && dest[ jQuery.expando ] ) { - data = jQuery._data( dest ); - - for ( e in data.events ) { - jQuery.removeEvent( dest, e, data.handle ); - } - - // Event data gets referenced instead of copied if the expando gets copied too - dest.removeAttribute( jQuery.expando ); - } - - // IE blanks contents when cloning scripts, and tries to evaluate newly-set text - if ( nodeName === "script" && dest.text !== src.text ) { - disableScript( dest ).text = src.text; - restoreScript( dest ); - - // IE6-10 improperly clones children of object elements using classid. - // IE10 throws NoModificationAllowedError if parent is null, #12132. - } else if ( nodeName === "object" ) { - if ( dest.parentNode ) { - dest.outerHTML = src.outerHTML; - } - - // This path appears unavoidable for IE9. When cloning an object - // element in IE9, the outerHTML strategy above is not sufficient. - // If the src has innerHTML and the destination does not, - // copy the src.innerHTML into the dest.innerHTML. #10324 - if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) { - dest.innerHTML = src.innerHTML; - } - - } else if ( nodeName === "input" && rcheckableType.test( src.type ) ) { - - // IE6-8 fails to persist the checked state of a cloned checkbox - // or radio button. Worse, IE6-7 fail to give the cloned element - // a checked appearance if the defaultChecked value isn't also set - - dest.defaultChecked = dest.checked = src.checked; - - // IE6-7 get confused and end up setting the value of a cloned - // checkbox/radio button to an empty string instead of "on" - if ( dest.value !== src.value ) { - dest.value = src.value; - } - - // IE6-8 fails to return the selected option to the default selected - // state when cloning options - } else if ( nodeName === "option" ) { - dest.defaultSelected = dest.selected = src.defaultSelected; - - // IE6-8 fails to set the defaultValue to the correct value when - // cloning other types of input fields - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -function domManip( collection, args, callback, ignored ) { - - // Flatten any nested arrays - args = concat.apply( [], args ); - - var first, node, hasScripts, - scripts, doc, fragment, - i = 0, - l = collection.length, - iNoClone = l - 1, - value = args[ 0 ], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return collection.each( function( index ) { - var self = collection.eq( index ); - if ( isFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); - } - domManip( self, args, callback, ignored ); - } ); - } - - if ( l ) { - fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - // Require either new content or an interest in ignored elements to invoke the callback - if ( first || ignored ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item - // instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( collection[ i ], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !jQuery._data( node, "globalEval" ) && - jQuery.contains( doc, node ) ) { - - if ( node.src ) { - - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl ) { - jQuery._evalUrl( node.src ); - } - } else { - jQuery.globalEval( - ( node.text || node.textContent || node.innerHTML || "" ) - .replace( rcleanScript, "" ) - ); - } - } - } - } - - // Fix #11809: Avoid leaking memory - fragment = first = null; - } - } - - return collection; -} - -function remove( elem, selector, keepData ) { - var node, - elems = selector ? jQuery.filter( selector, elem ) : elem, - i = 0; - - for ( ; ( node = elems[ i ] ) != null; i++ ) { - - if ( !keepData && node.nodeType === 1 ) { - jQuery.cleanData( getAll( node ) ); - } - - if ( node.parentNode ) { - if ( keepData && jQuery.contains( node.ownerDocument, node ) ) { - setGlobalEval( getAll( node, "script" ) ); - } - node.parentNode.removeChild( node ); - } - } - - return elem; -} - -jQuery.extend( { - htmlPrefilter: function( html ) { - return html.replace( rxhtmlTag, "<$1>" ); - }, - - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var destElements, node, clone, i, srcElements, - inPage = jQuery.contains( elem.ownerDocument, elem ); - - if ( support.html5Clone || jQuery.isXMLDoc( elem ) || - !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { - - clone = elem.cloneNode( true ); - - // IE<=8 does not properly clone detached, unknown element nodes - } else { - fragmentDiv.innerHTML = elem.outerHTML; - fragmentDiv.removeChild( clone = fragmentDiv.firstChild ); - } - - if ( ( !support.noCloneEvent || !support.noCloneChecked ) && - ( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - // Fix all IE cloning issues - for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) { - - // Ensure that the destination node is not null; Fixes #9587 - if ( destElements[ i ] ) { - fixCloneNodeIssues( node, destElements[ i ] ); - } - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) { - cloneCopyEvent( node, destElements[ i ] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - destElements = srcElements = node = null; - - // Return the cloned set - return clone; - }, - - cleanData: function( elems, /* internal */ forceAcceptData ) { - var elem, type, id, data, - i = 0, - internalKey = jQuery.expando, - cache = jQuery.cache, - attributes = support.attributes, - special = jQuery.event.special; - - for ( ; ( elem = elems[ i ] ) != null; i++ ) { - if ( forceAcceptData || acceptData( elem ) ) { - - id = elem[ internalKey ]; - data = id && cache[ id ]; - - if ( data ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - - // Remove cache only if it was not already removed by jQuery.event.remove - if ( cache[ id ] ) { - - delete cache[ id ]; - - // Support: IE<9 - // IE does not allow us to delete expando properties from nodes - // IE creates expando attributes along with the property - // IE does not have a removeAttribute function on Document nodes - if ( !attributes && typeof elem.removeAttribute !== "undefined" ) { - elem.removeAttribute( internalKey ); - - // Webkit & Blink performance suffers when deleting properties - // from DOM nodes, so set to undefined instead - // https://code.google.com/p/chromium/issues/detail?id=378607 - } else { - elem[ internalKey ] = undefined; - } - - deletedIds.push( id ); - } - } - } - } - } -} ); - -jQuery.fn.extend( { - - // Keep domManip exposed until 3.0 (gh-2225) - domManip: domManip, - - detach: function( selector ) { - return remove( this, selector, true ); - }, - - remove: function( selector ) { - return remove( this, selector ); - }, - - text: function( value ) { - return access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().append( - ( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value ) - ); - }, null, value, arguments.length ); - }, - - append: function() { - return domManip( this, arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - } ); - }, - - prepend: function() { - return domManip( this, arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - } ); - }, - - before: function() { - return domManip( this, arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - } ); - }, - - after: function() { - return domManip( this, arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - } ); - }, - - empty: function() { - var elem, - i = 0; - - for ( ; ( elem = this[ i ] ) != null; i++ ) { - - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - } - - // Remove any remaining nodes - while ( elem.firstChild ) { - elem.removeChild( elem.firstChild ); - } - - // If this is a select, ensure that it displays empty (#12336) - // Support: IE<9 - if ( elem.options && jQuery.nodeName( elem, "select" ) ) { - elem.options.length = 0; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map( function() { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - } ); - }, - - html: function( value ) { - return access( this, function( value ) { - var elem = this[ 0 ] || {}, - i = 0, - l = this.length; - - if ( value === undefined ) { - return elem.nodeType === 1 ? - elem.innerHTML.replace( rinlinejQuery, "" ) : - undefined; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - ( support.htmlSerialize || !rnoshimcache.test( value ) ) && - ( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && - !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { - - value = jQuery.htmlPrefilter( value ); - - try { - for ( ; i < l; i++ ) { - - // Remove element nodes and prevent memory leaks - elem = this[ i ] || {}; - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch ( e ) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var ignored = []; - - // Make the changes, replacing each non-ignored context element with the new content - return domManip( this, arguments, function( elem ) { - var parent = this.parentNode; - - if ( jQuery.inArray( this, ignored ) < 0 ) { - jQuery.cleanData( getAll( this ) ); - if ( parent ) { - parent.replaceChild( elem, this ); - } - } - - // Force callback invocation - }, ignored ); - } -} ); - -jQuery.each( { - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - i = 0, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone( true ); - jQuery( insert[ i ] )[ original ]( elems ); - - // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() - push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -} ); - - -var iframe, - elemdisplay = { - - // Support: Firefox - // We have to pre-define these values for FF (#10227) - HTML: "block", - BODY: "block" - }; - -/** - * Retrieve the actual display of a element - * @param {String} name nodeName of the element - * @param {Object} doc Document object - */ - -// Called only from within defaultDisplay -function actualDisplay( name, doc ) { - var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), - - display = jQuery.css( elem[ 0 ], "display" ); - - // We don't have any data stored on the element, - // so use "detach" method as fast way to get rid of the element - elem.detach(); - - return display; -} - -/** - * Try to determine the default display value of an element - * @param {String} nodeName - */ -function defaultDisplay( nodeName ) { - var doc = document, - display = elemdisplay[ nodeName ]; - - if ( !display ) { - display = actualDisplay( nodeName, doc ); - - // If the simple way fails, read from inside an iframe - if ( display === "none" || !display ) { - - // Use the already-created iframe if possible - iframe = ( iframe || jQuery( "