GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

no longer have to be logged in to merely view a photo album.

Browse Source
This commit is contained in:
Ian Denhardt 2010-12-21 14:54:02 -05:00
parent 148f6b6933
commit 012ccc2dcb
1 changed files with 35 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/GNUsocialPhotos/actions/photos.php
View File

@ -39,9 +39,13 @@ class PhotosAction extends Action
{
parent::prepare($args);
$this->user = common_current_user();
common_log(LOG_INFO, "finishing prepare. user : ");
common_log(LOG_INFO, $this->user->nickname);
$args = $this->returnToArgs();
$username = $args[1]['nickname'];
if (common_valid_profile_tag($username) == 0) {
$this->user = null;
} else {
$this->user = Profile::staticGet('nickname', $username);
}
return true;
}
@ -54,41 +58,18 @@ class PhotosAction extends Action
function title()
{
if (empty($this->user)) {
return _m('Hello');
return _m('No such user.');
} else {
return sprintf(_m('Hello, %s'), $this->user->nickname);
return sprintf(_m("%s's Photos."), $this->user->nickname);
}
}
function showContent()
{
common_log(LOG_INFO, "getting to show content.\n");
if (empty($this->user)) {
// TODO: should just redirect to the login page.
$this->element('p', array(), 'You are not logged in');
} else {
common_log(LOG_INFO, 'fileroot : ' . $_SERVER['DOCUMENT_ROOT'] . '/file/');
$dir = opendir($_SERVER['DOCUMENT_ROOT'] . '/file/');
if ($dir === false) {
$err = error_get_last();
common_log(LOG_INFO, 'Error opening dir : ' . $err['message']);
if(empty($this->user)) {
return;
}
$args = $this->returnToArgs();
foreach (array_keys($args) as $key) {
common_log(LOG_INFO, $key . ' => ' . $args[$key]);
if (is_array($args[$key])) {
foreach (array_keys($args[$key]) as $skey) {
common_log(LOG_INFO, ' ' . $skey . ' => ' . $args[$key][$skey]);
}
}
}
$pathparts = explode('/', $args[1]['nickname']);
$username = $pathparts[0];
$page = $_GET['pageid'];
if (!filter_var($page, FILTER_VALIDATE_INT)){
$page = 1;
@ -99,19 +80,9 @@ class PhotosAction extends Action
}
$this->element('a', array('href' => 'photos?pageid=' . ($page+1) ), 'Next page');
$args = $this->returnToArgs();
$profile_nick = $args[1]['nickname']; //Nickname for the profile being looked at
//TODO choice of available albums by user.
//Currently based on fact that each user can only have one album.
error_log('profile nick:', 3, '/tmp/sean.log');
error_log($profile_nick, 3, '/tmp/sean.log');
$profile = Profile::staticGet('nickname', $profile_nick);
//error_log(',profile_id:', 3, '/tmp/sean.log');
//error_log($profile->id, 3, '/tmp/sean.log');
$album = GNUSocialPhotoAlbum::staticGet('profile_id', $profile->id);
//error_log(',album_id:', 3, '/tmp/sean.log');
//error_log($album->album_id, 3, '/tmp/sean.log');
$album = GNUSocialPhotoAlbum::staticGet('profile_id', $this->user->id);
$photos = GNUsocialPhoto::getGalleryPage($page, $album->album_id, 9);
$this->elementStart('ul', array('class' => 'photothumbs'));
@ -124,5 +95,4 @@ class PhotosAction extends Action
}
$this->elementEnd('ul');
}
}
}