aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-21 16:31:46 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-21 16:31:46 -0700
commit024f2019e6a3f23bec88d3c1100d67456e34adc9 (patch)
treeb034ccdfff5af50d6f77496cbdd178b27427b270 /mod
parent709c86b2daec32ae0d5d6d0e7f88b8607e02edba (diff)
downloadvolse-hubzilla-024f2019e6a3f23bec88d3c1100d67456e34adc9.tar.gz
volse-hubzilla-024f2019e6a3f23bec88d3c1100d67456e34adc9.tar.bz2
volse-hubzilla-024f2019e6a3f23bec88d3c1100d67456e34adc9.zip
store default location
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php1
-rw-r--r--mod/profile.php1
-rw-r--r--mod/settings.php6
3 files changed, 7 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index 219808afc..cdd8a4976 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -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),
diff --git a/mod/profile.php b/mod/profile.php
index 44f718102..c5047d615 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -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,
diff --git a/mod/settings.php b/mod/settings.php
index 71109d903..f9cc429df 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -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'),