Merge pull request #1 from friendica/master

Merge master from friendica

1 files changed, 70 insertions, 48 deletions

diff --git a/mod/mitem.php b/mod/mitem.php
index 3240bb68b..7098d7489 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -4,12 +4,22 @@ require_once('include/menu.php');
 require_once('include/acl_selectors.php');
 
 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;
+
 	if(argc() < 2)
 		return;
 
-	$m = menu_fetch_id(intval(argv(1)),local_user());
+	$m = menu_fetch_id(intval(argv(1)),$uid);
 	if(! $m) {
 		notice( t('Menu not found.') . EOL);
 		return '';
@@ -20,8 +30,18 @@ function mitem_init(&$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;
+	}
+
+
 
 	if(! $a->data['menu'])
 		return;
@@ -29,7 +49,7 @@ function mitem_post(&$a) {
 
 	$channel = $a->get_channel();
 
-	$_REQUEST['mitem_channel_id'] = local_user();
+	$_REQUEST['mitem_channel_id'] = $uid;
 	$_REQUEST['menu_id'] = $a->data['menu']['menu_id'];
 
 	$_REQUEST['mitem_flags'] = 0;
@@ -42,20 +62,20 @@ function mitem_post(&$a) {
 	$mitem_id = ((argc() > 2) ? intval(argv(2)) : 0);
 	if($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) {
 			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
 			notice( t('Unable to update menu element.') . EOL);
 
 	}
 	else {
-		$r = menu_add_item($_REQUEST['menu_id'],local_user(),$_REQUEST);	
+		$r = menu_add_item($_REQUEST['menu_id'],$uid,$_REQUEST);	
 		if($r) {
 			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
 			notice( t('Unable to add menu element.') . EOL);
@@ -69,7 +89,20 @@ function mitem_post(&$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);
 		return '';
 	}
@@ -79,67 +112,61 @@ function mitem_content(&$a) {
 		return '';
 	}
 
-	$channel = $a->get_channel();
-
-	$m = menu_fetch($a->data['menu']['menu_name'],local_user(), get_observer_hash());
+	$m = menu_fetch($a->data['menu']['menu_name'],$uid,$ob_hash);
 	$a->data['menu_item'] = $m;
 
 
 	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",
 			intval($a->data['menu']['menu_id']),
-			local_user()
+			intval($uid)
 		);
 
 
 		$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'],
 			'$menudesc' => $a->data['menu']['menu_desc'],
-			'$edmenu' => t('Edit menu'),
-			'$menu_id' => $a->data['menu']['menu_id'],
-			'$mlist' => $r,
-			'$edit' => t('Edit element'),
-			'$drop' => t('Drop element'),
-			'$new' => t('New element'),
+			'$edmenu'   => t('Edit menu'),
+			'$menu_id'  => $a->data['menu']['menu_id'],
+			'$mlist'    => $r,
+			'$edit'     => t('Edit element'),
+			'$drop'     => t('Drop element'),
+			'$new'      => t('New element'),
 			'$hintmenu' => t('Edit this menu container'),
-			'$hintnew' => t('Add menu element'),
+			'$hintnew'  => t('Add menu element'),
 			'$hintdrop' => t('Delete this menu item'),
 			'$hintedit' => t('Edit this menu item')
-			));
-
-			
+		));
+	
 		return $o;
-
 	}
 
 
 	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']
+				'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'],
+				'$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,false),
-				'$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, ''),
-				'$newwin' => array('newwin', t('Open link in new window'), false,''),
+				'$permdesc'    => t("\x28click to open/close\x29"),
+				'$aclselect'   => populate_acl($perm_defaults,false),
+				'$mitem_desc'  => array('mitem_desc', t('Link text'), '', '','*'),
+				'$mitem_link'  => array('mitem_link', t('URL of link'), '', '', '*'),
+				'$usezid'      => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''),
+				'$newwin'      => array('newwin', t('Open link in new window'), false,''),
 // permissions go here
 				'$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;
 		}
@@ -148,23 +175,23 @@ function mitem_content(&$a) {
  		elseif(intval(argv(2))) {
 			$m = q("select * from menu_item where mitem_id = %d and mitem_channel_id = %d limit 1",
 				intval(argv(2)),
-				intval(local_user())
+				intval($uid)
 			);
 			if(! $m) {
 				notice( t('Menu item not found.') . EOL);
-				goaway(z_root() . '/menu');
+				goaway(z_root() . '/menu'. (($a->is_sys) ? '?f=&sys=1' : ''));
 			}
 
 			$mitem = $m[0];
 
 			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)
 					info( t('Menu item deleted.') . EOL);
 				else
 					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 {
 
@@ -179,7 +206,7 @@ function mitem_content(&$a) {
 					'$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'], '', '*'),
-					'$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),''),
 // permissions go here
 					'$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;
 			}
 		}
-
 	}
-
-
-
-
 }