james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more tidying

Browse Source
This commit is contained in:
Shish 2009-12-26 00:56:53 +00:00
parent 53f990bce8
commit 16d409583b
2 changed files with 68 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
contrib/pools/main.php
View File

@ -66,12 +66,10 @@ class Pools extends SimpleExtension {
if($event->page_matches("pool")) { if($event->page_matches("pool")) {
switch($event->get_arg(0)) { switch($event->get_arg(0)) {
case "list": //index case "list": //index
{ $this->list_pools($page, int_escape($event->get_arg(1)));
$this->list_pools($page, $event);
break; break;
}
case "new": // Show form case "new": // Show form
{
if(!$user->is_anonymous()){ if(!$user->is_anonymous()){
$this->theme->new_pool_composer($page); $this->theme->new_pool_composer($page);
} else { } else {
@ -79,48 +77,41 @@ class Pools extends SimpleExtension {
$this->theme->display_error($errMessage); $this->theme->display_error($errMessage);
} }
break; break;
}
case "create": // ADD _POST case "create": // ADD _POST
{
if(!$user->is_anonymous()){ if(!$user->is_anonymous()){
$newPoolID = $this->add_pool(); $newPoolID = $this->add_pool();
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("pool/view/".$newPoolID."")); $page->set_redirect(make_link("pool/view/".$newPoolID));
} else { } else {
$this->theme->display_error("You must be registered and logged in to add a image."); $this->theme->display_error("You must be registered and logged in to add a image.");
} }
break; break;
}
case "view": case "view":
{
$poolID = int_escape($event->get_arg(1)); $poolID = int_escape($event->get_arg(1));
$this->get_posts($event, $poolID); $this->get_posts($event, $poolID);
break; break;
}
case "updated": case "updated":
{ $this->get_history(int_escape($event->get_arg(1)));
$this->get_history($event);
break; break;
}
case "revert": case "revert":
{
if(!$user->is_anonymous()) { if(!$user->is_anonymous()) {
$historyID = int_escape($event->get_arg(1)); $historyID = int_escape($event->get_arg(1));
$this->revert_history($historyID); $this->revert_history($historyID);
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("pool/updated")); $page->set_redirect(make_link("pool/updated"));
} }
break; break;
}
case "edit": case "edit":
{
$poolID = int_escape($event->get_arg(1)); $poolID = int_escape($event->get_arg(1));
$pools = $this->get_pool($poolID); $pools = $this->get_pool($poolID);
foreach($pools as $pool) { foreach($pools as $pool) {
//if the pool is public and user is logged OR if the user is admin OR the user is the owner // if the pool is public and user is logged OR if the user is admin OR the user is the owner
if(($pool['public'] == "Y" && !$user->is_anonymous()) || $user->is_admin() || $user->id == $pool['user_id']) { if(($pool['public'] == "Y" && !$user->is_anonymous()) || $user->is_admin() || $user->id == $pool['user_id']) {
$this->theme->edit_pool($page, $this->get_pool($poolID), $this->edit_posts($poolID)); $this->theme->edit_pool($page, $this->get_pool($poolID), $this->edit_posts($poolID));
} else { } else {
@ -129,16 +120,15 @@ class Pools extends SimpleExtension {
} }
} }
break; break;
}
case "edit_pool": case "edit_pool":
{
$poolID = int_escape($_POST["pool_id"]); $poolID = int_escape($_POST["pool_id"]);
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("pool/edit/".$poolID)); $page->set_redirect(make_link("pool/edit/".$poolID));
break; break;
}
/*
case "order": case "order":
{
$poolID = int_escape($event->get_arg(1)); $poolID = int_escape($event->get_arg(1));
$pools = $this->get_pool($poolID); $pools = $this->get_pool($poolID);
@ -152,42 +142,14 @@ class Pools extends SimpleExtension {
} }
} }
break; break;
}
case "edit_order": case "edit_order":
{
$poolID = int_escape($_POST["pool_id"]); $poolID = int_escape($_POST["pool_id"]);
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("pool/order/".$poolID)); $page->set_redirect(make_link("pool/order/".$poolID));
break; break;
}
case "import":
{
$pool_id = int_escape($_POST["pool_id"]);
$pool = $this->get_single_pool($pool_id);
if(($pool['public'] == "Y" && !$user->is_anonymous()) || $user->is_admin() || $user->id == $pool['user_id']) {
$this->import_posts();
} else {
$this->theme->display_error("Permssion denied.");
}
break;
}
case "add_posts":
{
$pool_id = int_escape($_POST["pool_id"]);
$pool = $this->get_single_pool($pool_id);
if(($pool['public'] == "Y" && !$user->is_anonymous()) || $user->is_admin() || $user->id == $pool['user_id']) {
$this->add_posts();
$page->set_mode("redirect");
$page->set_redirect(make_link("pool/view/".$pool_id));
} else {
$this->theme->display_error("Permssion denied.");
}
break;
}
case "order_posts": case "order_posts":
{
$pool_id = int_escape($_POST["pool_id"]); $pool_id = int_escape($_POST["pool_id"]);
$pool = $this->get_single_pool($pool_id); $pool = $this->get_single_pool($pool_id);
@ -199,9 +161,34 @@ class Pools extends SimpleExtension {
$this->theme->display_error("Permssion denied."); $this->theme->display_error("Permssion denied.");
} }
break; break;
}
*/
case "import":
$pool_id = int_escape($_POST["pool_id"]);
$pool = $this->get_single_pool($pool_id);
if(($pool['public'] == "Y" && !$user->is_anonymous()) || $user->is_admin() || $user->id == $pool['user_id']) {
$this->import_posts();
} else {
$this->theme->display_error("Permssion denied.");
}
break;
case "add_posts":
$pool_id = int_escape($_POST["pool_id"]);
$pool = $this->get_single_pool($pool_id);
if(($pool['public'] == "Y" && !$user->is_anonymous()) || $user->is_admin() || $user->id == $pool['user_id']) {
$this->add_posts();
$page->set_mode("redirect");
$page->set_redirect(make_link("pool/view/".$pool_id));
} else {
$this->theme->display_error("Permssion denied.");
}
break;
case "remove_posts": case "remove_posts":
{
$pool_id = int_escape($_POST["pool_id"]); $pool_id = int_escape($_POST["pool_id"]);
$pool = $this->get_single_pool($pool_id); $pool = $this->get_single_pool($pool_id);
@ -214,9 +201,8 @@ class Pools extends SimpleExtension {
} }
break; break;
}
case "nuke": case "nuke":
{
$pool_id = int_escape($event->get_arg(1)); $pool_id = int_escape($event->get_arg(1));
$pool = $this->get_single_pool($pool_id); $pool = $this->get_single_pool($pool_id);
@ -229,55 +215,52 @@ class Pools extends SimpleExtension {
$this->theme->display_error("Permssion denied."); $this->theme->display_error("Permssion denied.");
} }
break; break;
}
case "nuke_pool": case "nuke_pool":
{
$poolID = int_escape($_POST["pool_id"]); $poolID = int_escape($_POST["pool_id"]);
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("pool/nuke/".$poolID)); $page->set_redirect(make_link("pool/nuke/".$poolID));
break; break;
}
default: default:
{
$page->set_mode("redirect"); $page->set_mode("redirect");
$page->set_redirect(make_link("pool/list")); $page->set_redirect(make_link("pool/list"));
break; break;
}
} }
} }
} }
/* /*
* HERE WE GET THE POOLS WHERE THE IMAGE APPEARS WHEN THE IMAGE IS DISPLAYED * HERE WE GET THE POOLS WHERE THE IMAGE APPEARS WHEN THE IMAGE IS DISPLAYED
*/ */
public function onDisplayingImage($event) { public function onDisplayingImage($event) {
global $page; global $config, $page;
$imageID = $event->image->id;
$poolsIDs = $this->get_pool_id($imageID);
$linksPools = ""; if($config->get_bool("poolsInfoOnViewImage")) {
foreach ($poolsIDs as $poolID){ $imageID = $event->image->id;
$pools = $this->get_pool($poolID['pool_id']); $poolsIDs = $this->get_pool_id($imageID);
foreach ($pools as $pool){
$linksPools .= "<a href='".make_link("pool/view/".$pool['id'])."'>".$pool['title']."</a>, "; $linksPools = array();
foreach($poolsIDs as $poolID) {
$pools = $this->get_pool($poolID['pool_id']);
foreach ($pools as $pool){
$linksPools[] = "<a href='".make_link("pool/view/".$pool['id'])."'>".$pool['title']."</a>";
}
}
if(count($linksPools) > 0) {
$this->theme->pool_info(implode($linksPools));
} }
} }
$linksPools = substr($linksPools, 0, -2);
$linksPools = $linksPools." ";
$this->theme->pool_info($linksPools);
} }
/* /*
* HERE WE GET THE LIST OF POOLS * HERE WE GET THE LIST OF POOLS
*/ */
private function list_pools(Page $page, $event){ private function list_pools(Page $page, $pageNumber) {
global $config, $database; global $config, $database;
$pageNumber = int_escape($event->get_arg(1));
if(is_null($pageNumber) || !is_numeric($pageNumber)) if(is_null($pageNumber) || !is_numeric($pageNumber))
$pageNumber = 0; $pageNumber = 0;
else if ($pageNumber <= 0) else if ($pageNumber <= 0)
@ -303,7 +286,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE CREATE A NEW POOL * HERE WE CREATE A NEW POOL
*/ */
@ -342,7 +324,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE GET THE IMAGES FROM THE TAG ON IMPORT * HERE WE GET THE IMAGES FROM THE TAG ON IMPORT
*/ */
@ -358,7 +339,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE ADD CHECKED IMAGES FROM POOL AND UPDATE THE HISTORY * HERE WE ADD CHECKED IMAGES FROM POOL AND UPDATE THE HISTORY
*/ */
@ -413,7 +393,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE REMOVE CHECKED IMAGES FROM POOL AND UPDATE THE HISTORY * HERE WE REMOVE CHECKED IMAGES FROM POOL AND UPDATE THE HISTORY
*/ */
@ -434,7 +413,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE CHECK IF THE POST IS ALREADY ON POOL * HERE WE CHECK IF THE POST IS ALREADY ON POOL
* USED IN add_posts() * USED IN add_posts()
@ -446,7 +424,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE GET ALL IMAGES FOR THE POOL * HERE WE GET ALL IMAGES FOR THE POOL
*/ */
@ -556,7 +533,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE NUKE ENTIRE POOL. WE REMOVE POOLS AND POSTS FROM REMOVED POOL AND HISTORIES ENTRIES FROM REMOVED POOL * HERE WE NUKE ENTIRE POOL. WE REMOVE POOLS AND POSTS FROM REMOVED POOL AND HISTORIES ENTRIES FROM REMOVED POOL
*/ */
@ -576,7 +552,6 @@ class Pools extends SimpleExtension {
} }
/* /*
* HERE WE ADD A HISTORY ENTRY * HERE WE ADD A HISTORY ENTRY
* FOR $action 1 (one) MEANS ADDED, 0 (zero) MEANS REMOVED * FOR $action 1 (one) MEANS ADDED, 0 (zero) MEANS REMOVED
@ -587,17 +562,15 @@ class Pools extends SimpleExtension {
INSERT INTO pool_history (pool_id, user_id, action, images, count, date) INSERT INTO pool_history (pool_id, user_id, action, images, count, date)
VALUES (?, ?, ?, ?, ?, now())", VALUES (?, ?, ?, ?, ?, now())",
array($poolID, $user->id, $action, $images, $count)); array($poolID, $user->id, $action, $images, $count));
} }
/* /*
* HERE WE GET THE HISTORY LIST * HERE WE GET THE HISTORY LIST
*/ */
private function get_history($event){ private function get_history($pageNumber) {
global $config, $database; global $config, $database;
$pageNumber = int_escape($event->get_arg(1));
if(is_null($pageNumber) || !is_numeric($pageNumber)) if(is_null($pageNumber) || !is_numeric($pageNumber))
$pageNumber = 0; $pageNumber = 0;
else if ($pageNumber <= 0) else if ($pageNumber <= 0)

20
contrib/pools/theme.php
View File

@ -4,14 +4,9 @@ class PoolsTheme extends Themelet {
* HERE WE ADD THE POOL INFO ON IMAGE * HERE WE ADD THE POOL INFO ON IMAGE
*/ */
public function pool_info($linksPools) { public function pool_info($linksPools) {
global $config, $page; global $page;
$editor = 'This post belongs to the '.html_escape($linksPools).' pool.'; $editor = 'This post belongs to the '.$linksPools.' pool.';
$page->add_block(new Block("Pool Info", $editor, "main", 1));
if($config->get_bool("poolsInfoOnViewImage")) {
if($linksPools != " ") {
$page->add_block(new Block("Pool Info", $editor, "main", 1));
}
}
} }
@ -37,8 +32,9 @@ class PoolsTheme extends Themelet {
foreach($pools as $pool) { foreach($pools as $pool) {
$oe = ($n++ % 2 == 0) ? "even" : "odd"; $oe = ($n++ % 2 == 0) ? "even" : "odd";
$pool_link = '<a href="'.make_link("pool/view/".$pool['id']).'">'.$pool['title']."</a>"; $pool_link = '<a href="'.make_link("pool/view/".$pool['id']).'">'.html_escape($pool['title'])."</a>";
$user_link = '<a href="'.make_link("user/".$pool['user_name']).'">'.$pool['user_name']."</a>"; $user_link = '<a href="'.make_link("user/".url_escape($pool['user_name'])).'">'.html_escape($pool['user_name'])."</a>";
$edit_link = '<a href="'.make_link("pool/edit/".$pool['id']).'">Edit</a>';
$del_link = '<a href="'.make_link("pool/nuke/".$pool['id']).'">Delete</a>'; $del_link = '<a href="'.make_link("pool/nuke/".$pool['id']).'">Delete</a>';
$public = ($pool['public'] == "Y" ? "Yes" : "No"); $public = ($pool['public'] == "Y" ? "Yes" : "No");
@ -49,7 +45,7 @@ class PoolsTheme extends Themelet {
"<td>".$public."</td>"; "<td>".$public."</td>";
if($user->is_admin()){ if($user->is_admin()){
$html .= "<td>".$del_link."</td>"; $html .= "<td>$edit_link / $del_link</td>";
} }
$html .= "</tr>"; $html .= "</tr>";
@ -304,7 +300,7 @@ class PoolsTheme extends Themelet {
$pool_images .= "<br>". $pool_images .= "<br>".
"<input type='submit' name='edit' id='edit' value='Remove Selected'/>". "<input type='submit' name='edit' id='edit' value='Remove Selected'/>".
"<input type='hidden' name='pool_id' value='".$pool['id']."'>". "<input type='hidden' name='pool_id' value='".$pools[0]['id']."'>".
"</form>"; "</form>";
$page->add_block(new Block("Editing Posts", $pool_images, "main", 30)); $page->add_block(new Block("Editing Posts", $pool_images, "main", 30));