From 39028d618403e40741009b070e4c969d499cf021 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 20 Mar 2013 20:46:43 +0000 Subject: Make the channels profile tab actually do something. --- mod/profiles.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/profiles.php b/mod/profiles.php index e857c4216..0a8b2b9dc 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -232,6 +232,7 @@ function profiles_post(&$a) { $about = fix_mce_lf(escape_tags(trim($_POST['about']))); $interest = fix_mce_lf(escape_tags(trim($_POST['interest']))); $contact = fix_mce_lf(escape_tags(trim($_POST['contact']))); + $channels = fix_mce_lf(escape_tags(trim($_POST['channels']))); $music = fix_mce_lf(escape_tags(trim($_POST['music']))); $book = fix_mce_lf(escape_tags(trim($_POST['book']))); $tv = fix_mce_lf(escape_tags(trim($_POST['tv']))); @@ -393,6 +394,7 @@ function profiles_post(&$a) { `about` = '%s', `interest` = '%s', `contact` = '%s', + `channels` = '%s', `music` = '%s', `book` = '%s', `tv` = '%s', @@ -426,6 +428,7 @@ function profiles_post(&$a) { dbesc($about), dbesc($interest), dbesc($contact), + dbesc($channels), dbesc($music), dbesc($book), dbesc($tv), @@ -550,6 +553,7 @@ function profiles_content(&$a) { '$lbl_about' => t('Tell us about yourself...'), '$lbl_hobbies' => t('Hobbies/Interests'), '$lbl_social' => t('Contact information and Social Networks'), + '$lbl_channels' => t('My other channels'), '$lbl_music' => t('Musical interests'), '$lbl_book' => t('Books, literature'), '$lbl_tv' => t('Television'), @@ -593,7 +597,8 @@ function profiles_content(&$a) { '$romance' => $r[0]['romance'], '$work' => $r[0]['work'], '$education' => $r[0]['education'], - '$contact' => $r[0]['contact'] + '$contact' => $r[0]['contact'], + '$channels' => $r[0]['channels'], )); $arr = array('profile' => $r[0], 'entry' => $o); -- cgit v1.2.3 From 28975931b5a3a16554b391e3b08885ba118b3748 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 20 Mar 2013 23:35:21 +0000 Subject: Add a fallback or two to randprof. --- mod/randprof.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/randprof.php b/mod/randprof.php index bddb3251a..7678c15b9 100644 --- a/mod/randprof.php +++ b/mod/randprof.php @@ -1,11 +1,24 @@ get_baseurl() . '/profile'); + // Nothing there, so try a local, public channel instead + else $x = randprof_fallback(); + if($x) { + $goaway = (z_root() . '/channel/' . $x); + goaway(chanlink_url($goaway));} + + // If we STILL haven't got anything, send them to their own profile, or the front page + + goaway($a->get_baseurl()); } -- cgit v1.2.3 From 499083d5d4b2e2a09003148e3da787c632871934 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 20 Mar 2013 23:43:02 +0000 Subject: Revert randprof - that was stupid. If you have a local channel, you also have it's xchan. --- mod/randprof.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'mod') diff --git a/mod/randprof.php b/mod/randprof.php index 7678c15b9..bddb3251a 100644 --- a/mod/randprof.php +++ b/mod/randprof.php @@ -1,24 +1,11 @@ get_baseurl()); + // FIXME this doesn't work at the moment as a fallback + goaway($a->get_baseurl() . '/profile'); } -- cgit v1.2.3 From 166596939b3af98b5f86688a16d3e4add2c28209 Mon Sep 17 00:00:00 2001 From: zottel Date: Thu, 21 Mar 2013 09:02:10 +0100 Subject: write notify settings to channel table when saving settings --- mod/settings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/settings.php b/mod/settings.php index da6cf709c..54e96d118 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -500,9 +500,10 @@ function settings_post(&$a) { ); */ - $r = q("update channel set channel_name = '%s', channel_timezone = '%s', channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d where channel_id = %d limit 1", + $r = q("update channel set channel_name = '%s', channel_timezone = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d where channel_id = %d limit 1", dbesc($username), dbesc($timezone), + intval($notify), intval($unkmail), intval($maxreq), intval($expire), -- cgit v1.2.3