We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 02a30cf4 authored by Evan Prodromou's avatar Evan Prodromou

start using stream mode prefs instead of separate parameter

parent 66c97a1a
......@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/feedlist.php';
class AllAction extends ProfileAction
{
var $notice;
var $mode = 'conversation';
function isReadOnly($args)
{
......@@ -57,9 +56,9 @@ class AllAction extends ProfileAction
{
parent::prepare($args);
$this->mode = $this->trimmed('mode', 'conversation');
$user = common_current_user();
if ($this->mode == 'stream') {
if (!empty($user) && $user->useStreamMode()) {
$stream = new InboxNoticeStream($this->user, Profile::current());
} else {
$stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
......@@ -183,7 +182,7 @@ class AllAction extends ProfileAction
$profile = $current_user->getProfile();
}
if ($this->mode == 'stream') {
if (!empty($current_user) && $current_user->showStreamMode()) {
$nl = new NoticeList($this->notice, $this);
} else {
$nl = new ThreadedNoticeList($this->notice, $this, $profile);
......
......@@ -60,7 +60,6 @@ class PublicAction extends Action
var $page = null;
var $notice;
var $userProfile = null;
var $mode = 'conversation';
function isReadOnly($args)
{
......@@ -89,9 +88,9 @@ class PublicAction extends Action
$this->userProfile = Profile::current();
$this->mode = $this->trimmed('mode', 'conversation');
$user = common_current_user();
if ($this->mode == 'stream') {
if (!empty($user) && $user->useStreamMode()) {
$stream = new PublicNoticeStream($this->userProfile);
} else {
$stream = new ThreadingPublicNoticeStream($this->userProfile);
......@@ -220,7 +219,9 @@ class PublicAction extends Action
*/
function showContent()
{
if ($this->mode == 'stream') {
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
$nl = new NoticeList($this->notice, $this);
} else {
$nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
......
......@@ -50,7 +50,6 @@ class ShowgroupAction extends GroupAction
var $page = null;
var $userProfile = null;
var $notice = null;
var $mode = 'conversation';
/**
* Is this page read-only?
......@@ -98,11 +97,11 @@ class ShowgroupAction extends GroupAction
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
$this->mode = $this->trimmed('mode', 'conversation');
$this->userProfile = Profile::current();
if ($this->mode == 'stream') {
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
$stream = new GroupNoticeStream($this->group, $this->userProfile);
} else {
$stream = new ThreadingGroupNoticeStream($this->group, $this->userProfile);
......@@ -146,7 +145,9 @@ class ShowgroupAction extends GroupAction
*/
function showGroupNotices()
{
if ($this->mode == 'stream') {
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
$nl = new NoticeList($this->notice, $this);
} else {
$nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
......
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Stream mode preferences
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category UI
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* Separate table for storing stream mode preferences
*
* @category UI
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class Stream_mode_prefs extends Managed_
{
/**
* Function comment
*
* @param
*
* @return
*/
function Method()
{
}
}
......@@ -1145,4 +1145,14 @@ class User extends Managed_DataObject
// TRANS: Subject for password recovery e-mail.
mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address);
}
function showStreamMode()
{
$smp = Stream_mode_prefs::staticGet('user_id', $this->id);
if (!empty($smp)) {
return $smp->show_stream_mode;
} else {
return false;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment