pools coding standards

This commit is contained in:
Shish 2009-11-15 05:00:24 +00:00
parent 14b48d5599
commit e61b1fe954
2 changed files with 702 additions and 725 deletions

View File

@ -8,11 +8,10 @@
*/
class Pools extends SimpleExtension {
public function onInitExt($event) {
global $config, $database;
if ($config->get_int("ext_pools_version") < 1){
if ($config->get_int("ext_pools_version") < 1) {
$database->create_table("pools", "
id SCORE_AIPK,
user_id INTEGER NOT NULL,
@ -73,7 +72,7 @@ class Pools extends SimpleExtension {
}
case "new": // Show form
{
if(!$user->is_anonymous()){
if(!$user->is_anonymous()) {
$this->theme->new_pool_composer($page);
} else {
$errMessage = "You must be registered and logged in to create a new pool.";
@ -83,7 +82,7 @@ class Pools extends SimpleExtension {
}
case "create": // ADD _POST
{
if(!$user->is_anonymous()){
if(!$user->is_anonymous()) {
$newPoolID = $this->add_pool();
$page->set_mode("redirect");
$page->set_redirect(make_link("pool/view/".$newPoolID.""));
@ -259,9 +258,9 @@ class Pools extends SimpleExtension {
$poolsIDs = $this->get_pool_id($imageID);
$linksPools = "";
foreach ($poolsIDs as $poolID){
foreach ($poolsIDs as $poolID) {
$pools = $this->get_pool($poolID['pool_id']);
foreach ($pools as $pool){
foreach ($pools as $pool) {
$linksPools .= "<a href='".make_link("pool/view/".$pool['id']."")."'>".$pool['title']."</a>, ";
}
}
@ -275,7 +274,7 @@ class Pools extends SimpleExtension {
/*
* HERE WE GET THE LIST OF POOLS
*/
private function list_pools(Page $page, $event){
private function list_pools(Page $page, $event) {
global $config, $database;
$pageNumber = $event->get_arg(1);
@ -308,14 +307,14 @@ class Pools extends SimpleExtension {
/*
* HERE WE CREATE A NEW POOL
*/
private function add_pool(){
private function add_pool() {
global $user, $database;
$public = html_escape($_POST["public"]);
$title = html_escape($_POST["title"]);
$description = html_escape($_POST["description"]);
if($public == ""){
if($public == "") {
$public = "N";
}
@ -333,7 +332,7 @@ class Pools extends SimpleExtension {
return $result["poolID"];
}
private function get_pool($poolID){
private function get_pool($poolID) {
global $database;
$poolID = int_escape($poolID);
return $database->get_all("SELECT * FROM pools WHERE id=?", array($poolID));
@ -349,7 +348,7 @@ class Pools extends SimpleExtension {
/*
* HERE WE GET THE ID OF THE POOL FROM AN IMAGE
*/
private function get_pool_id($imageID){
private function get_pool_id($imageID) {
global $database;
$imageID = int_escape($imageID);
return $database->get_all("SELECT pool_id FROM pool_images WHERE image_id =?", array($imageID));
@ -360,7 +359,7 @@ class Pools extends SimpleExtension {
/*
* HERE WE GET THE IMAGES FROM THE TAG ON IMPORT
*/
private function import_posts(){
private function import_posts() {
global $page, $config, $database;
$pool_id = int_escape($_POST["pool_id"]);
@ -377,15 +376,15 @@ class Pools extends SimpleExtension {
/*
* HERE WE ADD CHECKED IMAGES FROM POOL AND UPDATE THE HISTORY
*/
private function add_posts(){ //ADD CHECKED POSTS
private function add_posts() { //ADD CHECKED POSTS
global $database;
$poolID = int_escape($_POST['pool_id']);
$images = "";
foreach ($_POST['check'] as $imageID){
foreach ($_POST['check'] as $imageID) {
if(!$this->check_post($poolID, $imageID)){
if(!$this->check_post($poolID, $imageID)) {
$database->execute("
INSERT INTO pool_images
(pool_id, image_id)
@ -398,7 +397,7 @@ class Pools extends SimpleExtension {
}
if(!strlen($images) == 0){
if(!strlen($images) == 0) {
$count = $database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=?", array($poolID));
$this->add_history($poolID, 1, $images, $count);
}
@ -407,7 +406,7 @@ class Pools extends SimpleExtension {
return $poolID;
}
private function order_posts(){ //ORDER POSTS
private function order_posts() { //ORDER POSTS
global $database;
$poolID = int_escape($_POST['pool_id']);
@ -427,13 +426,13 @@ class Pools extends SimpleExtension {
/*
* HERE WE REMOVE CHECKED IMAGES FROM POOL AND UPDATE THE HISTORY
*/
private function remove_posts(){
private function remove_posts() {
global $database;
$poolID = int_escape($_POST['pool_id']);
$images = "";
foreach ($_POST['check'] as $imageID){
foreach ($_POST['check'] as $imageID) {
$database->execute("DELETE FROM pool_images WHERE pool_id = ? AND image_id = ?", array($poolID, $imageID));
$images .= " ".$imageID;
@ -450,7 +449,7 @@ class Pools extends SimpleExtension {
* HERE WE CHECK IF THE POST IS ALREADY ON POOL
* USED IN add_posts()
*/
private function check_post($poolID, $imageID){
private function check_post($poolID, $imageID) {
global $database;
$result = $database->db->GetOne("SELECT COUNT(*) FROM pool_images WHERE pool_id=? AND image_id=?", array($poolID, $imageID));
if($result == 0) {
@ -465,7 +464,7 @@ class Pools extends SimpleExtension {
/*
* HERE WE GET ALL IMAGES FOR THE POOL
*/
private function get_posts($event, $poolID){
private function get_posts($event, $poolID) {
global $config, $user, $database;
$pageNumber = $event->get_arg(2);
@ -540,7 +539,7 @@ class Pools extends SimpleExtension {
/*
* WE GET THE ORDER OF THE IMAGES
*/
private function edit_posts($poolID){
private function edit_posts($poolID) {
global $database;
$poolID = int_escape($poolID);
@ -561,7 +560,7 @@ class Pools extends SimpleExtension {
/*
* WE GET THE ORDER OF THE IMAGES BUT HERE WE SEND KEYS ADDED IN ARRAY TO GET THE ORDER IN THE INPUT VALUE
*/
private function edit_order($poolID){
private function edit_order($poolID) {
global $database;
$poolID = int_escape($poolID);
@ -578,14 +577,14 @@ class Pools extends SimpleExtension {
$images[] = array($image);
$result->MoveNext();
}
// Original code
//
// $images = array();
// while(!$result->EOF) {
// $image = Image::by_id($result->fields["image_id"]);
// $images[] = array($image);
// $result->MoveNext();
// }
// Original code
//
// $images = array();
// while(!$result->EOF) {
// $image = Image::by_id($result->fields["image_id"]);
// $images[] = array($image);
// $result->MoveNext();
// }
return $images;
}
@ -594,14 +593,14 @@ class Pools extends SimpleExtension {
/*
* HERE WE NUKE ENTIRE POOL. WE REMOVE POOLS AND POSTS FROM REMOVED POOL AND HISTORIES ENTRIES FROM REMOVED POOL
*/
private function nuke_pool($poolID){
private function nuke_pool($poolID) {
global $user, $database;
if($user->is_admin()){
if($user->is_admin()) {
$database->execute("DELETE FROM pool_history WHERE pool_id = ?", array($poolID));
$database->execute("DELETE FROM pool_images WHERE pool_id = ?", array($poolID));
$database->execute("DELETE FROM pools WHERE id = ?", array($poolID));
} elseif(!$user->is_anonymous()){
} elseif(!$user->is_anonymous()) {
// WE CHECK IF THE USER IS THE OWNER OF THE POOL IF NOT HE CAN'T DO ANYTHING
$database->execute("DELETE FROM pool_history WHERE pool_id = ?", array($poolID));
$database->execute("DELETE FROM pool_images WHERE pool_id = ?", array($poolID));
@ -615,7 +614,7 @@ class Pools extends SimpleExtension {
* HERE WE ADD A HISTORY ENTRY
* FOR $action 1 (one) MEANS ADDED, 0 (zero) MEANS REMOVED
*/
private function add_history($poolID, $action, $images, $count){
private function add_history($poolID, $action, $images, $count) {
global $user, $database;
$user_id = $user->id;
$database->execute("
@ -632,7 +631,7 @@ class Pools extends SimpleExtension {
/*
* HERE WE GET THE HISTORY LIST
*/
private function get_history($event){
private function get_history($event) {
global $config, $database;
$pageNumber = $event->get_arg(1);
@ -667,7 +666,7 @@ class Pools extends SimpleExtension {
/*
* HERE GO BACK IN HISTORY AND ADD OR REMOVE POSTS TO POOL
*/
private function revert_history($historyID){
private function revert_history($historyID) {
global $database;
$status = $database->get_all("SELECT * FROM pool_history WHERE id=?", array($historyID));
@ -709,10 +708,10 @@ class Pools extends SimpleExtension {
* HERE WE ADD A SIMPLE POST FROM POOL
* USED WITH FOREACH IN revert_history()
*/
private function add_post($poolID, $imageID){
private function add_post($poolID, $imageID) {
global $database;
if(!$this->check_post($poolID, $imageID)){
if(!$this->check_post($poolID, $imageID)) {
$database->execute("
INSERT INTO pool_images
(pool_id, image_id)
@ -730,7 +729,7 @@ class Pools extends SimpleExtension {
* HERE WE REMOVE A SIMPLE POST FROM POOL
* USED WITH FOREACH IN revert_history()
*/
private function delete_post($poolID, $imageID){
private function delete_post($poolID, $imageID) {
global $database;
$database->execute("DELETE FROM pool_images WHERE pool_id = ? AND image_id = ?", array($poolID, $imageID));

View File

@ -4,12 +4,12 @@ class PoolsTheme extends Themelet {
/*
* HERE WE ADD THE POOL INFO ON IMAGE
*/
public function pool_info($linksPools){
public function pool_info($linksPools) {
global $config, $page;
$editor = 'This post belongs to the '.$linksPools.' pool.';
if($config->get_bool("poolsInfoOnViewImage")){
if($linksPools <> " "){
if($config->get_bool("poolsInfoOnViewImage")) {
if($linksPools <> " ") {
$page->add_block(new Block("Pool Info", $editor, "main", 1));
}
}
@ -20,8 +20,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE SHOWS THE LIST OF POOLS
*/
public function list_pools(Page $page, $pools, $pageNumber, $totalPages)
{
public function list_pools(Page $page, $pools, $pageNumber, $totalPages) {
global $user;
$html = '<table id="poolsList" class="zebra">'.
@ -31,23 +30,22 @@ class PoolsTheme extends Themelet {
"<th>Posts</th>".
"<th>Public</th>";
if($user->is_admin()){
if($user->is_admin()) {
$html .= "<th>Action</th>";
}
$html .= "</tr></thead>";
$n = 0;
foreach ($pools as $pool)
{
foreach ($pools as $pool) {
$oe = ($n++ % 2 == 0) ? "even" : "odd";
$pool_link = '<a href="'.make_link("pool/view/".$pool['id']).'">'.$pool['title']."</a>";
$user_link = '<a href="'.make_link("user/".$pool['user_name']).'">'.$pool['user_name']."</a>";
$del_link = '<a href="'.make_link("pool/nuke/".$pool['id']).'">Delete</a>';
if($pool['public'] == "Y"){
if($pool['public'] == "Y") {
$public = "Yes";
} elseif($pool['public'] == "N"){
} elseif($pool['public'] == "N") {
$public = "No";
}
@ -57,7 +55,7 @@ class PoolsTheme extends Themelet {
"<td>".$pool['posts']."</td>".
"<td>".$public."</td>";
if($user->is_admin()){
if($user->is_admin()) {
$html .= "<td>".$del_link."</td>";
}
@ -80,8 +78,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE DISPLAY THE NEW POOL COMPOSER
*/
public function new_pool_composer(Page $page)
{
public function new_pool_composer(Page $page) {
$html = "<form action=".make_link("pool/create")." method='POST'>
<table>
<tr><td>Title:</td><td><input type='text' name='title'></td></tr>
@ -102,8 +99,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE DISPLAY THE POOL WITH TITLE DESCRIPTION AND IMAGES WITH PAGINATION
*/
public function view_pool($pools, $images, $pageNumber, $totalPages)
{
public function view_pool($pools, $images, $pageNumber, $totalPages) {
global $user, $page;
$pool_info = "<table id='poolsList' class='zebra'>".
@ -113,8 +109,7 @@ class PoolsTheme extends Themelet {
"</tr></thead>";
$n = 0;
foreach ($pools as $pool)
{
foreach ($pools as $pool) {
$oe = ($n++ % 2 == 0) ? "even" : "odd";
$pool_info .= "<tr class='$oe'>".
@ -123,8 +118,8 @@ class PoolsTheme extends Themelet {
"</tr>";
// this will make disasters if more than one pool comes in the parameter
if($pool['public'] == "Y" || $user->is_admin()){// IF THE POOL IS PUBLIC OR IS ADMIN SHOW EDIT PANEL
if(!$user->is_anonymous()){// IF THE USER IS REGISTERED AND LOGGED IN SHOW EDIT PANEL
if($pool['public'] == "Y" || $user->is_admin()) {// IF THE POOL IS PUBLIC OR IS ADMIN SHOW EDIT PANEL
if(!$user->is_anonymous()) {// IF THE USER IS REGISTERED AND LOGGED IN SHOW EDIT PANEL
$this->sidebar_options($page, $pool);
}
}
@ -157,7 +152,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE DISPLAY THE POOL OPTIONS ON SIDEBAR BUT WE HIDE REMOVE OPTION IF THE USER IS NOT THE OWNER OR ADMIN
*/
public function sidebar_options(Page $page, $pool){
public function sidebar_options(Page $page, $pool) {
global $user;
$editor = " <form action='".make_link("pool/import")."' method='POST'>
@ -177,7 +172,7 @@ class PoolsTheme extends Themelet {
</form>
";
if($user->id == $pool['user_id'] || $user->is_admin()){
if($user->id == $pool['user_id'] || $user->is_admin()) {
$editor .= "
<script type='text/javascript'>
function confirm_action() {
@ -199,7 +194,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE DISPLAY THE RESULT OF THE SEARCH ON IMPORT
*/
public function pool_result(Page $page, $images, $pool_id){
public function pool_result(Page $page, $images, $pool_id) {
$pool_images = "
<script language='JavaScript' type='text/javascript'>
@ -209,7 +204,7 @@ class PoolsTheme extends Themelet {
var a=new Array();
a=document.getElementsByName('check[]');
var p=0;
for(i=0;i<a.length;i++){
for(i=0;i<a.length;i++) {
a[i].checked = true ;
}
}
@ -219,7 +214,7 @@ class PoolsTheme extends Themelet {
var a=new Array();
a=document.getElementsByName('check[]');
var p=0;
for(i=0;i<a.length;i++){
for(i=0;i<a.length;i++) {
a[i].checked = false ;
}
}
@ -266,8 +261,7 @@ class PoolsTheme extends Themelet {
* HERE WE DISPLAY THE POOL ORDERER
* WE LIST ALL IMAGES ON POOL WITHOUT PAGINATION AND WITH A TEXT INPUT TO SET A NUMBER AND CHANGE THE ORDER
*/
public function edit_order(Page $page, $pools, $images)
{
public function edit_order(Page $page, $pools, $images) {
global $user;
$pool_info = "<table id='poolsList' class='zebra'>".
@ -278,8 +272,7 @@ class PoolsTheme extends Themelet {
$n = 0;
foreach ($pools as $pool)
{
foreach ($pools as $pool) {
$oe = ($n++ % 2 == 0) ? "even" : "odd";
$pool_info .= "<tr class='$oe'>".
@ -298,17 +291,12 @@ class PoolsTheme extends Themelet {
$n = 0;
foreach($images as $pair) {
$image = $pair[0];
$thumb_html = $this->build_thumb_html($image);
$pool_images .= '<span class="thumb">'.
'<a href="$image_link">'.$thumb_html.'</a>';
$pool_images .= '<br><input name="imgs['.$n.'][]" type="text" width="50px" value="'.$image->image_order.'" />'.
'<input name="imgs['.$n.'][]" type="hidden" value="'.$image->id.'" />';
$n = $n+1;
$pool_images .= '</span>';
}
@ -326,8 +314,7 @@ class PoolsTheme extends Themelet {
* HERE WE DISPLAY THE POOL EDITOR
* WE LIST ALL IMAGES ON POOL WITHOUT PAGINATION AND WITH A CHECKBOX TO SELECT WHICH IMAGE WE WANT REMOVE
*/
public function edit_pool(Page $page, $pools, $images)
{
public function edit_pool(Page $page, $pools, $images) {
global $user;
$pool_info = "<table id='poolsList' class='zebra'>".
@ -338,8 +325,7 @@ class PoolsTheme extends Themelet {
$n = 0;
foreach ($pools as $pool)
{
foreach ($pools as $pool) {
$oe = ($n++ % 2 == 0) ? "even" : "odd";
$pool_info .= "<tr class='$oe'>".
@ -363,7 +349,7 @@ class PoolsTheme extends Themelet {
var a=new Array();
a=document.getElementsByName('check[]');
var p=0;
for(i=0;i<a.length;i++){
for(i=0;i<a.length;i++) {
a[i].checked = true ;
}
}
@ -373,28 +359,21 @@ class PoolsTheme extends Themelet {
var a=new Array();
a=document.getElementsByName('check[]');
var p=0;
for(i=0;i<a.length;i++){
for(i=0;i<a.length;i++) {
a[i].checked = false ;
}
}
</script>
";
$pool_images .= "<form action='".make_link("pool/remove_posts")."' method='POST' name='checks'>";
foreach($images as $pair) {
$image = $pair[0];
$thumb_html = $this->build_thumb_html($image);
$pool_images .= '<span class="thumb">'.
'<a href="$image_link">'.$thumb_html.'</a>';
$pool_images .= '<br><input name="check[]" type="checkbox" value="'.$image->id.'" />';
$pool_images .= '</span>';
}
@ -417,7 +396,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE DISPLAY THE HISTORY LIST
*/
public function show_history($histories, $pageNumber, $totalPages){
public function show_history($histories, $pageNumber, $totalPages) {
global $page;
$html = "<table id='poolsList' class='zebra'>".
"<thead><tr>".
@ -430,8 +409,7 @@ class PoolsTheme extends Themelet {
"</tr></thead>";
$n = 0;
foreach ($histories as $history)
{
foreach ($histories as $history) {
$oe = ($n++ % 2 == 0) ? "even" : "odd";
$pool_link = "<a href='".make_link("pool/view/".$history['pool_id'])."'>".$history['title']."</a>";
@ -476,7 +454,7 @@ class PoolsTheme extends Themelet {
/*
* HERE WE DISPLAY THE ERROR
*/
public function display_error($errMessage){
public function display_error($errMessage) {
global $page;
$page->set_title("Error");