friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

store default location

This commit is contained in:
Mike Macgirvin 2010-08-21 16:31:46 -07:00
parent 709c86b2da
commit 024f2019e6
7 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/network.php
View File

@ -36,6 +36,7 @@ function network_content(&$a, $update = false) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $a->cmd, '$return_path' => $a->cmd,
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$defloc' => $a->user['default-location'],
'$visitor' => 'block', '$visitor' => 'block',
'$lockstate' => 'unlock', '$lockstate' => 'unlock',
'$acl' => populate_acl($a->user), '$acl' => populate_acl($a->user),

1
mod/profile.php
View File

@ -149,6 +149,7 @@ function profile_content(&$a, $update = false) {
$lockstate = 'unlock'; $lockstate = 'unlock';
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$defloc' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? $a->user['default-location'] : ''),
'$return_path' => $a->cmd, '$return_path' => $a->cmd,
'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'), '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
'$lockstate' => $lockstate, '$lockstate' => $lockstate,

6
mod/settings.php
View File

@ -56,6 +56,7 @@ function settings_post(&$a) {
$username = notags(trim($_POST['username'])); $username = notags(trim($_POST['username']));
$email = notags(trim($_POST['email'])); $email = notags(trim($_POST['email']));
$timezone = notags(trim($_POST['timezone'])); $timezone = notags(trim($_POST['timezone']));
$defloc = notags(trim($_POST['defloc']));
$publish = (($_POST['profile_in_directory'] == 1) ? 1: 0); $publish = (($_POST['profile_in_directory'] == 1) ? 1: 0);
$net_publish = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0); $net_publish = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0);
@ -136,7 +137,7 @@ function settings_post(&$a) {
$str_contact_deny = implode('',$contact_deny); $str_contact_deny = implode('',$contact_deny);
} }
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `theme` = '%s' WHERE `uid` = %d LIMIT 1", $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `default-location` = '%s', `theme` = '%s' WHERE `uid` = %d LIMIT 1",
dbesc($username), dbesc($username),
dbesc($email), dbesc($email),
dbesc($timezone), dbesc($timezone),
@ -145,6 +146,7 @@ function settings_post(&$a) {
dbesc($str_contact_deny), dbesc($str_contact_deny),
dbesc($str_group_deny), dbesc($str_group_deny),
intval($notify), intval($notify),
dbesc($defloc),
dbesc($theme), dbesc($theme),
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
@ -200,6 +202,7 @@ function settings_content(&$a) {
$nickname = $a->user['nickname']; $nickname = $a->user['nickname'];
$timezone = $a->user['timezone']; $timezone = $a->user['timezone'];
$notify = $a->user['notify-flags']; $notify = $a->user['notify-flags'];
$defloc = $a->user['default-location'];
if(! strlen($a->user['timezone'])) if(! strlen($a->user['timezone']))
$timezone = date_default_timezone_get(); $timezone = date_default_timezone_get();
@ -269,6 +272,7 @@ function settings_content(&$a) {
'$nickname_block' => $nickname_block, '$nickname_block' => $nickname_block,
'$timezone' => $timezone, '$timezone' => $timezone,
'$zoneselect' => select_timezone($timezone), '$zoneselect' => select_timezone($timezone),
'$defloc' => $defloc,
'$profile_in_dir' => $profile_in_dir, '$profile_in_dir' => $profile_in_dir,
'$profile_in_net_dir' => $profile_in_net_dir, '$profile_in_net_dir' => $profile_in_net_dir,
'$permissions' => t('Default Post Permissions'), '$permissions' => t('Default Post Permissions'),

2
view/jot-header.tpl
View File

@ -81,7 +81,7 @@ tinyMCE.init({
} }
function jotGetLocation() { function jotGetLocation() {
reply = prompt("Where are you right now?"); reply = prompt("Where are you right now?", $('#jot-location').val());
if(reply && reply.length) { if(reply && reply.length) {
$('#jot-location').val(reply); $('#jot-location').val(reply);
} }

2
view/jot.tpl
View File

@ -9,7 +9,7 @@
<input type="hidden" name="type" value="wall" /> <input type="hidden" name="type" value="wall" />
<input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="location" id="jot-location" value="" /> <input type="hidden" name="location" id="jot-location" value="$defloc" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>

7
view/settings.tpl
View File

@ -25,6 +25,13 @@ $zoneselect
</div> </div>
<div id="settings-timezone-end" ></div> <div id="settings-timezone-end" ></div>
<div id="settings-defloc-wrapper" >
<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
</div>
<div id="settings-defloc-end" ></div>
<div id="settings-theme-select"> <div id="settings-theme-select">
<label id="settings-theme-label" for="theme-select" >Display Theme: </label> <label id="settings-theme-label" for="theme-select" >Display Theme: </label>
$theme $theme

14
view/theme/default/style.css
View File

@ -282,7 +282,8 @@ input#dfrn-url {
#settings-username-end, #settings-username-end,
#settings-email-end, #settings-email-end,
#settings-nick-end, #settings-nick-end,
#settings-defloc-end,
#settings-timezone-end, #settings-timezone-end,
#settings-theme-end, #settings-theme-end,
#settings-password-end, #settings-password-end,
@ -298,7 +299,8 @@ input#dfrn-url {
#settings-username-label, #settings-username-label,
#settings-email-label, #settings-email-label,
#settings-nick-label, #settings-nick-label,
#settings-defloc-label,
#settings-timezone-label, #settings-timezone-label,
#settings-theme-label, #settings-theme-label,
#settings-password-label, #settings-password-label,
@ -315,6 +317,7 @@ input#dfrn-url {
#settings-username, #settings-username,
#settings-email, #settings-email,
#settings-nick, #settings-nick,
#settings-defloc,
#timezone-select, #timezone-select,
#theme-select, #theme-select,
#settings-password, #settings-password,
@ -328,7 +331,12 @@ input#dfrn-url {
margin-bottom: 20px; margin-bottom: 20px;
} }
#settings-theme-label { #settings-theme-label,
#settings-defloc-label {
margin-top: 20px;
}
#settings-defloc {
margin-top: 20px; margin-top: 20px;
} }