mirror of
https://github.com/friendica/friendica
synced 2024-12-23 00:00:21 +00:00
store default location
This commit is contained in:
Mike Macgirvin
parent
709c86b2da
commit
024f2019e6
7 changed files with 27 additions and 6 deletions
|
|
@ -36,6 +36,7 @@ function network_content(&$a, $update = false) {
|
|||
$o .= replace_macros($tpl,array(
|
||||
'$return_path' => $a->cmd,
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$defloc' => $a->user['default-location'],
|
||||
'$visitor' => 'block',
|
||||
'$lockstate' => 'unlock',
|
||||
'$acl' => populate_acl($a->user),
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ function profile_content(&$a, $update = false) {
|
|||
$lockstate = 'unlock';
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$defloc' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? $a->user['default-location'] : ''),
|
||||
'$return_path' => $a->cmd,
|
||||
'$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
|
||||
'$lockstate' => $lockstate,
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ function settings_post(&$a) {
|
|||
$username = notags(trim($_POST['username']));
|
||||
$email = notags(trim($_POST['email']));
|
||||
$timezone = notags(trim($_POST['timezone']));
|
||||
$defloc = notags(trim($_POST['defloc']));
|
||||
|
||||
$publish = (($_POST['profile_in_directory'] == 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);
|
||||
}
|
||||
|
||||
$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($email),
|
||||
dbesc($timezone),
|
||||
|
|
@ -145,6 +146,7 @@ function settings_post(&$a) {
|
|||
dbesc($str_contact_deny),
|
||||
dbesc($str_group_deny),
|
||||
intval($notify),
|
||||
dbesc($defloc),
|
||||
dbesc($theme),
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
|
|
@ -200,6 +202,7 @@ function settings_content(&$a) {
|
|||
$nickname = $a->user['nickname'];
|
||||
$timezone = $a->user['timezone'];
|
||||
$notify = $a->user['notify-flags'];
|
||||
$defloc = $a->user['default-location'];
|
||||
|
||||
if(! strlen($a->user['timezone']))
|
||||
$timezone = date_default_timezone_get();
|
||||
|
|
@ -269,6 +272,7 @@ function settings_content(&$a) {
|
|||
'$nickname_block' => $nickname_block,
|
||||
'$timezone' => $timezone,
|
||||
'$zoneselect' => select_timezone($timezone),
|
||||
'$defloc' => $defloc,
|
||||
'$profile_in_dir' => $profile_in_dir,
|
||||
'$profile_in_net_dir' => $profile_in_net_dir,
|
||||
'$permissions' => t('Default Post Permissions'),
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ tinyMCE.init({
|
|||
}
|
||||
|
||||
function jotGetLocation() {
|
||||
reply = prompt("Where are you right now?");
|
||||
reply = prompt("Where are you right now?", $('#jot-location').val());
|
||||
if(reply && reply.length) {
|
||||
$('#jot-location').val(reply);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<input type="hidden" name="type" value="wall" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<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>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,13 @@ $zoneselect
|
|||
</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">
|
||||
<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
|
||||
$theme
|
||||
|
|
|
|||
|
|
@ -283,6 +283,7 @@ input#dfrn-url {
|
|||
#settings-username-end,
|
||||
#settings-email-end,
|
||||
#settings-nick-end,
|
||||
#settings-defloc-end,
|
||||
#settings-timezone-end,
|
||||
#settings-theme-end,
|
||||
#settings-password-end,
|
||||
|
|
@ -299,6 +300,7 @@ input#dfrn-url {
|
|||
#settings-username-label,
|
||||
#settings-email-label,
|
||||
#settings-nick-label,
|
||||
#settings-defloc-label,
|
||||
#settings-timezone-label,
|
||||
#settings-theme-label,
|
||||
#settings-password-label,
|
||||
|
|
@ -315,6 +317,7 @@ input#dfrn-url {
|
|||
#settings-username,
|
||||
#settings-email,
|
||||
#settings-nick,
|
||||
#settings-defloc,
|
||||
#timezone-select,
|
||||
#theme-select,
|
||||
#settings-password,
|
||||
|
|
@ -328,7 +331,12 @@ input#dfrn-url {
|
|||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#settings-theme-label {
|
||||
#settings-theme-label,
|
||||
#settings-defloc-label {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#settings-defloc {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue