diff options
| author | friendica <info@friendica.com> | 2013-03-21 02:21:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-03-21 02:21:56 -0700 |
| commit | d9492a4a7687ba3804fcb353d916002b8fb2853d (patch) | |
| tree | 52428574e452bf01db114cdb24599ddae3791edd /mod | |
| parent | 4b22c6e531739d96fbe9c78f629aa34c35acb821 (diff) | |
| parent | 6db6f6640e73b85ddedbcbacb60f06b185372065 (diff) | |
| download | volse-hubzilla-d9492a4a7687ba3804fcb353d916002b8fb2853d.tar.gz volse-hubzilla-d9492a4a7687ba3804fcb353d916002b8fb2853d.tar.bz2 volse-hubzilla-d9492a4a7687ba3804fcb353d916002b8fb2853d.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/profiles.php | 7 | ||||
| -rw-r--r-- | mod/settings.php | 3 |
2 files changed, 8 insertions, 2 deletions
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); 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), |