harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sys edit ability to menus and menu items

Browse Source
This commit is contained in:
friendica 2014-11-12 01:43:34 -08:00
parent ada2e43ea2
commit 498344e81f
2 changed files with 96 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mod/menu.php
View File

@ -1,13 +1,23 @@
<?php <?php
require_once('include/menu.php'); require_once('include/menu.php');
require_once('include/identity.php');
function menu_post(&$a) { function menu_post(&$a) {
if(! local_user()) $uid = local_user();
if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] && is_site_admin()) {
$sys = get_sys_channel();
$uid = intval($sys['channel_id']);
$a->is_sys = true;
}
if(! $uid)
return; return;
$_REQUEST['menu_channel_id'] = local_user(); $_REQUEST['menu_channel_id'] = $uid;
if($_REQUEST['menu_bookmark']) if($_REQUEST['menu_bookmark'])
$_REQUEST['menu_flags'] |= MENU_BOOKMARK; $_REQUEST['menu_flags'] |= MENU_BOOKMARK;
if($_REQUEST['menu_system']) if($_REQUEST['menu_system'])
@ -19,7 +29,7 @@ function menu_post(&$a) {
$r = menu_edit($_REQUEST); $r = menu_edit($_REQUEST);
if($r) { if($r) {
info( t('Menu updated.') . EOL); info( t('Menu updated.') . EOL);
goaway(z_root() . '/mitem/' . $menu_id); goaway(z_root() . '/mitem/' . $menu_id . (($a->is_sys) ? '?f=&sys=1' : ''));
} }
else else
notice( t('Unable to update menu.'). EOL); notice( t('Unable to update menu.'). EOL);
@ -28,7 +38,7 @@ function menu_post(&$a) {
$r = menu_create($_REQUEST); $r = menu_create($_REQUEST);
if($r) { if($r) {
info( t('Menu created.') . EOL); info( t('Menu created.') . EOL);
goaway(z_root() . '/mitem/' . $r); goaway(z_root() . '/mitem/' . $r . (($a->is_sys) ? '?f=&sys=1' : ''));
} }
else else
notice( t('Unable to create menu.'). EOL); notice( t('Unable to create menu.'). EOL);
@ -40,18 +50,22 @@ function menu_post(&$a) {
function menu_content(&$a) { function menu_content(&$a) {
if(! local_user()) { $uid = local_user();
if($a->is_sys && is_site_admin()) {
$sys = get_sys_channel();
$uid = intval($sys['channel_id']);
}
if(! $uid) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return ''; return '';
} }
// $a->set_widget('design',design_tools());
if(argc() == 1) { if(argc() == 1) {
// list menus // list menus
$x = menu_list(local_user()); $x = menu_list($uid);
if($x) { if($x) {
for($y = 0; $y < count($x); $y ++) { for($y = 0; $y < count($x); $y ++) {
$x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false);
@ -89,19 +103,19 @@ function menu_content(&$a) {
} }
elseif(intval(argv(1))) { elseif(intval(argv(1))) {
$m = menu_fetch_id(intval(argv(1)),local_user()); $m = menu_fetch_id(intval(argv(1)),$uid);
if(! $m) { if(! $m) {
notice( t('Menu not found.') . EOL); notice( t('Menu not found.') . EOL);
return ''; return '';
} }
if(argc() == 3 && argv(2) == 'drop') { if(argc() == 3 && argv(2) == 'drop') {
$r = menu_delete_id(intval(argv(1)),local_user()); $r = menu_delete_id(intval(argv(1)),$uid);
if($r) if($r)
info( t('Menu deleted.') . EOL); info( t('Menu deleted.') . EOL);
else else
notice( t('Menu could not be deleted.'). EOL); notice( t('Menu could not be deleted.'). EOL);
goaway(z_root() . '/menu'); goaway(z_root() . '/menu' . (($a->is_sys) ? '?f=&sys=1' : ''));
} }
else { else {
$o = replace_macros(get_markup_template('menuedit.tpl'), array( $o = replace_macros(get_markup_template('menuedit.tpl'), array(

118
mod/mitem.php
View File

@ -4,12 +4,22 @@ require_once('include/menu.php');
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
function mitem_init(&$a) { function mitem_init(&$a) {
if(! local_user())
$uid = local_user();
if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] && is_site_admin()) {
$sys = get_sys_channel();
$uid = intval($sys['channel_id']);
$a->is_sys = true;
}
if(! $uid)
return; return;
if(argc() < 2) if(argc() < 2)
return; return;
$m = menu_fetch_id(intval(argv(1)),local_user()); $m = menu_fetch_id(intval(argv(1)),$uid);
if(! $m) { if(! $m) {
notice( t('Menu not found.') . EOL); notice( t('Menu not found.') . EOL);
return ''; return '';
@ -20,8 +30,18 @@ function mitem_init(&$a) {
function mitem_post(&$a) { function mitem_post(&$a) {
if(! local_user()) $uid = local_user();
if($a->is_sys && is_site_admin()) {
$sys = get_sys_channel();
$uid = intval($sys['channel_id']);
}
if(! $uid) {
return; return;
}
if(! $a->data['menu']) if(! $a->data['menu'])
return; return;
@ -29,7 +49,7 @@ function mitem_post(&$a) {
$channel = $a->get_channel(); $channel = $a->get_channel();
$_REQUEST['mitem_channel_id'] = local_user(); $_REQUEST['mitem_channel_id'] = $uid;
$_REQUEST['menu_id'] = $a->data['menu']['menu_id']; $_REQUEST['menu_id'] = $a->data['menu']['menu_id'];
$_REQUEST['mitem_flags'] = 0; $_REQUEST['mitem_flags'] = 0;
@ -42,20 +62,20 @@ function mitem_post(&$a) {
$mitem_id = ((argc() > 2) ? intval(argv(2)) : 0); $mitem_id = ((argc() > 2) ? intval(argv(2)) : 0);
if($mitem_id) { if($mitem_id) {
$_REQUEST['mitem_id'] = $mitem_id; $_REQUEST['mitem_id'] = $mitem_id;
$r = menu_edit_item($_REQUEST['menu_id'],local_user(),$_REQUEST); $r = menu_edit_item($_REQUEST['menu_id'],$uid,$_REQUEST);
if($r) { if($r) {
info( t('Menu element updated.') . EOL); info( t('Menu element updated.') . EOL);
goaway(z_root() . '/mitem/' . $_REQUEST['menu_id']); goaway(z_root() . '/mitem/' . $_REQUEST['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : ''));
} }
else else
notice( t('Unable to update menu element.') . EOL); notice( t('Unable to update menu element.') . EOL);
} }
else { else {
$r = menu_add_item($_REQUEST['menu_id'],local_user(),$_REQUEST); $r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST);
if($r) { if($r) {
info( t('Menu element added.') . EOL); info( t('Menu element added.') . EOL);
goaway(z_root() . '/mitem/' . $_REQUEST['menu_id']); goaway(z_root() . '/mitem/' . $_REQUEST['menu_id'] . (($a->is_sys) ? '?f=&sys=1' : ''));
} }
else else
notice( t('Unable to add menu element.') . EOL); notice( t('Unable to add menu element.') . EOL);
@ -69,7 +89,20 @@ function mitem_post(&$a) {
function mitem_content(&$a) { function mitem_content(&$a) {
if(! local_user()) { $uid = local_user();
$channel = $a->get_channel();
$observer = $a->get_observer();
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
if($a->is_sys && is_site_admin()) {
$sys = get_sys_channel();
$uid = intval($sys['channel_id']);
$channel = $sys;
$ob_hash = $sys['xchan_hash'];
}
if(! $uid) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return ''; return '';
} }
@ -79,67 +112,61 @@ function mitem_content(&$a) {
return ''; return '';
} }
$channel = $a->get_channel(); $m = menu_fetch($a->data['menu']['menu_name'],$uid,$ob_hash);
$m = menu_fetch($a->data['menu']['menu_name'],local_user(), get_observer_hash());
$a->data['menu_item'] = $m; $a->data['menu_item'] = $m;
if(argc() == 2) { if(argc() == 2) {
$r = q("select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc", $r = q("select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d order by mitem_order asc, mitem_desc asc",
intval($a->data['menu']['menu_id']), intval($a->data['menu']['menu_id']),
local_user() intval($uid)
); );
$o .= replace_macros(get_markup_template('mitemlist.tpl'),array( $o .= replace_macros(get_markup_template('mitemlist.tpl'),array(
'$title' => t('Manage Menu Elements'), '$title' => t('Manage Menu Elements'),
'$menuname' => $a->data['menu']['menu_name'], '$menuname' => $a->data['menu']['menu_name'],
'$menudesc' => $a->data['menu']['menu_desc'], '$menudesc' => $a->data['menu']['menu_desc'],
'$edmenu' => t('Edit menu'), '$edmenu' => t('Edit menu'),
'$menu_id' => $a->data['menu']['menu_id'], '$menu_id' => $a->data['menu']['menu_id'],
'$mlist' => $r, '$mlist' => $r,
'$edit' => t('Edit element'), '$edit' => t('Edit element'),
'$drop' => t('Drop element'), '$drop' => t('Drop element'),
'$new' => t('New element'), '$new' => t('New element'),
'$hintmenu' => t('Edit this menu container'), '$hintmenu' => t('Edit this menu container'),
'$hintnew' => t('Add menu element'), '$hintnew' => t('Add menu element'),
'$hintdrop' => t('Delete this menu item'), '$hintdrop' => t('Delete this menu item'),
'$hintedit' => t('Edit this menu item') '$hintedit' => t('Edit this menu item')
)); ));
return $o; return $o;
} }
if(argc() > 2) { if(argc() > 2) {
if(argv(2) === 'new') { if(argv(2) === 'new') {
$perm_defaults = array( $perm_defaults = array(
'allow_cid' => $channel['channel_allow_cid'], 'allow_cid' => $channel['channel_allow_cid'],
'allow_gid' => $channel['channel_allow_gid'], 'allow_gid' => $channel['channel_allow_gid'],
'deny_cid' => $channel['channel_deny_cid'], 'deny_cid' => $channel['channel_deny_cid'],
'deny_gid' => $channel['channel_deny_gid'] 'deny_gid' => $channel['channel_deny_gid']
); );
$o = replace_macros(get_markup_template('mitemedit.tpl'), array( $o = replace_macros(get_markup_template('mitemedit.tpl'), array(
'$header' => t('New Menu Element'), '$header' => t('New Menu Element'),
'$menu_id' => $a->data['menu']['menu_id'], '$menu_id' => $a->data['menu']['menu_id'],
'$permissions' => t('Menu Item Permissions'), '$permissions' => t('Menu Item Permissions'),
'$permdesc' => t("\x28click to open/close\x29"), '$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults,false), '$aclselect' => populate_acl($perm_defaults,false),
'$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'), '$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'),
'$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'), '$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'),
'$usezid' => array('usezid', t('Use Red magic-auth if available'), true, ''), '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''),
'$newwin' => array('newwin', t('Open link in new window'), false,''), '$newwin' => array('newwin', t('Open link in new window'), false,''),
// permissions go here // permissions go here
'$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Create') '$submit' => t('Create')
)); ));
return $o; return $o;
} }
@ -148,23 +175,23 @@ function mitem_content(&$a) {
elseif(intval(argv(2))) { elseif(intval(argv(2))) {
$m = q("select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1", $m = q("select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1",
intval(argv(2)), intval(argv(2)),
intval(local_user()) intval($uid)
); );
if(! $m) { if(! $m) {
notice( t('Menu item not found.') . EOL); notice( t('Menu item not found.') . EOL);
goaway(z_root() . '/menu'); goaway(z_root() . '/menu'. (($a->is_sys) ? '?f=&sys=1' : ''));
} }
$mitem = $m[0]; $mitem = $m[0];
if(argc() == 4 && argv(3) == 'drop') { if(argc() == 4 && argv(3) == 'drop') {
$r = menu_del_item($mitem['mitem_menu_id'], local_user(),intval(argv(2))); $r = menu_del_item($mitem['mitem_menu_id'], $uid, intval(argv(2)));
if($r) if($r)
info( t('Menu item deleted.') . EOL); info( t('Menu item deleted.') . EOL);
else else
notice( t('Menu item could not be deleted.'). EOL); notice( t('Menu item could not be deleted.'). EOL);
goaway(z_root() . '/mitem/' . $mitem['mitem_menu_id']); goaway(z_root() . '/mitem/' . $mitem['mitem_menu_id'] . (($a->is_sys) ? '?f=&sys=1' : ''));
} }
else { else {
@ -179,7 +206,7 @@ function mitem_content(&$a) {
'$mitem_id' => intval(argv(2)), '$mitem_id' => intval(argv(2)),
'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
'$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'),
'$usezid' => array('usezid', t('Use Red magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
'$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''), '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''),
// permissions go here // permissions go here
'$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')),
@ -188,10 +215,5 @@ function mitem_content(&$a) {
return $o; return $o;
} }
} }
} }
} }