Commit ddc121c0 authored by Evan Prodromou's avatar Evan Prodromou

New table for all old-school UI prefs

parent 02a30cf4
......@@ -58,7 +58,7 @@ class AllAction extends ProfileAction
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
if (!empty($user) && $user->streamModeOnly()) {
$stream = new InboxNoticeStream($this->user, Profile::current());
} else {
$stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
......@@ -182,7 +182,7 @@ class AllAction extends ProfileAction
$profile = $current_user->getProfile();
}
if (!empty($current_user) && $current_user->showStreamMode()) {
if (!empty($current_user) && $current_user->streamModeOnly()) {
$nl = new NoticeList($this->notice, $this);
} else {
$nl = new ThreadedNoticeList($this->notice, $this, $profile);
......
......@@ -90,7 +90,7 @@ class PublicAction extends Action
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
if (!empty($user) && $user->streamModeOnly()) {
$stream = new PublicNoticeStream($this->userProfile);
} else {
$stream = new ThreadingPublicNoticeStream($this->userProfile);
......@@ -221,7 +221,7 @@ class PublicAction extends Action
{
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
if (!empty($user) && $user->streamModeOnly()) {
$nl = new NoticeList($this->notice, $this);
} else {
$nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
......
......@@ -101,7 +101,7 @@ class ShowgroupAction extends GroupAction
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
if (!empty($user) && $user->streamModeOnly()) {
$stream = new GroupNoticeStream($this->group, $this->userProfile);
} else {
$stream = new ThreadingGroupNoticeStream($this->group, $this->userProfile);
......@@ -147,7 +147,7 @@ class ShowgroupAction extends GroupAction
{
$user = common_current_user();
if (!empty($user) && $user->useStreamMode()) {
if (!empty($user) && $user->streamModeOnly()) {
$nl = new NoticeList($this->notice, $this);
} else {
$nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
......
......@@ -3,7 +3,7 @@
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Stream mode preferences
* Older-style UI preferences
*
* PHP version 5
*
......@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
}
/**
* Separate table for storing stream mode preferences
* Separate table for storing UI preferences
*
* @category UI
* @package StatusNet
......@@ -45,18 +45,44 @@ if (!defined('STATUSNET')) {
* @link http://status.net/
*/
class Stream_mode_prefs extends Managed_
class Old_school_prefs extends Managed_DataObject
{
/**
* Function comment
*
* @param
*
* @return
*/
public $__table = 'old_school_prefs'; // table name
public $user_id;
public $stream_mode_only;
public $conversation_tree;
public $stream_nicknames;
public $created;
public $modified;
function Method()
public static function schemaDef()
{
return array(
'fields' => array(
'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
'stream_mode_only' => array('type' => 'int',
'size' => 'tiny',
'default' => 1,
'description' => 'No conversation streams'),
'conversation_tree' => array('type' => 'int',
'size' => 'tiny',
'default' => 1,
'description' => 'Hierarchical tree view for conversations'),
'stream_nicknames' => array('type' => 'int',
'size' => 'tiny',
'default' => 1,
'description' => 'Show nicknames for authors and addressees in streams'),
'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
),
'primary key' => array('user_id'),
'foreign keys' => array(
'old_school_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
),
);
}
function staticGet($k,$v=NULL) {
return Memcached_DataObject::staticGet('Old_school_prefs',$k,$v);
}
}
......@@ -1146,11 +1146,31 @@ class User extends Managed_DataObject
mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address);
}
function showStreamMode()
function streamModeOnly()
{
$smp = Stream_mode_prefs::staticGet('user_id', $this->id);
if (!empty($smp)) {
return $smp->show_stream_mode;
$osp = Old_school_prefs::staticGet('user_id', $this->id);
if (!empty($osp)) {
return $osp->stream_mode_only;
} else {
return false;
}
}
function conversationTree()
{
$osp = Old_school_prefs::staticGet('user_id', $this->id);
if (!empty($osp)) {
return $osp->conversation_tree;
} else {
return false;
}
}
function streamNicknames()
{
$osp = Old_school_prefs::staticGet('user_id', $this->id);
if (!empty($osp)) {
return $osp->stream_nicknames;
} else {
return false;
}
......
......@@ -86,6 +86,7 @@ $classes = array('Profile',
'Local_group',
'User_urlshortener_prefs',
'Schema_version',
'Old_school_prefs',
);
foreach ($classes as $cls) {
......
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