diff --git a/.gitignore b/.gitignore index bb7db37f..4b65b704 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ config.php release/* static/similar +static/stylespreview *.swp *.project *.php~ diff --git a/classes/ajax_start.php b/classes/ajax_start.php index 2b1afca8..a5ed2b80 100644 --- a/classes/ajax_start.php +++ b/classes/ajax_start.php @@ -23,7 +23,10 @@ if (!$Enabled = $Cache->get_value('enabled_'.$UserID)) { require(SERVER_ROOT.'/classes/mysql.class.php'); //Require the database wrapper $DB=NEW DB_MYSQL; //Load the database wrapper - $DB->query("SELECT Enabled FROM users_main WHERE ID='$UserID'"); + $DB->query(" + SELECT Enabled + FROM users_main + WHERE ID='$UserID'"); list($Enabled) = $DB->next_record(); $Cache->cache_value('enabled_'.$UserID, $Enabled, 0); } diff --git a/classes/alias.class.php b/classes/alias.class.php index 2e57a2f6..c1b90b31 100644 --- a/classes/alias.class.php +++ b/classes/alias.class.php @@ -7,7 +7,9 @@ function convert($str) { //Alternative approach with potential. function flush() { global $Cache, $DB; - $DB->query("SELECT Alias, ArticleID FROM wiki_aliases"); + $DB->query(" + SELECT Alias, ArticleID + FROM wiki_aliases"); $Aliases = $DB->to_array('Alias'); $Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks } @@ -16,7 +18,9 @@ function to_id($Alias) { global $Cache, $DB; $Aliases = $Cache->get_value('wiki_aliases'); if (!$Aliases) { - $DB->query("SELECT Alias, ArticleID FROM wiki_aliases"); + $DB->query(" + SELECT Alias, ArticleID + FROM wiki_aliases"); $Aliases = $DB->to_array('Alias'); $Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks } @@ -30,7 +34,10 @@ function flush() { function to_id($Alias) { global $DB; $Alias = $this->convert($Alias); - $DB->query("SELECT ArticleID FROM wiki_aliases WHERE Alias LIKE '$Alias'"); + $DB->query(" + SELECT ArticleID + FROM wiki_aliases + WHERE Alias LIKE '$Alias'"); list($ArticleID) = $DB->next_record(); return $ArticleID; } diff --git a/classes/artists.class.php b/classes/artists.class.php index 6c720425..6ed0eea4 100644 --- a/classes/artists.class.php +++ b/classes/artists.class.php @@ -37,7 +37,8 @@ public static function get_artists($GroupIDs) { if (empty($IDs)) { $IDs = "null"; } - $DB->query("SELECT ta.GroupID, + $DB->query(" + SELECT ta.GroupID, ta.ArtistID, aa.Name, ta.Importance, @@ -217,11 +218,18 @@ public static function display_artist($Artist, $MakeLink = true, $Escape = true) public static function delete_artist($ArtistID) { global $DB, $LoggedUser, $Cache; - $DB->query("SELECT Name FROM artists_group WHERE ArtistID = ".$ArtistID); + $DB->query(" + SELECT Name + FROM artists_group + WHERE ArtistID = ".$ArtistID); list($Name) = $DB->next_record(MYSQLI_NUM, false); // Delete requests - $DB->query("SELECT RequestID FROM requests_artists WHERE ArtistID=".$ArtistID." AND ArtistID != 0"); + $DB->query(" + SELECT RequestID + FROM requests_artists + WHERE ArtistID = $ArtistID + AND ArtistID != 0"); $Requests = $DB->to_array(); foreach ($Requests AS $Request) { list($RequestID) = $Request; @@ -251,7 +259,7 @@ public static function delete_artist($ArtistID) { } else { $Username = 'System'; } - Misc::write_log('Artist '.$ArtistID.' ('.$Name.') was deleted by '.$Username); + Misc::write_log("Artist $ArtistID ($Name) was deleted by $Username"); } diff --git a/classes/bookmarks.class.php b/classes/bookmarks.class.php index 18b23cc4..00790b27 100644 --- a/classes/bookmarks.class.php +++ b/classes/bookmarks.class.php @@ -85,7 +85,10 @@ public static function all_bookmarks($Type, $UserID = false) { $CacheKey = 'bookmarks_' . $Type . '_' . $UserID; if (($Bookmarks = $Cache->get_value($CacheKey)) === false) { list ($Table, $Col) = self::bookmark_schema($Type); - $DB->query("SELECT $Col FROM $Table WHERE UserID = '$UserID'"); + $DB->query(" + SELECT $Col + FROM $Table + WHERE UserID = '$UserID'"); $Bookmarks = $DB->collect($Col); $Cache->cache_value($CacheKey, $Bookmarks, 0); } diff --git a/classes/collages.class.php b/classes/collages.class.php index 4f5bf93e..cabcfc9d 100644 --- a/classes/collages.class.php +++ b/classes/collages.class.php @@ -4,7 +4,10 @@ public static function get_comment_count($CollageID) { global $DB, $Cache; $NumComments = $Cache->get_value('collage_comments_'.$CollageID); if ($NumComments === false) { - $DB->query("SELECT COUNT(ID) FROM collages_comments WHERE CollageID = '$CollageID'"); + $DB->query(" + SELECT COUNT(ID) + FROM collages_comments + WHERE CollageID = '$CollageID'"); list($NumComments) = $DB->next_record(); $Cache->cache_value('collage_comments_'.$CollageID, $NumComments, 0); } @@ -33,13 +36,19 @@ public static function get_comment_catalogue($CollageID, $CatalogueID) { public static function increase_subscriptions($CollageID) { global $DB; - $DB->query("UPDATE collages SET Subscribers = Subscribers + 1 WHERE ID = '$CollageID'"); + $DB->query(" + UPDATE collages + SET Subscribers = Subscribers + 1 + WHERE ID = '$CollageID'"); } public static function decrease_subscriptions($CollageID) { global $DB; - $DB->query("UPDATE collages SET Subscribers = IF(Subscribers < 1, 0, Subscribers - 1) WHERE ID = '$CollageID'"); + $DB->query(" + UPDATE collages + SET Subscribers = IF(Subscribers < 1, 0, Subscribers - 1) + WHERE ID = '$CollageID'"); } -} \ No newline at end of file +} diff --git a/classes/forums.class.php b/classes/forums.class.php index 3530a791..552580bd 100644 --- a/classes/forums.class.php +++ b/classes/forums.class.php @@ -41,12 +41,14 @@ public static function quote_notify($Body, $PostID, $Page, $PageID) { //remove any dupes in the array (the fast way) $Usernames = array_flip(array_flip($Usernames)); - $DB->query("SELECT m.ID, p.PushService - FROM users_main AS m - LEFT JOIN users_info AS i ON i.UserID = m.ID - LEFT JOIN users_push_notifications AS p ON p.UserID = m.ID - WHERE m.Username IN ('" . implode("', '", $Usernames) . "') - AND i.NotifyOnQuote = '1' AND i.UserID != $LoggedUser[ID]"); + $DB->query(" + SELECT m.ID, p.PushService + FROM users_main AS m + LEFT JOIN users_info AS i ON i.UserID = m.ID + LEFT JOIN users_push_notifications AS p ON p.UserID = m.ID + WHERE m.Username IN ('" . implode("', '", $Usernames) . "') + AND i.NotifyOnQuote = '1' + AND i.UserID != $LoggedUser[ID]"); $Results = $DB->to_array(); foreach ($Results as $Result) { @@ -57,8 +59,11 @@ public static function quote_notify($Body, $PostID, $Page, $PageID) { $PageID = db_string($PageID); $PostID = db_string($PostID); - $DB->query("INSERT IGNORE INTO users_notify_quoted (UserID, QuoterID, Page, PageID, PostID, Date) - VALUES ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')"); + $DB->query(" + INSERT IGNORE INTO users_notify_quoted + (UserID, QuoterID, Page, PageID, PostID, Date) + VALUES + ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')"); $Cache->delete_value('notify_quoted_' . $UserID); } diff --git a/classes/invite_tree.class.php b/classes/invite_tree.class.php index 62b9652c..0f365593 100644 --- a/classes/invite_tree.class.php +++ b/classes/invite_tree.class.php @@ -24,7 +24,10 @@ function make_tree() { ?>
query("SELECT TreePosition, TreeID, TreeLevel FROM invite_tree WHERE UserID=$UserID"); + $DB->query(" + SELECT TreePosition, TreeID, TreeLevel + FROM invite_tree + WHERE UserID = $UserID"); list($TreePosition, $TreeID, $TreeLevel) = $DB->next_record(MYSQLI_NUM, false); if (!$TreeID) { @@ -33,9 +36,9 @@ function make_tree() { $DB->query(" SELECT TreePosition FROM invite_tree - WHERE TreeID=$TreeID - AND TreeLevel=$TreeLevel - AND TreePosition>$TreePosition + WHERE TreeID = $TreeID + AND TreeLevel = $TreeLevel + AND TreePosition > $TreePosition ORDER BY TreePosition ASC LIMIT 1"); if ($DB->record_count()) { diff --git a/classes/lastfm.class.php b/classes/lastfm.class.php index d3096d07..af0c8537 100644 --- a/classes/lastfm.class.php +++ b/classes/lastfm.class.php @@ -25,7 +25,10 @@ public static function get_user_info($Username) { public static function compare_user_with($Username1, $Limit = 15) { global $Cache, $LoggedUser, $DB; - $DB->query("SELECT username FROM lastfm_users WHERE ID='$LoggedUser[ID]'"); + $DB->query(" + SELECT username + FROM lastfm_users + WHERE ID='$LoggedUser[ID]'"); if ($DB->record_count() > 0) { list($Username2) = $DB->next_record(); //Make sure the usernames are in the correct order to avoid dupe cache keys. @@ -104,7 +107,10 @@ public static function clear_cache($Username, $Uid) { $Cache->delete_value('lastfm_top_artists_' . $Username); $Cache->delete_value('lastfm_top_albums_' . $Username); $Cache->delete_value('lastfm_top_tracks_' . $Username); - $DB->query("SELECT username FROM lastfm_users WHERE ID='$LoggedUser[ID]'"); + $DB->query(" + SELECT username + FROM lastfm_users + WHERE ID='$LoggedUser[ID]'"); if ($DB->record_count() > 0) { list($Username2) = $DB->next_record(); //Make sure the usernames are in the correct order to avoid dupe cache keys. diff --git a/classes/misc.class.php b/classes/misc.class.php index 6ac3224b..8befd92e 100644 --- a/classes/misc.class.php +++ b/classes/misc.class.php @@ -108,7 +108,10 @@ public static function send_pm($ToID, $FromID, $Subject, $Body, $ConvID = '') { $Cache->cache_value('inbox_new_'.$ID, $UnRead); } - $DB->query("SELECT Username FROM users_main WHERE ID = '$FromID'"); + $DB->query(" + SELECT Username + FROM users_main + WHERE ID = '$FromID'"); list($SenderName) = $DB->next_record(); foreach ($ToID as $ID) { $DB->query(" @@ -141,7 +144,10 @@ public static function create_thread($ForumID, $AuthorID, $Title, $PostBody) { return -1; } - $DB->query("SELECT Username FROM users_main WHERE ID=".$AuthorID); + $DB->query(" + SELECT Username + FROM users_main + WHERE ID=".$AuthorID); if ($DB->record_count() < 1) { return -2; } diff --git a/classes/mysql.class.php b/classes/mysql.class.php index 874a036a..9b0eb306 100644 --- a/classes/mysql.class.php +++ b/classes/mysql.class.php @@ -20,7 +20,10 @@ * Making a query -$DB->query("SELECT * FROM table..."); +$DB->query(" + SELECT * + FROM table..."); + Is functionally equivalent to using mysqli_query("SELECT * FROM table...") Stores the result set in $this->QueryID Returns the result set, so you can save it for later (see set_query_id()) @@ -48,13 +51,13 @@ * The conventional way of retrieving a row from a result set is as follows: -list($All,$Columns,$That,$You,$Select) = $DB->next_record(); +list($All, $Columns, $That, $You, $Select) = $DB->next_record(); ----- * This is how you loop over the result set: -while (list($All,$Columns,$That,$You,$Select) = $DB->next_record()) { - echo "Do stuff with ".$All." of the ".$Columns.$That.$You.$Select; +while (list($All, $Columns, $That, $You, $Select) = $DB->next_record()) { + echo "Do stuff with $All of the ".$Columns.$That.$You.$Select; } ----- @@ -96,8 +99,12 @@ Example: - $FoodRS = $DB->query("SELECT * FROM food"); - $DB->query("SELECT * FROM drink"); + $FoodRS = $DB->query(" + SELECT * + FROM food"); + $DB->query(" + SELECT * + FROM drink"); $Drinks = $DB->next_record(); $DB->set_query_id($FoodRS); $Food = $DB->next_record(); diff --git a/classes/permissions.class.php b/classes/permissions.class.php index 6cda611c..f8024779 100644 --- a/classes/permissions.class.php +++ b/classes/permissions.class.php @@ -25,7 +25,10 @@ public static function get_permissions($PermissionID) { global $DB, $Cache; $Permission = $Cache->get_value('perm_'.$PermissionID); if (empty($Permission)) { - $DB->query("SELECT p.Level AS Class, p.Values as Permissions, p.Secondary, p.PermittedForums FROM permissions AS p WHERE ID='$PermissionID'"); + $DB->query(" + SELECT p.Level AS Class, p.Values as Permissions, p.Secondary, p.PermittedForums + FROM permissions AS p + WHERE ID='$PermissionID'"); $Permission = $DB->next_record(MYSQLI_ASSOC, array('Permissions')); $Permission['Permissions'] = unserialize($Permission['Permissions']); $Cache->cache_value('perm_'.$PermissionID, $Permission, 2592000); @@ -49,8 +52,10 @@ public static function get_permissions_for_user($UserID, $CustomPermissions = fa // Fetch custom permissions if they weren't passed in. if ($CustomPermissions === false) { - $DB->query('SELECT um.CustomPermissions FROM users_main AS um - WHERE um.ID = '.((int)$UserID)); + $DB->query(' + SELECT um.CustomPermissions + FROM users_main AS um + WHERE um.ID = '.((int)$UserID)); list($CustomPermissions) = $DB->next_record(MYSQLI_NUM, false); } diff --git a/classes/requests.class.php b/classes/requests.class.php index e9d86ab9..9d825eee 100644 --- a/classes/requests.class.php +++ b/classes/requests.class.php @@ -8,30 +8,34 @@ class Requests { public static function update_sphinx_requests($RequestID) { global $DB, $Cache; - $DB->query("REPLACE INTO sphinx_requests_delta ( - ID, UserID, TimeAdded, LastVote, CategoryID, Title, - Year, ReleaseType, CatalogueNumber, BitrateList, - FormatList, MediaList, LogCue, FillerID, TorrentID, - TimeFilled, Visible, Votes, Bounty) - SELECT - ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded, - UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID, - Title, Year, ReleaseType, CatalogueNumber, BitrateList, - FormatList, MediaList, LogCue, FillerID, TorrentID, - UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible, - COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty - FROM requests AS r LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID - wHERE ID = ".$RequestID." - GROUP BY r.ID"); + $DB->query(" + REPLACE INTO sphinx_requests_delta ( + ID, UserID, TimeAdded, LastVote, CategoryID, Title, + Year, ReleaseType, CatalogueNumber, BitrateList, + FormatList, MediaList, LogCue, FillerID, TorrentID, + TimeFilled, Visible, Votes, Bounty) + SELECT + ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded, + UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID, + Title, Year, ReleaseType, CatalogueNumber, BitrateList, + FormatList, MediaList, LogCue, FillerID, TorrentID, + UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible, + COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty + FROM requests AS r + LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID + WHERE ID = $RequestID + GROUP BY r.ID"); - $DB->query("UPDATE sphinx_requests_delta - SET ArtistList = (SELECT - GROUP_CONCAT(aa.Name SEPARATOR ' ') - FROM requests_artists AS ra - JOIN artists_alias AS aa ON aa.AliasID=ra.AliasID - WHERE ra.RequestID = ".$RequestID." - GROUP BY NULL) - WHERE ID = ".$RequestID); + $DB->query(" + UPDATE sphinx_requests_delta + SET ArtistList = ( + SELECT GROUP_CONCAT(aa.Name SEPARATOR ' ') + FROM requests_artists AS ra + JOIN artists_alias AS aa ON aa.AliasID=ra.AliasID + WHERE ra.RequestID = $RequestID + GROUP BY NULL + ) + WHERE ID = $RequestID"); $Cache->delete_value('requests_'.$RequestID); } @@ -72,35 +76,36 @@ public static function get_requests($RequestIDs, $Return = true) { */ if (count($NotFound) > 0) { - $DB->query("SELECT - r.ID AS ID, - r.UserID, - u.Username, - r.TimeAdded, - r.LastVote, - r.CategoryID, - r.Title, - r.Year, - r.Image, - r.Description, - r.CatalogueNumber, - r.RecordLabel, - r.ReleaseType, - r.BitrateList, - r.FormatList, - r.MediaList, - r.LogCue, - r.FillerID, - filler.Username, - r.TorrentID, - r.TimeFilled, - r.GroupID, - r.OCLC - FROM requests AS r - LEFT JOIN users_main AS u ON u.ID=r.UserID - LEFT JOIN users_main AS filler ON filler.ID=FillerID AND FillerID!=0 - WHERE r.ID IN (".$IDs.") - ORDER BY ID"); + $DB->query(" + SELECT + r.ID AS ID, + r.UserID, + u.Username, + r.TimeAdded, + r.LastVote, + r.CategoryID, + r.Title, + r.Year, + r.Image, + r.Description, + r.CatalogueNumber, + r.RecordLabel, + r.ReleaseType, + r.BitrateList, + r.FormatList, + r.MediaList, + r.LogCue, + r.FillerID, + filler.Username, + r.TorrentID, + r.TimeFilled, + r.GroupID, + r.OCLC + FROM requests AS r + LEFT JOIN users_main AS u ON u.ID=r.UserID + LEFT JOIN users_main AS filler ON filler.ID=FillerID AND FillerID!=0 + WHERE r.ID IN ($IDs) + ORDER BY ID"); $Requests = $DB->to_array(); foreach ($Requests as $Request) { @@ -121,7 +126,10 @@ public static function get_comment_count($RequestID) { global $Cache, $DB; $NumComments = $Cache->get_value('request_comments_'.$RequestID); if ($NumComments === false) { - $DB->query("SELECT COUNT(ID) FROM requests_comments WHERE RequestID = '$RequestID'"); + $DB->query(" + SELECT COUNT(ID) + FROM requests_comments + WHERE RequestID = '$RequestID'"); list($NumComments) = $DB->next_record(); $Cache->cache_value('request_comments_'.$RequestID, $NumComments, 0); } diff --git a/classes/script_start.php b/classes/script_start.php index c5496bc5..e80e6535 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -216,12 +216,14 @@ // Enabled - if the user's enabled or not // Permissions -if (isset($_COOKIE['session'])) { $LoginCookie=$Enc->decrypt($_COOKIE['session']); } +if (isset($_COOKIE['session'])) { + $LoginCookie = $Enc->decrypt($_COOKIE['session']); +} if (isset($LoginCookie)) { - list($SessionID, $LoggedUser['ID'])=explode("|~|",$Enc->decrypt($LoginCookie)); + list($SessionID, $LoggedUser['ID']) = explode("|~|", $Enc->decrypt($LoginCookie)); $LoggedUser['ID'] = (int)$LoggedUser['ID']; - $UserID=$LoggedUser['ID']; //TODO: UserID should not be LoggedUser + $UserID = $LoggedUser['ID']; //TODO: UserID should not be LoggedUser if (!$LoggedUser['ID'] || !$SessionID) { logout(); @@ -244,14 +246,17 @@ $Cache->cache_value('users_sessions_'.$UserID, $UserSessions, 0); } - if (!array_key_exists($SessionID,$UserSessions)) { + if (!array_key_exists($SessionID, $UserSessions)) { logout(); } // Check if user is enabled $Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']); if ($Enabled === false) { - $DB->query("SELECT Enabled FROM users_main WHERE ID='$LoggedUser[ID]'"); + $DB->query(" + SELECT Enabled + FROM users_main + WHERE ID='$LoggedUser[ID]'"); list($Enabled) = $DB->next_record(); $Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0); } @@ -336,7 +341,10 @@ if (isset($LoggedUser['Permissions']['site_torrents_notify'])) { $LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']); if (!is_array($LoggedUser['Notify'])) { - $DB->query("SELECT ID, Label FROM users_notify_filters WHERE UserID='$LoggedUser[ID]'"); + $DB->query(" + SELECT ID, Label + FROM users_notify_filters + WHERE UserID='$LoggedUser[ID]'"); $LoggedUser['Notify'] = $DB->to_array('ID'); $Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000); } @@ -371,7 +379,10 @@ ('$LoggedUser[ID]', '$NewIP', '".sqltime()."')"); $ipcc = Tools::geoip($NewIP); - $DB->query("UPDATE users_main SET IP='$NewIP', ipcc='".$ipcc."' WHERE ID='$LoggedUser[ID]'"); + $DB->query(" + UPDATE users_main + SET IP='$NewIP', ipcc='$ipcc' + WHERE ID='$LoggedUser[ID]'"); $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']); $Cache->update_row(false, array('IP' => $_SERVER['REMOTE_ADDR'])); $Cache->commit_transaction(0); @@ -383,7 +394,12 @@ // Get stylesheets $Stylesheets = $Cache->get_value('stylesheets'); if (!is_array($Stylesheets)) { - $DB->query('SELECT ID, LOWER(REPLACE(Name," ","_")) AS Name, Name AS ProperName FROM stylesheets'); + $DB->query(' + SELECT + ID, + LOWER(REPLACE(Name," ","_")) AS Name, + Name AS ProperName + FROM stylesheets'); $Stylesheets = $DB->to_array('ID', MYSQLI_BOTH); $Cache->cache_value('stylesheets', $Stylesheets, 600); } @@ -396,12 +412,10 @@ } } - $Debug->set_flag('end user handling'); $Debug->set_flag('start function definitions'); - /** * Log out the current session */ @@ -413,7 +427,10 @@ function logout() { if ($SessionID) { - $DB->query("DELETE FROM users_sessions WHERE UserID='$LoggedUser[ID]' AND SessionID='".db_string($SessionID)."'"); + $DB->query(" + DELETE FROM users_sessions + WHERE UserID='$LoggedUser[ID]' + AND SessionID='".db_string($SessionID)."'"); $Cache->begin_transaction('users_sessions_'.$LoggedUser['ID']); $Cache->delete_row($SessionID); @@ -453,8 +470,6 @@ function authorize($Ajax = false) { return true; } - - $Debug->set_flag('ending function definitions'); //Include /sections/*/index.php $Document = basename(parse_url($_SERVER['SCRIPT_FILENAME'], PHP_URL_PATH), '.php'); diff --git a/classes/tools.class.php b/classes/tools.class.php index c667a703..e9d3edfa 100644 --- a/classes/tools.class.php +++ b/classes/tools.class.php @@ -177,19 +177,28 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) { $Cache->delete_value('user_info_heavy_'.$UserID); $Cache->delete_value('user_stats_'.$UserID); - $DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID' AND Active = 1"); + $DB->query(" + SELECT SessionID + FROM users_sessions + WHERE UserID='$UserID' + AND Active = 1"); while (list($SessionID) = $DB->next_record()) { $Cache->delete_value('session_'.$UserID.'_'.$SessionID); } $Cache->delete_value('users_sessions_'.$UserID); - $DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'"); + $DB->query(" + DELETE FROM users_sessions + WHERE UserID='$UserID'"); } // Remove the users from the tracker. - $DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(', ',$UserIDs).')'); + $DB->query(" + SELECT torrent_pass + FROM users_main + WHERE ID in (".implode(', ',$UserIDs).')'); $PassKeys = $DB->collect('torrent_pass'); $Concat = ''; foreach ($PassKeys as $PassKey) { diff --git a/classes/torrents.class.php b/classes/torrents.class.php index 09ec45d5..8f4f5523 100644 --- a/classes/torrents.class.php +++ b/classes/torrents.class.php @@ -77,9 +77,11 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true, */ if (count($NotFound) > 0) { - $DB->query("SELECT - g.ID, g.Name, g.Year, g.RecordLabel, g.CatalogueNumber, g.TagList, g.ReleaseType, g.VanityHouse, g.WikiImage, g.CategoryID - FROM torrents_group AS g WHERE g.ID IN ($IDs)"); + $DB->query(" + SELECT + g.ID, g.Name, g.Year, g.RecordLabel, g.CatalogueNumber, g.TagList, g.ReleaseType, g.VanityHouse, g.WikiImage, g.CategoryID + FROM torrents_group AS g + WHERE g.ID IN ($IDs)"); while ($Group = $DB->next_record(MYSQLI_ASSOC, true)) { unset($NotFound[$Group['ID']]); @@ -96,13 +98,14 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true, } if ($Torrents) { - $DB->query("SELECT - ID, GroupID, Media, Format, Encoding, RemasterYear, Remastered, RemasterTitle, - RemasterRecordLabel, RemasterCatalogueNumber, Scene, HasLog, HasCue, LogScore, - FileCount, FreeTorrent, Size, Leechers, Seeders, Snatched, Time, ID AS HasFile - FROM torrents AS t - WHERE GroupID IN($IDs) - ORDER BY GroupID, Remastered, (RemasterYear != 0) DESC, RemasterYear, RemasterTitle, + $DB->query(" + SELECT + ID, GroupID, Media, Format, Encoding, RemasterYear, Remastered, RemasterTitle, + RemasterRecordLabel, RemasterCatalogueNumber, Scene, HasLog, HasCue, LogScore, + FileCount, FreeTorrent, Size, Leechers, Seeders, Snatched, Time, ID AS HasFile + FROM torrents AS t + WHERE GroupID IN($IDs) + ORDER BY GroupID, Remastered, (RemasterYear != 0) DESC, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, Media, Format, Encoding, ID"); while ($Torrent = $DB->next_record(MYSQLI_ASSOC, true)) { $Found[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent; @@ -211,8 +214,11 @@ public static function torrent_properties(&$Torrent, &$Flags) { */ public static function write_group_log($GroupID, $TorrentID, $UserID, $Message, $Hidden) { global $DB,$Time; - $DB->query("INSERT INTO group_log (GroupID, TorrentID, UserID, Info, Time, Hidden) VALUES (" - .$GroupID.", ".$TorrentID.", ".$UserID.", '".db_string($Message)."', '".sqltime()."', ".$Hidden.")"); + $DB->query(" + INSERT INTO group_log + (GroupID, TorrentID, UserID, Info, Time, Hidden) + VALUES + ($GroupID, $TorrentID, $UserID, '".db_string($Message)."', '".sqltime()."', $Hidden)"); } @@ -223,14 +229,20 @@ public static function write_group_log($GroupID, $TorrentID, $UserID, $Message, * @param int $GroupID Set it if you have it handy, to save a query. Otherwise, it will be found. * @param string $OcelotReason The deletion reason for ocelot to report to users. */ - public static function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) { + public static function delete_torrent($ID, $GroupID = 0, $OcelotReason = -1) { global $DB, $Cache, $LoggedUser; if (!$GroupID) { - $DB->query("SELECT GroupID, UserID FROM torrents WHERE ID='$ID'"); + $DB->query(" + SELECT GroupID, UserID + FROM torrents + WHERE ID='$ID'"); list($GroupID, $UploaderID) = $DB->next_record(); } if (empty($UserID)) { - $DB->query("SELECT UserID FROM torrents WHERE ID='$ID'"); + $DB->query(" + SELECT UserID + FROM torrents + WHERE ID='$ID'"); list($UserID) = $DB->next_record(); } @@ -244,14 +256,22 @@ public static function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) { } - $DB->query("SELECT info_hash FROM torrents WHERE ID = ".$ID); + $DB->query(" + SELECT info_hash + FROM torrents + WHERE ID = ".$ID); list($InfoHash) = $DB->next_record(MYSQLI_BOTH, false); - $DB->query("DELETE FROM torrents WHERE ID = ".$ID); + $DB->query(" + DELETE FROM torrents + WHERE ID = ".$ID); Tracker::update_tracker('delete_torrent', array('info_hash' => rawurlencode($InfoHash), 'id' => $ID, 'reason' => $OcelotReason)); $Cache->decrement('stats_torrent_count'); - $DB->query("SELECT COUNT(ID) FROM torrents WHERE GroupID='$GroupID'"); + $DB->query(" + SELECT COUNT(ID) + FROM torrents + WHERE GroupID='$GroupID'"); list($Count) = $DB->next_record(); if ($Count == 0) { @@ -261,34 +281,56 @@ public static function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) { } // Torrent notifications - $DB->query("SELECT UserID FROM users_notify_torrents WHERE TorrentID='$ID'"); + $DB->query(" + SELECT UserID + FROM users_notify_torrents + WHERE TorrentID='$ID'"); while (list($UserID) = $DB->next_record()) { $Cache->delete_value('notifications_new_'.$UserID); } - $DB->query("DELETE FROM users_notify_torrents WHERE TorrentID='$ID'"); + $DB->query(" + DELETE FROM users_notify_torrents + WHERE TorrentID='$ID'"); - - $DB->query("UPDATE reportsv2 SET + $DB->query(" + UPDATE reportsv2 + SET Status='Resolved', LastChangeTime='".sqltime()."', ModComment='Report already dealt with (Torrent deleted)' - WHERE TorrentID=".$ID." + WHERE TorrentID = $ID AND Status != 'Resolved'"); $Reports = $DB->affected_rows(); if ($Reports) { $Cache->decrement('num_torrent_reportsv2', $Reports); } - $DB->query("DELETE FROM torrents_files WHERE TorrentID='$ID'"); - $DB->query("DELETE FROM torrents_bad_tags WHERE TorrentID = ".$ID); - $DB->query("DELETE FROM torrents_bad_folders WHERE TorrentID = ".$ID); - $DB->query("DELETE FROM torrents_bad_files WHERE TorrentID = ".$ID); - $DB->query("DELETE FROM torrents_cassette_approved WHERE TorrentID = ".$ID); - $DB->query("DELETE FROM torrents_lossymaster_approved WHERE TorrentID = ".$ID); - $DB->query("DELETE FROM torrents_lossyweb_approved WHERE TorrentID = ".$ID); + $DB->query(" + DELETE FROM torrents_files + WHERE TorrentID = '$ID'"); + $DB->query(" + DELETE FROM torrents_bad_tags + WHERE TorrentID = ".$ID); + $DB->query(" + DELETE FROM torrents_bad_folders + WHERE TorrentID = ".$ID); + $DB->query(" + DELETE FROM torrents_bad_files + WHERE TorrentID = ".$ID); + $DB->query(" + DELETE FROM torrents_cassette_approved + WHERE TorrentID = ".$ID); + $DB->query(" + DELETE FROM torrents_lossymaster_approved + WHERE TorrentID = ".$ID); + $DB->query(" + DELETE FROM torrents_lossyweb_approved + WHERE TorrentID = ".$ID); // Tells Sphinx that the group is removed - $DB->query("REPLACE INTO sphinx_delta (ID,Time) VALUES ($ID, UNIX_TIMESTAMP())"); + $DB->query(" + REPLACE INTO sphinx_delta (ID, Time) + VALUES ($ID, UNIX_TIMESTAMP())"); $Cache->delete_value('torrent_download_'.$ID); $Cache->delete_value('torrent_group_'.$GroupID); @@ -305,9 +347,12 @@ public static function delete_torrent($ID, $GroupID=0, $OcelotReason=-1) { public static function delete_group($GroupID) { global $DB, $Cache; - Misc::write_log("Group ".$GroupID." automatically deleted (No torrents have this group)."); + Misc::write_log("Group $GroupID automatically deleted (No torrents have this group)."); - $DB->query("SELECT CategoryID FROM torrents_group WHERE ID='$GroupID'"); + $DB->query(" + SELECT CategoryID + FROM torrents_group + WHERE ID='$GroupID'"); list($Category) = $DB->next_record(); if ($Category == 1) { $Cache->decrement('stats_album_count'); @@ -317,11 +362,19 @@ public static function delete_group($GroupID) { // Collages - $DB->query("SELECT CollageID FROM collages_torrents WHERE GroupID='$GroupID'"); + $DB->query(" + SELECT CollageID + FROM collages_torrents + WHERE GroupID='$GroupID'"); if ($DB->record_count() > 0) { $CollageIDs = $DB->collect('CollageID'); - $DB->query("UPDATE collages SET NumTorrents=NumTorrents-1 WHERE ID IN (".implode(', ',$CollageIDs).")"); - $DB->query("DELETE FROM collages_torrents WHERE GroupID='$GroupID'"); + $DB->query(" + UPDATE collages + SET NumTorrents=NumTorrents-1 + WHERE ID IN (".implode(', ',$CollageIDs).')'); + $DB->query(" + DELETE FROM collages_torrents + WHERE GroupID='$GroupID'"); foreach ($CollageIDs as $CollageID) { $Cache->delete_value('collage_'.$CollageID); @@ -331,10 +384,15 @@ public static function delete_group($GroupID) { // Artists // Collect the artist IDs and then wipe the torrents_artist entry - $DB->query("SELECT ArtistID FROM torrents_artists WHERE GroupID = ".$GroupID); + $DB->query(" + SELECT ArtistID + FROM torrents_artists + WHERE GroupID = ".$GroupID); $Artists = $DB->collect('ArtistID'); - $DB->query("DELETE FROM torrents_artists WHERE GroupID='$GroupID'"); + $DB->query(" + DELETE FROM torrents_artists + WHERE GroupID='$GroupID'"); foreach ($Artists as $ArtistID) { if (empty($ArtistID)) { @@ -365,9 +423,15 @@ public static function delete_group($GroupID) { } // Requests - $DB->query("SELECT ID FROM requests WHERE GroupID='$GroupID'"); + $DB->query(" + SELECT ID + FROM requests + WHERE GroupID='$GroupID'"); $Requests = $DB->collect('ID'); - $DB->query("UPDATE requests SET GroupID = NULL WHERE GroupID = '$GroupID'"); + $DB->query(" + UPDATE requests + SET GroupID = NULL + WHERE GroupID = '$GroupID'"); foreach ($Requests as $RequestID) { $Cache->delete_value('request_'.$RequestID); } @@ -404,7 +468,10 @@ public static function update_hash($GroupID) { WHERE ID='$GroupID'"); // Fetch album vote score - $DB->query("SELECT Score FROM torrents_votes WHERE GroupID=$GroupID"); + $DB->query(" + SELECT Score + FROM torrents_votes + WHERE GroupID=$GroupID"); if ($DB->record_count()) { list($VoteScore) = $DB->next_record(); } else { @@ -559,7 +626,11 @@ public static function filelist_get_file($File) { if ($Spaces = strspn($Name, ' ')) { $Name = str_replace(' ', ' ', substr($Name, 0, $Spaces)) . substr($Name, $Spaces); } - return array('ext' => $FileExt, 'size' => substr($Size, 1, -1), 'name' => substr($Name, 0, -$DelimLen)); + return array( + 'ext' => $FileExt, + 'size' => substr($Size, 1, -1), + 'name' => substr($Name, 0, -$DelimLen) + ); } /** @@ -744,7 +815,10 @@ public static function has_snatched($TorrentID, $AllUsers = false) { $SnatchedTorrents[$i] = array(); } // Not found in cache. Since we don't have a suitable index, it's faster to update everything - $DB->query("SELECT fid, tstamp AS TorrentID FROM xbt_snatched WHERE uid='$UserID'"); + $DB->query(" + SELECT fid, tstamp AS TorrentID + FROM xbt_snatched + WHERE uid = '$UserID'"); while (list($ID) = $DB->next_record(MYSQLI_NUM, false)) { $SnatchedTorrents[$ID & $LastBucket][(int)$ID] = true; } @@ -754,7 +828,11 @@ public static function has_snatched($TorrentID, $AllUsers = false) { return true; } else { // Old cache, check if torrent has been snatched recently - $DB->query("SELECT fid FROM xbt_snatched WHERE uid='$UserID' AND tstamp>=$LastUpdate"); + $DB->query(" + SELECT fid + FROM xbt_snatched + WHERE uid = '$UserID' + AND tstamp >= $LastUpdate"); while (list($ID) = $DB->next_record(MYSQLI_NUM, false)) { $CurBucketID = $ID & $LastBucket; if ($SnatchedTorrents[$CurBucketID] === false) { diff --git a/classes/user_rank.class.php b/classes/user_rank.class.php index 3040e5ee..ae6c1a2e 100644 --- a/classes/user_rank.class.php +++ b/classes/user_rank.class.php @@ -7,9 +7,10 @@ class USER_RANK { // Returns a 101 row array (101 percentiles - 0 - 100), with the minimum value for that percentile as the value for each row // BTW - ingenious function build_table($MemKey, $Query) { - global $Cache,$DB; + global $Cache, $DB; - $DB->query("DROP TEMPORARY TABLE IF EXISTS temp_stats"); + $DB->query(" + DROP TEMPORARY TABLE IF EXISTS temp_stats"); $DB->query(" CREATE TEMPORARY TABLE temp_stats ( @@ -17,9 +18,13 @@ function build_table($MemKey, $Query) { Val bigint(20) NOT NULL );"); - $DB->query("INSERT INTO temp_stats (Val) ".$Query); + $DB->query(" + INSERT INTO temp_stats (Val) ". + $Query); - $DB->query("SELECT COUNT(ID) FROM temp_stats"); + $DB->query(" + SELECT COUNT(ID) + FROM temp_stats"); list($UserCount) = $DB->next_record(); $DB->query(" diff --git a/classes/users.class.php b/classes/users.class.php index 0936455e..8eace908 100644 --- a/classes/users.class.php +++ b/classes/users.class.php @@ -178,7 +178,10 @@ public static function user_heavy_info($UserID) { } unset($HeavyInfo['PermittedForums']); - $DB->query("SELECT PermissionID FROM users_levels WHERE UserID = $UserID"); + $DB->query(" + SELECT PermissionID + FROM users_levels + WHERE UserID = $UserID"); $PermIDs = $DB->collect('PermissionID'); foreach ($PermIDs AS $PermID) { $Perms = Permissions::get_permissions($PermID); diff --git a/classes/votes.class.php b/classes/votes.class.php index 3ac84605..17d8ba61 100644 --- a/classes/votes.class.php +++ b/classes/votes.class.php @@ -36,7 +36,10 @@ public static function get_user_votes($UserID) { $UserVotes = $Cache->get_value('voted_albums_'.$UserID); if ($UserVotes === false) { - $DB->query('SELECT GroupID, Type FROM users_votes WHERE UserID='.$UserID); + $DB->query(' + SELECT GroupID, Type + FROM users_votes + WHERE UserID='.$UserID); $UserVotes = $DB->to_array('GroupID', MYSQL_ASSOC, false); $Cache->cache_value('voted_albums_'.$UserID, $UserVotes); } @@ -55,7 +58,10 @@ public static function get_group_votes($GroupID) { $GroupVotes = $Cache->get_value('votes_'.$GroupID); if ($GroupVotes === false) { - $DB->query("SELECT Ups AS Ups, Total AS Total FROM torrents_votes WHERE GroupID=$GroupID"); + $DB->query(" + SELECT Ups AS Ups, Total AS Total + FROM torrents_votes + WHERE GroupID = $GroupID"); if ($DB->record_count() == 0) { $GroupVotes = array('Ups'=>0, 'Total'=>0); } else { @@ -166,8 +172,10 @@ public static function binomial_score($Ups, $Total) { if (($Total <= 0) || ($Ups < 0)) { return 0; } - $phat = $Ups/$Total; - return ($phat + Z_VAL*Z_VAL/(2*$Total) - Z_VAL*sqrt(($phat*(1-$phat)+Z_VAL*Z_VAL/(4*$Total))/$Total))/(1+Z_VAL*Z_VAL/$Total); + $phat = $Ups / $Total; + $Numerator = ($phat + Z_VAL * Z_VAL / (2 * $Total) - Z_VAL * sqrt(($phat * (1 - $phat) + Z_VAL * Z_VAL / (4 * $Total)) / $Total)); + $Denominator = (1 + Z_VAL * Z_VAL / $Total); + return ($Numerator / $Denominator); } /** @@ -207,14 +215,18 @@ public static function get_rank_all($GroupID) { if ($Rankings === false) { $Rankings = array(); $i = 0; - $DB->query("SELECT GroupID FROM torrents_votes ORDER BY Score DESC LIMIT 100"); + $DB->query(" + SELECT GroupID + FROM torrents_votes + ORDER BY Score DESC + LIMIT 100"); while (list($GID) = $DB->next_record()) { $Rankings[$GID] = ++$i; } $Cache->cache_value('voting_ranks_overall', $Rankings, 259200); // 3 days } - return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false; + return (isset($Rankings[$GroupID]) ? $Rankings[$GroupID] : false); } /** @@ -238,18 +250,20 @@ public static function get_rank_year($GroupID, $Year) { if ($Rankings === false) { $Rankings = array(); $i = 0; - $DB->query("SELECT GroupID - FROM torrents_votes AS v - JOIN torrents_group AS g ON g.ID = v.GroupID - WHERE g.Year = $Year - ORDER BY Score DESC LIMIT 100"); + $DB->query(" + SELECT GroupID + FROM torrents_votes AS v + JOIN torrents_group AS g ON g.ID = v.GroupID + WHERE g.Year = $Year + ORDER BY Score DESC + LIMIT 100"); while (list($GID) = $DB->next_record()) { $Rankings[$GID] = ++$i; } $Cache->cache_value('voting_ranks_year_'.$Year , $Rankings, 259200); // 3 days } - return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false; + return (isset($Rankings[$GroupID]) ? $Rankings[$GroupID] : false); } /** @@ -277,19 +291,21 @@ public static function get_rank_decade($GroupID, $Year) { if ($Rankings === false) { $Rankings = array(); $i = 0; - $DB->query("SELECT GroupID - FROM torrents_votes AS v - JOIN torrents_group AS g ON g.ID = v.GroupID - WHERE g.Year BETWEEN $Year AND ".($Year+9)." - AND g.CategoryID = 1 - ORDER BY Score DESC LIMIT 100"); + $DB->query(" + SELECT GroupID + FROM torrents_votes AS v + JOIN torrents_group AS g ON g.ID = v.GroupID + WHERE g.Year BETWEEN $Year AND " . ($Year + 9) . " + AND g.CategoryID = 1 + ORDER BY Score DESC + LIMIT 100"); while (list($GID) = $DB->next_record()) { $Rankings[$GID] = ++$i; } $Cache->cache_value('voting_ranks_decade_'.$Year , $Rankings, 259200); // 3 days } - return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false; + return (isset($Rankings[$GroupID]) ? $Rankings[$GroupID] : false); } } ?> diff --git a/design/privateheader.php b/design/privateheader.php index 21e5bf3f..2c5397b0 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -271,7 +271,10 @@ if (check_perms('users_mod')) { global $SBlogReadTime, $LatestSBlogTime; if (!$SBlogReadTime && ($SBlogReadTime = $Cache->get_value('staff_blog_read_'.$LoggedUser['ID'])) === false) { - $DB->query("SELECT Time FROM staff_blog_visits WHERE UserID = ".$LoggedUser['ID']); + $DB->query(" + SELECT Time + FROM staff_blog_visits + WHERE UserID = ".$LoggedUser['ID']); if (list($SBlogReadTime) = $DB->next_record()) { $SBlogReadTime = strtotime($SBlogReadTime); } else { @@ -280,7 +283,9 @@ $Cache->cache_value('staff_blog_read_'.$LoggedUser['ID'], $SBlogReadTime, 1209600); } if (!$LatestSBlogTime && ($LatestSBlogTime = $Cache->get_value('staff_blog_latest_time')) === false) { - $DB->query("SELECT MAX(Time) FROM staff_blog"); + $DB->query(" + SELECT MAX(Time) + FROM staff_blog"); if (list($LatestSBlogTime) = $DB->next_record()) { $LatestSBlogTime = strtotime($LatestSBlogTime); } else { @@ -406,7 +411,10 @@ // Torrent reports code $NumTorrentReports = $Cache->get_value('num_torrent_reportsv2'); if ($NumTorrentReports === false) { - $DB->query("SELECT COUNT(ID) FROM reportsv2 WHERE Status='New'"); + $DB->query(" + SELECT COUNT(ID) + FROM reportsv2 + WHERE Status='New'"); list($NumTorrentReports) = $DB->next_record(); $Cache->cache_value('num_torrent_reportsv2', $NumTorrentReports, 0); } @@ -416,7 +424,10 @@ // Other reports code $NumOtherReports = $Cache->get_value('num_other_reports'); if ($NumOtherReports === false) { - $DB->query("SELECT COUNT(ID) FROM reports WHERE Status='New'"); + $DB->query(" + SELECT COUNT(ID) + FROM reports + WHERE Status='New'"); list($NumOtherReports) = $DB->next_record(); $Cache->cache_value('num_other_reports', $NumOtherReports, 0); } diff --git a/image.php b/image.php index 48363d25..e4d8f8ac 100644 --- a/image.php +++ b/image.php @@ -135,44 +135,66 @@ function image_height($Type, $Data) { } -function send_pm($ToID,$FromID,$Subject,$Body,$ConvID='') { +function send_pm($ToID, $FromID, $Subject, $Body, $ConvID = '') { global $DB, $Cache; if ($ToID == 0) { // Don't allow users to send messages to the system return; } if ($ConvID == '') { - $DB->query("INSERT INTO pm_conversations(Subject) VALUES ('$Subject')"); + $DB->query(" + INSERT INTO pm_conversations (Subject) + VALUES ('$Subject')"); $ConvID = $DB->inserted_id(); - $DB->query("INSERT INTO pm_conversations_users - (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) VALUES + $DB->query(" + INSERT INTO pm_conversations_users + (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) + VALUES ('$ToID', '$ConvID', '1','0','".sqltime()."', '".sqltime()."', '1')"); if ($FromID != 0) { - $DB->query("INSERT INTO pm_conversations_users - (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) VALUES - ('$FromID', '$ConvID', '0','1','".sqltime()."', '".sqltime()."', '0')"); + $DB->query(" + INSERT INTO pm_conversations_users + (UserID, ConvID, InInbox, InSentbox, SentDate, ReceivedDate, UnRead) + VALUES + ('$FromID', '$ConvID', '0','1','".sqltime()."', '".sqltime()."', '0')"); } } else { - $DB->query("UPDATE pm_conversations_users SET + $DB->query(" + UPDATE pm_conversations_users + SET InInbox='1', UnRead='1', ReceivedDate='".sqltime()."' - WHERE UserID='$ToID' + WHERE UserID='$ToID' AND ConvID='$ConvID'"); - $DB->query("UPDATE pm_conversations_users SET + $DB->query(" + UPDATE pm_conversations_users + SET InSentbox='1', SentDate='".sqltime()."' - WHERE UserID='$FromID' + WHERE UserID='$FromID' AND ConvID='$ConvID'"); } - $DB->query("INSERT INTO pm_messages - (SenderID, ConvID, SentDate, Body) VALUES - ('$FromID', '$ConvID', '".sqltime()."', '".$Body."')"); + $DB->query(" + INSERT INTO pm_messages + (SenderID, ConvID, SentDate, Body) + VALUES + ('$FromID', '$ConvID', '".sqltime()."', '$Body')"); // Clear the caches of the inbox and sentbox - //$DB->query("SELECT UnRead from pm_conversations_users WHERE ConvID='$ConvID' AND UserID='$ToID'"); - $DB->query("SELECT COUNT(ConvID) FROM pm_conversations_users WHERE UnRead = '1' and UserID='$ToID' AND InInbox = '1'"); + /*$DB->query(" + SELECT UnRead + FROM pm_conversations_users + WHERE ConvID='$ConvID' + AND UserID='$ToID'"); + */ + $DB->query(" + SELECT COUNT(ConvID) + FROM pm_conversations_users + WHERE UnRead = '1' + AND UserID='$ToID' + AND InInbox = '1'"); list($UnRead) = $DB->next_record(MYSQLI_BOTH, FALSE); $Cache->cache_value('inbox_new_'.$ToID, $UnRead); @@ -218,7 +240,7 @@ function make_utf8($Str) { $Encoding = 'UTF-8'; } if (empty($Encoding)) { - $Encoding = mb_detect_encoding($Str,'UTF-8, ISO-8859-1'); + $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1'); } if (empty($Encoding)) { $Encoding = 'ISO-8859-1'; @@ -226,7 +248,7 @@ function make_utf8($Str) { if ($Encoding == 'UTF-8') { return $Str; } else { - return @mb_convert_encoding($Str,'UTF-8',$Encoding); + return @mb_convert_encoding($Str, 'UTF-8', $Encoding); } } } diff --git a/sections/index/feat_merch.php b/sections/index/feat_merch.php new file mode 100644 index 00000000..f341908a --- /dev/null +++ b/sections/index/feat_merch.php @@ -0,0 +1,44 @@ +get_value('featured_merch'); + if ($FeaturedMerch === false) { + $DB->query(' + SELECT ProductID, Title, Image, ArtistID + FROM featured_merch + WHERE Ended = 0'); + $FeaturedMerch = $DB->next_record(MYSQLI_ASSOC); + $Cache->cache_value('featured_merch', $FeaturedMerch, 0); + } + + if ($FeaturedMerch != null) { +?> +
+
+ Featured Product +
+
+ Featured Product Image +
+
+ Product Page + 0) { + $UserInfo = Users::user_info($FeaturedMerch['ArtistID']); +?> - Artist: + +
+
+ +
+
+ It's a mystery! +
+
+ You may want to put an image here. +
+
+ diff --git a/sections/index/private.php b/sections/index/private.php index 0e93842a..5bc4e921 100644 --- a/sections/index/private.php +++ b/sections/index/private.php @@ -30,7 +30,7 @@
0) ? (int)$_POST['artistid'] : 0; + + if (!$Title) { + $Title = db_string('Featured Product'); + } + + $DB->query(" + UPDATE featured_merch + SET Ended = '".sqltime()."' + WHERE Ended = 0"); + $DB->query(" + INSERT INTO featured_merch (ProductID, Title, Image, ArtistID, Started) + VALUES ($ProductID, '$Title', '$Image', '$ArtistID', '".sqltime()."')"); + $Cache->delete_value('featured_merch'); + header('Location: index.php'); + die(); +} + +View::show_header(); +?> +

Change the featured merchandise

+
+
+ + + + + + + + + + + + + + + + + + + + + + +
Product ID: + +
Title: + +
Image: + +
+ +
Artist ID: + +
+
+
+ diff --git a/sections/user/stylesheetgallery.php b/sections/tools/misc/render_base.html similarity index 86% rename from sections/user/stylesheetgallery.php rename to sections/tools/misc/render_base.html index c827ee6a..afc50481 100644 --- a/sections/user/stylesheetgallery.php +++ b/sections/tools/misc/render_base.html @@ -1,44 +1,20 @@ -get_value("cssgallery_".$Name); - if (!empty($ImageData)) { - echo json_encode(array('data' => $ImageData, 'status' => "0")); - die(); - } else { - echo json_encode(array('status' => "-1")); - die(); - } - } else { -?> Stylesheet Gallery - + - - - - - - + + + - +

Gazelle

+
@@ -171,7 +148,7 @@ - by Rippy Just now + by Ananke Just now 385 95,197 @@ -180,7 +157,7 @@

- + What.CD

@@ -196,7 +173,8 @@

Community

- + + @@ -315,13 +293,13 @@ - by Ananke 1 min ago + by tuutiki 1 min ago - + - + + + + + + + + - + - - - - - + - + + + + + + + + @@ -266,15 +284,6 @@ function checked($Checked) { - - - - - - - - + - + + + + + @@ -370,7 +383,7 @@ function checked($Checked) { @@ -558,7 +571,7 @@ function checked($Checked) {
Forum Last post 22,564 608,253

Vanity House @@ -341,8 +319,12 @@ +
+
+
+
+
+
+ - "-2")); - die(); - } - //Get the actual image data from the sent data string. - $FullData = $_POST['image']; - list($type, $ImageData) = explode(';', $FullData); - list(, $Base64Data) = explode(',', $ImageData); - $Image = base64_decode($Base64Data); - //Save the image to a file - file_put_contents(STATIC_SERVER.'thumb_'.$_POST['stylesheet'].'.png', $Image); - //Check if the file got saved properly, return status message. - if (!file_exists(STATIC_SERVER.'thumb_'.$_POST['stylesheet'].'.png')) { - echo json_encode(array('status' => "-1")); - die(); - } else { - echo json_encode(array('status' => "0")); - die(); - } -} elseif (!isset($_POST['ajax'])) { -// If this is accessed by the administrating user, display the page (creates calls to itself through AJAX). -View::show_header('Rerender stylesheet gallery images', 'jquery,stylesheetgallery_rerender_queue'); +View::show_header('Rerender stylesheet gallery images', 'jquery'); +global $DB; +$DB->query(' + SELECT + ID, + LOWER(REPLACE(Name," ","_")) AS Name, + Name AS ProperName + FROM stylesheets'); +$Styles = $DB->to_array('ID', MYSQLI_BOTH); ?> -

Rerender stylesheet gallery images

-
-
Color codes
+
+
Rendering parameters
    -
  • - Queued
    • -
  • - Currently encoding render
    • -
  • - Rendered successfully
    • -
  • - Rendering returned an error, check console
    • -
  • - Storage returned an error
    • -
  • - Incomplete data error
    • +
  • Server root:
    • +
  • Static server:
    • +
  • Whoami:
    • +
  • Path:
    • +
  • Phantomjs ver:
    • +
  • Styles:
-
- About rendering -
+
About rendering
-

You are currently rerendering the stylesheet gallery images. Please don't close this page until rendering is finished or some images may be left unrendered.

-

This is a processing-intensive operation; you're likely to see a spike in your CPU & RAM usage.

-

Tested and debugged on up-to-date Webkit and Gecko browsers; Opera will result in undefined behavior.

-

Important: Be sure to double-check the gallery once all rendering is finished.

-
- Begin rendering +

You are now rendering stylesheet gallery images.

+

The used parameters can be seen on the right, returned statuses are displayed below.

-
- Rendering status -
-
-
- -

-

- +
Rendering status
+
+ +
+
+

Build preview: + +

+ +

Snap preview: + +

+ +
+
- + Settings','user,jquery,jquery-ui,release_sort,password_validate,validate,push_settings,cssgallery,preview_paranoia'); +View::show_header($Username.' > Settings','user,jquery,jquery-ui,release_sort,password_validate,validate,push_settings,cssgallery,preview_paranoia,bbcode'); @@ -69,14 +69,13 @@ function checked($Checked) { WHERE ID = '$UserID'"); $LastFMUsername = ''; list($LastFMUsername) = $DB->next_record(); - echo $Val->GenerateJS('userform'); ?>

> Settings

-
+
@@ -93,7 +92,7 @@ function checked($Checked) {

   Show gallery @@ -102,14 +101,28 @@ function checked($Checked) {
OpenDyslexic + checked="checked" /> + +

Read about OpenDyslexic, a CC-BY 3.0 licensed font designed for users with dyslexia, at http://opendyslexic.org/.

+

This is an experimental feature, and some stylesheets will have display issues.

+
+ Torrent options +
Default search type @@ -119,7 +132,7 @@ function checked($Checked) {
Torrent grouping @@ -149,16 +162,6 @@ function checked($Checked) {
Forum posts per page - -
Sort/hide release types @@ -221,7 +224,7 @@ function checked($Checked) {
  • - /> + />
  • @@ -232,17 +235,32 @@ function checked($Checked) {
SubscriptionVoting links - checked="checked" /> - + checked="checked" /> +
Quote notificationsDownload torrents as text files - checked="checked" /> - + checked="checked" /> + +
+ Community options +
Forum posts per page +
OpenDyslexic - checked="checked" /> - -

Read about OpenDyslexic, a CC-BY 3.0 licensed font designed for users with dyslexia, at http://opendyslexic.org/.

-

This is an experimental feature, and some stylesheets will have display issues.

-
Avatars @@ -295,7 +304,6 @@ function checked($Checked) {
Auto-save text @@ -303,18 +311,23 @@ function checked($Checked) {
Voting links - checked="checked" /> - +
+ Notifications
Download torrents as text filesSubscriptions - checked="checked" /> - + checked="checked" /> + +
Quote notifications + checked="checked" /> +
 

Note: Paranoia has nothing to do with your security on this site; the only thing affected by this setting is other users' ability to see your site activity and taste in music.

-

Select the elements you want to show on your profile. For example, if you tick "Show count" for "Snatched", users will be able to see how many torrents you have snatched. If you tick "Show list", they will be able to see the full list of torrents you've snatched.

+

Select the elements you want to show on your profile. For example, if you check "Show count" for "Snatched", users will be able to see how many torrents you have snatched. If you check "Show list", they will be able to see the full list of torrents you have snatched.

Some information will still be available in the site log.
- +
diff --git a/sections/user/index.php b/sections/user/index.php index 918ca1b3..bb3200f7 100644 --- a/sections/user/index.php +++ b/sections/user/index.php @@ -14,9 +14,6 @@ } switch ($_REQUEST['action']) { - case 'stylesheetgallery': - include('stylesheetgallery.php'); - break; case 'notify': include('notify_edit.php'); break; diff --git a/sections/user/notify_edit.php b/sections/user/notify_edit.php index dae09f79..da0534ea 100644 --- a/sections/user/notify_edit.php +++ b/sections/user/notify_edit.php @@ -30,15 +30,33 @@ ToYear, Users FROM users_notify_filters - WHERE UserID='$LoggedUser[ID]' - UNION ALL - SELECT NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL"); -$i = 0; -$NumFilters = $DB->record_count() - 1; + WHERE UserID=$LoggedUser[ID]"); + +$NumFilters = $DB->record_count(); $Notifications = $DB->to_array(); +$Notifications[] = array( + 'ID' => false, + 'Label' => '', + 'Artists' => '', + 'ExcludeVA' => false, + 'NewGroupsOnly' => true, + 'Tags' => '', + 'NotTags' => '', + 'ReleaseTypes' => '', + 'Categories' => '', + 'Formats' => '', + 'Encodings' => '', + 'Media' => '', + 'FromYear' => '', + 'ToYear' => '', + 'Users' => '' +); +$i = 0; foreach ($Notifications as $N) { // $N stands for Notifications + $i++; + $NewFilter = $N['ID'] === false; $N['Artists'] = implode(', ', explode('|', substr($N['Artists'], 1, -1))); $N['Tags'] = implode(', ', explode('|', substr($N['Tags'], 1, -1))); $N['NotTags'] = implode(', ', explode('|', substr($N['NotTags'], 1, -1))); @@ -62,23 +80,27 @@ if ($N['ToYear'] == 0) { $N['ToYear'] = ''; } - $i++; - if ($i > $NumFilters && $NumFilters > 0) { ?> -

Create a new notification filter

+ if ($NewFilter && $NumFilters > 0) { +?> +

+

Create a new notification filter

0) { ?> -

- RSS feed - - Delete - Show -

+

+ RSS feed + + Delete + Show +

- + - > - $NumFilters) { ?> + + + + > + - - @@ -107,7 +127,7 @@ @@ -186,14 +206,11 @@ - -

- +
diff --git a/sections/wiki/aliases.php b/sections/wiki/aliases.php index db8afbb2..c8dc0917 100644 --- a/sections/wiki/aliases.php +++ b/sections/wiki/aliases.php @@ -46,13 +46,17 @@ query("SELECT Alias FROM wiki_aliases WHERE ArticleID='$ArticleID'"); +$DB->query(" + SELECT Alias + FROM wiki_aliases + WHERE ArticleID = '$ArticleID'"); while (list($Revision, $Title, $AuthorID, $AuthorName, $Date) = $DB->next_record()) { ?> - + diff --git a/sections/wiki/compare.php b/sections/wiki/compare.php index 038d5429..18eabfbf 100644 --- a/sections/wiki/compare.php +++ b/sections/wiki/compare.php @@ -58,7 +58,11 @@ function get_body($ID, $Rev) { if ($Rev == $Revision) { $Str = $Body; } else { - $DB->query("SELECT Body FROM wiki_revisions WHERE ID='$ID' AND Revision='$Rev'"); + $DB->query(" + SELECT Body + FROM wiki_revisions + WHERE ID='$ID' + AND Revision='$Rev'"); if (!$DB->record_count()) { error(404); } diff --git a/sections/wiki/delete.php b/sections/wiki/delete.php index d3172483..ac4cc925 100644 --- a/sections/wiki/delete.php +++ b/sections/wiki/delete.php @@ -4,7 +4,10 @@ error(404); } -$DB->query("SELECT Title FROM wiki_articles WHERE ID = $ID"); +$DB->query(" + SELECT Title + FROM wiki_articles + WHERE ID = $ID"); if ($DB->record_count() < 1) { error(404); @@ -12,7 +15,7 @@ list($Title) = $DB->next_record(MYSQLI_NUM, false); //Log -Misc::write_log("Wiki article ".$ID." (".$Title.") was deleted by ".$LoggedUser['Username']); +Misc::write_log("Wiki article $ID ($Title) was deleted by ".$LoggedUser['Username']); //Delete $DB->query("DELETE FROM wiki_articles WHERE ID = $ID"); $DB->query("DELETE FROM wiki_aliases WHERE ArticleID = $ID"); diff --git a/sections/wiki/search.php b/sections/wiki/search.php index 64209262..82bd50c5 100644 --- a/sections/wiki/search.php +++ b/sections/wiki/search.php @@ -55,9 +55,12 @@ $SQL .= "%' "; } -$SQL.=" ORDER BY $Order $Way LIMIT $Limit "; +$SQL.= " + ORDER BY $Order $Way + LIMIT $Limit "; $RS = $DB->query($SQL); -$DB->query("SELECT FOUND_ROWS()"); +$DB->query(" + SELECT FOUND_ROWS()"); list($NumResults) = $DB->next_record(); View::show_header('Search articles'); diff --git a/sections/wiki/takecreate.php b/sections/wiki/takecreate.php index e427165d..5154986b 100644 --- a/sections/wiki/takecreate.php +++ b/sections/wiki/takecreate.php @@ -12,7 +12,10 @@ $Err = $Val->ValidateForm($_POST); if (!$Err) { - $DB->query("SELECT ID FROM wiki_articles WHERE Title='$P[title]'"); + $DB->query(" + SELECT ID + FROM wiki_articles + WHERE Title='$P[title]'"); if ($DB->record_count() > 0) { list($ID) = $DB->next_record(); $Err = 'An article with that name already exists here.'; @@ -39,29 +42,36 @@ $Edit = $Read; //Human error fix. } } else { - $Read=100; - $Edit=100; + $Read = 100; + $Edit = 100; } -$DB->query("INSERT INTO wiki_articles - (Revision, Title, Body, MinClassRead, MinClassEdit, Date, Author) VALUES - ('1', '$P[title]', '$P[body]', '$Read', '$Edit', '".sqltime()."', '$LoggedUser[ID]')"); +$DB->query(" + INSERT INTO wiki_articles + (Revision, Title, Body, MinClassRead, MinClassEdit, Date, Author) + VALUES + ('1', '$P[title]', '$P[body]', '$Read', '$Edit', '".sqltime()."', '$LoggedUser[ID]')"); $ArticleID = $DB->inserted_id(); -//$NewAlias = $Alias->convert($_POST['alias']); -//if ($NewAlias != '') { -// $DB->query("INSERT INTO wiki_aliases (Alias, ArticleID) VALUES ('$NewAlias', '$ArticleID')"); -//} - +/* +$NewAlias = $Alias->convert($_POST['alias']); +if ($NewAlias != '') { + $DB->query(" + INSERT INTO wiki_aliases (Alias, ArticleID) + VALUES ('$NewAlias', '$ArticleID')"); +} +*/ $TitleAlias = $Alias->convert($_POST['title']); if ($TitleAlias != $Alias) { - $DB->query("INSERT INTO wiki_aliases (Alias, ArticleID) VALUES ('".db_string($TitleAlias)."', '$ArticleID')"); + $DB->query(" + INSERT INTO wiki_aliases (Alias, ArticleID) + VALUES ('".db_string($TitleAlias)."', '$ArticleID')"); } $Alias->flush(); -Misc::write_log("Wiki article ".$ArticleID." (".$_POST['title'].") was created by ".$LoggedUser['Username']); +Misc::write_log("Wiki article $ArticleID (".$_POST['title'].") was created by ".$LoggedUser['Username']); header('Location: wiki.php?action=article&id='.$ArticleID); diff --git a/static/functions/cssgallery.js b/static/functions/cssgallery.js index 773cf244..77e1a60b 100644 --- a/static/functions/cssgallery.js +++ b/static/functions/cssgallery.js @@ -1,8 +1,5 @@ (function($) { - /*! jQuery Ajax Queue v0.1.2pre | (c) 2013 Corey Frang | Licensed MIT */ - (function(e){var r=e({});e.ajaxQueue=function(n){function t(r){u=e.ajax(n),u.done(a.resolve).fail(a.reject).then(r,r)}var u,a=e.Deferred(),i=a.promise();return r.queue(t),i.abort=function(o){if(u)return u.abort(o);var c=r.queue(),f=e.inArray(t,c);return f>-1&&c.splice(f,1),a.rejectWith(n.context||n,[i,o,""]),i},i}})(jQuery); - //@ sourceMappingURL=dist/jquery.ajaxQueue.min.map - + $(document).ready(function () { // If the custom stylesheet field is empty, select the current style from the previews if(!$('input#styleurl').val()){ diff --git a/static/functions/script_start.js b/static/functions/script_start.js index 79e1bb55..695e3cdc 100644 --- a/static/functions/script_start.js +++ b/static/functions/script_start.js @@ -16,7 +16,7 @@ var listener = { var f = function() { callback.call(el); }; - el.attachEvent('on'+type, f); + el.attachEvent('on' + type, f); } } }; @@ -51,9 +51,9 @@ function html_entity_decode(str) { function get_size(size) { var steps = 0; - while (size>=1024) { + while (size >= 1024) { steps++; - size=size/1024; + size = size / 1024; } var ext; switch(steps) { @@ -107,7 +107,7 @@ function ratio(dividend, divisor, color) { } else if (dividend == 0 && divisor > 0) { return '-∞'; } - var rat = ((dividend/divisor)-0.005).toFixed(2); //Subtract .005 to floor to 2 decimals + var rat = ((dividend / divisor) - 0.005).toFixed(2); //Subtract .005 to floor to 2 decimals if (color) { var col = get_ratio_color(rat); if (col) { @@ -132,7 +132,7 @@ function error_message(message) { $("#content").raw().insertBefore(messageDiv,$("#content").raw().firstChild); } -//returns key if true, and false if false better than the php funciton +//returns key if true, and false if false. better than the PHP funciton function in_array(needle, haystack, strict) { if (strict === undefined) { strict = false; @@ -161,7 +161,6 @@ var util = function (selector, context) { return new util.fn.init(selector, context); } - util.fn = util.prototype = { objects: new Array(), init: function (selector, context) { @@ -191,7 +190,7 @@ util.fn = util.prototype = { return this; }, listen: function (event, callback) { - for (var i=0,il=this.objects.length;i Copyright (c)2013 Niklas von Hertzen (@niklasvh) Released under MIT License */ - (function(window,document,undefined){"use strict";var _html2canvas={},previousElement,computedCSS,html2canvas;function h2clog(a){if(_html2canvas.logging && window.console && window.console.log){window.console.log(a);}}_html2canvas.Util={};_html2canvas.Util.trimText=(function(isNative){return function(input){if(isNative){return isNative.apply(input );}else {return ((input || '')+ '').replace(/^\s+|\s+$/g ,'' );}};})(String.prototype.trim );_html2canvas.Util.parseBackgroundImage=function (value){var whitespace=' \r\n\t',method,definition,prefix,prefix_i,block,results=[],c,mode=0,numParen=0,quote,args;var appendResult=function(){if(method){if(definition.substr(0,1 )==='"'){definition=definition.substr(1,definition.length - 2 );}if(definition){args.push(definition);}if(method.substr(0,1 )==='-' && (prefix_i=method.indexOf('-',1 )+ 1)> 0){prefix=method.substr(0,prefix_i);method=method.substr(prefix_i );}results.push({prefix: prefix,method: method.toLowerCase(),value: block,args: args });}args=[];/*for some odd reason,setting .length=0 didn't work in safari*/ method=prefix=definition=block='';};appendResult();for(var i=0,ii=value.length;i -1){continue;}switch(c){case '"': if(!quote){quote=c;}else if(quote===c){quote=null;}break;case '(': if(quote){break;}else if(mode===0){mode=1;block +=c;continue;}else {numParen++;}break;case ')': if(quote){break;}else if(mode===1){if(numParen===0){mode=0;block +=c;appendResult();continue;}else {numParen--;}}break;case ',': if(quote){break;}else if(mode===0){appendResult();continue;}else if(mode===1){if(numParen===0 && !method.match(/^url$/i)){args.push(definition);definition='';block +=c;continue;}}break;}block +=c;if(mode===0){method +=c;}else {definition +=c;}}appendResult();return results;};_html2canvas.Util.Bounds=function getBounds (el){var clientRect,bounds={};if(el.getBoundingClientRect){clientRect=el.getBoundingClientRect();/* TODO add scroll position to bounds,so no scrolling of window necessary*/ bounds.top=clientRect.top;bounds.bottom=clientRect.bottom || (clientRect.top + clientRect.height);bounds.left=clientRect.left;/* older IE doesn't have width/height,but top/bottom instead*/ bounds.width=clientRect.width || (clientRect.right - clientRect.left);bounds.height=clientRect.height || (clientRect.bottom - clientRect.top);return bounds;}};_html2canvas.Util.getCSS=function (el,attribute,index){/* return $(el).css(attribute);*/ var val,isBackgroundSizePosition=attribute.match(/^background(Size|Position)$/ );function toPX(attribute,val ){var rsLeft=el.runtimeStyle && el.runtimeStyle[ attribute ],left,style=el.style;/* Check ifwe are not dealing with pixels,(Opera has issues with this)*/ /* Ported from jQuery css.js*/ /* From the awesome hack by Dean Edwards*/ /* http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291*/ /* If we're not dealing with a regular pixel number*/ /* but a number that has a weird ending,we need to convert it to pixels*/ if(!/^-?[0-9]+\.?[0-9]*(?:px)?$/i.test(val )&& /^-?\d/.test(val )){/* Remember the original values*/ left=style.left;/* Put in the new values to get a computed value out*/ if(rsLeft ){el.runtimeStyle.left=el.currentStyle.left;}style.left=attribute==="fontSize" ? "1em" : (val || 0);val=style.pixelLeft + "px";/* Revert the changed values*/ style.left=left;if(rsLeft ){el.runtimeStyle.left=rsLeft;}}if(!/^(thin|medium|thick)$/i.test(val )){return Math.round(parseFloat(val ))+ "px";}return val;}if(previousElement !==el){computedCSS=document.defaultView.getComputedStyle(el,null);}val=computedCSS[attribute];if(isBackgroundSizePosition){val=(val || '').split(',' );val=val[index || 0] || val[0] || 'auto';val=_html2canvas.Util.trimText(val).split(' ');if(attribute==='backgroundSize' && (!val[ 0 ] || val[ 0 ].match(/cover|contain|auto/ ))){/*these values will be handled in the parent function*/ }else {val[ 0 ]=(val[ 0 ].indexOf("%" )===-1 )? toPX(attribute + "X",val[ 0 ] ): val[ 0 ];if(val[ 1 ]===undefined){if(attribute==='backgroundSize'){val[ 1 ]='auto';return val;}else {/* IE 9 doesn't return double digit always*/ val[ 1 ]=val[ 0 ];}}val[ 1 ]=(val[ 1 ].indexOf("%" )===-1 )? toPX(attribute + "Y",val[ 1 ] ): val[ 1 ];}}else if(/border(Top|Bottom)(Left|Right)Radius/.test(attribute)){var arr=val.split(" ");if(arr.length <=1 ){arr[ 1 ]=arr[ 0 ];}arr[ 0 ]=parseInt(arr[ 0 ],10 );arr[ 1 ]=parseInt(arr[ 1 ],10 );val=arr;}return val;};_html2canvas.Util.resizeBounds=function(current_width,current_height,target_width,target_height,stretch_mode ){var target_ratio=target_width / target_height,current_ratio=current_width / current_height,output_width,output_height;if(!stretch_mode || stretch_mode==='auto'){output_width=target_width;output_height=target_height;}else {if(target_ratio < current_ratio ^ stretch_mode==='contain'){output_height=target_height;output_width=target_height * current_ratio;}else {output_width=target_width;output_height=target_width / current_ratio;}}return {width: output_width,height: output_height };};function backgroundBoundsFactory(prop,el,bounds,image,imageIndex,backgroundSize ){var bgposition=_html2canvas.Util.getCSS(el,prop,imageIndex ),topPos,left,percentage,val;if(bgposition.length===1){val=bgposition[0];bgposition=[];bgposition[0]=val;bgposition[1]=val;}if(bgposition[0].toString().indexOf("%")!==-1){percentage=(parseFloat(bgposition[0])/100);left=bounds.width * percentage;if(prop !=='backgroundSize'){left -=(backgroundSize || image).width*percentage;}}else {if(prop==='backgroundSize'){if(bgposition[0]==='auto'){left=image.width;}else {if(bgposition[0].match(/contain|cover/)){var resized=_html2canvas.Util.resizeBounds(image.width,image.height,bounds.width,bounds.height,bgposition[0] );left=resized.width;topPos=resized.height;}else {left=parseInt (bgposition[0],10 );}}}else {left=parseInt(bgposition[0],10 );}}if(bgposition[1]==='auto'){topPos=left / image.width * image.height;}else if(bgposition[1].toString().indexOf("%")!==-1){percentage=(parseFloat(bgposition[1])/100);topPos=bounds.height * percentage;if(prop !=='backgroundSize'){topPos -=(backgroundSize || image).height * percentage;}}else {topPos=parseInt(bgposition[1],10);}return [left,topPos];}_html2canvas.Util.BackgroundPosition=function(el,bounds,image,imageIndex,backgroundSize ){var result=backgroundBoundsFactory('backgroundPosition',el,bounds,image,imageIndex,backgroundSize );return {left: result[0],top: result[1] };};_html2canvas.Util.BackgroundSize=function(el,bounds,image,imageIndex ){var result=backgroundBoundsFactory('backgroundSize',el,bounds,image,imageIndex );return {width: result[0],height: result[1] };};_html2canvas.Util.Extend=function (options,defaults){for (var key in options){if(options.hasOwnProperty(key)){defaults[key]=options[key];}}return defaults;};/* * Derived from jQuery.contents()* Copyright 2010,John Resig * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license */ _html2canvas.Util.Children=function(elem ){var children;try {children=(elem.nodeName && elem.nodeName.toUpperCase()==="IFRAME")? elem.contentDocument || elem.contentWindow.document : (function(array ){var ret=[];if(array !==null ){(function(first,second ){var i=first.length,j=0;if(typeof second.length==="number" ){for (var l=second.length;j < l;j++ ){first[ i++ ]=second[ j ];}}else {while (second[j] !==undefined ){first[ i++ ]=second[ j++ ];}}first.length=i;return first;})(ret,array );}return ret;})(elem.childNodes );}catch (ex){h2clog("html2canvas.Util.Children failed with exception: " + ex.message);children=[];}return children;};_html2canvas.Util.Font=(function (){var fontData={};return function(font,fontSize,doc){if(fontData[font + "-" + fontSize] !==undefined){return fontData[font + "-" + fontSize];}var container=doc.createElement('div'),img=doc.createElement('img'),span=doc.createElement('span'),sampleText='Hidden Text',baseline,middle,metricsObj;container.style.visibility="hidden";container.style.fontFamily=font;container.style.fontSize=fontSize;container.style.margin=0;container.style.padding=0;doc.body.appendChild(container);/* http://probablyprogramming.com/2009/03/15/the-tiniest-gif-ever (handtinywhite.gif)*/ img.src="data:image/gif;base64,R0lGODlhAQABAIABAP/*/wAAACwAAAAAAQABAAACAkQBADs=";img.width=1;img.height=1;img.style.margin=0;img.style.padding=0;img.style.verticalAlign="baseline";span.style.fontFamily=font;span.style.fontSize=fontSize;span.style.margin=0;span.style.padding=0;span.appendChild(doc.createTextNode(sampleText));container.appendChild(span);container.appendChild(img);baseline=(img.offsetTop - span.offsetTop)+ 1;container.removeChild(span);container.appendChild(doc.createTextNode(sampleText));container.style.lineHeight="normal";img.style.verticalAlign="super";middle=(img.offsetTop-container.offsetTop)+ 1;metricsObj={baseline: baseline,lineWidth: 1,middle: middle };fontData[font + "-" + fontSize]=metricsObj;doc.body.removeChild(container);return metricsObj;};})();(function(){_html2canvas.Generate={};var reGradients=[ /^(-webkit-linear-gradient)\(([a-z\s]+)([\w\d\.\s,%\(\)]+)\)$/,/^(-o-linear-gradient)\(([a-z\s]+)([\w\d\.\s,%\(\)]+)\)$/,/^(-webkit-gradient)\((linear|radial),\s((?:\d{1,3}%?)\s(?:\d{1,3}%?),\s(?:\d{1,3}%?)\s(?:\d{1,3}%?))([\w\d\.\s,%\(\)\-]+)\)$/,/^(-moz-linear-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?))([\w\d\.\s,%\(\)]+)\)$/,/^(-webkit-radial-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?)),\s(\w+)\s([a-z\-]+)([\w\d\.\s,%\(\)]+)\)$/,/^(-moz-radial-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?)),\s(\w+)\s?([a-z\-]*)([\w\d\.\s,%\(\)]+)\)$/,/^(-o-radial-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?)),\s(\w+)\s([a-z\-]+)([\w\d\.\s,%\(\)]+)\)$/ ];/* * TODO: Add IE10 vendor prefix (-ms)support * TODO: Add W3C gradient (linear-gradient)support * TODO: Add old Webkit -webkit-gradient(radial,...)support * TODO: Maybe some RegExp optimizations are possible ;o)*/ _html2canvas.Generate.parseGradient=function(css,bounds){var gradient,i,len=reGradients.length,m1,stop,m2,m2Len,step,m3,tl,tr,br,bl;for(i=0;i < len;i+=1){m1=css.match(reGradients[i]);if(m1){break;}}if(m1){switch(m1[1]){case '-webkit-linear-gradient': case '-o-linear-gradient': gradient={type: 'linear',x0: null,y0: null,x1: null,y1: null,colorStops: [] };/* get coordinates*/ m2=m1[2].match(/\w+/g);if(m2){m2Len=m2.length;for(i=0;i < m2Len;i+=1){switch(m2[i]){case 'top': gradient.y0=0;gradient.y1=bounds.height;break;case 'right': gradient.x0=bounds.width;gradient.x1=0;break;case 'bottom': gradient.y0=bounds.height;gradient.y1=0;break;case 'left': gradient.x0=0;gradient.x1=bounds.width;break;}}}if(gradient.x0===null && gradient.x1===null){/* center*/ gradient.x0=gradient.x1=bounds.width / 2;}if(gradient.y0===null && gradient.y1===null){/* center*/ gradient.y0=gradient.y1=bounds.height / 2;}/* get colors and stops*/ m2=m1[3].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)(?:\s\d{1,3}(?:%|px))?)+/g);if(m2){m2Len=m2.length;step=1 / Math.max(m2Len - 1,1);for(i=0;i < m2Len;i+=1){m3=m2[i].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\s*(\d{1,3})?(%|px)?/);if(m3[2]){stop=parseFloat(m3[2]);if(m3[3]==='%'){stop /=100;}else {/* px - stupid opera*/ stop /=bounds.width;}}else {stop=i * step;}gradient.colorStops.push({color: m3[1],stop: stop });}}break;case '-webkit-gradient': gradient={type: m1[2]==='radial' ? 'circle' : m1[2],/* TODO: Add radial gradient support for older mozilla definitions*/ x0: 0,y0: 0,x1: 0,y1: 0,colorStops: [] };/* get coordinates*/ m2=m1[3].match(/(\d{1,3})%?\s(\d{1,3})%?,\s(\d{1,3})%?\s(\d{1,3})%?/);if(m2){gradient.x0=(m2[1] * bounds.width)/ 100;gradient.y0=(m2[2] * bounds.height)/ 100;gradient.x1=(m2[3] * bounds.width)/ 100;gradient.y1=(m2[4] * bounds.height)/ 100;}/* get colors and stops*/ m2=m1[4].match(/((?:from|to|color-stop)\((?:[0-9\.]+,\s)?(?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)\))+/g);if(m2){m2Len=m2.length;for(i=0;i < m2Len;i+=1){m3=m2[i].match(/(from|to|color-stop)\(([0-9\.]+)?(?:,\s)?((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\)/);stop=parseFloat(m3[2]);if(m3[1]==='from'){stop=0.0;}if(m3[1]==='to'){stop=1.0;}gradient.colorStops.push({color: m3[3],stop: stop });}}break;case '-moz-linear-gradient': gradient={type: 'linear',x0: 0,y0: 0,x1: 0,y1: 0,colorStops: [] };/* get coordinates*/ m2=m1[2].match(/(\d{1,3})%?\s(\d{1,3})%?/);/* m2[1]==0% -> left*/ /* m2[1]==50% -> center*/ /* m2[1]==100% -> right*/ /* m2[2]==0% -> top*/ /* m2[2]==50% -> center*/ /* m2[2]==100% -> bottom*/ if(m2){gradient.x0=(m2[1] * bounds.width)/ 100;gradient.y0=(m2[2] * bounds.height)/ 100;gradient.x1=bounds.width - gradient.x0;gradient.y1=bounds.height - gradient.y0;}/* get colors and stops*/ m2=m1[3].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)(?:\s\d{1,3}%)?)+/g);if(m2){m2Len=m2.length;step=1 / Math.max(m2Len - 1,1);for(i=0;i < m2Len;i+=1){m3=m2[i].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\s*(\d{1,3})?(%)?/);if(m3[2]){stop=parseFloat(m3[2]);if(m3[3]){/* percentage*/ stop /=100;}}else {stop=i * step;}gradient.colorStops.push({color: m3[1],stop: stop });}}break;case '-webkit-radial-gradient': case '-moz-radial-gradient': case '-o-radial-gradient': gradient={type: 'circle',x0: 0,y0: 0,x1: bounds.width,y1: bounds.height,cx: 0,cy: 0,rx: 0,ry: 0,colorStops: [] };/* center*/ m2=m1[2].match(/(\d{1,3})%?\s(\d{1,3})%?/);if(m2){gradient.cx=(m2[1] * bounds.width)/ 100;gradient.cy=(m2[2] * bounds.height)/ 100;}/* size*/ m2=m1[3].match(/\w+/);m3=m1[4].match(/[a-z\-]*/);if(m2 && m3){switch(m3[0]){case 'farthest-corner': case 'cover': /* is equivalent to farthest-corner*/ case '': /* mozilla removes "cover" from definition :(*/ tl=Math.sqrt(Math.pow(gradient.cx,2)+ Math.pow(gradient.cy,2));tr=Math.sqrt(Math.pow(gradient.cx,2)+ Math.pow(gradient.y1 - gradient.cy,2));br=Math.sqrt(Math.pow(gradient.x1 - gradient.cx,2)+ Math.pow(gradient.y1 - gradient.cy,2));bl=Math.sqrt(Math.pow(gradient.x1 - gradient.cx,2)+ Math.pow(gradient.cy,2));gradient.rx=gradient.ry=Math.max(tl,tr,br,bl);break;case 'closest-corner': tl=Math.sqrt(Math.pow(gradient.cx,2)+ Math.pow(gradient.cy,2));tr=Math.sqrt(Math.pow(gradient.cx,2)+ Math.pow(gradient.y1 - gradient.cy,2));br=Math.sqrt(Math.pow(gradient.x1 - gradient.cx,2)+ Math.pow(gradient.y1 - gradient.cy,2));bl=Math.sqrt(Math.pow(gradient.x1 - gradient.cx,2)+ Math.pow(gradient.cy,2));gradient.rx=gradient.ry=Math.min(tl,tr,br,bl);break;case 'farthest-side': if(m2[0]==='circle'){gradient.rx=gradient.ry=Math.max(gradient.cx,gradient.cy,gradient.x1 - gradient.cx,gradient.y1 - gradient.cy );}else {/* ellipse*/ gradient.type=m2[0];gradient.rx=Math.max(gradient.cx,gradient.x1 - gradient.cx );gradient.ry=Math.max(gradient.cy,gradient.y1 - gradient.cy );}break;case 'closest-side': case 'contain': /* is equivalent to closest-side*/ if(m2[0]==='circle'){gradient.rx=gradient.ry=Math.min(gradient.cx,gradient.cy,gradient.x1 - gradient.cx,gradient.y1 - gradient.cy );}else {/* ellipse*/ gradient.type=m2[0];gradient.rx=Math.min(gradient.cx,gradient.x1 - gradient.cx );gradient.ry=Math.min(gradient.cy,gradient.y1 - gradient.cy );}break;/* TODO: add support for "30px 40px" sizes (webkit only)*/ }}/* color stops*/ m2=m1[5].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)(?:\s\d{1,3}(?:%|px))?)+/g);if(m2){m2Len=m2.length;step=1 / Math.max(m2Len - 1,1);for(i=0;i < m2Len;i+=1){m3=m2[i].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\s*(\d{1,3})?(%|px)?/);if(m3[2]){stop=parseFloat(m3[2]);if(m3[3]==='%'){stop /=100;}else {/* px - stupid opera*/ stop /=bounds.width;}}else {stop=i * step;}gradient.colorStops.push({color: m3[1],stop: stop });}}break;}}return gradient;};_html2canvas.Generate.Gradient=function(src,bounds){if(bounds.width===0 || bounds.height===0){return;}var canvas=document.createElement('canvas'),ctx=canvas.getContext('2d'),gradient,grad,i,len;canvas.width=bounds.width;canvas.height=bounds.height;/* TODO: add support for multi defined background gradients*/ gradient=_html2canvas.Generate.parseGradient(src,bounds);if(gradient){if(gradient.type==='linear'){grad=ctx.createLinearGradient(gradient.x0,gradient.y0,gradient.x1,gradient.y1);for (i=0,len=gradient.colorStops.length;i < len;i+=1){try {grad.addColorStop(gradient.colorStops[i].stop,gradient.colorStops[i].color);}catch(e){h2clog(['failed to add color stop: ',e,';tried to add: ',gradient.colorStops[i],';stop: ',i,';in: ',src]);}}ctx.fillStyle=grad;ctx.fillRect(0,0,bounds.width,bounds.height);}else if(gradient.type==='circle'){grad=ctx.createRadialGradient(gradient.cx,gradient.cy,0,gradient.cx,gradient.cy,gradient.rx);for (i=0,len=gradient.colorStops.length;i < len;i+=1){try {grad.addColorStop(gradient.colorStops[i].stop,gradient.colorStops[i].color);}catch(e){h2clog(['failed to add color stop: ',e,';tried to add: ',gradient.colorStops[i],';stop: ',i,';in: ',src]);}}ctx.fillStyle=grad;ctx.fillRect(0,0,bounds.width,bounds.height);}else if(gradient.type==='ellipse'){/* draw circle*/ var canvasRadial=document.createElement('canvas'),ctxRadial=canvasRadial.getContext('2d'),ri=Math.max(gradient.rx,gradient.ry),di=ri * 2,imgRadial;canvasRadial.width=canvasRadial.height=di;grad=ctxRadial.createRadialGradient(gradient.rx,gradient.ry,0,gradient.rx,gradient.ry,ri);for (i=0,len=gradient.colorStops.length;i < len;i+=1){try {grad.addColorStop(gradient.colorStops[i].stop,gradient.colorStops[i].color);}catch(e){h2clog(['failed to add color stop: ',e,';tried to add: ',gradient.colorStops[i],';stop: ',i,';in: ',src]);}}ctxRadial.fillStyle=grad;ctxRadial.fillRect(0,0,di,di);ctx.fillStyle=gradient.colorStops[i - 1].color;ctx.fillRect(0,0,canvas.width,canvas.height);ctx.drawImage(canvasRadial,gradient.cx - gradient.rx,gradient.cy - gradient.ry,2 * gradient.rx,2 * gradient.ry);}}return canvas;};_html2canvas.Generate.ListAlpha=function(number){var tmp="",modulus;do {modulus=number % 26;tmp=String.fromCharCode((modulus)+ 64)+ tmp;number=number / 26;}while((number*26)> 26);return tmp;};_html2canvas.Generate.ListRoman=function(number){var romanArray=["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"],decimal=[1000,900,500,400,100,90,50,40,10,9,5,4,1],roman="",v,len=romanArray.length;if(number <=0 || number >=4000){return number;}for (v=0;v < len;v+=1){while (number >=decimal[v]){number -=decimal[v];roman +=romanArray[v];}}return roman;};})();function h2cRenderContext(width,height){var storage=[];return {storage: storage,width: width,height: height,clip: function(){storage.push({type: "function",name: "clip",'arguments': arguments });},translate: function(){storage.push({type: "function",name: "translate",'arguments': arguments });},fill: function(){storage.push({type: "function",name: "fill",'arguments': arguments });},save: function(){storage.push({type: "function",name: "save",'arguments': arguments });},restore: function(){storage.push({type: "function",name: "restore",'arguments': arguments });},fillRect: function (){storage.push({type: "function",name: "fillRect",'arguments': arguments });},createPattern: function(){storage.push({type: "function",name: "createPattern",'arguments': arguments });},drawShape: function(){var shape=[];storage.push({type: "function",name: "drawShape",'arguments': shape });return {moveTo: function(){shape.push({name: "moveTo",'arguments': arguments });},lineTo: function(){shape.push({name: "lineTo",'arguments': arguments });},arcTo: function(){shape.push({name: "arcTo",'arguments': arguments });},bezierCurveTo: function(){shape.push({name: "bezierCurveTo",'arguments': arguments });},quadraticCurveTo: function(){shape.push({name: "quadraticCurveTo",'arguments': arguments });}};},drawImage: function (){storage.push({type: "function",name: "drawImage",'arguments': arguments });},fillText: function (){storage.push({type: "function",name: "fillText",'arguments': arguments });},setVariable: function (variable,value){storage.push({type: "variable",name: variable,'arguments': value });}};}_html2canvas.Parse=function (images,options){window.scroll(0,0);var element=((options.elements===undefined )? document.body : options.elements[0]),/* select body by default*/ numDraws=0,doc=element.ownerDocument,support=_html2canvas.Util.Support(options,doc),ignoreElementsRegExp=new RegExp("(" + options.ignoreElements + ")"),body=doc.body,getCSS=_html2canvas.Util.getCSS,pseudoHide="___html2canvas___pseudoelement",hidePseudoElements=doc.createElement('style');hidePseudoElements.innerHTML='.' + pseudoHide + '-before:before {content: "" !important;display: none !important;}' + '.' + pseudoHide + '-after:after {content: "" !important;display: none !important;}';body.appendChild(hidePseudoElements);images=images || {};function documentWidth (){return Math.max(Math.max(doc.body.scrollWidth,doc.documentElement.scrollWidth),Math.max(doc.body.offsetWidth,doc.documentElement.offsetWidth),Math.max(doc.body.clientWidth,doc.documentElement.clientWidth));}function documentHeight (){return Math.max(Math.max(doc.body.scrollHeight,doc.documentElement.scrollHeight),Math.max(doc.body.offsetHeight,doc.documentElement.offsetHeight),Math.max(doc.body.clientHeight,doc.documentElement.clientHeight));}function getCSSInt(element,attribute){var val=parseInt(getCSS(element,attribute),10);return (isNaN(val))? 0 : val;/* borders in old IE are throwing 'medium' for demo.html*/ }function renderRect (ctx,x,y,w,h,bgcolor){if(bgcolor !=="transparent"){ctx.setVariable("fillStyle",bgcolor);ctx.fillRect(x,y,w,h);numDraws+=1;}}function textTransform (text,transform){switch(transform){case "lowercase": return text.toLowerCase();case "capitalize": return text.replace(/(^|\s|:|-|\(|\))([a-z])/g ,function (m,p1,p2){if(m.length > 0){return p1 + p2.toUpperCase();}});case "uppercase": return text.toUpperCase();default: return text;}}function noLetterSpacing(letter_spacing){return (/^(normal|none|0px)$/.test(letter_spacing));}function drawText(currentText,x,y,ctx){if(currentText !==null && _html2canvas.Util.trimText(currentText).length > 0){ctx.fillText(currentText,x,y);numDraws+=1;}}function setTextVariables(ctx,el,text_decoration,color){var align=false,bold=getCSS(el,"fontWeight"),family=getCSS(el,"fontFamily"),size=getCSS(el,"fontSize");switch(parseInt(bold,10)){case 401: bold="bold";break;case 400: bold="normal";break;}ctx.setVariable("fillStyle",color);ctx.setVariable("font",[getCSS(el,"fontStyle"),getCSS(el,"fontVariant"),bold,size,family].join(" "));ctx.setVariable("textAlign",(align)? "right" : "left");if(text_decoration !=="none"){return _html2canvas.Util.Font(family,size,doc);}}function renderTextDecoration(ctx,text_decoration,bounds,metrics,color){switch(text_decoration){case "underline": /* Draws a line at the baseline of the font*/ /* TODO As some browsers display the line as more than 1px ifthe font-size is big,need to take that into account both in position and size*/ renderRect(ctx,bounds.left,Math.round(bounds.top + metrics.baseline + metrics.lineWidth),bounds.width,1,color);break;case "overline": renderRect(ctx,bounds.left,Math.round(bounds.top),bounds.width,1,color);break;case "line-through": /* TODO try and find exact position for line-through*/ renderRect(ctx,bounds.left,Math.ceil(bounds.top + metrics.middle + metrics.lineWidth),bounds.width,1,color);break;}}function getTextBounds(state,text,textDecoration,isLast){var bounds;if(support.rangeBounds){if(textDecoration !=="none" || _html2canvas.Util.trimText(text).length !==0){bounds=textRangeBounds(text,state.node,state.textOffset);}state.textOffset +=text.length;}else if(state.node && typeof state.node.nodeValue==="string" ){var newTextNode=(isLast)? state.node.splitText(text.length): null;bounds=textWrapperBounds(state.node);state.node=newTextNode;}return bounds;}function textRangeBounds(text,textNode,textOffset){var range=doc.createRange();range.setStart(textNode,textOffset);range.setEnd(textNode,textOffset + text.length);return range.getBoundingClientRect();}function textWrapperBounds(oldTextNode){var parent=oldTextNode.parentNode,wrapElement=doc.createElement('wrapper'),backupText=oldTextNode.cloneNode(true);wrapElement.appendChild(oldTextNode.cloneNode(true));parent.replaceChild(wrapElement,oldTextNode);var bounds=_html2canvas.Util.Bounds(wrapElement);parent.replaceChild(backupText,wrapElement);return bounds;}function renderText(el,textNode,stack){var ctx=stack.ctx,color=getCSS(el,"color"),textDecoration=getCSS(el,"textDecoration"),textAlign=getCSS(el,"textAlign"),metrics,textList,state={node: textNode,textOffset: 0 };if(_html2canvas.Util.trimText(textNode.nodeValue).length > 0){textNode.nodeValue=textTransform(textNode.nodeValue,getCSS(el,"textTransform"));textAlign=textAlign.replace(["-webkit-auto"],["auto"]);textList=(!options.letterRendering && /^(left|right|justify|auto)$/.test(textAlign)&& noLetterSpacing(getCSS(el,"letterSpacing")))? textNode.nodeValue.split(/(\b| )/): textNode.nodeValue.split("");metrics=setTextVariables(ctx,el,textDecoration,color);if(options.chinese){textList.forEach(function(word,index){if(/.*[\u4E00-\u9FA5].*$/.test(word)){word=word.split("");word.unshift(index,1);textList.splice.apply(textList,word);}});}textList.forEach(function(text,index){var bounds=getTextBounds(state,text,textDecoration,(index < textList.length - 1));if(bounds){drawText(text,bounds.left,bounds.bottom,ctx);renderTextDecoration(ctx,textDecoration,bounds,metrics,color);}});}}function listPosition (element,val){var boundElement=doc.createElement("boundelement" ),originalType,bounds;boundElement.style.display="inline";originalType=element.style.listStyleType;element.style.listStyleType="none";boundElement.appendChild(doc.createTextNode(val));element.insertBefore(boundElement,element.firstChild);bounds=_html2canvas.Util.Bounds(boundElement);element.removeChild(boundElement);element.style.listStyleType=originalType;return bounds;}function elementIndex(el ){var i=-1,count=1,childs=el.parentNode.childNodes;if(el.parentNode){while(childs[ ++i ] !==el ){if(childs[ i ].nodeType===1 ){count++;}}return count;}else {return -1;}}function listItemText(element,type){var currentIndex=elementIndex(element),text;switch(type){case "decimal": text=currentIndex;break;case "decimal-leading-zero": text=(currentIndex.toString().length===1)? currentIndex="0" + currentIndex.toString(): currentIndex.toString();break;case "upper-roman": text=_html2canvas.Generate.ListRoman(currentIndex );break;case "lower-roman": text=_html2canvas.Generate.ListRoman(currentIndex ).toLowerCase();break;case "lower-alpha": text=_html2canvas.Generate.ListAlpha(currentIndex ).toLowerCase();break;case "upper-alpha": text=_html2canvas.Generate.ListAlpha(currentIndex );break;}text +=". ";return text;}function renderListItem(element,stack,elBounds){var x,text,ctx=stack.ctx,type=getCSS(element,"listStyleType"),listBounds;if(/^(decimal|decimal-leading-zero|upper-alpha|upper-latin|upper-roman|lower-alpha|lower-greek|lower-latin|lower-roman)$/i.test(type)){text=listItemText(element,type);listBounds=listPosition(element,text);setTextVariables(ctx,element,"none",getCSS(element,"color"));if(getCSS(element,"listStylePosition")==="inside"){ctx.setVariable("textAlign","left");x=elBounds.left;}else {return;}drawText(text,x,listBounds.bottom,ctx);}}function loadImage (src){var img=images[src];if(img && img.succeeded===true){return img.img;}else {return false;}}function clipBounds(src,dst){var x=Math.max(src.left,dst.left),y=Math.max(src.top,dst.top),x2=Math.min((src.left + src.width),(dst.left + dst.width)),y2=Math.min((src.top + src.height),(dst.top + dst.height));return {left:x,top:y,width:x2-x,height:y2-y };}function setZ(zIndex,parentZ){/* TODO fix static elements overlapping relative/absolute elements under same stack,ifthey are defined after them*/ var newContext;if(!parentZ){newContext=h2czContext(0);return newContext;}if(zIndex !=="auto"){newContext=h2czContext(zIndex);parentZ.children.push(newContext);return newContext;}return parentZ;}function renderImage(ctx,element,image,bounds,borders){var paddingLeft=getCSSInt(element,'paddingLeft'),paddingTop=getCSSInt(element,'paddingTop'),paddingRight=getCSSInt(element,'paddingRight'),paddingBottom=getCSSInt(element,'paddingBottom');drawImage(ctx,image,0,/*sx*/ 0,/*sy*/ image.width,/*sw*/ image.height,/*sh*/ bounds.left + paddingLeft + borders[3].width,/*dx*/ bounds.top + paddingTop + borders[0].width,/* dy*/ bounds.width - (borders[1].width + borders[3].width + paddingLeft + paddingRight),/*dw*/ bounds.height - (borders[0].width + borders[2].width + paddingTop + paddingBottom)/*dh*/ );}function getBorderData(element){return ["Top","Right","Bottom","Left"].map(function(side){return {width: getCSSInt(element,'border' + side + 'Width'),color: getCSS(element,'border' + side + 'Color')};});}function getBorderRadiusData(element){return ["TopLeft","TopRight","BottomRight","BottomLeft"].map(function(side){return getCSS(element,'border' + side + 'Radius');});}var getCurvePoints=(function(kappa){return function(x,y,r1,r2){var ox=(r1)* kappa,/* control point offset horizontal*/ oy=(r2)* kappa,/* control point offset vertical*/ xm=x + r1,/* x-middle*/ ym=y + r2;/* y-middle*/ return {topLeft: bezierCurve({x:x,y:ym },{x:x,y:ym - oy },{x:xm - ox,y:y },{x:xm,y:y }),topRight: bezierCurve({x:x,y:y },{x:x + ox,y:y },{x:xm,y:ym - oy },{x:xm,y:ym }),bottomRight: bezierCurve({x:xm,y:y },{x:xm,y:y + oy },{x:x + ox,y:ym },{x:x,y:ym }),bottomLeft: bezierCurve({x:xm,y:ym },{x:xm - ox,y:ym },{x:x,y:y + oy },{x:x,y:y })};};})(4 * ((Math.sqrt(2)- 1)/ 3));function bezierCurve(start,startControl,endControl,end){var lerp=function (a,b,t){return {x:a.x + (b.x - a.x)* t,y:a.y + (b.y - a.y)* t };};return {start: start,startControl: startControl,endControl: endControl,end: end,subdivide: function(t){var ab=lerp(start,startControl,t),bc=lerp(startControl,endControl,t),cd=lerp(endControl,end,t),abbc=lerp(ab,bc,t),bccd=lerp(bc,cd,t),dest=lerp(abbc,bccd,t);return [bezierCurve(start,ab,abbc,dest),bezierCurve(dest,bccd,cd,end)];},curveTo: function(borderArgs){borderArgs.push(["bezierCurve",startControl.x,startControl.y,endControl.x,endControl.y,end.x,end.y]);},curveToReversed: function(borderArgs){borderArgs.push(["bezierCurve",endControl.x,endControl.y,startControl.x,startControl.y,start.x,start.y]);}};}function parseCorner(borderArgs,radius1,radius2,corner1,corner2,x,y){if(radius1[0] > 0 || radius1[1] > 0){borderArgs.push(["line",corner1[0].start.x,corner1[0].start.y]);corner1[0].curveTo(borderArgs);corner1[1].curveTo(borderArgs);}else {borderArgs.push(["line",x,y]);}if(radius2[0] > 0 || radius2[1] > 0){borderArgs.push(["line",corner2[0].start.x,corner2[0].start.y]);}}function drawSide(borderData,radius1,radius2,outer1,inner1,outer2,inner2){var borderArgs=[];if(radius1[0] > 0 || radius1[1] > 0){borderArgs.push(["line",outer1[1].start.x,outer1[1].start.y]);outer1[1].curveTo(borderArgs);}else {borderArgs.push([ "line",borderData.c1[0],borderData.c1[1]]);}if(radius2[0] > 0 || radius2[1] > 0){borderArgs.push(["line",outer2[0].start.x,outer2[0].start.y]);outer2[0].curveTo(borderArgs);borderArgs.push(["line",inner2[0].end.x,inner2[0].end.y]);inner2[0].curveToReversed(borderArgs);}else {borderArgs.push([ "line",borderData.c2[0],borderData.c2[1]]);borderArgs.push([ "line",borderData.c3[0],borderData.c3[1]]);}if(radius1[0] > 0 || radius1[1] > 0){borderArgs.push(["line",inner1[1].end.x,inner1[1].end.y]);inner1[1].curveToReversed(borderArgs);}else {borderArgs.push([ "line",borderData.c4[0],borderData.c4[1]]);}return borderArgs;}function calculateCurvePoints(bounds,borderRadius,borders){var x=bounds.left,y=bounds.top,width=bounds.width,height=bounds.height,tlh=borderRadius[0][0],tlv=borderRadius[0][1],trh=borderRadius[1][0],trv=borderRadius[1][1],brv=borderRadius[2][0],brh=borderRadius[2][1],blh=borderRadius[3][0],blv=borderRadius[3][1],topWidth=width - trh,rightHeight=height - brv,bottomWidth=width - brh,leftHeight=height - blv;return {topLeftOuter: getCurvePoints(x,y,tlh,tlv ).topLeft.subdivide(0.5),topLeftInner: getCurvePoints(x + borders[3].width,y + borders[0].width,Math.max(0,tlh - borders[3].width),Math.max(0,tlv - borders[0].width)).topLeft.subdivide(0.5),topRightOuter: getCurvePoints(x + topWidth,y,trh,trv ).topRight.subdivide(0.5),topRightInner: getCurvePoints(x + Math.min(topWidth,width + borders[3].width),y + borders[0].width,(topWidth > width + borders[3].width)? 0 :trh - borders[3].width,trv - borders[0].width ).topRight.subdivide(0.5),bottomRightOuter: getCurvePoints(x + bottomWidth,y + rightHeight,brh,brv ).bottomRight.subdivide(0.5),bottomRightInner: getCurvePoints(x + Math.min(bottomWidth,width + borders[3].width),y + Math.min(rightHeight,height + borders[0].width),Math.max(0,brh - borders[1].width),Math.max(0,brv - borders[2].width)).bottomRight.subdivide(0.5),bottomLeftOuter: getCurvePoints(x,y + leftHeight,blh,blv ).bottomLeft.subdivide(0.5),bottomLeftInner: getCurvePoints(x + borders[3].width,y + leftHeight,Math.max(0,blh - borders[3].width),Math.max(0,blv - borders[2].width)).bottomLeft.subdivide(0.5)};}function getBorderClip(element,borderPoints,borders,radius,bounds){var backgroundClip=getCSS(element,'backgroundClip'),borderArgs=[];switch(backgroundClip){case "content-box": case "padding-box": parseCorner(borderArgs,radius[0],radius[1],borderPoints.topLeftInner,borderPoints.topRightInner,bounds.left + borders[3].width,bounds.top + borders[0].width);parseCorner(borderArgs,radius[1],radius[2],borderPoints.topRightInner,borderPoints.bottomRightInner,bounds.left + bounds.width - borders[1].width,bounds.top + borders[0].width);parseCorner(borderArgs,radius[2],radius[3],borderPoints.bottomRightInner,borderPoints.bottomLeftInner,bounds.left + bounds.width - borders[1].width,bounds.top + bounds.height - borders[2].width);parseCorner(borderArgs,radius[3],radius[0],borderPoints.bottomLeftInner,borderPoints.topLeftInner,bounds.left + borders[3].width,bounds.top + bounds.height - borders[2].width);break;default: parseCorner(borderArgs,radius[0],radius[1],borderPoints.topLeftOuter,borderPoints.topRightOuter,bounds.left,bounds.top);parseCorner(borderArgs,radius[1],radius[2],borderPoints.topRightOuter,borderPoints.bottomRightOuter,bounds.left + bounds.width,bounds.top);parseCorner(borderArgs,radius[2],radius[3],borderPoints.bottomRightOuter,borderPoints.bottomLeftOuter,bounds.left + bounds.width,bounds.top + bounds.height);parseCorner(borderArgs,radius[3],radius[0],borderPoints.bottomLeftOuter,borderPoints.topLeftOuter,bounds.left,bounds.top + bounds.height);break;}return borderArgs;}function parseBorders(element,bounds,borders){var x=bounds.left,y=bounds.top,width=bounds.width,height=bounds.height,borderSide,bx,by,bw,bh,borderArgs,/* http://www.w3.org/TR/css3-background/#the-border-radius*/ borderRadius=getBorderRadiusData(element),borderPoints=calculateCurvePoints(bounds,borderRadius,borders),borderData={clip: getBorderClip(element,borderPoints,borders,borderRadius,bounds),borders: [] };for (borderSide=0;borderSide < 4;borderSide++){if(borders[borderSide].width > 0){bx=x;by=y;bw=width;bh=height - (borders[2].width);switch(borderSide){case 0: /* top border*/ bh=borders[0].width;borderArgs=drawSide({c1: [bx,by],c2: [bx + bw,by],c3: [bx + bw - borders[1].width,by + bh],c4: [bx + borders[3].width,by + bh] },borderRadius[0],borderRadius[1],borderPoints.topLeftOuter,borderPoints.topLeftInner,borderPoints.topRightOuter,borderPoints.topRightInner);break;case 1: /* right border*/ bx=x + width - (borders[1].width);bw=borders[1].width;borderArgs=drawSide({c1: [bx + bw,by],c2: [bx + bw,by + bh + borders[2].width],c3: [bx,by + bh],c4: [bx,by + borders[0].width] },borderRadius[1],borderRadius[2],borderPoints.topRightOuter,borderPoints.topRightInner,borderPoints.bottomRightOuter,borderPoints.bottomRightInner);break;case 2: /* bottom border*/ by=(by + height)- (borders[2].width);bh=borders[2].width;borderArgs=drawSide({c1: [bx + bw,by + bh],c2: [bx,by + bh],c3: [bx + borders[3].width,by],c4: [bx + bw - borders[2].width,by] },borderRadius[2],borderRadius[3],borderPoints.bottomRightOuter,borderPoints.bottomRightInner,borderPoints.bottomLeftOuter,borderPoints.bottomLeftInner);break;case 3: /* left border*/ bw=borders[3].width;borderArgs=drawSide({c1: [bx,by + bh + borders[2].width],c2: [bx,by],c3: [bx + bw,by + borders[0].width],c4: [bx + bw,by + bh] },borderRadius[3],borderRadius[0],borderPoints.bottomLeftOuter,borderPoints.bottomLeftInner,borderPoints.topLeftOuter,borderPoints.topLeftInner);break;}borderData.borders.push({args: borderArgs,color: borders[borderSide].color });}}return borderData;}function createShape(ctx,args){var shape=ctx.drawShape();args.forEach(function(border,index){shape[(index===0)? "moveTo" : border[0] + "To" ].apply(null,border.slice(1));});return shape;}function renderBorders(ctx,borderArgs,color){if(color !=="transparent"){ctx.setVariable("fillStyle",color);createShape(ctx,borderArgs);ctx.fill();numDraws+=1;}}function renderFormValue (el,bounds,stack){var valueWrap=doc.createElement('valuewrap'),cssPropertyArray=['lineHeight','textAlign','fontFamily','color','fontSize','paddingLeft','paddingTop','width','height','border','borderLeftWidth','borderTopWidth'],textValue,textNode;cssPropertyArray.forEach(function(property){try {valueWrap.style[property]=getCSS(el,property);}catch(e){/* Older IE has issues with "border"*/ h2clog("html2canvas: Parse: Exception caught in renderFormValue: " + e.message);}});valueWrap.style.borderColor="black";valueWrap.style.borderStyle="solid";valueWrap.style.display="block";valueWrap.style.position="absolute";if(/^(submit|reset|button|text|password)$/.test(el.type)|| el.nodeName==="SELECT"){valueWrap.style.lineHeight=getCSS(el,"height");}valueWrap.style.top=bounds.top + "px";valueWrap.style.left=bounds.left + "px";textValue=(el.nodeName==="SELECT")? (el.options[el.selectedIndex] || 0).text : el.value;if(!textValue){textValue=el.placeholder;}textNode=doc.createTextNode(textValue);valueWrap.appendChild(textNode);body.appendChild(valueWrap);renderText(el,textNode,stack);body.removeChild(valueWrap);}function drawImage (ctx){ctx.drawImage.apply(ctx,Array.prototype.slice.call(arguments,1));numDraws+=1;}function getPseudoElement(el,which){var elStyle=window.getComputedStyle(el,which);if(!elStyle || !elStyle.content || elStyle.content==="none" || elStyle.content==="-moz-alt-content"){return;}var content=elStyle.content + '',first=content.substr(0,1 );/*strips quotes*/ if(first===content.substr(content.length - 1 )&& first.match(/'|"/)){content=content.substr(1,content.length - 2 );}var isImage=content.substr(0,3 )==='url',elps=document.createElement(isImage ? 'img' : 'span' );elps.className=pseudoHide + "-before " + pseudoHide + "-after";Object.keys(elStyle).filter(indexedProperty).forEach(function(prop){/* Prevent assigning of read only CSS Rules,ex. length,parentRule*/ try {elps.style[prop]=elStyle[prop];}catch (e){h2clog(['Tried to assign readonly property ',prop,'Error:',e]);}});if(isImage){elps.src=_html2canvas.Util.parseBackgroundImage(content)[0].args[0];}else {elps.innerHTML=content;}return elps;}function indexedProperty(property){return (isNaN(window.parseInt(property,10)));}function injectPseudoElements(el,stack){var before=getPseudoElement(el,':before'),after=getPseudoElement(el,':after');if(!before && !after){return;}if(before){el.className +=" " + pseudoHide + "-before";el.parentNode.insertBefore(before,el);parseElement(before,stack,true);el.parentNode.removeChild(before);el.className=el.className.replace(pseudoHide + "-before","").trim();}if(after){el.className +=" " + pseudoHide + "-after";el.appendChild(after);parseElement(after,stack,true);el.removeChild(after);el.className=el.className.replace(pseudoHide + "-after","").trim();}}function renderBackgroundRepeat(ctx,image,backgroundPosition,bounds){var offsetX=Math.round(bounds.left + backgroundPosition.left),offsetY=Math.round(bounds.top + backgroundPosition.top);ctx.createPattern(image);ctx.translate(offsetX,offsetY);ctx.fill();ctx.translate(-offsetX,-offsetY);}function backgroundRepeatShape(ctx,image,backgroundPosition,bounds,left,top,width,height){var args=[];args.push(["line",Math.round(left),Math.round(top)]);args.push(["line",Math.round(left + width),Math.round(top)]);args.push(["line",Math.round(left + width),Math.round(height + top)]);args.push(["line",Math.round(left),Math.round(height + top)]);createShape(ctx,args);ctx.save();ctx.clip();renderBackgroundRepeat(ctx,image,backgroundPosition,bounds);ctx.restore();}function renderBackgroundColor(ctx,backgroundBounds,bgcolor){renderRect(ctx,backgroundBounds.left,backgroundBounds.top,backgroundBounds.width,backgroundBounds.height,bgcolor );}function renderBackgroundRepeating(el,bounds,ctx,image,imageIndex){var backgroundSize=_html2canvas.Util.BackgroundSize(el,bounds,image,imageIndex),backgroundPosition=_html2canvas.Util.BackgroundPosition(el,bounds,image,imageIndex,backgroundSize),backgroundRepeat=getCSS(el,"backgroundRepeat").split(",").map(function(value){return value.trim();});image=resizeImage(image,backgroundSize);backgroundRepeat=backgroundRepeat[imageIndex] || backgroundRepeat[0];switch (backgroundRepeat){case "repeat-x": backgroundRepeatShape(ctx,image,backgroundPosition,bounds,bounds.left,bounds.top + backgroundPosition.top,99999,image.height);break;case "repeat-y": backgroundRepeatShape(ctx,image,backgroundPosition,bounds,bounds.left + backgroundPosition.left,bounds.top,image.width,99999);break;case "no-repeat": backgroundRepeatShape(ctx,image,backgroundPosition,bounds,bounds.left + backgroundPosition.left,bounds.top + backgroundPosition.top,image.width,image.height);break;default: renderBackgroundRepeat(ctx,image,backgroundPosition,{top: bounds.top,left: bounds.left,width: image.width,height: image.height });break;}}function renderBackgroundImage(element,bounds,ctx){var backgroundImage=getCSS(element,"backgroundImage"),backgroundImages=_html2canvas.Util.parseBackgroundImage(backgroundImage),image,imageIndex=backgroundImages.length;while(imageIndex--){backgroundImage=backgroundImages[imageIndex];if(!backgroundImage.args || backgroundImage.args.length===0){continue;}var key=backgroundImage.method==='url' ? backgroundImage.args[0] : backgroundImage.value;image=loadImage(key);/* TODO add support for background-origin*/ if(image){renderBackgroundRepeating(element,bounds,ctx,image,imageIndex);}else {h2clog("html2canvas: Error loading background:",backgroundImage);}}}function resizeImage(image,bounds){if(image.width===bounds.width && image.height===bounds.height){return image;}var ctx,canvas=doc.createElement('canvas');canvas.width=bounds.width;canvas.height=bounds.height;ctx=canvas.getContext("2d");drawImage(ctx,image,0,0,image.width,image.height,0,0,bounds.width,bounds.height );return canvas;}function setOpacity(ctx,element,parentStack){var opacity=getCSS(element,"opacity")* ((parentStack)? parentStack.opacity : 1);ctx.setVariable("globalAlpha",opacity);return opacity;}function createStack(element,parentStack,bounds){var ctx=h2cRenderContext((!parentStack)? documentWidth(): bounds.width ,(!parentStack)? documentHeight(): bounds.height),stack={ctx: ctx,zIndex: setZ(getCSS(element,"zIndex"),(parentStack)? parentStack.zIndex : null),opacity: setOpacity(ctx,element,parentStack),cssPosition: getCSS(element,"position"),borders: getBorderData(element),clip: (parentStack && parentStack.clip)? _html2canvas.Util.Extend({},parentStack.clip ): null };/* TODO correct overflow for absolute content residing under a static position*/ if(options.useOverflow===true && /(hidden|scroll|auto)/.test(getCSS(element,"overflow"))===true && /(BODY)/i.test(element.nodeName)===false){stack.clip=(stack.clip)? clipBounds(stack.clip,bounds): bounds;}stack.zIndex.children.push(stack);return stack;}function getBackgroundBounds(borders,bounds,clip){var backgroundBounds={left: bounds.left + borders[3].width,top: bounds.top + borders[0].width,width: bounds.width - (borders[1].width + borders[3].width),height: bounds.height - (borders[0].width + borders[2].width)};if(clip){backgroundBounds=clipBounds(backgroundBounds,clip);}return backgroundBounds;}function renderElement(element,parentStack,pseudoElement){var bounds=_html2canvas.Util.Bounds(element),image,bgcolor=(ignoreElementsRegExp.test(element.nodeName))? "#efefef" : getCSS(element,"backgroundColor"),stack=createStack(element,parentStack,bounds),borders=stack.borders,ctx=stack.ctx,backgroundBounds=getBackgroundBounds(borders,bounds,stack.clip),borderData=parseBorders(element,bounds,borders);createShape(ctx,borderData.clip);ctx.save();ctx.clip();if(backgroundBounds.height > 0 && backgroundBounds.width > 0){renderBackgroundColor(ctx,bounds,bgcolor);renderBackgroundImage(element,backgroundBounds,ctx);}ctx.restore();borderData.borders.forEach(function(border){renderBorders(ctx,border.args,border.color);});if(!pseudoElement){injectPseudoElements(element,stack);}switch(element.nodeName){case "IMG": if((image=loadImage(element.getAttribute('src')))){renderImage(ctx,element,image,bounds,borders);}else {h2clog("html2canvas: Error loading :" + element.getAttribute('src'));}break;case "INPUT": /* TODO add all relevant type's,i.e. HTML5 new stuff*/ /* todo add support for placeholder attribute for browsers which support it*/ if(/^(text|url|email|submit|button|reset)$/.test(element.type)&& (element.value || element.placeholder).length > 0){renderFormValue(element,bounds,stack);}break;case "TEXTAREA": if((element.value || element.placeholder || "").length > 0){renderFormValue(element,bounds,stack);}break;case "SELECT": if((element.options||element.placeholder || "").length > 0){renderFormValue(element,bounds,stack);}break;case "LI": renderListItem(element,stack,backgroundBounds);break;case "CANVAS": renderImage(ctx,element,element,bounds,borders);break;}return stack;}function isElementVisible(element){return (getCSS(element,'display')!=="none" && getCSS(element,'visibility')!=="hidden" && !element.hasAttribute("data-html2canvas-ignore"));}function parseElement (el,stack,pseudoElement){if(isElementVisible(el)){stack=renderElement(el,stack,pseudoElement)|| stack;if(!ignoreElementsRegExp.test(el.nodeName)){_html2canvas.Util.Children(el).forEach(function(node){if(node.nodeType===1){parseElement(node,stack,pseudoElement);}else if(node.nodeType===3){renderText(el,node,stack);}});}}}function svgDOMRender(body,stack){var img=new Image(),docWidth=documentWidth(),docHeight=documentHeight(),html="";function parseDOM(el){var children=_html2canvas.Util.Children(el ),len=children.length,attr,a,alen,elm,i;for (i=0;i < len;i+=1 ){elm=children[ i ];if(elm.nodeType===3 ){/* Text node*/ html +=elm.nodeValue.replace(//g,">");}else if(elm.nodeType===1 ){/* Element*/ if(!/^(script|meta|title)$/.test(elm.nodeName.toLowerCase())){html +="<" + elm.nodeName.toLowerCase();/* add attributes*/ if(elm.hasAttributes()){attr=elm.attributes;alen=attr.length;for (a=0;a < alen;a+=1 ){html +=" " + attr[ a ].name + '="' + attr[ a ].value + '"';}}html +='>';parseDOM(elm );html +="";}}}}parseDOM(body);img.src=[ "data:image/svg+xml,","","","",html.replace(/\#/g,"%23"),"","","" ].join("");img.onload=function(){stack.svgRender=img;};}function init(){var stack=renderElement(element,null);if(support.svgRendering){svgDOMRender(document.documentElement,stack);}Array.prototype.slice.call(element.children,0).forEach(function(childElement){parseElement(childElement,stack);});stack.backgroundColor=getCSS(document.documentElement,"backgroundColor");body.removeChild(hidePseudoElements);return stack;}return init();};function h2czContext(zindex){return {zindex: zindex,children: [] };}_html2canvas.Preload=function(options ){var images={numLoaded: 0,/* also failed are counted here*/ numFailed: 0,numTotal: 0,cleanupDone: false },pageOrigin,methods,i,count=0,element=options.elements[0] || document.body,doc=element.ownerDocument,domImages=doc.images,/* TODO probably should limit it to images present in the element only*/ imgLen=domImages.length,link=doc.createElement("a"),supportCORS=(function(img ){return (img.crossOrigin !==undefined);})(new Image()),timeoutTimer;link.href=window.location.href;pageOrigin=link.protocol + link.host;function isSameOrigin(url){link.href=url;link.href=link.href;/* YES,BELIEVE IT OR NOT,that is required for IE9 - http://jsfiddle.net/niklasvh/2e48b/*/ var origin=link.protocol + link.host;return (origin===pageOrigin);}function start(){h2clog("html2canvas: start: images: " + images.numLoaded + " / " + images.numTotal + " (failed: " + images.numFailed + ")");if(!images.firstRun && images.numLoaded >=images.numTotal){h2clog("Finished loading images: # " + images.numTotal + " (failed: " + images.numFailed + ")");if(typeof options.complete==="function"){options.complete(images);}}}/* TODO modify proxy to serve images with CORS enabled,where available*/ function proxyGetImage(url,img,imageObj){var callback_name,scriptUrl=options.proxy,script;link.href=url;url=link.href;/* work around for pages with base href="" set - WARNING: this may change the url*/ callback_name='html2canvas_' + (count++);imageObj.callbackname=callback_name;if(scriptUrl.indexOf("?")> -1){scriptUrl +="&";}else {scriptUrl +="?";}scriptUrl +='url=' + encodeURIComponent(url)+ '&callback=' + callback_name;script=doc.createElement("script");window[callback_name]=function(a){if(a.substring(0,6)==="error:"){imageObj.succeeded=false;images.numLoaded++;images.numFailed++;start();}else {setImageLoadHandlers(img,imageObj);img.src=a;}window[callback_name]=undefined;/* to work with IE<9 // NOTE: that the undefined callback property-name still exists on the window object (for IE<9)*/ try {delete window[callback_name];/* for all browser that support this*/ }catch(ex){}script.parentNode.removeChild(script);script=null;delete imageObj.script;delete imageObj.callbackname;};script.setAttribute("type","text/javascript");script.setAttribute("src",scriptUrl);imageObj.script=script;window.document.body.appendChild(script);}function loadPseudoElement(element,type){var style=window.getComputedStyle(element,type),content=style.content;if(content.substr(0,3)==='url'){methods.loadImage(_html2canvas.Util.parseBackgroundImage(content)[0].args[0]);}loadBackgroundImages(style.backgroundImage,element);}function loadPseudoElementImages(element){loadPseudoElement(element,":before");loadPseudoElement(element,":after");}function loadGradientImage(backgroundImage,bounds){var img=_html2canvas.Generate.Gradient(backgroundImage,bounds);if(img !==undefined){images[backgroundImage]={img: img,succeeded: true };images.numTotal++;images.numLoaded++;start();}}function invalidBackgrounds(background_image){return (background_image && background_image.method && background_image.args && background_image.args.length > 0 );}function loadBackgroundImages(background_image,el){var bounds;_html2canvas.Util.parseBackgroundImage(background_image).filter(invalidBackgrounds).forEach(function(background_image){if(background_image.method==='url'){methods.loadImage(background_image.args[0]);}else if(background_image.method.match(/\-?gradient$/)){if(bounds===undefined){bounds=_html2canvas.Util.Bounds(el);}loadGradientImage(background_image.value,bounds);}});}function getImages (el){var elNodeType=false;/* Firefox fails with permission denied on pages with iframes*/ try {_html2canvas.Util.Children(el).forEach(function(img){getImages(img);});}catch(e ){}try {elNodeType=el.nodeType;}catch (ex){elNodeType=false;h2clog("html2canvas: failed to access some element's nodeType - Exception: " + ex.message);}if(elNodeType===1 || elNodeType===undefined){loadPseudoElementImages(el);try {loadBackgroundImages(_html2canvas.Util.getCSS(el,'backgroundImage'),el);}catch(e){h2clog("html2canvas: failed to get background-image - Exception: " + e.message);}loadBackgroundImages(el);}}function setImageLoadHandlers(img,imageObj){img.onload=function(){if(imageObj.timer !==undefined ){/* CORS succeeded*/ window.clearTimeout(imageObj.timer );}images.numLoaded++;imageObj.succeeded=true;img.onerror=img.onload=null;start();};img.onerror=function(){if(img.crossOrigin==="anonymous"){/* CORS failed*/ window.clearTimeout(imageObj.timer );/* let's try with proxy instead*/ if(options.proxy ){var src=img.src;img=new Image();imageObj.img=img;img.src=src;proxyGetImage(img.src,img,imageObj );return;}}images.numLoaded++;images.numFailed++;imageObj.succeeded=false;img.onerror=img.onload=null;start();};}methods={loadImage: function(src ){var img,imageObj;if(src && images[src]===undefined ){img=new Image();if(src.match(/data:image\/.*;base64,/i)){img.src=src.replace(/url\(['"]{0,}|['"]{0,}\)$/ig,'');imageObj=images[src]={img: img };images.numTotal++;setImageLoadHandlers(img,imageObj);}else if(isSameOrigin(src )|| options.allowTaint===true ){imageObj=images[src]={img: img };images.numTotal++;setImageLoadHandlers(img,imageObj);img.src=src;}else if(supportCORS && !options.allowTaint && options.useCORS ){/* attempt to load with CORS*/ img.crossOrigin="anonymous";imageObj=images[src]={img: img };images.numTotal++;setImageLoadHandlers(img,imageObj);img.src=src;/* work around for https://bugs.webkit.org/show_bug.cgi?id=80028*/ img.customComplete=function (){if(!this.img.complete){this.timer=window.setTimeout(this.img.customComplete,100);}else {this.img.onerror();}}.bind(imageObj);img.customComplete();}else if(options.proxy ){imageObj=images[src]={img: img };images.numTotal++;proxyGetImage(src,img,imageObj );}}},cleanupDOM: function(cause){var img,src;if(!images.cleanupDone){if(cause && typeof cause==="string"){h2clog("html2canvas: Cleanup because: " + cause);}else {h2clog("html2canvas: Cleanup after timeout: " + options.timeout + " ms.");}for (src in images){if(images.hasOwnProperty(src)){img=images[src];if(typeof img==="object" && img.callbackname && img.succeeded===undefined){/* cancel proxy image request*/ window[img.callbackname]=undefined;/* to work with IE<9 // NOTE: that the undefined callback property-name still exists on the window object (for IE<9)*/ try {delete window[img.callbackname];/* for all browser that support this*/ }catch(ex){}if(img.script && img.script.parentNode){img.script.setAttribute("src","about:blank");/* try to cancel running request*/ img.script.parentNode.removeChild(img.script);}images.numLoaded++;images.numFailed++;h2clog("html2canvas: Cleaned up failed img: '" + src + "' Steps: " + images.numLoaded + " / " + images.numTotal);}}}/* cancel any pending requests*/ if(window.stop !==undefined){window.stop();}else if(document.execCommand !==undefined){document.execCommand("Stop",false);}if(document.close !==undefined){document.close();}images.cleanupDone=true;if(!(cause && typeof cause==="string")){start();}}},renderingDone: function(){if(timeoutTimer){window.clearTimeout(timeoutTimer);}}};if(options.timeout > 0){timeoutTimer=window.setTimeout(methods.cleanupDOM,options.timeout);}h2clog('html2canvas: Preload starts: finding background-images');images.firstRun=true;getImages(element);h2clog('html2canvas: Preload: Finding images');/* load images*/ for (i=0;i < imgLen;i+=1){methods.loadImage(domImages[i].getAttribute("src" ));}images.firstRun=false;h2clog('html2canvas: Preload: Done.');if(images.numTotal===images.numLoaded ){start();}return methods;};_html2canvas.Renderer=function(parseQueue,options){function createRenderQueue(parseQueue){var queue=[];var sortZ=function(zStack){var subStacks=[],stackValues=[];zStack.children.forEach(function(stackChild){if(stackChild.children && stackChild.children.length > 0){subStacks.push(stackChild);stackValues.push(stackChild.zindex);}else {queue.push(stackChild);}});stackValues.sort(function(a,b){return a - b;});stackValues.forEach(function(zValue){var index;subStacks.some(function(stack,i){index=i;return (stack.zindex===zValue);});sortZ(subStacks.splice(index,1)[0]);});};sortZ(parseQueue.zIndex);return queue;}function getRenderer(rendererName){var renderer;if(typeof options.renderer==="string" && _html2canvas.Renderer[rendererName] !==undefined){renderer=_html2canvas.Renderer[rendererName](options);}else if(typeof rendererName==="function"){renderer=rendererName(options);}else {throw new Error("Unknown renderer");}if(typeof renderer !=="function" ){throw new Error("Invalid renderer defined");}return renderer;}return getRenderer(options.renderer)(parseQueue,options,document,createRenderQueue(parseQueue),_html2canvas);};_html2canvas.Util.Support=function (options,doc){function supportSVGRendering(){var img=new Image(),canvas=doc.createElement("canvas"),ctx=(canvas.getContext===undefined)? false : canvas.getContext("2d");if(ctx===false){return false;}canvas.width=canvas.height=10;img.src=[ "data:image/svg+xml,","","","
","sup","
","","" ].join("");try {ctx.drawImage(img,0,0);canvas.toDataURL();}catch(e){return false;}h2clog('html2canvas: Parse: SVG powered rendering available');return true;}/* Test whether we can use ranges to measure bounding boxes*/ /* Opera doesn't provide valid bounds.height/bottom even though it supports the method.*/ function supportRangeBounds(){var r,testElement,rangeBounds,rangeHeight,support=false;if(doc.createRange){r=doc.createRange();if(r.getBoundingClientRect){testElement=doc.createElement('boundtest');testElement.style.height="123px";testElement.style.display="block";doc.body.appendChild(testElement);r.selectNode(testElement);rangeBounds=r.getBoundingClientRect();rangeHeight=rangeBounds.height;if(rangeHeight===123){support=true;}doc.body.removeChild(testElement);}}return support;}return {rangeBounds: supportRangeBounds(),svgRendering: options.svgRendering && supportSVGRendering()};};window.html2canvas=function(elements,opts){elements=(elements.length)? elements : [elements];var queue,canvas,options={/* general*/ logging: false,elements: elements,background: "#fff",/* preload options*/ proxy: null,timeout: 0,/* no timeout*/ useCORS: false,/* try to load images as CORS (where available),before falling back to proxy*/ allowTaint: false,/* whether to allow images to taint the canvas,won't need proxy ifset to true*/ /* parse options*/ svgRendering: false,/* use svg powered rendering where available (FF11+)*/ ignoreElements: "IFRAME|OBJECT|PARAM",useOverflow: true,letterRendering: false,chinese: false,/* render options*/ width: null,height: null,taintTest: true,/* do a taint test with all images before applying to canvas*/ renderer: "Canvas" };options=_html2canvas.Util.Extend(opts,options);_html2canvas.logging=options.logging;options.complete=function(images ){if(typeof options.onpreloaded==="function"){if(options.onpreloaded(images )===false ){return;}}queue=_html2canvas.Parse(images,options );if(typeof options.onparsed==="function"){if(options.onparsed(queue )===false ){return;}}canvas=_html2canvas.Renderer(queue,options );if(typeof options.onrendered==="function"){options.onrendered(canvas );}};/* for pages without images,we still want this to be async,i.e. return methods before executing*/ window.setTimeout(function(){_html2canvas.Preload(options );},0 );return {render: function(queue,opts ){return _html2canvas.Renderer(queue,_html2canvas.Util.Extend(opts,options));},parse: function(images,opts ){return _html2canvas.Parse(images,_html2canvas.Util.Extend(opts,options));},preload: function(opts ){return _html2canvas.Preload(_html2canvas.Util.Extend(opts,options));},log: h2clog };};window.html2canvas.log=h2clog;/* for renderers*/ window.html2canvas.Renderer={Canvas: undefined /* We are assuming this will be used*/ };_html2canvas.Renderer.Canvas=function(options){options=options || {};var doc=document,safeImages=[],testCanvas=document.createElement("canvas"),testctx=testCanvas.getContext("2d"),canvas=options.canvas || doc.createElement('canvas');function createShape(ctx,args){ctx.beginPath();args.forEach(function(arg){ctx[arg.name].apply(ctx,arg['arguments']);});ctx.closePath();}function safeImage(item){if(safeImages.indexOf(item['arguments'][0].src )===-1){testctx.drawImage(item['arguments'][0],0,0);try {testctx.getImageData(0,0,1,1);}catch(e){testCanvas=doc.createElement("canvas");testctx=testCanvas.getContext("2d");return false;}safeImages.push(item['arguments'][0].src);}return true;}function isTransparent(backgroundColor){return (backgroundColor==="transparent" || backgroundColor==="rgba(0,0,0,0)");}function renderItem(ctx,item){switch(item.type){case "variable": ctx[item.name]=item['arguments'];break;case "function": if(item.name==="createPattern"){if(item['arguments'][0].width > 0 && item['arguments'][0].height > 0){try {ctx.fillStyle=ctx.createPattern(item['arguments'][0],"repeat");}catch(e){h2clog("html2canvas: Renderer: Error creating pattern",e.message);}}}else if(item.name==="drawShape"){createShape(ctx,item['arguments']);}else if(item.name==="drawImage"){if(item['arguments'][8] > 0 && item['arguments'][7] > 0){if(!options.taintTest || (options.taintTest && safeImage(item))){ctx.drawImage.apply(ctx,item['arguments'] );}}}else {ctx[item.name].apply(ctx,item['arguments']);}break;}}return function(zStack,options,doc,queue,_html2canvas){var ctx=canvas.getContext("2d"),storageContext,i,queueLen,newCanvas,bounds,fstyle;canvas.width=canvas.style.width=options.width || zStack.ctx.width;canvas.height=canvas.style.height=options.height || zStack.ctx.height;fstyle=ctx.fillStyle;ctx.fillStyle=(isTransparent(zStack.backgroundColor)&& options.background !==undefined)? options.background : zStack.backgroundColor;ctx.fillRect(0,0,canvas.width,canvas.height);ctx.fillStyle=fstyle;if(options.svgRendering && zStack.svgRender !==undefined ){/* TODO: enable async rendering to support this*/ ctx.drawImage(zStack.svgRender,0,0 );}else {for (i=0,queueLen=queue.length;i < queueLen;i+=1 ){storageContext=queue.splice(0,1)[0];storageContext.canvasPosition=storageContext.canvasPosition || {};/* set common settings for canvas*/ ctx.textBaseline="bottom";if(storageContext.clip){ctx.save();ctx.beginPath();/* console.log(storageContext);*/ ctx.rect(storageContext.clip.left,storageContext.clip.top,storageContext.clip.width,storageContext.clip.height);ctx.clip();}if(storageContext.ctx.storage){storageContext.ctx.storage.forEach(renderItem.bind(null,ctx));}if(storageContext.clip){ctx.restore();}}}h2clog("html2canvas: Renderer: Canvas renderer done - returning canvas obj");queueLen=options.elements.length;if(queueLen===1){if(typeof options.elements[0]==="object" && options.elements[0].nodeName !=="BODY"){/* crop image to the bounds of selected (single)element*/ bounds=_html2canvas.Util.Bounds(options.elements[0]);newCanvas=doc.createElement('canvas');newCanvas.width=bounds.width;newCanvas.height=bounds.height;ctx=newCanvas.getContext("2d");ctx.drawImage(canvas,bounds.left,bounds.top,bounds.width,bounds.height,0,0,bounds.width,bounds.height);canvas=null;return newCanvas;}}return canvas;};};})(window,document); - - // Used to update the user with the status of rendering. - function colorstatus(color){ - $('html').empty(); - $('html').css('background', 'none repeat scroll 0 0 '+color); - } - - // These two objects control the dimensions of rendering. - // IMPORTANT: The first object needs to contain the default page size or the render will have undefined results. - var sizeInitially = { - width: 1200 - }; - sizeInitially.height = sizeInitially.width*5/6; - // The size of the final rendering, the larger the dimensions, the larger the cached image, but the better the quality. - var sizeFinally = { - width: 450 - }; - sizeFinally.height = sizeFinally.width*5/6; - - $(document).ready(function (){ - // Ensure static document dimensions regardless of actual viewport size - $('html').width(sizeInitially.width); - $('html').height(sizeInitially.height); - $('body').width(sizeInitially.width); - $('body').height(sizeInitially.height); - // Get the currently rendered stylesheet name, used for $.post() later. - var stylesheetName = $('body').attr('stylesheet'); - console.log("Start: "+stylesheetName); - // If we can render, start doing so, if we can't, error out. - if(html2canvas){ - // First render - html2canvas(document.body,{ - logging: true, - width: sizeInitially.width, - height: sizeInitially.height, - onrendered: function(canvas){ - // Oh no, inline css. *Gasp.* Actually practical here to ensure the render has no borders regardless of browser actions. - $('body').empty(); - $('link[rel=stylesheet]').remove(); - $('body').css('background', 'url('+canvas.toDataURL()+') no-repeat scroll center top'); - $('body').css('background-size', '100% 100%'); - $('body').css('position', 'relative'); - $('html').width(sizeFinally.width); - $('html').height(sizeFinally.height); - $('body').width(sizeFinally.width); - $('body').height(sizeFinally.height); - // Secondary, smaller render based on the first one - html2canvas(document.body,{ - logging: true, - width: sizeFinally.width, - height: sizeFinally.height, - onrendered: function(canvas){ - console.log("Finished render: "+stylesheetName); - $('body').empty(); - $('link[rel=stylesheet]').remove(); - colorstatus("yellow"); - var imageData = canvas.toDataURL(); - // Send the rendered image along with the stylesheet name to PHP for caching. - var postData = $.ajax({ - cache: false, - url: "tools.php", - type: 'post', - data: { - ajax: true, - action: "rerender_gallery", - image: imageData, - stylesheet: stylesheetName - } - }).done(function(response){ - console.log("Finished post: "+stylesheetName); - // Update the user about the received response once done. - var reply = $.parseJSON(response); - if(reply.status == "0"){ - // All good, time to consider replacing all comments with just "Snafucate". - colorstatus("yellowgreen"); - } else if(reply.status == "-1") { - // PHP returned an error for saving the image - colorstatus("blue"); - } else if(reply.status == "-1") { - // PHP didn't receive the full $.post() - colorstatus("purple"); - } else { - // Unknown status, panic. - colorstats("black"); - } - $('html').click(); - return 0; - }).fail(function(){ - // Failed to $.post() data to PHP. - colorstatus("red"); - console.log("Failed to $.post() data to PHP."); - $('html').click(); - }); - } - }); - // No loops, no hoops. Ensure the browser knows we're finished. - return 0; - } - }); - } else { - // Failed to start html2canvas - colorstatus("red"); - console.log("Failed to start html2canvas."); - } - }); -})(jQuery); \ No newline at end of file diff --git a/static/functions/stylesheetgallery_rerender_queue.js b/static/functions/stylesheetgallery_rerender_queue.js deleted file mode 100644 index b0fcea30..00000000 --- a/static/functions/stylesheetgallery_rerender_queue.js +++ /dev/null @@ -1,42 +0,0 @@ -(function ($){ - - // Work through the queue of stylesheets - function recursivelyProcessQueue(queue){ - // If our work here is done, call it a day. - if(queue.length < 1) return 0; - var nextTarget = queue.pop(); - var originalSrc = nextTarget.attr('src'); - nextTarget.attr('src', nextTarget.attr('data-src')); - nextTarget.load(function() { - var targetHtml = $(this).contents().find("html"); - targetHtml.on('click', function() { - targetHtml.unbind(); - recursivelyProcessQueue(queue); - // Avoid unnecessary caching, cahce might lead to undefined behavior. - nextTarget.attr('src', '#'); - nextTarget.addClass('finished'); - return 0; - }) - }); - // Be sure to close off. - return 0; - } - - $(document).ready(function (){ - // Build a queue of stylesheets to be rendered - var queue = []; - $('.statusbutton').children('iframe').each(function() { - var targetDiv = $(this); - queue.push(targetDiv); - }); - // We'd prefer to work from top-down, not bottom-up. - queue = queue.reverse(); - $('#start_rerendering').click(function(event) { - event.preventDefault(); - recursivelyProcessQueue(queue); - $(this).css('text-decoration', 'line-through'); - $(this).unbind(); - return false; - }); - }); -})(jQuery); diff --git a/static/functions/user.js b/static/functions/user.js index 56a0d316..fb3337b5 100644 --- a/static/functions/user.js +++ b/static/functions/user.js @@ -157,15 +157,12 @@ function ToggleIdenticons() { } function userform_submit() { - var userform = jQuery('#userform'); if (jQuery('#resetpasskey').is(':checked')) { - if (confirm('Are you sure you want to reset your passkey?')) { - userform.submit(); + if (!confirm('Are you sure you want to reset your passkey?')) { + return false; } } - else { - userform.submit(); - }; + return formVal(); } function togglePassKey(key) { diff --git a/static/functions/validate.js b/static/functions/validate.js index eb872ff0..1882d867 100644 --- a/static/functions/validate.js +++ b/static/functions/validate.js @@ -67,6 +67,7 @@ function validDate(theDate) { function showError(fields,alertStr) { var tField=Array(); + var obj, el; if (typeof(fields) == 'object') { tField[0] = fields; @@ -74,22 +75,20 @@ function showError(fields,alertStr) { tField = fields.split(','); } for (s = 0; s <= tField.length - 1; s++) { - if ($('#'+tField[s])) { - $('#'+tField[s]).className=$('#'+tField[s]).className+" elem_error"; + obj = $('#'+tField[s]); + if (obj) { + el = obj.raw(); + obj.add_class("elem_error"); if (s == 0) { - $('#'+tField[s]).focus(); + el.focus(); try { - $('#'+tField[s]).select(); + el.select(); } catch (error) { } } - - errorElems[errorElems.length] = tField[s]; - if ($('#'+tField[s]).type != "select-one") { - $('#'+tField[s]).onkeypress=function() { clearElemError(); }; - } else { - $('#'+tField[s]).onchange=function() { clearElemError(); }; - } + var evtType = el.type == "select-one" ? "change" : "keypress"; + obj.listen(evtType, clearElemError); + errorElems.push(tField[s]); } } @@ -115,14 +114,13 @@ function clearErrors(theForm) { } function clearElemError(evt) { + var obj, el; for (x = 0; x <= errorElems.length - 1; x++) { - elem = $('#'+errorElems[x]); - if ($('#'+elem).type != "select-one") { - $('#'+elem).onkeypress = ""; - } else { - $('#'+elem).onchange = ""; - } - elem.className = elemStyles[elem.id]; + obj = $('#'+errorElems[x]); + el = obj.raw(); + var evtType = el.type == "select-one" ? "change" : "keypress"; + obj.unbind(evtType, clearElemError); + el.className = elemStyles[el.id]; } errorElems = Array(); }