Resolve conflicts after pull from evan

darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
This commit is contained in:
mikec 2008-07-21 09:56:37 -04:00
parent d48609ac51
commit a4fa34cecb
6 changed files with 50 additions and 11 deletions

View File

@ -87,6 +87,12 @@ class EmailsettingsAction extends SettingsAction {
common_checkbox('emailnotifysub', common_checkbox('emailnotifysub',
_('Send me notices of new subscriptions through email.'), _('Send me notices of new subscriptions through email.'),
$user->emailnotifysub); $user->emailnotifysub);
common_checkbox('emailpost',
_('I want to post notices by email.'),
$user->emailpost);
common_checkbox('emailmicroid',
_('Publish a MicroID for my email address.'),
$user->emailmicroid);
common_submit('save', _('Save')); common_submit('save', _('Save'));
@ -128,6 +134,8 @@ class EmailsettingsAction extends SettingsAction {
function save_preferences() { function save_preferences() {
$emailnotifysub = $this->boolean('emailnotifysub'); $emailnotifysub = $this->boolean('emailnotifysub');
$emailmicroid = $this->boolean('emailmicroid');
$emailpost = $this->boolean('emailpost');
$user = common_current_user(); $user = common_current_user();
@ -138,6 +146,8 @@ class EmailsettingsAction extends SettingsAction {
$original = clone($user); $original = clone($user);
$user->emailnotifysub = $emailnotifysub; $user->emailnotifysub = $emailnotifysub;
$user->emailmicroid = $emailmicroid;
$user->emailpost = $emailpost;
$result = $user->update($original); $result = $user->update($original);

View File

@ -52,6 +52,18 @@ class ProfilesettingsAction extends SettingsAction {
common_input('location', _('Location'), common_input('location', _('Location'),
($this->arg('location')) ? $this->arg('location') : $profile->location, ($this->arg('location')) ? $this->arg('location') : $profile->location,
_('Where you are, like "City, State (or Region), Country"')); _('Where you are, like "City, State (or Region), Country"'));
$language = common_language();
common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), TRUE, $language);
$timezone = common_timezone();
$timezones = array();
foreach(DateTimeZone::listIdentifiers() as $k => $v) {
$timezones[$v] = $v;
}
common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), TRUE, $timezone);
common_checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
common_submit('submit', _('Save')); common_submit('submit', _('Save'));
common_element_end('form'); common_element_end('form');
common_show_footer(); common_show_footer();
@ -64,6 +76,9 @@ class ProfilesettingsAction extends SettingsAction {
$homepage = $this->trimmed('homepage'); $homepage = $this->trimmed('homepage');
$bio = $this->trimmed('bio'); $bio = $this->trimmed('bio');
$location = $this->trimmed('location'); $location = $this->trimmed('location');
$autosubscribe = $this->boolean('autosubscribe');
$language = $this->trimmed('language');
$timezone = $this->trimmed('timezone');
# Some validation # Some validation

View File

@ -36,6 +36,10 @@ class User extends DB_DataObject
public $email; // varchar(255) unique_key public $email; // varchar(255) unique_key
public $incomingemail; // varchar(255) unique_key public $incomingemail; // varchar(255) unique_key
public $emailnotifysub; // tinyint(1) default_1 public $emailnotifysub; // tinyint(1) default_1
public $emailmicroid; // tinyint(1) default_1
public $language; // varchar(50)
public $timezone; // varchar(50)
public $emailpost; // tinyint(1) default_1
public $jabber; // varchar(255) unique_key public $jabber; // varchar(255) unique_key
public $jabbernotify; // tinyint(1) public $jabbernotify; // tinyint(1)
public $jabberreplies; // tinyint(1) public $jabberreplies; // tinyint(1)
@ -79,7 +83,7 @@ class User extends DB_DataObject
function updateKeys(&$orig) { function updateKeys(&$orig) {
$parts = array(); $parts = array();
foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) { foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) {
if (strcmp($this->$k, $orig->$k) != 0) { if (strcmp($this->$k, $orig->$k) != 0) {
$parts[] = $k . ' = ' . $this->_quote($this->$k); $parts[] = $k . ' = ' . $this->_quote($this->$k);
} }

View File

@ -172,6 +172,10 @@ password = 2
email = 2 email = 2
incomingemail = 2 incomingemail = 2
emailnotifysub = 17 emailnotifysub = 17
emailmicroid = 17
language = 2
timezone = 2
emailpost = 17
jabber = 2 jabber = 2
jabbernotify = 17 jabbernotify = 17
jabberreplies = 17 jabberreplies = 17

View File

@ -47,6 +47,10 @@ create table user (
email varchar(255) unique key comment 'email address for password recovery etc.', email varchar(255) unique key comment 'email address for password recovery etc.',
incomingemail varchar(255) unique key comment 'email address for post-by-email', incomingemail varchar(255) unique key comment 'email address for post-by-email',
emailnotifysub tinyint default 1 comment 'Notify by email of subscriptions', emailnotifysub tinyint default 1 comment 'Notify by email of subscriptions',
emailmicroid tinyint default 1 comment 'whether to publish email microid',
language varchar(50) comment 'preferred language',
timezone varchar(50) comment 'timezone',
emailpost tinyint default 1 comment 'Post by email',
jabber varchar(255) unique key comment 'jabber ID for notices', jabber varchar(255) unique key comment 'jabber ID for notices',
jabbernotify tinyint default 0 comment 'whether to send notices to jabber', jabbernotify tinyint default 0 comment 'whether to send notices to jabber',
jabberreplies tinyint default 0 comment 'whether to send notices to jabber on replies', jabberreplies tinyint default 0 comment 'whether to send notices to jabber on replies',

View File

@ -121,5 +121,7 @@ require_once(INSTALLDIR.'/classes/Confirm_address.php');
require_once(INSTALLDIR.'/classes/Remember_me.php'); require_once(INSTALLDIR.'/classes/Remember_me.php');
require_once(INSTALLDIR.'/classes/Queue_item.php'); require_once(INSTALLDIR.'/classes/Queue_item.php');
require_once(INSTALLDIR.'/classes/Reply.php'); require_once(INSTALLDIR.'/classes/Reply.php');
require_once(INSTALLDIR.'/classes/Notice_tag.php');
require_once(INSTALLDIR.'/classes/Sms_carrier.php');
require_once('markdown.php'); require_once('markdown.php');