Merge pull request #341 from jgen/master

More small tweaks
This commit is contained in:
Shish
2013-10-14 05:29:47 -07:00
9 changed files with 45 additions and 30 deletions

View File

@@ -112,7 +112,7 @@ class Artists extends Extension {
global $database;
$author = strtolower($event->author);
if (strlen($author) == 0 || strpos($author, " "))
if (strlen($author) === 0 || strpos($author, " "))
return;
$paddedAuthor = str_replace(" ", "_", $author);
@@ -709,7 +709,7 @@ class Artists extends Extension {
if (is_null($aliasID) || !is_numeric($aliasID))
return;
if (is_null($alias) || strlen($alias) == 0)
if (is_null($alias) || strlen($alias) === 0)
return;
global $user;
@@ -767,7 +767,7 @@ class Artists extends Extension {
if (is_null($memberID) || !is_numeric($memberID))
return;
if (is_null($memberName) || strlen($memberName) == 0)
if (is_null($memberName) || strlen($memberName) === 0)
return;
global $user;
@@ -796,7 +796,7 @@ class Artists extends Extension {
global $user;
$name = html_escape(strtolower($_POST["name"]));
if (is_null($name) || (strlen($name) == 0) || strpos($name, " "))
if (is_null($name) || (strlen($name) === 0) || strpos($name, " "))
return -1;
$notes = html_escape(ucfirst($_POST["notes"]));

View File

@@ -23,7 +23,7 @@
$ys = ys($log);
$posts = $ys->posts();
if (sizeof($posts) == 0)
if (sizeof($posts) === 0)
$html .= '
<div id="ys-post-1" class="ys-post ys-first ys-admin-post">
<span class="ys-post-timestamp">13:37</span>

View File

@@ -162,10 +162,13 @@ class Index extends Extension {
$search_terms = $event->get_search_terms();
$page_number = $event->get_page_number();
$page_size = $event->get_page_size();
$count_search_terms = count($search_terms);
try {
#log_debug("index", "Search for ".implode(" ", $search_terms), false, array("terms"=>$search_terms));
$total_pages = Image::count_pages($search_terms);
if(SPEED_HAX && count($search_terms) == 0 && ($page_number < 10)) { // extra caching for the first few post/list pages
if(SPEED_HAX && $count_search_terms === 0 && ($page_number < 10)) { // extra caching for the first few post/list pages
$images = $database->cache->get("post-list-$page_number");
if(!$images) {
$images = Image::find_images(($page_number-1)*$page_size, $page_size, $search_terms);
@@ -182,11 +185,13 @@ class Index extends Extension {
$images = array();
}
if(count($search_terms) == 0 && count($images) == 0 && $page_number == 1) {
$count_images = count($images);
if($count_search_terms === 0 && $count_images === 0 && $page_number === 1) {
$this->theme->display_intro($page);
send_event(new PostListBuildingEvent($search_terms));
}
else if(count($search_terms) > 0 && count($images) == 1 && $page_number == 1) {
else if($count_search_terms > 0 && $count_images === 1 && $page_number === 1) {
$page->set_mode("redirect");
$page->set_redirect(make_link('post/view/'.$images[0]->id));
}