summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/gallery/tests/Xss_Security_Test.php3
-rw-r--r--modules/gallery/tests/xss_data.txt25
-rw-r--r--modules/search/helpers/search_installer.php11
-rw-r--r--modules/search/module.info2
-rw-r--r--modules/tag/controllers/admin_tags.php6
-rw-r--r--modules/tag/js/tag.js2
-rw-r--r--themes/admin_default/css/screen.css5
7 files changed, 26 insertions, 28 deletions
diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index 85624517..16541017 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -144,7 +144,8 @@ class Xss_Security_Test extends Unit_Test_Case {
"dynamic_bottom", "dynamic_top", "footer", "head", "header_bottom",
"header_top", "page_bottom", "page_top", "photo_blocks", "photo_bottom",
"photo_top", "resize_bottom", "resize_top", "sidebar_blocks", "sidebar_bottom",
- "sidebar_top", "thumb_bottom", "thumb_info", "thumb_top")) &&
+ "sidebar_top", "thumb_bottom", "thumb_info", "thumb_top",
+ "movie_menu")) &&
self::_token_matches("(", $tokens, $token_number + 3)) {
$method = $tokens[$token_number + 2][1];
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 193d2ca1..57da8730 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -295,10 +295,11 @@ themes/admin_default/views/admin.html.php 68 DIRTY $sideb
themes/admin_default/views/admin.html.php 73 DIRTY $theme->admin_footer()
themes/admin_default/views/admin.html.php 75 DIRTY $theme->admin_credits()
themes/admin_default/views/admin.html.php 79 DIRTY $theme->admin_page_bottom()
-themes/admin_default/views/block.html.php 2 DIRTY $id
-themes/admin_default/views/block.html.php 2 DIRTY_ATTR $css_id
-themes/admin_default/views/block.html.php 10 DIRTY $title
-themes/admin_default/views/block.html.php 13 DIRTY $content
+themes/admin_default/views/block.html.php 3 DIRTY_ATTR $anchor
+themes/admin_default/views/block.html.php 5 DIRTY $id
+themes/admin_default/views/block.html.php 5 DIRTY_ATTR $css_id
+themes/admin_default/views/block.html.php 13 DIRTY $title
+themes/admin_default/views/block.html.php 16 DIRTY $content
themes/admin_default/views/pager.html.php 13 DIRTY_JS str_replace('{page}',1,$url)
themes/admin_default/views/pager.html.php 20 DIRTY_JS str_replace('{page}',$previous_page,$url)
themes/admin_default/views/pager.html.php 27 DIRTY $from_to_msg
@@ -309,10 +310,10 @@ themes/default/views/album.html.php 16 DIRTY_ATTR $ite
themes/default/views/album.html.php 18 DIRTY_JS $child->url()
themes/default/views/album.html.php 19 DIRTY $child->thumb_img(array("class"=>"gThumbnail"))
themes/default/views/album.html.php 23 DIRTY_JS $child->url()
-themes/default/views/block.html.php 2 DIRTY_ATTR $anchor
-themes/default/views/block.html.php 3 DIRTY_ATTR $css_id
-themes/default/views/block.html.php 4 DIRTY $title
-themes/default/views/block.html.php 6 DIRTY $content
+themes/default/views/block.html.php 3 DIRTY_ATTR $anchor
+themes/default/views/block.html.php 5 DIRTY_ATTR $css_id
+themes/default/views/block.html.php 6 DIRTY $title
+themes/default/views/block.html.php 8 DIRTY $content
themes/default/views/dynamic.html.php 11 DIRTY_ATTR $child->is_album()?"gAlbum":""
themes/default/views/dynamic.html.php 13 DIRTY_JS $child->url()
themes/default/views/dynamic.html.php 14 DIRTY_ATTR $child->id
@@ -329,10 +330,10 @@ themes/default/views/page.html.php 42 DIRTY $new_h
themes/default/views/page.html.php 43 DIRTY $thumb_proportion
themes/default/views/page.html.php 82 DIRTY $header_text
themes/default/views/page.html.php 84 DIRTY_JS item::root()->url()
-themes/default/views/page.html.php 98 DIRTY_JS $parent->url("show={$theme->item()->id}")
-themes/default/views/page.html.php 112 DIRTY $content
-themes/default/views/page.html.php 118 DIRTY newView("sidebar.html")
-themes/default/views/page.html.php 125 DIRTY $footer_text
+themes/default/views/page.html.php 102 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
+themes/default/views/page.html.php 117 DIRTY $content
+themes/default/views/page.html.php 123 DIRTY newView("sidebar.html")
+themes/default/views/page.html.php 130 DIRTY $footer_text
themes/default/views/pager.html.php 13 DIRTY_JS str_replace('{page}',1,$url)
themes/default/views/pager.html.php 20 DIRTY_JS str_replace('{page}',$previous_page,$url)
themes/default/views/pager.html.php 27 DIRTY $from_to_msg
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index 096f46c7..f3225b4e 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -28,7 +28,7 @@ class search_installer {
PRIMARY KEY (`id`),
KEY(`item_id`),
FULLTEXT INDEX (`data`))
- ENGINE=MYISAM
+ ENGINE=MyISAM
DEFAULT CHARSET=utf8;");
module::set_version("search", 1);
}
@@ -48,13 +48,4 @@ class search_installer {
static function uninstall() {
Database::instance()->query("DROP TABLE {search_records}");
}
-
- static function upgrade($version) {
- $db = Database::instance();
- if ($version == 1) {
- $db->query("ALTER TABLE {search_records} ENGINE=MYISAM");
- module::set_version("search", 2);
- }
- }
-
}
diff --git a/modules/search/module.info b/modules/search/module.info
index 2f2ebdf1..f417c4fa 100644
--- a/modules/search/module.info
+++ b/modules/search/module.info
@@ -1,3 +1,3 @@
name = "Search"
description = "Allows users to search their Gallery"
-version = 2
+version = 1
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 3301566b..63f7957c 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -81,7 +81,7 @@ class Admin_Tags_Controller extends Admin_Controller {
kohana::show_404();
}
- //Don't use a form as the form is dynamically created in the js
+ // Don't use a form as the form is dynamically created in the js
$post = new Validation($_POST);
$post->add_rules("name", "required", "length[1,64]");
$valid = $post->validate();
@@ -89,7 +89,7 @@ class Admin_Tags_Controller extends Admin_Controller {
$new_name = $this->input->post("name");
$new_tag = ORM::factory("tag")->where("name", $new_name)->find();
if ($new_tag->loaded) {
- $error_msg = "There is already a tag with that name";
+ $error_msg = t("There is already a tag with that name");
$valid = false;
}
} else {
@@ -115,7 +115,7 @@ class Admin_Tags_Controller extends Admin_Controller {
} else {
print json_encode(
array("result" => "error",
- "message" => $error_msg));
+ "message" => (string) $error_msg));
}
}
}
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index d656da36..52c695c6 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -69,7 +69,7 @@ function editInPlace(element) {
window.location.reload();
} else if (data.result == "error") {
$("#gRenameTagForm #name")
- .css("border", "2px solid red")
+ .addClass("gError")
.focus();
$("#gTagAdmin").before("<p id=\"gEditErrorMessage\" class=\"gError\">" + data.message + "</p>");
}
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 33cc6733..de6d436e 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -1034,6 +1034,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
float: right;
}
+#gRenameTagForm input[type="text"].gError {
+ border: 2px solid red;
+ background: none;
+}
+
#gRenameTagForm input[type="submit"] {
height: 25px;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 19:03:16 +0000