diff options
Diffstat (limited to 'pages')
46 files changed, 645 insertions, 1588 deletions
diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php new file mode 100644 index 000000000..f464f98c9 --- /dev/null +++ b/pages/account/forgotten_password.php @@ -0,0 +1,27 @@ +<?php +/** + * Assembles and outputs the forgotten password page. + * + * @package Elgg.Core + * @subpackage Registration + */ + +if (elgg_is_logged_in()) { + forward(); +} + +$title = elgg_echo("user:password:lost"); +$content = elgg_view_title($title); + +$content .= elgg_view_form('user/requestnewpassword', array( + 'class' => 'elgg-form-account', +)); + +if (elgg_get_config('walled_garden')) { + elgg_load_css('elgg.walled_garden'); + $body = elgg_view_layout('walled_garden', array('content' => $content)); + echo elgg_view_page($title, $body, 'walled_garden'); +} else { + $body = elgg_view_layout('one_column', array('content' => $content)); + echo elgg_view_page($title, $body); +} diff --git a/pages/account/login.php b/pages/account/login.php new file mode 100644 index 000000000..6aa3752d0 --- /dev/null +++ b/pages/account/login.php @@ -0,0 +1,28 @@ +<?php +/** + * Assembles and outputs a login page. + * + * This page serves as a fallback for non-JS users who click on the login + * drop down link. + * + * If the user is logged in, this page will forward to the front page. + * + * @package Elgg.Core + * @subpackage Accounts + */ + +if (elgg_is_logged_in()) { + forward(''); +} + +$title = elgg_echo('login'); +$content = elgg_view('core/account/login_box'); + +if (elgg_get_config('walled_garden')) { + elgg_load_css('elgg.walled_garden'); + $body = elgg_view_layout('walled_garden', array('content' => $content)); + echo elgg_view_page($title, $body, 'walled_garden'); +} else { + $body = elgg_view_layout('one_column', array('content' => $content)); + echo elgg_view_page($title, $body); +} diff --git a/pages/account/register.php b/pages/account/register.php new file mode 100644 index 000000000..2fe8b74c0 --- /dev/null +++ b/pages/account/register.php @@ -0,0 +1,58 @@ +<?php +/** + * Assembles and outputs the registration page. + * + * Since 1.8, registration can be disabled via administration. If this is + * the case, calls to this page will forward to the network front page. + * + * If the user is logged in, this page will forward to the network + * front page. + * + * @package Elgg.Core + * @subpackage Registration + */ + +// check new registration allowed +if (elgg_get_config('allow_registration') == false) { + register_error(elgg_echo('registerdisabled')); + forward(); +} + +$friend_guid = (int) get_input('friend_guid', 0); +$invitecode = get_input('invitecode'); + +// only logged out people need to register +if (elgg_is_logged_in()) { + forward(); +} + +$title = elgg_echo("register"); + +$content = elgg_view_title($title); + +// create the registration url - including switching to https if configured +$register_url = elgg_get_site_url() . 'action/register'; +if (elgg_get_config('https_login')) { + $register_url = str_replace("http:", "https:", $register_url); +} +$form_params = array( + 'action' => $register_url, + 'class' => 'elgg-form-account', +); + +$body_params = array( + 'friend_guid' => $friend_guid, + 'invitecode' => $invitecode +); +$content .= elgg_view_form('register', $form_params, $body_params); + +$content .= elgg_view('help/register'); + +if (elgg_get_config('walled_garden')) { + elgg_load_css('elgg.walled_garden'); + $body = elgg_view_layout('walled_garden', array('content' => $content)); + echo elgg_view_page($title, $body, 'walled_garden'); +} else { + $body = elgg_view_layout('one_column', array('content' => $content)); + echo elgg_view_page($title, $body); +} diff --git a/pages/account/reset_password.php b/pages/account/reset_password.php new file mode 100644 index 000000000..3ab8ccf3e --- /dev/null +++ b/pages/account/reset_password.php @@ -0,0 +1,40 @@ +<?php +/** + * Page for resetting a forgotten password + * + * @package Elgg.Core + * @subpackage Registration + */ + +if (elgg_is_logged_in()) { + forward(); +} + +$user_guid = get_input('u'); +$code = get_input('c'); + +$user = get_entity($user_guid); + +// don't check code here to avoid automated attacks +if (!$user instanceof ElggUser) { + register_error(elgg_echo('user:passwordreset:unknown_user')); + forward(); +} + +$params = array( + 'guid' => $user_guid, + 'code' => $code, +); +$form = elgg_view_form('user/passwordreset', array('class' => 'elgg-form-account'), $params); + +$title = elgg_echo('resetpassword'); +$content = elgg_view_title(elgg_echo('resetpassword')) . $form; + +if (elgg_get_config('walled_garden')) { + elgg_load_css('elgg.walled_garden'); + $body = elgg_view_layout('walled_garden', array('content' => $content)); + echo elgg_view_page($title, $body, 'walled_garden'); +} else { + $body = elgg_view_layout('one_column', array('content' => $content)); + echo elgg_view_page($title, $body); +} diff --git a/pages/admin.php b/pages/admin.php deleted file mode 100644 index 1a04ab279..000000000 --- a/pages/admin.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/** - * Tidypics Admin Page - */ - -admin_gatekeeper(); -set_context('admin'); - -$tab = get_input('tab', 'settings'); - -$body = elgg_view_title(elgg_echo('tidypics:administration')); - -$body .= elgg_view("tidypics/admin/tidypics", array('tab' => $tab)); - -page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body)); diff --git a/pages/avatar/edit.php b/pages/avatar/edit.php new file mode 100644 index 000000000..56aede887 --- /dev/null +++ b/pages/avatar/edit.php @@ -0,0 +1,32 @@ +<?php +/** + * Upload and crop an avatar page + */ + +// Only logged in users +gatekeeper(); + +elgg_set_context('profile_edit'); + +$title = elgg_echo('avatar:edit'); + +$entity = elgg_get_page_owner_entity(); +if (!elgg_instanceof($entity, 'user') || !$entity->canEdit()) { + register_error(elgg_echo('avatar:noaccess')); + forward(REFERER); +} + +$content = elgg_view('core/avatar/upload', array('entity' => $entity)); + +// only offer the crop view if an avatar has been uploaded +if (isset($entity->icontime)) { + $content .= elgg_view('core/avatar/crop', array('entity' => $entity)); +} + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/avatar/view.php b/pages/avatar/view.php new file mode 100644 index 000000000..10d81fef1 --- /dev/null +++ b/pages/avatar/view.php @@ -0,0 +1,54 @@ +<?php +/** + * View an avatar + */ + +// page owner library sets this based on URL +$user = elgg_get_page_owner_entity(); + +// Get the size +$size = strtolower(get_input('size')); +if (!in_array($size, array('master', 'large', 'medium', 'small', 'tiny', 'topbar'))) { + $size = 'medium'; +} + +// If user doesn't exist, return default icon +if (!$user) { + $url = "_graphics/icons/default/{$size}.png"; + $url = elgg_normalize_url($url); + forward($url); +} + +$user_guid = $user->getGUID(); + +// Try and get the icon +$filehandler = new ElggFile(); +$filehandler->owner_guid = $user_guid; +$filehandler->setFilename("profile/{$user_guid}{$size}.jpg"); + +$success = false; + +try { + if ($filehandler->open("read")) { + if ($contents = $filehandler->read($filehandler->size())) { + $success = true; + } + } +} catch (InvalidParameterException $e) { + elgg_log("Unable to get avatar for user with GUID $user_guid", 'ERROR'); +} + + +if (!$success) { + $url = "_graphics/icons/default/{$size}.png"; + $url = elgg_normalize_url($url); + forward($url); +} + +header("Content-type: image/jpeg", true); +header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+6 months")), true); +header("Pragma: public", true); +header("Cache-Control: public", true); +header("Content-Length: " . strlen($contents)); + +echo $contents; diff --git a/pages/download.php b/pages/download.php deleted file mode 100644 index 23c3e39f4..000000000 --- a/pages/download.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * Tidypics Download Photos - * - * do not call this directly - call through page handler - */ - -global $CONFIG; - -$file_guid = (int) get_input("file_guid"); -$file = get_entity($file_guid); - -$type = get_input("type"); - -if ($file) { - $filename = $file->originalfilename; - $mime = $file->mimetype; - - header("Content-Type: $mime"); - if ($type == "inline") { - header("Content-Disposition: inline; filename=\"$filename\""); - } else { - header("Content-Disposition: attachment; filename=\"$filename\""); - } - - $readfile = new ElggFile($file_guid); - $readfile->owner_guid = $file->owner_guid; - - $contents = $readfile->grabFile(); - - if (empty($contents)) { - echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" ); - } else { - - // expires every 60 days - $expires = 60 * 60*60*24; - - header("Content-Length: " . strlen($contents)); - header("Cache-Control: public", true); - header("Pragma: public", true); - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); - - - echo $contents; - } - - exit; -} else { - register_error(elgg_echo("image:downloadfailed")); -}
\ No newline at end of file diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php deleted file mode 100644 index 7c7b989cf..000000000 --- a/pages/edit_multiple.php +++ /dev/null @@ -1,52 +0,0 @@ -<?php -/** - * Tidypics: Edit the properties of multiple images - * - * Called after upload only - */ - -include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; - -gatekeeper(); -set_context('photos'); - -set_page_owner(get_loggedin_userid()); - - -$batch = get_input('batch'); -if ($batch) { - $images = elgg_get_entities_from_metadata(array( - 'metadata_name' => 'batch', - 'metadata_value' => $batch, - 'type' => 'object', - 'subtype' => 'image', - 'owner_guid' => get_loggedin_userid(), - 'limit' => ELGG_ENTITIES_NO_VALUE, - )); -} else { - // parse out photo guids - $file_string = get_input('files'); - $file_array_sent = explode('-', $file_string); - - $images = array(); - foreach ($file_array_sent as $file_guid) { - if ($entity = get_entity($file_guid)) { - if ($entity->canEdit()) { - array_push($images, $entity); - } - } - } -} - -if (!$images) { - forward($_SERVER['HTTP_REFERER']); -} - - -$title = elgg_echo('tidypics:editprops'); - -$content .= elgg_view_title($title); -$content .= elgg_view("tidypics/forms/edit_multi", array('images' => $images)); - -$body = elgg_view_layout('two_column_left_sidebar', '', $content); -page_draw($title, $body); diff --git a/pages/entities/index.php b/pages/entities/index.php new file mode 100644 index 000000000..e73d65db4 --- /dev/null +++ b/pages/entities/index.php @@ -0,0 +1,56 @@ +<?php +/** + * Generic entity viewer + * Given a GUID, this page will try and display any entity + * + * @package Elgg + * @subpackage Core + */ + + +// Get the GUID of the entity we want to view +$guid = (int) get_input('guid'); +$shell = get_input('shell'); +if ($shell == "no") { + $shell = false; +} else { + $shell = true; +} + +$context = get_input('context'); +if ($context) { + elgg_set_context($context); +} + +// Get the entity, if possible +if ($entity = get_entity($guid)) { + if ($entity->container_guid) { + elgg_set_page_owner_guid($entity->container_guid); + } else { + elgg_set_page_owner_guid($entity->owner_guid); + } + + // Set the body to be the full view of the entity, and the title to be its title + if ($entity instanceof ElggObject) { + $title = $entity->title; + } else if ($entity instanceof ElggEntity) { + $title = $entity->name; + } + $area1 = elgg_view_entity($entity, array('full_view' => true)); + if ($shell) { + $body = elgg_view_layout('one_column', array('content' => $area1)); + } else { + $body = $area1; + } +} else { + $body = elgg_echo('notfound'); +} + +// Display the page +if ($shell) { + echo elgg_view_page($title, $body); +} else { + header("Content-type: text/html; charset=UTF-8"); + echo $title; + echo $body; +}
\ No newline at end of file diff --git a/pages/friends/collections/add.php b/pages/friends/collections/add.php new file mode 100644 index 000000000..60f7586ba --- /dev/null +++ b/pages/friends/collections/add.php @@ -0,0 +1,22 @@ +<?php +/** + * Elgg add a collection of friends + * + * @package Elgg.Core + * @subpackage Social.Collections + */ + +// You need to be logged in for this one +gatekeeper(); + +$title = elgg_echo('friends:collections:add'); + +$content = elgg_view_title($title); + +$content .= elgg_view_form('friends/collections/add', array(), array( + 'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999), +)); + +$body = elgg_view_layout('one_sidebar', array('content' => $content)); + +echo elgg_view_page(elgg_echo('friends:collections:add'), $body); diff --git a/pages/friends/collections/pickercallback.php b/pages/friends/collections/pickercallback.php new file mode 100644 index 000000000..c6ed61cf0 --- /dev/null +++ b/pages/friends/collections/pickercallback.php @@ -0,0 +1,59 @@ +<?php +/** + * Elgg friends picker callback + * + * @package Elgg.Core + * @subpackage Social.Collections + */ + +// Load Elgg engine +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); + +$site_url = elgg_get_site_url(); + +// Get callback type (list or picker) +$type = get_input('type', 'picker'); + +$collection = (int) get_input('collection', 0); +$members = get_members_of_access_collection($collection, true); +if (!$members) { + $members = array(); +} + +$friendspicker = (int) get_input('friendspicker', 0); + +// Get page owner (bomb out if there isn't one) +$pageowner = elgg_get_page_owner_entity(); +if (!$pageowner) { + forward(); + exit; +} + +// Depending on the view type, launch a different view +switch($type) { + case 'list': + $js_segment = elgg_view('core/friends/tablelistcountupdate', array( + 'friendspicker' => $friendspicker, + 'count' => sizeof($members), + )); + $content = elgg_view('core/friends/tablelist', array( + 'entities' => $members, + 'content' => $js_segment, + )); + break; + default: + $friends = $pageowner->getFriends('', 9999); + + $content = elgg_view('input/friendspicker', array( + 'entities' => $friends, + 'value' => $members, + 'callback' => true, + 'friendspicker' => $friendspicker, + 'collection_id' => $collection, + 'formtarget' => $site_url . 'action/friends/collections/edit', + )); + break; +} + +// Output the content +echo $content;
\ No newline at end of file diff --git a/pages/friends/collections/view.php b/pages/friends/collections/view.php new file mode 100644 index 000000000..0d72fe788 --- /dev/null +++ b/pages/friends/collections/view.php @@ -0,0 +1,21 @@ +<?php +/** + * Elgg collections of friends + * + * @package Elgg.Core + * @subpackage Social.Collections + */ + +$title = elgg_echo('friends:collections'); +elgg_register_title_button('collections', 'add'); + +$content = elgg_view_access_collections(elgg_get_logged_in_user_guid()); + +$body = elgg_view_layout('content', array( + 'filter' => false, + 'content' => $content, + 'title' => $title, + 'context' => 'collections', +)); + +echo elgg_view_page($title, $body); diff --git a/pages/friends/index.php b/pages/friends/index.php new file mode 100644 index 000000000..63518a413 --- /dev/null +++ b/pages/friends/index.php @@ -0,0 +1,35 @@ +<?php +/** + * Elgg friends page + * + * @package Elgg.Core + * @subpackage Social.Friends + */ + +$owner = elgg_get_page_owner_entity(); +if (!$owner) { + // unknown user so send away (@todo some sort of 404 error) + forward(); +} + +$title = elgg_echo("friends:owned", array($owner->name)); + +$options = array( + 'relationship' => 'friend', + 'relationship_guid' => $owner->getGUID(), + 'inverse_relationship' => FALSE, + 'type' => 'user', + 'full_view' => FALSE +); +$content = elgg_list_entities_from_relationship($options); +if (!$content) { + $content = elgg_echo('friends:none'); +} + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/friends/of.php b/pages/friends/of.php new file mode 100644 index 000000000..aa9ee8bee --- /dev/null +++ b/pages/friends/of.php @@ -0,0 +1,35 @@ +<?php +/** + * Elgg friends of page + * + * @package Elgg.Core + * @subpackage Social.Friends + */ + +$owner = elgg_get_page_owner_entity(); +if (!$owner) { + // unknown user so send away (@todo some sort of 404 error) + forward(); +} + +$title = elgg_echo("friends:of:owned", array($owner->name)); + +$options = array( + 'relationship' => 'friend', + 'relationship_guid' => $owner->getGUID(), + 'inverse_relationship' => TRUE, + 'type' => 'user', + 'full_view' => FALSE +); +$content = elgg_list_entities_from_relationship($options); +if (!$content) { + $content = elgg_echo('friends:none'); +} + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/lists/highestrated.php b/pages/lists/highestrated.php deleted file mode 100644 index e05e7a9ba..000000000 --- a/pages/lists/highestrated.php +++ /dev/null @@ -1,65 +0,0 @@ -<?php - /** - * Tidypics Friends Albums Listing - * - */ - - include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php"; - - //if no friends were requested, see world pictures instead, or redirect to user's friends -/* if (is_null(get_input('username')) || get_input('username')=='') { - if (!isloggedin()) { - forward('pg/photos/world'); - } else { - forward('pg/photos/friends/' . $_SESSION['user']->username); - } - }*/ - -// if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') { -// $groupname = get_input('username'); -// } else { -// $groupname = page_owner_entity()->name; -// }; -// - //there has to be a better way to do this - if(!$groupname) { - $page = get_input("page"); - list($pagename, $groupname) = split("/", $page); - } - - list($group_holder, $album_id) = split(":", $groupname); -// echo "<pre>page: $page\ngroup: $groupname\nalbum: $album_id"; die; - - $user = get_user_by_username($friendname); - global $CONFIG; - $prefix = $CONFIG->dbprefix; - $max = 24; - - $sql = "SELECT ent.guid, count(1) as mycount, avg(ms2.string) as average - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' AND ent.container_guid = $album_id - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'generic_rate' - INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id - INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid - GROUP BY ent.guid HAVING mycount > 1 - ORDER BY average DESC - LIMIT $max"; - - $result = get_data($sql); - - $entities = array(); - foreach($result as $entity) { - $entities[] = get_entity($entity->guid); - } - - $album = get_entity($album_id); - $title = $album["title"] . ": " . elgg_echo("tidypics:highestrated"); - $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/highestvotecount.php b/pages/lists/highestvotecount.php deleted file mode 100644 index 26b907144..000000000 --- a/pages/lists/highestvotecount.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - $sql = "SELECT ent.guid, u.name as owner, count( 1 ) AS mycount, avg( ms2.string ) AS average - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'generic_rate' - INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id - INNER JOIN " . $prefix . "users_entity u ON ent.owner_guid = u.guid - GROUP BY ent.guid - ORDER BY mycount DESC - LIMIT $max"; - - $result = get_data($sql); - - $title = "Most voted images"; - $area2 = elgg_view_title($title); - - $entities = array(); - foreach($result as $entity) { - $entities[] = get_entity($entity->guid); - $full_entity = get_entity($entity->guid); - $area2 .= " <div class='tidypics_album_images'> - Owner: $entity->owner<br /> - Votes: $entity->mycount<br /> - Average: $entity->average - </div> - "; - $area2 .= elgg_view_entity($full_entity); - - } - - $body = elgg_view_layout('two_column_left_sidebar', '', $area2); - page_draw($title, $body); -?>
\ No newline at end of file diff --git a/pages/lists/mostcommentedimages.php b/pages/lists/mostcommentedimages.php deleted file mode 100644 index 0a4eb9622..000000000 --- a/pages/lists/mostcommentedimages.php +++ /dev/null @@ -1,42 +0,0 @@ -<?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 - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'generic_comment' - 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 diff --git a/pages/lists/mostcommentedimagesthismonth.php b/pages/lists/mostcommentedimagesthismonth.php deleted file mode 100644 index d95e2aff5..000000000 --- a/pages/lists/mostcommentedimagesthismonth.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - - //find timestamps for first and last days of this month - $time_info = new stdClass(); - $time_info->start = mktime(0,0,0, date("m"), 1, date("Y")); - $time_info->end = mktime(); - - //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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'generic_comment' - WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end - 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:mostcommentedthismonth"); - $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/mostcommentedimagestoday.php b/pages/lists/mostcommentedimagestoday.php deleted file mode 100644 index bd1a0cbec..000000000 --- a/pages/lists/mostcommentedimagestoday.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - - //find timestamps for today - $time_info = new stdClass(); - $time_info->start = mktime(0,0,0, date("m"), date("d"), date("Y")); - $time_info->end = mktime(); - - //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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'generic_comment' - WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end - 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:mostcommentedtoday"); - $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 deleted file mode 100644 index 0a2595c85..000000000 --- a/pages/lists/mostrecentimages.php +++ /dev/null @@ -1,64 +0,0 @@ -<?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()); - } -} - -// 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 = elgg_list_entities(array( - "type" => "object", - "subtype" => "image", - "owner_guid" => $user_id, - "limit" => $max, - "full_view" => 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/mostviewedimages.php b/pages/lists/mostviewedimages.php deleted file mode 100644 index eb87bc17c..000000000 --- a/pages/lists/mostviewedimages.php +++ /dev/null @@ -1,87 +0,0 @@ -<?php - -/** - * Most viewed images - either for a user or all site - * - */ - -// 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); -/* - $start = microtime(true); - $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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid AND ann1.owner_guid != ent.owner_guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'tp_view' - 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); - } -*/ -//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); - } -} 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/mostviewedimageslastmonth.php b/pages/lists/mostviewedimageslastmonth.php deleted file mode 100644 index 1ed9161f7..000000000 --- a/pages/lists/mostviewedimageslastmonth.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - - //find timestamps for first and last days of last month - $time_info = new stdClass(); - $time_info->start = strtotime("-1 months", mktime(0,0,0, date("m"), 1, date("Y"))); - $time_info->end = mktime(0,0,0,date("m"), 0, date("Y")); - - //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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid AND ann1.owner_guid != ent.owner_guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'tp_view' - WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end - 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:mostviewedlastmonth"); - $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/mostviewedimagesthismonth.php b/pages/lists/mostviewedimagesthismonth.php deleted file mode 100644 index bfe08e1da..000000000 --- a/pages/lists/mostviewedimagesthismonth.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - - //find timestamps for first and last days of this month - $time_info = new stdClass(); - $time_info->start = mktime(0,0,0, date("m"), 1, date("Y")); - $time_info->end = mktime(); - - //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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid AND ann1.owner_guid != ent.owner_guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'tp_view' - WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end - 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:mostviewedthismonth"); - $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/mostviewedimagesthisyear.php b/pages/lists/mostviewedimagesthisyear.php deleted file mode 100644 index fe1a63d38..000000000 --- a/pages/lists/mostviewedimagesthisyear.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - - //find timestamps for first day of the year and current date - $time_info = new stdClass(); - $time_info->start = mktime(0,0,0, 1, 1, date("Y")); - $time_info->end = mktime(); - - //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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid AND ann1.owner_guid != ent.owner_guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'tp_view' - WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end - 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:mostviewedthisyear"); - $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/mostviewedimagestoday.php b/pages/lists/mostviewedimagestoday.php deleted file mode 100644 index f8e844753..000000000 --- a/pages/lists/mostviewedimagestoday.php +++ /dev/null @@ -1,50 +0,0 @@ -<?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; - - - //find timestamps for today - $time_info = new stdClass(); - $time_info->start = mktime(0,0,0, date("m"), date("d"), date("Y")); - $time_info->end = mktime(); - - //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' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid AND ann1.owner_guid != ent.owner_guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'tp_view' - WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end - 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:mostviewedtoday"); - $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/recentlycommented.php b/pages/lists/recentlycommented.php deleted file mode 100644 index f070e8563..000000000 --- a/pages/lists/recentlycommented.php +++ /dev/null @@ -1,69 +0,0 @@ -<?php - -/** - * Images recently commented on - world view only - * - */ - -// 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 - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - 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; - } -} - -$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 deleted file mode 100644 index 419576d8e..000000000 --- a/pages/lists/recentlyviewed.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php - -/** - * Most recently viewed images - world view only right now - * - */ - -// 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 - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - 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; - } -} - -$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); diff --git a/pages/lists/recentvotes.php b/pages/lists/recentvotes.php deleted file mode 100644 index 3d8eac97e..000000000 --- a/pages/lists/recentvotes.php +++ /dev/null @@ -1,52 +0,0 @@ -<?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; - - $sql = "SELECT ent.guid, u2.name AS owner, u.name AS voter, ms2.string as vote - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'generic_rate' - INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id - INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid - INNER JOIN " . $prefix . "users_entity u2 ON ent.owner_guid = u2.guid - ORDER BY ann1.time_created DESC - LIMIT $max"; - - $result = get_data($sql); - - $title = "Recently rated images"; - $area2 = elgg_view_title($title); - - $entities = array(); - foreach($result as $entity) { - $entities[] = get_entity($entity->guid); - $full_entity = get_entity($entity->guid); - $area2 .= " <div class='tidypics_album_images'> - Owner: $entity->owner<br /> - Voter: $entity->voter<br /> - Rating: $entity->vote - </div> - "; - $area2 .= elgg_view_entity($full_entity); - - } - - -// $area2 .= elgg_view_entity_list($entities, $max, 0, $max); - $body = elgg_view_layout('two_column_left_sidebar', '', $area2); - page_draw($title, $body); -?>
\ No newline at end of file diff --git a/pages/photos/album/add.php b/pages/photos/album/add.php deleted file mode 100644 index d34d39177..000000000 --- a/pages/photos/album/add.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php -/** - * Create new album page - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$owner = elgg_get_page_owner_entity(); - -gatekeeper(); -group_gatekeeper(); - -$title = elgg_echo('photos:add'); - -// set up breadcrumbs -elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); -if (elgg_instanceof($owner, 'user')) { - elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); -} else { - elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); -} -elgg_push_breadcrumb($title); - -$vars = tidypics_prepare_form_vars(); -$content = elgg_view_form('photos/album/save', array('method' => 'post'), $vars); - -$body = elgg_view_layout('content', array( - 'content' => $content, - 'title' => $title, - 'filter' => '', -)); - -echo elgg_view_page($title, $body); diff --git a/pages/photos/album/edit.php b/pages/photos/album/edit.php deleted file mode 100644 index 6fff50b29..000000000 --- a/pages/photos/album/edit.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php -/** - * Edit an album - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$guid = (int) get_input('guid'); - -if (!$entity = get_entity($guid)) { - // @todo either deleted or do not have access - forward('photos/all'); -} - -if (!$entity->canEdit()) { - // @todo cannot change it - forward('photos/all'); -} - -elgg_set_page_owner_guid($entity->getContainerGUID()); -$owner = elgg_get_page_owner_entity(); - -gatekeeper(); -group_gatekeeper(); - -$title = elgg_echo('album:edit'); - -// set up breadcrumbs -elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); -if (elgg_instanceof($owner, 'user')) { - elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); -} else { - elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); -} -elgg_push_breadcrumb($title); - -$vars = tidypics_prepare_form_vars($entity); -$content = elgg_view_form('photos/album/save', array('method' => 'post'), $vars); - -$body = elgg_view_layout('content', array( - 'content' => $content, - 'title' => $title, - 'filter' => '', -)); - -echo elgg_view_page($title, $body); diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php deleted file mode 100644 index aafcf14bc..000000000 --- a/pages/photos/album/view.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php -/** - * This displays the photos that belong to an album - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -group_gatekeeper(); - -// get the album entity -$album_guid = (int) get_input('guid'); -$album = get_entity($album_guid); -if (!$album) { - // @todo album deleted or don't have access - forward('photos/all'); -} - -elgg_set_page_owner_guid($album->getContainerGUID()); -$owner = elgg_get_page_owner_entity(); - -$title = elgg_echo($album->getTitle()); - -// set up breadcrumbs -elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all'); -elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); -elgg_push_breadcrumb($album->getTitle()); - -$content = elgg_view_entity($album, array('full_view' => true)); - -if ($album->canWriteToContainer()) { - elgg_register_menu_item('title', array( - 'name' => 'upload', - 'href' => 'photos/upload/' . $album->getGUID(), - 'text' => elgg_echo('images:upload'), - 'link_class' => 'elgg-button elgg-button-action', - )); -} - -$body = elgg_view_layout('content', array( - 'filter' => false, - 'content' => $content, - 'title' => $album->getTitle(), - 'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'album')), -)); - -echo elgg_view_page($title, $body); diff --git a/pages/photos/all.php b/pages/photos/all.php deleted file mode 100644 index edda65ce0..000000000 --- a/pages/photos/all.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/** - * View all albums on the site - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -elgg_push_breadcrumb(elgg_echo('photos')); - -$num_albums = 16; - -elgg_push_context('tidypics:main'); -$offset = (int)get_input('offset', 0); -$content = elgg_list_entities(array( - 'type' => 'object', - 'subtype' => 'album', - 'limit' => $num_albums, - 'full_view' => false, - 'list_type' => 'gallery', - 'list_type_toggle' => false, - 'gallery_class' => 'tidypics-gallery', -)); -elgg_pop_context(); - -$title = elgg_echo('album:all'); - -elgg_register_title_button('photos'); - -$body = elgg_view_layout('content', array( - 'filter_context' => 'all', - 'content' => $content, - 'title' => $title, - 'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'all')), -)); - -echo elgg_view_page($title, $body); diff --git a/pages/photos/friends.php b/pages/photos/friends.php deleted file mode 100644 index b7b6178c5..000000000 --- a/pages/photos/friends.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php -/** - * List all the albums of someone's friends - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$owner = elgg_get_page_owner_entity(); - -elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); -elgg_push_breadcrumb($owner->name, "photos/friends/$owner->username"); -elgg_push_breadcrumb(elgg_echo('friends')); - -$title = elgg_echo('album:friends'); - - -$num_albums = 16; - -elgg_push_context('tidypics:main'); -set_input('list_type', 'gallery'); -$content = list_user_friends_objects($owner->guid, 'album', $num_albums, false); -elgg_pop_context(); - -elgg_register_title_button(); - -$body = elgg_view_layout('content', array( - 'filter_context' => 'friends', - 'content' => $content, - 'title' => $title, -)); - -echo elgg_view_page($title, $body); diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php deleted file mode 100644 index 6580c6f52..000000000 --- a/pages/photos/image/upload.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php -/** - * Tidypics Upload Images Page - * - */ - -include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; - -global $CONFIG; - -// must be logged in to upload images -gatekeeper(); - -$album_guid = (int) get_input('album_guid'); -if (!$album_guid) { - forward(); -} - -if (get_plugin_setting('uploader', 'tidypics') != "disabled") { - $uploader = get_input('uploader', 'ajax'); -} else { - $uploader = 'basic'; -} - - -$album = get_entity($album_guid); - -//if album does not exist or user does not have access -if (!$album || !$album->canEdit()) { - // throw warning and forward to previous page - forward($_SERVER['HTTP_REFERER']); -} - -// set page owner based on container (user or group) -set_page_owner($album->container_guid); - -$page_owner = page_owner_entity(); -if ($page_owner instanceof ElggGroup) { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); -} - -set_context('photos'); -$title = elgg_echo('album:addpix') . ': ' . $album->title; -$area2 .= elgg_view_title($title); - -if ($uploader == 'basic') { - $area2 .= elgg_view('input/form', array( - 'action' => "{$CONFIG->wwwroot}action/tidypics/upload", - 'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)), - 'internalid' => 'tidypicsUpload', - 'enctype' => 'multipart/form-data', - 'method' => 'post', - )); - -} else { - $area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album)); -} - -$body = elgg_view_layout('two_column_left_sidebar', '', $area2); - -page_draw($title, $body); diff --git a/pages/photos/owner.php b/pages/photos/owner.php deleted file mode 100644 index f6582e326..000000000 --- a/pages/photos/owner.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php -/** - * Show all the albums that belong to a user or group - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -group_gatekeeper(); - -$owner = elgg_get_page_owner_entity(); - -//set the title -$title = elgg_echo('album:user', array($owner->name)); - -// set up breadcrumbs -elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all'); -elgg_push_breadcrumb($owner->name); - - -$num_albums = 16; - -elgg_push_context('tidypics:main'); -$content = elgg_list_entities(array( - 'type' => 'object', - 'subtype' => 'album', - 'container_guid' => $owner->getGUID(), - 'limit' => $num_albums, - 'full_view' => false, - 'list_type' => 'gallery', - 'list_type_toggle' => false, - 'gallery_class' => 'tidypics-gallery', -)); -elgg_pop_context(); - -elgg_register_title_button(); - -$body = elgg_view_layout('content', array( - 'filter_context' => 'mine', - 'content' => $content, - 'title' => $title, - 'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'owner')), -)); - -echo elgg_view_page($title, $body); diff --git a/pages/profile/edit.php b/pages/profile/edit.php new file mode 100644 index 000000000..0ffb8783f --- /dev/null +++ b/pages/profile/edit.php @@ -0,0 +1,32 @@ +<?php +/** + * Edit profile page + */ + +gatekeeper(); + +$user = elgg_get_page_owner_entity(); +if (!$user) { + register_error(elgg_echo("profile:notfound")); + forward(); +} + +// check if logged in user can edit this profile +if (!$user->canEdit()) { + register_error(elgg_echo("profile:noaccess")); + forward(); +} + +elgg_set_context('profile_edit'); + +$title = elgg_echo('profile:edit'); + +$content = elgg_view_form('profile/edit', array(), array('entity' => $user)); + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/river.php b/pages/river.php new file mode 100644 index 000000000..801d9f664 --- /dev/null +++ b/pages/river.php @@ -0,0 +1,61 @@ +<?php +/** + * Main activity stream list page + */ + +$options = array(); + +$page_type = preg_replace('[\W]', '', get_input('page_type', 'all')); +$type = preg_replace('[\W]', '', get_input('type', 'all')); +$subtype = preg_replace('[\W]', '', get_input('subtype', '')); +if ($subtype) { + $selector = "type=$type&subtype=$subtype"; +} else { + $selector = "type=$type"; +} + +if ($type != 'all') { + $options['type'] = $type; + if ($subtype) { + $options['subtype'] = $subtype; + } +} + +switch ($page_type) { + case 'mine': + $title = elgg_echo('river:mine'); + $page_filter = 'mine'; + $options['subject_guid'] = elgg_get_logged_in_user_guid(); + break; + case 'friends': + $title = elgg_echo('river:friends'); + $page_filter = 'friends'; + $options['relationship_guid'] = elgg_get_logged_in_user_guid(); + $options['relationship'] = 'friend'; + break; + default: + $title = elgg_echo('river:all'); + $page_filter = 'all'; + break; +} + +$activity = elgg_list_river($options); +if (!$activity) { + $activity = elgg_echo('river:none'); +} + +$content = elgg_view('core/river/filter', array('selector' => $selector)); + +$sidebar = elgg_view('core/river/sidebar'); + +$params = array( + 'title' => $title, + 'content' => $content . $activity, + 'sidebar' => $sidebar, + 'filter_context' => $page_filter, + 'class' => 'elgg-river-layout', +); + +$body = elgg_view_layout('content', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/server_analysis.php b/pages/server_analysis.php deleted file mode 100644 index 7e4218b83..000000000 --- a/pages/server_analysis.php +++ /dev/null @@ -1,143 +0,0 @@ -<?php - -/******************************************************************** - * - * Tidypics System Analysis Script - * - * Helps admins configure their server - * - ********************************************************************/ - -include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; - -global $CONFIG; - -admin_gatekeeper(); - -set_context('admin'); - -$title = 'TidyPics Server Analysis'; - - -function tp_readable_size($bytes) { - if (strpos($bytes, 'M')) { - return $bytes . 'B'; - } - - $size = $bytes / 1024; - if ($size < 1024) { - $size = number_format($size, 2); - $size .= ' KB'; - } else { - $size = $size / 1024; - if ($size < 1024) { - $size = number_format($size, 2); - $size .= ' MB'; - } else { - $size = $size / 1024; - $size = number_format($size, 2); - $size .= ' GB'; - } - } - return $size; -} - -$disablefunc = explode(',', ini_get('disable_functions')); -$exec_avail = "Disabled"; -if (is_callable('exec') && !in_array('exec',$disablefunc)) { - $exec_avail = "Enabled"; -} - -ob_start(); - -echo elgg_view_title($title); -?> -<div class="contentWrapper"> - <table width="100%"> - <tr> - <td>PHP version</td> - <td><?php echo phpversion(); ?></td> - <td></td> - </tr> - <tr> - <td>GD</td> - <td><?php echo (extension_loaded('gd')) ? 'Enabled' : 'Disabled'; ?></td> - <td>Elgg requires the GD extension to be loaded</td> - </tr> - <tr> - <td>IMagick PHP extension</td> - <td><?php echo (extension_loaded('imagick')) ? 'Enabled' : 'Disabled'; ?></td> - <td></td> - </tr> - <tr> - <td>exec()</td> - <td><?php echo $exec_avail; ?></td> - <td>Required for ImageMagick command line</td> - </tr> - <tr> - <td>Memory Available to PHP</td> - <td><?php echo tp_readable_size(ini_get('memory_limit')); ?></td> - <td>Change memory_limit to increase</td> - </tr> - <tr> - <td>Memory Used to Load This Page</td> - <td><?php if (function_exists('memory_get_peak_usage')) echo tp_readable_size(memory_get_peak_usage()); ?></td> - <td>This is approximately the minimum per page</td> - </tr> - <tr> - <td>Max File Upload Size</td> - <td><?php echo tp_readable_size(ini_get('upload_max_filesize')); ?></td> - <td>Max size of an uploaded image</td> - </tr> - <tr> - <td>Max Post Size</td> - <td><?php echo tp_readable_size(ini_get('post_max_size')); ?></td> - <td>Max post size = sum of images + html form</td> - </tr> - <tr> - <td>Max Input Time</td> - <td><?php echo ini_get('max_input_time'); ?> s</td> - <td>Time script waits for upload to finish</td> - </tr> - <tr> - <td>Max Execution Time</td> - <td><?php echo ini_get('max_execution_time'); ?> s</td> - <td>Max time a script will run</td> - </tr> - <tr> - <td>GD imagejpeg</td> - <td><?php echo (is_callable('imagejpeg')) ? 'Enabled' : 'Disabled'; ?></td> - <td></td> - </tr> - <tr> - <td>GD imagepng</td> - <td><?php echo (is_callable('imagepng')) ? 'Enabled' : 'Disabled'; ?></td> - <td></td> - </tr> - <tr> - <td>GD imagegif</td> - <td><?php echo (is_callable('imagegif')) ? 'Enabled' : 'Disabled'; ?></td> - <td></td> - </tr> - <tr> - <td>EXIF</td> - <td><?php echo (is_callable('exif_read_data')) ? 'Enabled' : 'Disabled'; ?></td> - <td></td> - </tr> - <tr> - <td>Cookie only sessions</td> - <td><?php echo (ini_get('session.use_only_cookies')) ? 'Enabled' : 'Disabled'; ?></td> - <td>Cookie only sessions may affect the Flash uploader</td> - </tr> - </table> - <div style="margin-top:20px;"> - <a href="<?php echo $CONFIG->url . "mod/tidypics/docs/configure_server.txt"; ?>">Server configuration doc</a> - </div> -</div> -<?php - -$content = ob_get_clean(); - -$body = elgg_view_layout('two_column_left_sidebar', '', $content); - -echo page_draw($title, $body);
\ No newline at end of file diff --git a/pages/settings/account.php b/pages/settings/account.php new file mode 100644 index 000000000..962e1fc37 --- /dev/null +++ b/pages/settings/account.php @@ -0,0 +1,28 @@ +<?php +/** + * Elgg user account settings. + * + * @package Elgg + * @subpackage Core + */ + +// Only logged in users +gatekeeper(); + +// Make sure we don't open a security hole ... +if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) { + register_error(elgg_echo('noaccess')); + forward('/'); +} + +$title = elgg_echo('usersettings:user'); + +$content = elgg_view('core/settings/account'); + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php new file mode 100644 index 000000000..9dcc9211d --- /dev/null +++ b/pages/settings/statistics.php @@ -0,0 +1,28 @@ +<?php +/** + * Elgg user statistics. + * + * @package Elgg + * @subpackage Core + */ + +// Only logged in users +gatekeeper(); + +// Make sure we don't open a security hole ... +if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) { + register_error(elgg_echo('noaccess')); + forward('/'); +} + +$title = elgg_echo("usersettings:statistics"); + +$content = elgg_view("core/settings/statistics"); + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/settings/tools.php b/pages/settings/tools.php new file mode 100644 index 000000000..ed6b941c0 --- /dev/null +++ b/pages/settings/tools.php @@ -0,0 +1,29 @@ +<?php +/** + * Elgg user tools settings + * + * @package Elgg + * @subpackage Core + */ + +// Only logged in users +gatekeeper(); + +// Make sure we don't open a security hole ... +if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) { + register_error(elgg_echo('noaccess')); + forward('/'); +} + +$title = elgg_echo("usersettings:plugins"); + +$content = elgg_view("core/settings/tools", + array('installed_plugins' => elgg_get_plugins())); + +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); + +echo elgg_view_page($title, $body); diff --git a/pages/sortalbum.php b/pages/sortalbum.php deleted file mode 100644 index 0bbd8159e..000000000 --- a/pages/sortalbum.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php -/** - * Tidypics Album Sort Page - * - * This displays a listing of all the photos so that they can be sorted - */ - -// if this page belongs to a closed group, prevent anyone outside group from seeing -if (is_callable('group_gatekeeper')) { - group_gatekeeper(); -} - -// get the album entity -$album_guid = (int) get_input('guid'); -$album = get_entity($album_guid); - -// panic if we can't get it -if (!$album) { - forward(); -} - -// container should always be set, but just in case -if ($album->container_guid) { - set_page_owner($album->container_guid); -} else { - set_page_owner($album->owner_guid); -} - -$owner = page_owner_entity(); - -$title = sprintf(elgg_echo('tidypics:sort'), $album->title); - -$content = elgg_view_title($title); -$content .= elgg_view('tidypics/sort', array('album' => $album)); - -$body = elgg_view_layout('two_column_left_sidebar', '', $content); - -page_draw($title, $body); diff --git a/pages/tagged.php b/pages/tagged.php deleted file mode 100644 index 34ea8a709..000000000 --- a/pages/tagged.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php -/** - * Tidypics Tagged Listing - * - * List all photos tagged with a user - */ - -include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; - - -// Get user guid -$guid = get_input('guid'); - -$user = get_entity($guid); - -if ($user) { - $title = sprintf(elgg_echo('tidypics:usertag'), $user->name); -} else { - $title = "User does not exist"; -} - - -// create main column -$body = elgg_view_title($title); - -set_context('search'); -set_input('search_viewtype', 'gallery'); // need to force gallery view -$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); - -// Set up submenus -if (isloggedin()) { - add_submenu_item( elgg_echo("album:yours"), - $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - 'tidypics-b' ); -} -add_submenu_item( elgg_echo('album:all'), - $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics-z'); -add_submenu_item( elgg_echo('tidypics:mostrecent'), - $CONFIG->wwwroot . 'pg/photos/mostrecent', - 'tidypics-z'); - - - -$body = elgg_view_layout('two_column_left_sidebar', '', $body); - - -page_draw($title, $body); diff --git a/pages/thumbnail.php b/pages/thumbnail.php deleted file mode 100644 index 9daa2f9c0..000000000 --- a/pages/thumbnail.php +++ /dev/null @@ -1,78 +0,0 @@ -<?php - -/** - * Tidypics Thumbnail - * - */ - -// Get file GUID -$file_guid = (int) get_input('file_guid'); - -// Get file thumbnail size -$size = get_input('size'); -// only 3 possibilities -if ($size != 'small' && $size != 'thumb') { - $size = 'large'; -} - -$error_image = ''; -switch ($size) { - case 'thumb': - $error_image = "image_error_thumb.png"; - break; - case 'small': - $error_image = "image_error_small.png"; - break; - case 'large': - $error_image = "image_error_large.png"; - break; -} - -// Get file entity -$file = get_entity($file_guid); -if (!$file) { - forward('mod/tidypics/graphics/' . $error_image); -} - -if ($file->getSubtype() != "image") { - forward('mod/tidypics/graphics/' . $error_image); -} - -// Get filename -if ($size == "thumb") { - $thumbfile = $file->thumbnail; -} else if ($size == "small") { - $thumbfile = $file->smallthumb; -} else { - $thumbfile = $file->largethumb; -} - -if (!$thumbfile) { - forward('mod/tidypics/graphics/' . $error_image); -} - -// create Elgg File object -$readfile = new ElggFile(); -$readfile->owner_guid = $file->owner_guid; -$readfile->setFilename($thumbfile); -$contents = $readfile->grabFile(); - -// send error image if file could not be read -if (!$contents) { - forward('mod/tidypics/graphics/' . $error_image); -} - -// expires every 14 days -$expires = 14 * 60*60*24; - -// overwrite header caused by php session code so images can be cached -$mime = $file->getMimeType(); -header("Content-Type: $mime"); -header("Content-Length: " . strlen($contents)); -header("Cache-Control: public", true); -header("Pragma: public", true); -header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); - -// Return the thumbnail and exit -echo $contents; -exit; diff --git a/pages/viewimage.php b/pages/viewimage.php deleted file mode 100644 index 890f7e8c4..000000000 --- a/pages/viewimage.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php - -/** - * Tidypics image view - * - * Display a view of a single image - */ - -// Load Elgg engine -include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; - -// if this page belongs to a closed group, prevent anyone outside group from seeing -if (is_callable('group_gatekeeper')) { - group_gatekeeper(); -} - -// get the album entity -$photo_guid = (int) get_input('guid'); -$photo = get_entity($photo_guid); - -// panic if we can't get it -if (!$photo) { - forward(); -} - -// set page owner based on owner of photo album -set_page_owner($photo->owner_guid); -$album = get_entity($photo->container_guid); -if ($album) { - $owner_guid = $album->container_guid; - if ($owner_guid) { - set_page_owner($owner_guid); - } -} - - -$page_owner = page_owner_entity(); -if ($page_owner instanceof ElggGroup) { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); -} - -if (can_write_to_container(0, $album->container_guid)) { - add_submenu_item( elgg_echo('image:edit'), - $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, - 'photos'); - $ts = time(); - $token = generate_action_token($ts); - add_submenu_item( elgg_echo('image:delete'), - $CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts, - 'photos', - true); -} - - -$title = $photo->title; -$area2 = elgg_view_title($title); -$area2 .= elgg_view_entity($photo, true); - -$body = elgg_view_layout('two_column_left_sidebar', '', $area2); - -page_draw($title, $body); |