add categories to apps (wip)

3 files changed, 164 insertions, 29 deletions

diff --git a/include/apps.php b/include/apps.php
index 30fed361d..b3d0c954e 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -69,6 +69,7 @@ function app_name_compare($a,$b) {
 	return strcmp($a['name'],$b['name']);
 }
 
+
 function parse_app_description($f,$translate = true) {
 	$ret = array();
 
@@ -295,6 +296,7 @@ function app_render($papp,$mode = 'view') {
 
 function app_install($uid,$app) {
 	$app['uid'] = $uid;
+
 	if(app_installed($uid,$app))
 		$x = app_update($app);
 	else
@@ -305,9 +307,17 @@ function app_install($uid,$app) {
 			dbesc($x['app_id']),
 			intval($uid)
 		);
-		if($r)
-			build_sync_packet($uid,array('app' => $r[0]));
-
+		if($r) {
+			if(! $r[0]['app_system']) {
+				if($app['categories'] && (! $app['term'])) {
+					$r[0]['term'] = q("select * from term where otype = %d and oid = d",
+						intval(TERM_OBJ_APP),
+						intval($r[0]['id'])
+					);
+					build_sync_packet($uid,array('app' => $r[0]));
+				}
+			}
+		}
 		return $x['app_id'];
 	}
 	return false;
@@ -322,22 +332,28 @@ function app_destroy($uid,$app) {
 			dbesc($app['guid']),
 			intval($uid)
 		);
-		$x[0]['app_deleted'] = 1;
-
-		if($x[0]['app_system']) {
-			$r = q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
-				dbesc($app['guid']),
-				intval($uid)
-			);
-		}
-		else {
-			$r = q("delete from app where app_id = '%s' and app_channel = %d",
-				dbesc($app['guid']),
-				intval($uid)
+		if($x) {
+			$x[0]['app_deleted'] = 1;
+			q("delete from term where otype = %d and oid = %d",
+				intval(TERM_OBJ_APP),
+				intval($x[0]['id'])
 			);
+			if($x[0]['app_system']) {
+				$r = q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
+					dbesc($app['guid']),
+					intval($uid)
+				);
+			}
+			else {
+				$r = q("delete from app where app_id = '%s' and app_channel = %d",
+					dbesc($app['guid']),
+					intval($uid)
+				);
+
+				// we don't sync system apps - they may be completely different on the other system
+				build_sync_packet($uid,array('app' => $x));
+			}
 		}
-
-		build_sync_packet($uid,array('app' => $x));
 	}
 }
 
@@ -365,7 +381,12 @@ function app_list($uid, $deleted = false) {
 	);
 	if($r) {
 		for($x = 0; $x < count($r); $x ++) {
-			$r[$x]['type'] = 'personal';
+			if(! $r[$x]['app_system'])
+				$r[$x]['type'] = 'personal';
+			$r[$x]['term'] = q("select * from term where otype = %d and oid = %d",
+				intval(TERM_OBJ_APP),
+				intval($r[$x]['id'])
+			);
 		}
 	}
 	return($r);
@@ -436,6 +457,22 @@ function app_store($arr) {
 		$ret['success'] = true;
 		$ret['app_id'] = $darray['app_id'];
 	}
+	if($arr['categories']) {
+		$x = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
+			dbesc($darray['app_id']),
+			intval($darray['app_channel'])
+		);
+		$y = explode(',',$arr['categories']);
+		if($y) {
+			foreach($y as $t) {
+				$t = trim($t);
+				if($t) {
+					store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
+				}
+			}
+		}
+	}
+
 	return $ret;
 }
 
@@ -495,6 +532,28 @@ function app_update($arr) {
 		$ret['app_id'] = $darray['app_id'];
 	}
 
+	$x = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
+		dbesc($darray['app_id']),
+		intval($darray['app_channel'])
+	);
+	if($x) {
+		q("delete from term where otype = %d and oid = %d",
+			intval(TERM_OBJ_APP),
+			intval($x[0]['id'])
+		);
+		if($arr['categories']) {
+			$y = explode(',',$arr['categories']);
+			if($y) {
+				foreach($y as $t) {
+					$t = trim($t);
+					if($t) {
+						store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
+					}
+				}
+			}
+		}
+	}
+
 	return $ret;
 
 }
@@ -551,9 +610,23 @@ function app_encode($app,$embed = false) {
 	if($app['app_deleted'])
 		$ret['deleted'] = $app['app_deleted'];
 
+	if($app['term']) {
+		$s = '';
+		foreach($app['term'] as $t) {
+			if($s)
+				$s .= ',';
+			$s .= $t['term'];
+		}
+		$ret['categories'] = $s;
+	}
+
+
 	if(! $embed)
 		return $ret;
 
+	if(array_key_exists('categories',$ret))
+		unset($ret['categories']);
+	
 	$j = json_encode($ret);
 	return '[app]' . chunk_split(base64_encode($j),72,"\n") . '[/app]';
 
diff --git a/include/identity.php b/include/identity.php
index c60c846c0..53bed7c0f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -580,11 +580,18 @@ function identity_basic_export($channel_id, $items = false) {
 	if($r)
 		$ret['obj'] = $r;
 
-	$r = q("select * from app where app_channel = %d",
+	$r = q("select * from app where app_channel = %d and app_system = 0",
 		intval($channel_id)
 	);
-	if($r)
+	if($r) {
+		for($x = 0; $x < count($r); $x ++) {
+			$r[$x]['term'] = q("select * from term where otype = %d and oid = %d",
+				intval(TERM_OBJ_APP),
+				intval($r[$x]['id'])
+			);
+		}
 		$ret['app'] = $r;
+	}
 
 	$r = q("select * from chatroom where cr_uid = %d",
 		intval($channel_id)
diff --git a/include/import.php b/include/import.php
index f6e62f9e0..321f275b1 100644
--- a/include/import.php
+++ b/include/import.php
@@ -297,8 +297,11 @@ function import_apps($channel,$apps) {
 	if($channel && $apps) {
 		foreach($apps as $app) {
 
+			$term = ((array_key_exists('term',$app) && is_array($app['term'])) ? $app['term'] : null); 
+
 			unset($app['id']);
 			unset($app['app_channel']);
+			unset($app['term']);
 
 			$app['app_channel'] = $channel['channel_id'];
 
@@ -307,6 +310,8 @@ function import_apps($channel,$apps) {
 				$app['app_photo'] = $x[0];
 			}
 
+			$hash = $app['app_id'];
+
 			dbesc_array($app);
 			$r = dbq("INSERT INTO app (`" 
 				. implode("`, `", array_keys($app)) 
@@ -314,6 +319,21 @@ function import_apps($channel,$apps) {
 				. implode("', '", array_values($app)) 
 				. "')" 
 			);
+
+			if($term) {
+				$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+					dbesc($hash),
+					intval($channel['channel_id'])
+				);
+				if($x) {
+					foreach($term as $t) {
+						store_item_tag($channel['channel_id'],$x[0]['id'],TERM_OBJ_APP,$t['type'],escape_tags($t['term']),escape_tags($t['url']));
+					}
+				}
+			}
+
+
+
 		}
 	}
 }
@@ -325,16 +345,41 @@ function sync_apps($channel,$apps) {
 	if($channel && $apps) {
 		foreach($apps as $app) {
 
-           if(array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
+			$exists = false;
+			$term = ((array_key_exists('term',$app)) ? $app['term'] : null);
+
+			$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+				dbesc($app['app_id']),
+				intval($channel['channel_id'])
+			);
+			if($x) {
+				$exists = $x[0];
+			}
+			
+			if(array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
                 q("delete from app where app_id = '%s' and app_channel = %d limit 1",
                     dbesc($app['app_id']),
                     intval($channel['channel_id'])
                 );
+				if($exists) {
+					q("delete from term where otype = %d and oid = %d",
+						intval(TERM_OBJ_APP),
+						intval($exists['id'])
+            		);
+				}
                 continue;
             }
 
 			unset($app['id']);
 			unset($app['app_channel']);
+			unset($app['term']);
+
+			if($exists) {
+				q("delete from term where otype = %d and oid = %d",
+					intval(TERM_OBJ_APP),
+					intval($exists['id'])
+            	);
+			}
 
 			if(! $app['app_created'] || $app['app_created'] === NULL_DATE)
 				$app['app_created'] = datetime_convert();
@@ -348,16 +393,15 @@ function sync_apps($channel,$apps) {
 				$app['app_photo'] = $x[0];
 			}
 
-			$exists = false;
+			if($exists && $term) {
+				foreach($term as $t) {
+					store_item_tag($channel['channel_id'],$exists['id'],TERM_OBJ_APP,$t['type'],escape_tags($t['term']),escape_tags($t['url']));
+				}
+			}
 
-			$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
-				dbesc($app['app_id']),
-				intval($channel['channel_id'])
-			);
-			if($x) {
-				if($x[0]['app_edited'] >= $app['app_edited'])
+			if($exists) {
+				if($exists['app_edited'] >= $app['app_edited'])
 					continue;
-				$exists = true;
 			}
 			$hash = $app['app_id'];
 
@@ -380,6 +424,17 @@ function sync_apps($channel,$apps) {
 					. implode("', '", array_values($app)) 
 					. "')" 
 				);
+				if($term) {
+					$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+						dbesc($hash),
+						intval($channel['channel_id'])
+					);
+					if($x) {
+						foreach($term as $t) {
+							store_item_tag($channel['channel_id'],$x[0]['id'],TERM_OBJ_APP,$t['type'],escape_tags($t['term']),escape_tags($t['url']));
+						}
+					}
+				}
 			}
 		}
 	}