diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-21 17:18:44 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-21 17:18:44 +0100 |
| commit | 9ba1b8d7207c852e1cb323a25998065ca30b31a4 (patch) | |
| tree | 6938898d1e4f7a5686c34c7a664ccb37c47d741a /mod | |
| parent | bd45bb3ad30c8867b957f63d5423e90b4b41afe9 (diff) | |
| parent | d726c921eb5902483dfeb82383829e9309f6b65c (diff) | |
| download | volse-hubzilla-9ba1b8d7207c852e1cb323a25998065ca30b31a4.tar.gz volse-hubzilla-9ba1b8d7207c852e1cb323a25998065ca30b31a4.tar.bz2 volse-hubzilla-9ba1b8d7207c852e1cb323a25998065ca30b31a4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/events.php | 5 | ||||
| -rw-r--r-- | mod/settings.php | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mod/events.php b/mod/events.php index c3731bf1c..af5a9fc66 100755 --- a/mod/events.php +++ b/mod/events.php @@ -280,11 +280,14 @@ function events_content(&$a) { // $plaintext = false; + $first_day = get_pconfig(local_channel(),'system','cal_first_day'); + $htpl = get_markup_template('event_head.tpl'); $a->page['htmlhead'] .= replace_macros($htpl,array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : 'textareas'), - '$lang' => $a->language + '$lang' => $a->language, + '$first_day' => (($first_day) ? $first_day : 0) )); $o =""; diff --git a/mod/settings.php b/mod/settings.php index 9a18d8e48..339f83cfe 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -405,7 +405,6 @@ function settings_post(&$a) { $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); - $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted! $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0); $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0); @@ -416,6 +415,8 @@ function settings_post(&$a) { $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); $adult = (($_POST['adult'] == 1) ? 1 : 0); + $cal_first_day = (((x($_POST,'first_day')) && (intval($_POST['first_day']) == 1)) ? 1: 0); + $channel = $a->get_channel(); $pageflags = $channel['channel_pageflags']; $existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0); @@ -503,6 +504,7 @@ function settings_post(&$a) { set_pconfig(local_channel(),'system','evdays',$evdays); set_pconfig(local_channel(),'system','photo_path',$photo_path); set_pconfig(local_channel(),'system','attach_path',$attach_path); + set_pconfig(local_channel(),'system','cal_first_day',$cal_first_day); $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d", dbesc($username), @@ -1110,6 +1112,7 @@ function settings_content(&$a) { '$removeme' => t('Remove Channel'), '$removechannel' => t('Remove this channel.'), '$firefoxshare' => t('Firefox Share $Projectname provider'), + '$cal_first_day' => array('first_day', t('Start calendar week on monday'), ((get_pconfig(local_channel(),'system','cal_first_day')) ? 1 : ''), '', $yes_no), )); call_hooks('settings_form',$o); |