diff options
Diffstat (limited to 'mod')
-rw-r--r-- | mod/connections.php | 2 | ||||
-rw-r--r-- | mod/directory.php | 2 | ||||
-rw-r--r-- | mod/editwebpage.php | 36 | ||||
-rwxr-xr-x | mod/events.php | 1 | ||||
-rw-r--r-- | mod/mitem.php | 45 | ||||
-rw-r--r-- | mod/network.php | 1 | ||||
-rw-r--r-- | mod/suggest.php | 1 | ||||
-rw-r--r-- | mod/webpages.php | 19 |
8 files changed, 78 insertions, 29 deletions
diff --git a/mod/connections.php b/mod/connections.php index 6b3ed113c..b29e4dde8 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -43,6 +43,8 @@ function connections_aside(&$a) { } $a->set_widget('collections', group_side('connections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_xchan'] : ''))); + + $a->set_widget('suggest',suggest_widget()); $a->set_widget('findpeople',findpeople_widget()); } diff --git a/mod/directory.php b/mod/directory.php index 1f22e9bf8..e6c003099 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -213,6 +213,8 @@ function directory_content(&$a) { if($j['keywords']) { $a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); } + $a->set_widget('suggest',suggest_widget()); + // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 5a21aa78d..840bda336 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -19,6 +19,8 @@ function editwebpage_content(&$a) { $owner = intval($r[0]['channel_id']); //logger('owner: ' . print_r($owner,true)); } + + $is_owner = ((local_user() && local_user() == $owner) ? true : false); $o = ''; @@ -52,6 +54,23 @@ function editwebpage_content(&$a) { ); + if($itm[0]['item_flags'] & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + if($itm[0]['title']) + $itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key); + if($itm[0]['body']) + $itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); + } + + $item_id = q("select * from item_id where service = 'WEBPAGE' and iid = %d limit 1", + $itm[0]['id'] + ); + if($item_id) + $page_title = $item_id[0]['sid']; + + + + $plaintext = true; if(feature_enabled($itm[0]['uid'],'richtext')) @@ -112,9 +131,14 @@ function editwebpage_content(&$a) { //FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list. $rp = '/webpages/' . $which; + $lockstate = $o .= replace_macros($tpl,array( '$return_path' => $rp, + '$webpage' => true, + '$placeholdpagetitle' => t('Page link title'), + '$pagetitle' => $page_title, + '$action' => 'item', '$share' => t('Edit'), '$upload' => t('Upload photo'), @@ -131,9 +155,11 @@ function editwebpage_content(&$a) { '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, '$baseurl' => $a->get_baseurl(), - '$defloc' => $channel['channel_location'], - '$visitor' => 'none', - '$pvisit' => 'none', + '$defloc' => $itm[0]['location'], + '$visitor' => ($is_owner) ? 'block' : 'none', + '$acl' => populate_acl($itm[0]), + '$showacl' => true, + '$pvisit' => ($is_owner) ? 'block' : 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, '$mimeselect' => $mimeselect, @@ -143,8 +169,8 @@ function editwebpage_content(&$a) { '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), - '$lockstate' => $lockstate, - '$acl' => '', + 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), + '$acl' => populate_acl($itm[0]), '$bang' => '', '$profile_uid' => (intval($owner)), '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), diff --git a/mod/events.php b/mod/events.php index 77756fb13..265c74fce 100755 --- a/mod/events.php +++ b/mod/events.php @@ -1,5 +1,6 @@ <?php +require_once('include/conversation.php'); require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); diff --git a/mod/mitem.php b/mod/mitem.php index 6a5785114..8e60e2d65 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -1,6 +1,7 @@ <?php require_once('include/menu.php'); +require_once('include/acl_selectors.php'); function mitem_init(&$a) { if(! local_user()) @@ -25,6 +26,9 @@ function mitem_post(&$a) { if(! $a->data['menu']) return; + + $channel = $a->get_channel(); + $_REQUEST['mitem_channel_id'] = local_user(); $_REQUEST['menu_id'] = $a->data['menu']['menu_id']; @@ -34,29 +38,6 @@ function mitem_post(&$a) { if($_REQUEST['newwin']) $_REQUEST['mitem_flags'] |= MENU_ITEM_NEWWIN; -// FIXME!!!! - - if ((! $_REQUEST['contact_allow']) - && (! $_REQUEST['group_allow']) - && (! $_REQUEST['contact_deny']) - && (! $_REQUEST['group_deny'])) { - $str_group_allow = $channel['channel_allow_gid']; - $str_contact_allow = $channel['channel_allow_cid']; - $str_group_deny = $channel['channel_deny_gid']; - $str_contact_deny = $channel['channel_deny_cid']; - } - else { - - // use the posted permissions - - $str_group_allow = perms2str($_REQUEST['group_allow']); - $str_contact_allow = perms2str($_REQUEST['contact_allow']); - $str_group_deny = perms2str($_REQUEST['group_deny']); - $str_contact_deny = perms2str($_REQUEST['contact_deny']); - } - - - $mitem_id = ((argc() > 2) ? intval(argv(2)) : 0); if($mitem_id) { @@ -98,6 +79,8 @@ function mitem_content(&$a) { return ''; } + $channel = $a->get_channel(); + $a->set_widget('design',design_tools()); @@ -135,11 +118,24 @@ function mitem_content(&$a) { if(argc() > 2) { + + + if(argv(2) === 'new') { + $perm_defaults = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + $o = replace_macros(get_markup_template('mitemedit.tpl'), array( '$header' => t('New Menu Element'), '$menu_id' => $a->data['menu']['menu_id'], + '$permissions' => t('Menu Item Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($perm_defaults), '$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'), '$usezid' => array('usezid', t('Use Red magic-auth if available'), true, ''), @@ -180,6 +176,9 @@ function mitem_content(&$a) { $o = replace_macros(get_markup_template('mitemedit.tpl'), array( '$header' => t('Edit Menu Element'), '$menu_id' => $a->data['menu']['menu_id'], + '$permissions' => t('Menu Item Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($mitem), '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), diff --git a/mod/network.php b/mod/network.php index 18173043e..f087149f3 100644 --- a/mod/network.php +++ b/mod/network.php @@ -50,6 +50,7 @@ function network_init(&$a) { $a->page['aside'] .= group_side('network','network',true,$_GET['gid']); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); + $a->page['aside'] .= suggest_widget(); $a->page['aside'] .= saved_searches($search); $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); diff --git a/mod/suggest.php b/mod/suggest.php index f891ebefc..bfa471fa5 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -50,6 +50,7 @@ function suggest_content(&$a) { $arr[] = array( 'url' => chanlink_url($rr['xchan_url']), + 'profile' => $rr['xchan_url'], 'name' => $rr['xchan_name'], 'photo' => $rr['xchan_photo_m'], 'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['xchan_hash'], diff --git a/mod/webpages.php b/mod/webpages.php index 5257bc91d..90004faa1 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -60,13 +60,30 @@ function webpages_content(&$a) { require_once ('include/conversation.php'); require_once('include/acl_selectors.php'); + + if(local_user() && local_user() == $a->profile_uid) { + $channel = $a->get_channel(); + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + } + else + $channel_acl = array(); + + + + + $x = array( 'webpage' => ITEM_WEBPAGE, 'is_owner' => true, 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), - 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($a->get_channel()) : ''), + 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl) : ''), 'visitor' => 'block', 'profile_uid' => intval($owner), 'mimetype' => $mimetype, |