diff --git a/classes/util.php b/classes/util.php index c4f2051c..1934a270 100644 --- a/classes/util.php +++ b/classes/util.php @@ -8,12 +8,17 @@ * @param string $Str * @return true if $Str numeric */ -function is_number($Str) { - $Return = true; - if ($Str < 0) { $Return = false; } - // We're converting input to a int, then string and comparing to original - $Return = ($Str == strval(intval($Str)) ? true : false); - return $Return; +if (PHP_INT_SIZE === 4) { + function is_number($Str) { + if ($Str[0] == '-' || $Str[0] == '+') { // Leading plus/minus signs are ok + $Str[0] = 0; + } + return ltrim($Str, "0..9") === ''; + } +} else { + function is_number($Str) { + return $Str == strval(intval($Str)); + } } diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index dea2a80e..4df16363 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -535,18 +535,17 @@ function header_link($SortKey,$DefaultWay="desc") { } /** End run search query and collect results **/ +$HideFilter = isset($LoggedUser['ShowTorFilter']) && $LoggedUser['ShowTorFilter'] == 0; // This is kinda ugly, but the enormous if paragraph was really hard to read $AdvancedSearch = !empty($_GET['action']) && $_GET['action'] == "advanced"; $AdvancedSearch |= !empty($LoggedUser['SearchType']) && (empty($_GET['action']) || $_GET['action'] == "advanced"); $AdvancedSearch &= check_perms('site_advanced_search'); if ($AdvancedSearch) { - $Debug->log_var(1, 'Advanced search'); $Action = 'action=advanced'; $HideBasic = ' hidden'; $HideAdvanced = ''; } else { - $Debug->log_var(1, 'Basic search'); $Action = 'action=basic'; $HideBasic = ''; $HideAdvanced = ' hidden'; @@ -561,7 +560,7 @@ function header_link($SortKey,$DefaultWay="desc") {

Torrents

-
+
Basic / @@ -571,16 +570,16 @@ function header_link($SortKey,$DefaultWay="desc") { search - Hide +
-
+
@@ -829,10 +828,7 @@ function header_link($SortKey,$DefaultWay="desc") { - query("SELECT tags.Name, diff --git a/sections/user/edit.php b/sections/user/edit.php index 7287fd7e..e5da25d0 100644 --- a/sections/user/edit.php +++ b/sections/user/edit.php @@ -78,7 +78,7 @@ function checked($Checked) { -
Artist name: - + />
+
- + diff --git a/sections/user/takeedit.php b/sections/user/takeedit.php index 0bb7fce5..36a1cefa 100644 --- a/sections/user/takeedit.php +++ b/sections/user/takeedit.php @@ -27,7 +27,6 @@ $Val->SetFields('postsperpage',1,"number","You forgot to select your posts per page option.",array('inarray'=>array(25,50,100))); //$Val->SetFields('hidecollage',1,"number","You forgot to select your collage option.",array('minlength'=>0,'maxlength'=>1)); $Val->SetFields('collagecovers',1,"number","You forgot to select your collage option."); -$Val->SetFields('showtags',1,"number","You forgot to select your show tags option.",array('minlength'=>0,'maxlength'=>1)); $Val->SetFields('avatar',0,"regex","You did not enter a valid avatar url.",array('regex'=>"/^".IMAGE_REGEX."$/i")); $Val->SetFields('email',1,"email","You did not enter a valid email address."); $Val->SetFields('irckey',0,"string","You did not enter a valid IRCKey, must be between 6 and 32 characters long.",array('minlength'=>6,'maxlength'=>32)); @@ -187,6 +186,7 @@ $Options['PostsPerPage'] = (int) $_POST['postsperpage']; //$Options['HideCollage'] = (!empty($_POST['hidecollage']) ? 1 : 0); $Options['CollageCovers'] = empty($_POST['collagecovers']) ? 0 : $_POST['collagecovers']; +$Options['ShowTorFilter'] = empty($_POST['showtfilter']) ? 0 : 1; $Options['ShowTags'] = (!empty($_POST['showtags']) ? 1 : 0); $Options['AutoSubscribe'] = (!empty($_POST['autosubscribe']) ? 1 : 0); $Options['DisableSmileys'] = (!empty($_POST['disablesmileys']) ? 1 : 0); diff --git a/sections/wiki/article.php b/sections/wiki/article.php index 621547b4..ae0ff658 100644 --- a/sections/wiki/article.php +++ b/sections/wiki/article.php @@ -55,12 +55,8 @@
-
Table of Contents
-
- -
-
-
+
Search
+
Browse articles
+
+
+
Table of Contents
+
+ +
+
  • diff --git a/static/functions/comments.js b/static/functions/comments.js index 3d7f09f1..c21aaa0f 100644 --- a/static/functions/comments.js +++ b/static/functions/comments.js @@ -66,9 +66,12 @@ function Edit_Form(post,key) { } function Cancel_Edit(postid) { - $('#reply_box').toggle(); - $('#bar' + postid).raw().innerHTML = $('#bar' + postid).raw().oldbar; - $('#content' + postid).raw().innerHTML = $('#bar' + postid).raw().cancel; + var answer = confirm("Are you sure you want to cancel?"); + if (answer) { + $('#reply_box').toggle(); + $('#bar' + postid).raw().innerHTML = $('#bar' + postid).raw().oldbar; + $('#content' + postid).raw().innerHTML = $('#bar' + postid).raw().cancel; + } } function Preview_Edit(postid) { diff --git a/static/functions/push_settings.js b/static/functions/push_settings.js index a1deeefa..ba2f0222 100644 --- a/static/functions/push_settings.js +++ b/static/functions/push_settings.js @@ -20,12 +20,15 @@ if($(this).val() == TOASTY) { $('#pushservice_title').text("Device ID"); + $('#pushusername_title').text("Username"); } else if($(this).val() == PUSHOVER) { $('#pushservice_title').text("Token"); + $('#pushusername_title').text("User Key"); } else { $('#pushservice_title').text("API Key"); + $('#pushusername_title').text("Username"); } } else { diff --git a/static/styles/anorex/style.css b/static/styles/anorex/style.css index a4756960..203fcdfa 100644 --- a/static/styles/anorex/style.css +++ b/static/styles/anorex/style.css @@ -731,6 +731,12 @@ ul .invitetree { margin: 10px 2px; } +/* Layout (User options) */ + +.user_options .options_list li { + margin: 0; +} + /* Layout (MISC) */ .left_poll { diff --git a/static/styles/dark_ambient/style.css b/static/styles/dark_ambient/style.css index e4ea5310..32113607 100644 --- a/static/styles/dark_ambient/style.css +++ b/static/styles/dark_ambient/style.css @@ -1389,18 +1389,21 @@ h3 { margin: 10px 0; } -#user #userform { +#userform { padding: 20px 0 0 0; } -#userform select#stylesheet, -#userform select#searchtype, -#userform select#discogview, -#userform select#hidecollage, -#userform select#showtags { +.user_options select#stylesheet, +.user_options select#searchtype, +.user_options select#discogview, +.user_options select#hidecollage{ width: 130px; } +.user_options .options_list { + padding: 0; +} + #user .linkbox, #artist .linkbox, #collage .linkbox, diff --git a/static/styles/kuro/style.css b/static/styles/kuro/style.css index e835f81d..b54e4de8 100644 --- a/static/styles/kuro/style.css +++ b/static/styles/kuro/style.css @@ -813,6 +813,12 @@ ul .invitetree { margin: 10px 2px; } +/* Layout (User options) */ + +.user_options .options_list li { + margin: 0; +} + /* Layout (MISC) */ .left_poll { diff --git a/static/styles/layer_cake/style.css b/static/styles/layer_cake/style.css index 424dcb34..ef82c764 100644 --- a/static/styles/layer_cake/style.css +++ b/static/styles/layer_cake/style.css @@ -709,6 +709,12 @@ ul .invitetree { margin: 10px 2px; } +/* Layout (User options) */ + +.user_options .options_list li { + margin: 0; +} + /* Layout (MISC) */ .left_poll { diff --git a/static/styles/minimal/style.css b/static/styles/minimal/style.css index d634b1b8..43059b31 100644 --- a/static/styles/minimal/style.css +++ b/static/styles/minimal/style.css @@ -219,6 +219,7 @@ table tr.colhead_dark td{background:#555; border:0} #user #styleurl{width:40% !important} #user table textarea{width:98% !important} #user table tr td.center strong{display:block} +.user_options .options_list{padding: 0;} /* FORUMS */ #forums h3{margin:15px 0} diff --git a/static/styles/minimal/style2.css b/static/styles/minimal/style2.css index 0c434a23..450b82e0 100644 --- a/static/styles/minimal/style2.css +++ b/static/styles/minimal/style2.css @@ -209,6 +209,7 @@ table tr.colhead_dark td{background:#555; border:0} #user #styleurl{width:40% !important} #user table textarea{width:98% !important} #user table tr td.center strong{display:block} +.user_options .options_list{padding: 0;} /* FORUMS */ #forums h3{margin:15px 0} diff --git a/static/styles/postmod/style.css b/static/styles/postmod/style.css index d65e683e..3dfd680c 100644 --- a/static/styles/postmod/style.css +++ b/static/styles/postmod/style.css @@ -891,6 +891,12 @@ ul .invitetree { background: transparent !important; outline: 0 } +/* Layout (User options) */ + +.user_options .options_list li { + margin: 0; +} + /* Layout (MISC) */ .poll{list-style:none; padding:10px; margin:5px} diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css index 5c1fe873..4b3989b0 100644 --- a/static/styles/proton/style.css +++ b/static/styles/proton/style.css @@ -1498,18 +1498,21 @@ h3 { margin: 10px 0; } -#user #userform { +#userform { padding: 20px 0 0 0; } -#userform select#stylesheet, -#userform select#searchtype, -#userform select#discogview, -#userform select#hidecollage, -#userform select#showtags { +.user_options select#stylesheet, +.user_options select#searchtype, +.user_options select#discogview, +.user_options select#hidecollage{ width: 130px; } +.user_options .options_list { + padding: 0; +} + #user .linkbox, #artist .linkbox, #collage .linkbox, diff --git a/static/styles/white.cd/style.css b/static/styles/white.cd/style.css index 8b86d1c3..064bb79d 100644 --- a/static/styles/white.cd/style.css +++ b/static/styles/white.cd/style.css @@ -709,6 +709,9 @@ table tr td.unread_locked_sticky { padding-top:20px; text-transform:uppercase; } +.user_options .options_list { + padding:0; + } #site_debug { width:950px; margin:0 auto;
Site preferences @@ -187,12 +187,18 @@ function checked($Checked) {
Browse page tag listTorrent search - +
    +
  • + /> + +
    • +
  • + /> + +
    • +