aboutsummaryrefslogtreecommitdiff
path: root/pages/lists
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2010-07-25 02:01:36 +0000
committerCash Costello <cash.costello@gmail.com>2010-07-25 02:01:36 +0000
commit73403645808a81425381f43c25e0ea2c92705312 (patch)
tree83fb73e9a122054f6f4c2e1c44e399572ee13e28 /pages/lists
parent791ec4925346cb38ecca9a2f2574b012ab64a88a (diff)
downloadelgg-73403645808a81425381f43c25e0ea2c92705312.tar.gz
elgg-73403645808a81425381f43c25e0ea2c92705312.tar.bz2
first go at brining tidypics up to code standards
Diffstat (limited to 'pages/lists')
-rw-r--r--pages/lists/mostcommentedimages.php63
-rw-r--r--pages/lists/mostrecentimages.php102
-rw-r--r--pages/lists/mostviewedimages.php121
-rw-r--r--pages/lists/recentlycommented.php111
-rw-r--r--pages/lists/recentlyviewed.php105
5 files changed, 252 insertions, 250 deletions
diff --git a/pages/lists/mostcommentedimages.php b/pages/lists/mostcommentedimages.php
index 801409fdc..0a4eb9622 100644
--- a/pages/lists/mostcommentedimages.php
+++ b/pages/lists/mostcommentedimages.php
@@ -1,22 +1,22 @@
<?php
- /**
- * Tidypics full view of an image
- * Given a GUID, this page will try and display any entity
- *
- */
-
- // Load Elgg engine
- include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
-
- global $CONFIG;
- $prefix = $CONFIG->dbprefix;
- $max = 24;
-
- //this works but is wildly inefficient
- //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-
- $sql = "SELECT ent.guid, count( * ) AS views
+/**
+ * Tidypics full view of an image
+ * Given a GUID, this page will try and display any entity
+ *
+ */
+
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max = 24;
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT ent.guid, count( * ) AS views
FROM " . $prefix . "entities ent
INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
AND sub.subtype = 'image'
@@ -26,18 +26,17 @@
GROUP BY ent.guid
ORDER BY views DESC
LIMIT $max";
-
- $result = get_data($sql);
-
- $entities = array();
- foreach($result as $entity) {
- $entities[] = get_entity($entity->guid);
- }
-
- tidypics_mostviewed_submenus();
- $title = elgg_echo("tidypics:mostcommented");
- $area2 = elgg_view_title($title);
- $area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
- page_draw($title, $body);
-?> \ No newline at end of file
+
+$result = get_data($sql);
+
+$entities = array();
+foreach ($result as $entity) {
+ $entities[] = get_entity($entity->guid);
+}
+
+tidypics_mostviewed_submenus();
+$title = elgg_echo("tidypics:mostcommented");
+$area2 = elgg_view_title($title);
+$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body); \ No newline at end of file
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 178e3c722..722f1fc32 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -1,56 +1,58 @@
<?php
- /**
- * Most recently uploaded images - individual or world
- *
- */
-
- // Load Elgg engine
- include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
-
- // start with assumption this is for all site photos
- $title = elgg_echo('tidypics:mostrecent');
- $user_id = 0;
-
- // is this all site or an individuals images
- $username = get_input('username');
- if ($username) {
- $user = get_user_by_username($username);
- if ($user) {
- $user_id = $user->guid;
-
- if ($user_id == get_loggedin_userid())
- $title = elgg_echo('tidypics:yourmostrecent');
- else
- $title = sprintf(elgg_echo("tidypics:friendmostrecent"), $user->name);
- }
- } else {
- // world view - set page owner to logged in user
- if (isloggedin()) {
- set_page_owner(get_loggedin_userid());
+/**
+ * Most recently uploaded images - individual or world
+ *
+ */
+
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+
+// start with assumption this is for all site photos
+$title = elgg_echo('tidypics:mostrecent');
+$user_id = 0;
+
+// is this all site or an individuals images
+$username = get_input('username');
+if ($username) {
+ $user = get_user_by_username($username);
+ if ($user) {
+ $user_id = $user->guid;
+
+ if ($user_id == get_loggedin_userid()) {
+ $title = elgg_echo('tidypics:yourmostrecent');
+ } else {
+ $title = sprintf(elgg_echo("tidypics:friendmostrecent"), $user->name);
}
}
-
- // allow other plugins to override the slideshow
- $slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
- if ($slideshow_link) {
- add_submenu_item(elgg_echo('album:slideshow'),
- $slideshow_link,
- 'photos' );
+} else {
+ // world view - set page owner to logged in user
+ if (isloggedin()) {
+ set_page_owner(get_loggedin_userid());
}
+}
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+ add_submenu_item(elgg_echo('album:slideshow'),
+ $slideshow_link,
+ 'photos' );
+}
+
+// how many do we display
+$max = 12;
+
+// grab the html to display the images
+$images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true);
+
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+if (empty($area2)) {
+ $area2 = $images;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
- // how many do we display
- $max = 12;
-
- // grab the html to display the images
- $images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true);
-
-
- // this view takes care of the title on the main column and the content wrapper
- $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
- if( empty( $area2 )) $area2 = $images;
-
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
- page_draw($title, $body);
-?> \ No newline at end of file
+page_draw($title, $body);
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index d945680f1..eb87bc17c 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -1,33 +1,33 @@
<?php
- /**
- * Most viewed images - either for a user or all site
- *
- */
+/**
+ * Most viewed images - either for a user or all site
+ *
+ */
- // Load Elgg engine
- include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
- global $CONFIG;
- $prefix = $CONFIG->dbprefix;
- $max = 24;
-
- $owner_guid = page_owner();
-
- //$start = microtime(true);
- $photos = tp_get_entities_from_annotations_calculate_x(
- 'count',
- 'object',
- 'image',
- 'tp_view',
- '',
- '',
- $owner_guid,
- $max);
- //error_log("elgg query is " . (float)(microtime(true) - $start));
-
- //this works but is wildly inefficient
- //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max = 24;
+
+$owner_guid = page_owner();
+
+//$start = microtime(true);
+$photos = tp_get_entities_from_annotations_calculate_x(
+ 'count',
+ 'object',
+ 'image',
+ 'tp_view',
+ '',
+ '',
+ $owner_guid,
+ $max);
+//error_log("elgg query is " . (float)(microtime(true) - $start));
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
/*
$start = microtime(true);
$sql = "SELECT ent.guid, count( * ) AS views
@@ -48,39 +48,40 @@
$entities[] = get_entity($entity->guid);
}
*/
- //error_log("custom query is " . (float)(microtime(true) - $start));
-
- // allow other plugins to override the slideshow
- $slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
- if ($slideshow_link) {
- add_submenu_item(elgg_echo('album:slideshow'),
- $slideshow_link,
- 'photos' );
- }
-
- if ($owner_guid) {
- if ($owner_guid == get_loggedin_userid()) {
- $title = elgg_echo("tidypics:yourmostviewed");
- } else {
- $title = sprintf(elgg_echo("tidypics:friendmostviewed"), page_owner_entity()->name);
- }
+//error_log("custom query is " . (float)(microtime(true) - $start));
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+ add_submenu_item(elgg_echo('album:slideshow'),
+ $slideshow_link,
+ 'photos' );
+}
+
+if ($owner_guid) {
+ if ($owner_guid == get_loggedin_userid()) {
+ $title = elgg_echo("tidypics:yourmostviewed");
} else {
- // world view - set page owner to logged in user
- if (isloggedin()) {
- set_page_owner(get_loggedin_userid());
- }
-
- $title = elgg_echo("tidypics:mostviewed");
+ $title = sprintf(elgg_echo("tidypics:friendmostviewed"), page_owner_entity()->name);
}
- $area2 = elgg_view_title($title);
-
- // grab the html to display the images
- $content = tp_view_entity_list($photos, $max, 0, $max, false);
-
- // this view takes care of the title on the main column and the content wrapper
- $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
- if( empty( $area2 )) $area2 = $content;
-
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
- page_draw($title, $body);
-?> \ No newline at end of file
+} else {
+ // world view - set page owner to logged in user
+ if (isloggedin()) {
+ set_page_owner(get_loggedin_userid());
+ }
+
+ $title = elgg_echo("tidypics:mostviewed");
+}
+$area2 = elgg_view_title($title);
+
+// grab the html to display the images
+$content = tp_view_entity_list($photos, $max, 0, $max, false);
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
+if (empty($area2)) {
+ $area2 = $content;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index 1d5f7aea7..f070e8563 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -1,36 +1,36 @@
<?php
- /**
- * Images recently commented on - world view only
- *
- */
+/**
+ * Images recently commented on - world view only
+ *
+ */
- // Load Elgg engine
- include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
- // world view - set page owner to logged in user
- if (isloggedin()) {
- set_page_owner(get_loggedin_userid());
- }
-
- // allow other plugins to override the slideshow
- $slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
- if ($slideshow_link) {
- add_submenu_item(elgg_echo('album:slideshow'),
- $slideshow_link,
- 'photos' );
- }
-
-
- global $CONFIG;
- $prefix = $CONFIG->dbprefix;
- $max_limit = 200; //get extra because you'll have multiple views per image in the result set
- $max = 16; //controls how many actually show on screen
-
- //this works but is wildly inefficient
- //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-
- $sql = "SELECT distinct (ent.guid), ann1.time_created
+// world view - set page owner to logged in user
+if (isloggedin()) {
+ set_page_owner(get_loggedin_userid());
+}
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+ add_submenu_item(elgg_echo('album:slideshow'),
+ $slideshow_link,
+ 'photos' );
+}
+
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max_limit = 200; //get extra because you'll have multiple views per image in the result set
+$max = 16; //controls how many actually show on screen
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT distinct (ent.guid), ann1.time_created
FROM " . $prefix . "entities ent
INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
AND sub.subtype = 'image'
@@ -39,34 +39,31 @@
AND ms.string = 'generic_comment'
ORDER BY ann1.time_created DESC
LIMIT $max_limit";
-
- $result = get_data($sql);
- $entities = array();
- foreach($result as $entity) {
- if(!$entities[$entity->guid]) {
- $entities[$entity->guid] = get_entity($entity->guid);
- }
- if(count($entities) >= $max) break;
+$result = get_data($sql);
+
+$entities = array();
+foreach ($result as $entity) {
+ if (!$entities[$entity->guid]) {
+ $entities[$entity->guid] = get_entity($entity->guid);
}
-
- $user = get_loggedin_user();
- if( $user->guid == 9 ) {
- echo "<pre>";
- var_dump( $sql);
-// var_dump( $result );
- echo "</pre>";
+ if (count($entities) >= $max) {
+ break;
}
- $title = elgg_echo("tidypics:recentlycommented");
- $area2 = elgg_view_title($title);
-
- // grab the html to display the images
- $images = tp_view_entity_list($entities, $max, 0, $max, false);
-
- // this view takes care of the title on the main column and the content wrapper
- $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
- if( empty( $area2 )) $area2 = $images;
-
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
- page_draw($title, $body);
-?> \ No newline at end of file
+}
+
+$user = get_loggedin_user();
+$title = elgg_echo("tidypics:recentlycommented");
+$area2 = elgg_view_title($title);
+
+// grab the html to display the images
+$images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+if (empty($area2)) {
+ $area2 = $images;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 16ad474df..419576d8e 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -1,36 +1,36 @@
<?php
- /**
- * Most recently viewed images - world view only right now
- *
- */
+/**
+ * Most recently viewed images - world view only right now
+ *
+ */
- // Load Elgg engine
- include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
- // world view - set page owner to logged in user
- if (isloggedin()) {
- set_page_owner(get_loggedin_userid());
- }
-
- // allow other plugins to override the slideshow
- $slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
- if ($slideshow_link) {
- add_submenu_item(elgg_echo('album:slideshow'),
- $slideshow_link,
- 'photos' );
- }
-
-
- global $CONFIG;
- $prefix = $CONFIG->dbprefix;
- $max_limit = 200; //get extra because you'll have multiple views per image in the result set
- $max = 16; //controls how many actually show on screen
-
- //this works but is wildly inefficient
- //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-
- $sql = "SELECT distinct ent.guid, ann1.time_created
+// world view - set page owner to logged in user
+if (isloggedin()) {
+ set_page_owner(get_loggedin_userid());
+}
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+ add_submenu_item(elgg_echo('album:slideshow'),
+ $slideshow_link,
+ 'photos' );
+}
+
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max_limit = 200; //get extra because you'll have multiple views per image in the result set
+$max = 16; //controls how many actually show on screen
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT distinct ent.guid, ann1.time_created
FROM " . $prefix . "entities ent
INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
AND sub.subtype = 'image'
@@ -39,27 +39,30 @@
AND ms.string = 'tp_view'
ORDER BY ann1.id DESC
LIMIT $max_limit";
-
- $result = get_data($sql);
- $entities = array();
- foreach($result as $entity) {
- if(!$entities[$entity->guid]) {
- $entities[$entity->guid] = get_entity($entity->guid);
- }
- if(count($entities) >= $max) break;
+$result = get_data($sql);
+
+$entities = array();
+foreach ($result as $entity) {
+ if (!$entities[$entity->guid]) {
+ $entities[$entity->guid] = get_entity($entity->guid);
+ }
+ if (count($entities) >= $max) {
+ break;
}
-
- $title = elgg_echo("tidypics:recentlyviewed");
- $area2 = elgg_view_title($title);
-
- // grab the html to display the images
- $images = tp_view_entity_list($entities, $max, 0, $max, false);
-
- // this view takes care of the title on the main column and the content wrapper
- $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
- if( empty( $area2 )) $area2 = $images;
-
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
- page_draw($title, $body);
-?> \ No newline at end of file
+}
+
+$title = elgg_echo("tidypics:recentlyviewed");
+$area2 = elgg_view_title($title);
+
+// grab the html to display the images
+$images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+if (empty($area2)) {
+ $area2 = $images;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);