Merge remote-tracking branch 'upstream/master'

4 files changed, 318 insertions, 1 deletions

diff --git a/mod/item.php b/mod/item.php
index dc8ee5015..1893a6ef4 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -70,6 +70,7 @@ function item_post(&$a) {
 	$categories  = ((x($_REQUEST,'category'))    ? escape_tags($_REQUEST['category']) : '');
 	$webpage     = ((x($_REQUEST,'webpage'))     ? intval($_REQUEST['webpage'])       : 0);
 	$pagetitle   = ((x($_REQUEST,'pagetitle'))   ? escape_tags($_REQUEST['pagetitle']): '');
+	$buildblock  = ((x($_REQUEST,'buildblock'))  ? intval($_REQUEST['buildblock'])    : 0);
 
 	if($pagetitle) {
 		require_once('library/urlify/URLify.php');
@@ -492,6 +493,8 @@ function item_post(&$a) {
 	if($webpage)
 		$item_restrict = $item_restrict | ITEM_WEBPAGE;
 
+	if($buildblock)
+		$item_restrict = $item_restrict | ITEM_BUILDBLOCK;
 		
 		
 	if(! strlen($verb))
diff --git a/mod/menu.php b/mod/menu.php
new file mode 100644
index 000000000..910fc389b
--- /dev/null
+++ b/mod/menu.php
@@ -0,0 +1,115 @@
+<?php
+
+require_once('include/menu.php');
+
+function menu_post(&$a) {
+
+	if(! local_user())
+		return;
+
+	$_REQUEST['menu_channel_id'] = local_user();
+
+	$menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
+	if($menu_id) {
+		$_REQUEST['menu_id'] = intval(argv(1));
+		$r = menu_edit($_REQUEST);
+		if($r) {
+			info( t('Menu updated.') . EOL);
+			goaway(z_root() . '/mitem/' . $menu_id); 
+		}
+		else
+			notice( t('Unable to update menu.'). EOL);
+	}
+	else {
+		$r = menu_create($_REQUEST);
+			if($r) {
+			info( t('Menu created.') . EOL);
+			goaway(z_root() . '/mitem/' . $r); 
+		}
+		else
+			notice( t('Unable to create menu.'). EOL);
+
+	}
+
+}
+
+
+function menu_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return '';
+	}
+
+
+	if(argc() == 1) {
+		// list menus
+		$x = menu_list(local_user());
+		if($x) {
+			$o = replace_macros(get_markup_template('menulist.tpl'),array(
+				'$title' => t('Manage Menus'),
+				'$menus' => $x,
+				'$edit' => t('Edit'),
+				'$drop' => t('Drop'),
+				'$new' => t('New'),
+				'$hintnew' => t('Create a new menu'),
+				'$hintdrop' => t('Delete this menu'),
+				'$hintcontent' => t('Edit menu contents'),
+				'$hintedit' => t('Edit this menu')
+				));
+		}
+		return $o;
+
+
+
+
+
+	}
+
+
+	if(argc() > 1) {
+		if(argv(1) === 'new') {			
+			$o = replace_macros(get_markup_template('menuedit.tpl'), array(
+				'$header' => t('New Menu'),
+				'$menu_name' => array('menu_name', t('Menu name'), '', t('Must be unique, only seen by you'), '*'),
+				'$menu_desc' => array('menu_desc', t('Menu title'), '', t('Menu title as seen by others'), ''),
+				'$submit' => t('Create')
+			));
+			return $o;
+		}
+
+ 		elseif(intval(argv(1))) {
+			$m = menu_fetch_id(intval(argv(1)),local_user());
+			if(! $m) {
+				notice( t('Menu not found.') . EOL);
+				return '';
+			}
+			if(argc() == 3 && argv(2) == 'drop') {
+				$r = menu_delete_id(intval(argv(1)),local_user());
+				if($r)
+					info( t('Menu deleted.') . EOL);
+				else
+					notice( t('Menu could not be deleted.'). EOL);
+
+				goaway(z_root() . '/menu');
+			}
+			else {
+				$o = replace_macros(get_markup_template('menuedit.tpl'), array(
+					'$header' => t('Edit Menu'),
+					'$menu_id' => intval(argv(1)),
+					'$hintedit' => t('Add or remove entries to this menu'),
+					'$editcontents' => t('Edit menu contents'),
+					'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
+					'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
+					'$submit' => t('Modify')
+				));
+				return $o;
+			}
+		}
+		else {
+			notice( t('Not found.') . EOL);
+			return;
+		}
+	}
+
+}
diff --git a/mod/mitem.php b/mod/mitem.php
new file mode 100644
index 000000000..2b890d5a1
--- /dev/null
+++ b/mod/mitem.php
@@ -0,0 +1,200 @@
+<?php
+
+require_once('include/menu.php');
+
+function mitem_init(&$a) {
+	if(! local_user())
+		return;
+	if(argc() < 2)
+		return;
+
+	$m = menu_fetch_id(intval(argv(1)),local_user());
+	if(! $m) {
+		notice( t('Menu not found.') . EOL);
+		return '';
+	}
+	$a->data['menu'] = $m;
+
+}
+
+function mitem_post(&$a) {
+
+	if(! local_user())
+		return;
+
+	if(! $a->data['menu'])
+		return;
+
+	$_REQUEST['mitem_channel_id'] = local_user();
+	$_REQUEST['menu_id'] = $a->data['menu']['menu_id'];
+
+	$_REQUEST['mitem_flags'] = 0;
+	if($_REQUEST['usezid'])
+		$_REQUEST['mitem_flags'] |= MENU_ITEM_ZID;
+	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) {
+		$_REQUEST['mitem_id'] = $mitem_id;
+		$r = menu_edit_item($_REQUEST['menu_id'],local_user(),$_REQUEST);	
+		if($r) {
+			info( t('Menu element updated.') . EOL);
+			goaway(z_root() . '/mitem/' . $_REQUEST['menu_id']);
+		}
+		else
+			notice( t('Unable to update menu element.') . EOL);
+
+	}
+	else {
+		$r = menu_add_item($_REQUEST['menu_id'],local_user(),$_REQUEST);	
+		if($r) {
+			info( t('Menu element added.') . EOL);
+			goaway(z_root() . '/mitem/' . $_REQUEST['menu_id']);
+		}
+		else
+			notice( t('Unable to add menu element.') . EOL);
+
+	}
+
+
+
+}
+
+
+function mitem_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return '';
+	}
+
+	if(argc() < 2 || (! $a->data['menu'])) {
+		notice( t('Not found.') . EOL);
+		return '';
+	}
+
+
+	$m = menu_fetch($a->data['menu']['menu_name'],local_user(), get_observer_hash());
+	$a->set_widget('menu_preview',menu_render($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()
+		);
+
+		if($r) {
+			$o = replace_macros(get_markup_template('mitemlist.tpl'),array(
+				'$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'),
+				'$hintmenu' => t('Edit this menu container'),
+				'$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') {
+
+			$o = replace_macros(get_markup_template('mitemedit.tpl'), array(
+				'$header' => t('New Menu Element'),
+				'$menu_id' => $a->data['menu']['menu_id'],
+				'$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,''),
+// 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')
+			));
+			return $o;
+		}
+
+
+ 		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())
+			);
+			if(! $m) {
+				notice( t('Menu item not found.') . EOL);
+				goaway(z_root() . '/menu');
+			}
+
+			$mitem = $m[0];
+
+			if(argc() == 4 && argv(3) == 'drop') {
+				$r = menu_del_item($mitem['mitem_menu_id'], local_user(),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']);
+			}
+			else {
+
+				// edit menu item
+
+				$o = replace_macros(get_markup_template('mitemedit.tpl'), array(
+					'$header' => t('Edit Menu Element'),
+					'$menu_id' => $a->data['menu']['menu_id'],
+					'$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), ''),
+					'$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')),
+					'$submit' => t('Modify')
+				));
+				return $o;
+			}
+		}
+
+	}
+
+
+
+
+}
diff --git a/mod/settings.php b/mod/settings.php
index 0cca41810..c39286ebc 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -330,7 +330,6 @@ function settings_post(&$a) {
 
 
 	$expire_items     = ((x($_POST,'expire_items')) ? intval($_POST['expire_items'])	 : 0);
-	$expire_notes     = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes'])	 : 0);
 	$expire_starred   = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
 	$expire_photos    = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos'])	 : 0);
 	$expire_network_only    = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only'])	 : 0);