From e81bdcb20018d29b3330803b4637fc65898fd069 Mon Sep 17 00:00:00 2001 From: Max Shinn Date: Sun, 26 Dec 2010 20:51:17 -0600 Subject: [PATCH] Untabify --- plugins/GNUsocialPhotos/actions/photo.php | 22 ++++++++-------- .../GNUsocialPhotos/actions/photoupload.php | 26 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/plugins/GNUsocialPhotos/actions/photo.php b/plugins/GNUsocialPhotos/actions/photo.php index 64d3e16a17..6a77a59ed3 100644 --- a/plugins/GNUsocialPhotos/actions/photo.php +++ b/plugins/GNUsocialPhotos/actions/photo.php @@ -44,12 +44,12 @@ class PhotoAction extends Action parent::prepare($args); $args = $this->returnToArgs(); - $this->photoid = $args[1]['photoid']; - $this->photo = GNUsocialPhoto::staticGet('notice_id', $this->photoid); - $this->notice = Notice::staticGet('id', $this->photoid); + $this->photoid = $args[1]['photoid']; + $this->photo = GNUsocialPhoto::staticGet('notice_id', $this->photoid); + $this->notice = Notice::staticGet('id', $this->photoid); $this->user = Profile::staticGet('id', $this->notice->profile_id); - + $notices = Notice::conversationStream((int)$this->photoid-1, null, null); //Why do I have to do -1? $this->conversation = new ConversationTree($notices, $this); return true; @@ -67,10 +67,10 @@ class PhotoAction extends Action if (empty($this->user)) { return _m('No such user.'); } else if (empty($this->photo)) { - return _m('No such photo.'); - } else if (!empty($this->photo->title)) { + return _m('No such photo.'); + } else if (!empty($this->photo->title)) { return $this->photo->title; - } else { + } else { return sprintf(_m("%s's Photo."), $this->user->nickname); } } @@ -90,9 +90,9 @@ class PhotoAction extends Action $this->elementStart('a', array('href' => $this->photo->uri)); $this->element('img', array('src' => $this->photo->uri)); $this->elementEnd('a'); - $this->element('p', array(), $this->photo->photo_description); - //This is a hack to hide the top-level comment - $this->element('style', array(), "#notice-{$this->photoid} div { display: none } #notice-{$this->photoid} ol li div { display: inline }"); - $this->conversation->show(); + $this->element('p', array(), $this->photo->photo_description); + //This is a hack to hide the top-level comment + $this->element('style', array(), "#notice-{$this->photoid} div { display: none } #notice-{$this->photoid} ol li div { display: inline }"); + $this->conversation->show(); } } diff --git a/plugins/GNUsocialPhotos/actions/photoupload.php b/plugins/GNUsocialPhotos/actions/photoupload.php index 358c99f49c..cfe588fc64 100644 --- a/plugins/GNUsocialPhotos/actions/photoupload.php +++ b/plugins/GNUsocialPhotos/actions/photoupload.php @@ -64,20 +64,20 @@ class PhotouploadAction extends Action $this->elementStart('form', array('enctype' => 'multipart/form-data', 'method' => 'post', 'action' => common_local_url('photoupload'))); - $this->elementStart('ul', 'form_data'); - $this->elementStart('li'); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->element('input', array('name' => 'photofile', 'type' => 'file', 'id' => 'photofile')); - $this->elementEnd('li'); - //$this->element('br'); - $this->elementStart('li'); - $this->input('phototitle', "Title", $this->trimmed('phototitle'), "The title of the photo. (Optional)"); - $this->elementEnd('li'); - $this->elementStart('li'); - $this->textarea('photo_description', "Description", $this->trimmed('photo_description'), "A description of the photo. (Optional)"); - $this->elementEnd('li'); - $this->elementEnd('ul'); + $this->elementEnd('li'); + //$this->element('br'); + $this->elementStart('li'); + $this->input('phototitle', "Title", $this->trimmed('phototitle'), "The title of the photo. (Optional)"); + $this->elementEnd('li'); + $this->elementStart('li'); + $this->textarea('photo_description', "Description", $this->trimmed('photo_description'), "A description of the photo. (Optional)"); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('upload', _('Upload')); $this->elementEnd('form'); } @@ -140,8 +140,8 @@ class PhotouploadAction extends Action return; } - $title = $this->trimmed('phototitle'); - $photo_description = $this->trimmed('photo_description'); + $title = $this->trimmed('phototitle'); + $photo_description = $this->trimmed('photo_description'); common_log(LOG_INFO, 'upload path : ' . $imagefile->filepath);