diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 1 | ||||
| -rw-r--r-- | mod/cloud.php | 9 | ||||
| -rw-r--r-- | mod/connedit.php | 11 | ||||
| -rw-r--r-- | mod/dav.php | 9 | ||||
| -rw-r--r-- | mod/display.php | 1 | ||||
| -rw-r--r-- | mod/home.php | 1 | ||||
| -rw-r--r-- | mod/network.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | mod/profiles.php | 5 | ||||
| -rw-r--r-- | mod/search.php | 1 |
10 files changed, 19 insertions, 22 deletions
diff --git a/mod/channel.php b/mod/channel.php index e819de0e0..c8ac83baf 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -286,6 +286,7 @@ function channel_content(&$a, $update = 0, $load = false) { '$cats' => (($category) ? $category : ''), '$tags' => (($hashtags) ? $hashtags : ''), '$mid' => $mid, + '$verb' => '', '$dend' => $datequery, '$dbegin' => $datequery2 )); diff --git a/mod/cloud.php b/mod/cloud.php index abeae88eb..3643e599c 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -41,15 +41,6 @@ if(! defined('TRINIDAD')) { * @param App &$a */ function cloud_init(&$a) { - // call ($currenttheme)_init since we're operating outside of index.php - $theme_info_file = "view/theme/" . current_theme() . "/php/theme.php"; - if (file_exists($theme_info_file)){ - require_once($theme_info_file); - if (function_exists(str_replace('-', '_', current_theme()) . '_init')) { - $func = str_replace('-', '_', current_theme()) . '_init'; - $func($a); - } - } require_once('include/reddav.php'); diff --git a/mod/connedit.php b/mod/connedit.php index 49aae6684..5c36c3184 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -55,6 +55,15 @@ function connedit_post(&$a) { if(! $contact_id) return; + // TODO if configured for hassle-free permissions, we'll post the form with ajax as soon as the + // connection enable is toggled to a special autopost url and set permissions immediately, leaving + // the other form elements alone pending a manual submit of the form. The downside is that there + // will be a window of opportunity when the permissions have been set but before you've had a chance + // to review and possibly restrict them. The upside is we won't have to warn you that your connection + // can't do anything until you save the bloody form. + + $autopost = (((argc() > 2) && (argv(2) === 'auto')) ? true : false); + $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($contact_id), intval(local_user()) @@ -287,7 +296,7 @@ function connedit_content(&$a) { $o .= "\$('#me_id_perms_" . $p . "').attr('checked','checked'); \n"; } } - $o .= "abook_perms_msg(); }\n</script>\n"; + $o .= " }\n</script>\n"; } if(argc() == 3) { diff --git a/mod/dav.php b/mod/dav.php index 1bff5ffbc..e3719cb93 100644 --- a/mod/dav.php +++ b/mod/dav.php @@ -37,15 +37,6 @@ if (x($_SERVER, 'HTTP_AUTHORIZATION')) { * @param App &$a */ function dav_init(&$a) { - // call ($currenttheme)_init since we're operating outside of index.php - $theme_info_file = "view/theme/" . current_theme() . "/php/theme.php"; - if (file_exists($theme_info_file)){ - require_once($theme_info_file); - if (function_exists(str_replace('-', '_', current_theme()) . '_init')) { - $func = str_replace('-', '_', current_theme()) . '_init'; - $func($a); - } - } require_once('include/reddav.php'); diff --git a/mod/display.php b/mod/display.php index 7d7f4ca13..f14aca6da 100644 --- a/mod/display.php +++ b/mod/display.php @@ -136,6 +136,7 @@ function display_content(&$a, $update = 0, $load = false) { '$tags' => '', '$dend' => '', '$dbegin' => '', + '$verb' => '', '$mid' => $item_hash )); diff --git a/mod/home.php b/mod/home.php index b2538795f..e82aab385 100644 --- a/mod/home.php +++ b/mod/home.php @@ -144,6 +144,7 @@ function home_content(&$a, $update = 0, $load = false) { '$tags' => '', '$dend' => '', '$mid' => '', + '$verb' => '', '$dbegin' => '' )); } diff --git a/mod/network.php b/mod/network.php index d444dbd59..894ea9c10 100644 --- a/mod/network.php +++ b/mod/network.php @@ -251,6 +251,7 @@ function network_content(&$a, $update = 0, $load = false) { '$tags' => $hashtags, '$dend' => $datequery, '$mid' => '', + '$verb' => '', '$dbegin' => $datequery2 )); } diff --git a/mod/photos.php b/mod/photos.php index 3a7ef2d71..b2eb2847f 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -140,7 +140,7 @@ function photos_post(&$a) { ); if($r) { foreach($r as $i) { - drop_item($i['id'],false); + drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */); if(! $item_restrict) proc_run('php','include/notifier.php','drop',$i['id']); } diff --git a/mod/profiles.php b/mod/profiles.php index 11cd86645..ef5f6b379 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -296,6 +296,8 @@ function profiles_post(&$a) { $work = fix_mce_lf(escape_tags(trim($_POST['work']))); $education = fix_mce_lf(escape_tags(trim($_POST['education']))); + $hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0); + require_once('include/text.php'); linkify_tags($a, $likes, local_user()); linkify_tags($a, $dislikes, local_user()); @@ -312,7 +314,6 @@ function profiles_post(&$a) { linkify_tags($a, $work, local_user()); linkify_tags($a, $education, local_user()); - $hide_friends = (($_POST['hide_friends'] == 1) ? 1: 0); $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : ''); @@ -621,7 +622,7 @@ function profiles_content(&$a) { $opt_tpl = get_markup_template("profile_hide_friends.tpl"); $hide_friends = replace_macros($opt_tpl,array('$field' => array( - 'hide-friends', + 'hide_friends', t('Hide your contact/friend list from viewers of this profile?'), $r[0]['hide_friends'], '', diff --git a/mod/search.php b/mod/search.php index 6df9d631a..2ea6ad86f 100644 --- a/mod/search.php +++ b/mod/search.php @@ -109,6 +109,7 @@ function search_content(&$a,$update = 0, $load = false) { '$cats' => '', '$tags' => '', '$mid' => '', + '$verb' => '', '$dend' => '', '$dbegin' => '' )); |