some work on comanche autocomplete

9 files changed, 32 insertions, 16 deletions

diff --git a/mod/blocks.php b/mod/blocks.php
index 96005e9a3..3c9274991 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -95,7 +95,9 @@ function blocks_content(&$a) {
 		'ptlabel' => t('Block Name'),
 		'profile_uid' => intval($owner),
 		'expanded' => true,
-		'novoting' => true
+		'novoting' => true,
+		'bbco_autocomplete' => 'bbcode',
+		'bbcode' => true
 	);
 
 	if($_REQUEST['title'])
diff --git a/mod/channel.php b/mod/channel.php
index 88c420366..87ced9246 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -124,15 +124,17 @@ function channel_content(&$a, $update = 0, $load = false) {
 
 			$x = array(
 				'is_owner' => $is_owner,
-            	'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
-	            'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''),
-    	        'nickname' => App::$profile['channel_address'],
-        	    'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-            	'acl' => (($is_owner) ? populate_acl($channel_acl,true,((App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
+				'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
+				'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''),
+				'nickname' => App::$profile['channel_address'],
+				'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
+				'acl' => (($is_owner) ? populate_acl($channel_acl,true,((App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
 				'showacl' => (($is_owner) ? 'yes' : ''),
-	            'bang' => '',
+				'bang' => '',
 				'visitor' => (($is_owner || $observer) ? true : false),
-        	    'profile_uid' => App::$profile['profile_uid']
+				'profile_uid' => App::$profile['profile_uid'],
+				'bbco_autocomplete' => 'bbcode',
+				'bbcode' => true
         	);
 
         	$o .= status_editor($a,$x);
diff --git a/mod/editblock.php b/mod/editblock.php
index 35922e483..214c495dd 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -115,7 +115,8 @@ function editblock_content(&$a) {
 		'$ispublic'      => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag'        => '',
 		'$nickname'      => $channel['channel_address'],
-		'$confirmdelete' => t('Delete block?')
+		'$confirmdelete' => t('Delete block?'),
+		'$bbco_autocomplete'=> (($mimetype  == 'text/bbcode') ? 'bbcode' : 'comanche-block')
 	));
 
 	$tpl = get_markup_template("jot.tpl");
@@ -174,6 +175,7 @@ function editblock_content(&$a) {
 		'$defexpire'           => '',
 		'$feature_expire'      => false,
 		'$expires'             => t('Set expiration date'),
+		'$bbcode'              => (($mimetype  == 'text/bbcode') ? true : false)
 	));
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 9c27afa30..0b58fe5fe 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -109,7 +109,8 @@ function editlayout_content(&$a) {
 		'$ispublic'      => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag'        => $geotag,
 		'$nickname'      => $channel['channel_address'],
-		'$confirmdelete' => t('Delete layout?')
+		'$confirmdelete' => t('Delete layout?'),
+		'$bbco_autocomplete'=> 'comanche'
 	));
 
 
diff --git a/mod/editpost.php b/mod/editpost.php
index a433d91f4..397254a48 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -54,7 +54,9 @@ function editpost_content(&$a) {
 		'$geotag' => $geotag,
 		'$nickname' => $channel['channel_address'],
 		'$expireswhen' => t('Expires YYYY-MM-DD HH:MM'),
-	    '$confirmdelete' => t('Delete item?'),
+		'$confirmdelete' => t('Delete item?'),
+		'$editor_autocomplete'=> true,
+		'$bbco_autocomplete'=> 'bbcode'
 	));
 
 	if(intval($itm[0]['item_obscured'])) {
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 445c31ad4..9f6df9536 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -150,7 +150,8 @@ function editwebpage_content(&$a) {
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $channel['channel_address'],
-		'$confirmdelete' => t('Delete webpage?')
+		'$confirmdelete' => t('Delete webpage?'),
+		'$bbco_autocomplete'=> 'bbcode',
 	));
 
 	$tpl = get_markup_template("jot.tpl");
@@ -215,7 +216,7 @@ function editwebpage_content(&$a) {
 		'$defexpire' => '',
 		'$feature_expire' => false,
 		'$expires' => t('Set expiration date'),
-
+		'$bbco_autocomplete'=> 'bbcode'
 	));
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
diff --git a/mod/layouts.php b/mod/layouts.php
index dbb005e08..e28c9a066 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -122,7 +122,8 @@ function layouts_content(&$a) {
 		'profile_uid' => intval($owner),
 		'expanded'    => true,
 		'placeholdertitle' => t('Layout Description (Optional)'),
-		'novoting' => true
+		'novoting' => true,
+		'bbco_autocomplete' => 'comanche'
 	);
 
 	if($_REQUEST['title'])
diff --git a/mod/network.php b/mod/network.php
index e195ac496..5465cd064 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -169,7 +169,10 @@ function network_content(&$a, $update = 0, $load = false) {
 			'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')),
 			'bang'             => (($private_editing) ? '!' : ''),
 			'visitor'          => true,
-			'profile_uid'      => local_channel()
+			'profile_uid'      => local_channel(),
+			'editor_autocomplete' => true,
+			'bbco_autocomplete' => 'bbcode',
+			'bbcode' => true
 		);
 		if($deftag)
 			$x['pretext'] = $deftag;
diff --git a/mod/webpages.php b/mod/webpages.php
index 2196eb9fc..c20a147da 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -114,7 +114,9 @@ function webpages_content(&$a) {
 		'mimetype'    => $mimetype,
 		'layout'      => $layout,
 		'expanded'    => true,
-		'novoting' => true
+		'novoting'=> true,
+		'bbco_autocomplete' => 'bbcode',
+		'bbcode' => true
 	);
 	
 	if($_REQUEST['title'])