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

FavorAction upgraded to extend FormAction

Browse Source 
Includes some minor changes to other things as well, such as the session
token input element now having the same 'name' attribute as everyone else.
(it still retains a 'token-'+noticeid 'id' attribute for clientside JS)
This commit is contained in:
Mikael Nordfeldth
2013-09-23 11:34:15 +02:00
parent f711f9ee75
commit 5f1fea1488
7 changed files with 80 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/AnonymousFave/actions/anondisfavor.php
View File

@@ -27,9 +27,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('STATUSNET')) {
exit(1);
}
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Anonymous disfavor class
@@ -65,22 +63,14 @@ class AnonDisfavorAction extends RedirectingAction
$id = $this->trimmed('notice');
$notice = Notice::getKV($id);
$token = $this->trimmed('token-' . $notice->id);
if (!$token || $token != common_session_token()) {
// TRANS: Client error.
$this->clientError(_m('There was a problem with your session token. Try again, please.'));
return;
}
$token = $this->checkSessionToken();
$fave = new Fave();
$fave->user_id = $profile->id;
$fave->notice_id = $notice->id;
if (!$fave->find(true)) {
// TRANS: Client error.
$this->clientError(_m('This notice is not a favorite!'));
return;
throw new NoResultException($fave);
}
$result = $fave->delete();

13
plugins/AnonymousFave/actions/anonfavor.php
View File

@@ -27,9 +27,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('STATUSNET')) {
exit(1);
}
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Anonymous favor class
@@ -64,14 +62,7 @@ class AnonFavorAction extends RedirectingAction
$id = $this->trimmed('notice');
$notice = Notice::getKV($id);
$token = $this->trimmed('token-' . $notice->id);
if (empty($token) || $token != common_session_token()) {
// TRANS: Client error.
$this->clientError(_m('There was a problem with your session token. Try again, please.'));
return;
}
$token = $this->checkSessionToken();
if ($profile->hasFave($notice)) {
// TRANS: Client error.