From 5678d78c06e1a5ae021f41147e893b48bc2f9e1e Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Mon, 12 May 2008 07:35:27 +0000 Subject: renamed the tagcloud class to tag, started moving things around not sure where I like the taglist, seems weird in its own box --- lib/class/browse.class.php | 11 +-- lib/class/tag.class.php | 215 +++++++++++++++++++++++++++++++++++++++++++ lib/class/tagcloud.class.php | 178 ----------------------------------- 3 files changed, 219 insertions(+), 185 deletions(-) create mode 100644 lib/class/tag.class.php delete mode 100644 lib/class/tagcloud.class.php (limited to 'lib/class') diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index 1d0f3db4..663761fd 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -815,13 +815,10 @@ class Browse { ${$class_name} = new $class_name($id); } - - if (!$ajax && in_array($_SESSION['browse']['type'], - array('artist','album','song'))) { - $tagcloudHead = "Matching tags"; - $tagcloudList = TagCloud::get_tags($_SESSION['browse']['type'], $all_ids); - require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php'; - } + if (!$ajax && Tag::validate_type($_SESSION['browse']['type'])) { + $tagcloudList = Tag::get_many_tags($_SESSION['browse']['type'], $all_ids); + require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php'; + } Ajax::start_container('browse_content'); // Switch on the type of browsing we're doing diff --git a/lib/class/tag.class.php b/lib/class/tag.class.php new file mode 100644 index 00000000..7964c549 --- /dev/null +++ b/lib/class/tag.class.php @@ -0,0 +1,215 @@ +id); + $tagval = Dba::escape($tagval); + $type = Dba::escape($type); + $id = intval($id); + + // Check if tag object exists + $sql = "SELECT `tag`.`id` FROM `tag` WHERE `name`='$tagval'"; + $db_results = Dba::query($sql) ; + $row = Dba::fetch_assoc($db_results); + $insert_id = $row['id']; + + // If the tag doesn't exist create it. + if (!count($row)) { + $sql = "INSERT INTO `tag` SET `name`='$tagval'"; + $db_results = Dba::query($sql) ; + $insert_id = Dba::insert_id(); + } + + // Now make sure this isn't a duplicate + $sql = "SELECT * FROM `tag_map " . + "WHERE `tag_id`='$insert_id' AND `user`='$uid' AND `object_type`='$type' AND `object_id`='$id'"; + $db_results = Dba::query($sql); + + $row = Dba::fetch_assoc($db_results); + + // Only insert it if the current tag for this user doesn't exist + if (!count($row)) { + $sql = "INSERT INTO `tag_map` (`tag_id`,`user`,`object_type`,`object_id`) " . + "VALUES ('$tid','$uid','$type','$id')"; + $db_results = Dba::query($sql); + } + + return true; + + } // add_tag + + /** + * get_many_tags + * This builds a cache of all of the tags contained by the specified object ids + * of the specified type + */ + public static function get_many_tags($type, $object_ids) { + + // If they pass us nothing, they get nothing + if (!count($object_ids)) { return array(); } + if (!self::validate_type($type)) { return array(); } + + $lid = '(' . implode(',',$id) . ')'; + $orsql = ''; + + if ($objType == 'artist' || $objType == 'album') + $orsql=" or (tag_map.object_id = song.id AND tag_map.object_type='song' and song.$objType in $lid )"; + if ($objType == 'artist') + $orsql .= "or (tag_map.object_id = album.id AND tag_map.object_type='album' and $objType.id in $lid )"; + $sql = "SELECT DISTINCT tag.id, tag.name, tag_map.user, $objType.id as oid FROM tag, tag_map, song, artist, album WHERE " . + "tag_map.tag_id = tag.id AND ( (tag_map.object_type='$objType' AND $objType.id in $lid AND tag_map.object_id = $objType.id) $orsql) " . + "AND song.album = album.id AND song.artist = artist.id;"; +return array(); + $results = array(); + + $db_results = Dba::query($sql) or die(Dba::error()); + + while ($r = Dba::fetch_assoc($db_results)) { + $uid = intval($r['oid']); + $results[] = $r; + } + + //return self::filter_with_prefs($results); + return $results; + + } // get_man_tags + + /** + * get_object_tags + * Display all tags that apply to maching target type of the specified id + */ + public static function get_object_tags($type, $id) { + + if (!self::validate_type($type)) { return array(); } + + $sql = "SELECT DISTINCT `tag_map`.`id`, `tag`.`name`, `tag_map`.`user` FROM `tag` " . + "LEFT JOIN `tag_map` ON `tag_map`.`id`=`tag`.`map_id` " . + "LEFT JOIN `$type` ON `$type`.`id`=`tag_map`.`object_id` " . + "WHERE `tag_map`.`object_type`='$type'"; + + $results = array(); + $db_results = Dba::query($sql); + + while ($row = Dba::fetch_assoc($db_results)) { + $results[] = $row; + } + + return $results; + + } // get_object_tags + + /** + * filter_with_prefs + * This filters the tags based on the users preference + */ + public static function filter_with_prefs($l) { + + $colors = array('#0000FF', + '#00FF00', '#FFFF00', '#00FFFF','#FF00FF','#FF0000'); + $prefs = 'tag company'; +// $prefs = Config::get('tags_userlist'); + + $ulist = explode(' ', $prefs); + $req = ''; + + foreach($ulist as $i) { + $req .= "'" . Dba::escape($i) . "',"; + } + $req = rtrim($req, ','); + + $sql = 'SELECT `id`,`username` FROM `user` WHERE '; + + if ($prefs=='all') { + $sql .= '1'; + } + else { + $sql .= 'username in ('.$req.')'; + } + + $db_results = Dba::query($sql); + + $uids=array(); + $usernames = array(); + $p = 0; + while ($r = Dba::fetch_assoc($db_results)) { + $usernames[$r['id']] = $r['username']; + $uids[$r['id']] = $colors[$p]; + $p++; + if ($p == sizeof($colors)) { + $p = 0; + } + } + + $res = array(); + + foreach ($l as $i) { + if ($GLOBALS['user']->id == $i['user']) { + $res[] = $i; + } + elseif (isset($uids[$i['user']])) { + $i['color'] = $uids[$i['user']]; + $i['username'] = $usernames[$i['user']]; + $res[] = $i; + } + } + + return $res; + + } // filter_with_prefs + + /** + * validate_type + * This validates the type of the object the user wants to tag, we limit this to types + * we currently support + */ + public static function validate_type($type) { + + $valid_array = array('song','artist','album'); + + if (in_array($type,$valid_array)) { return true; } + + return false; + + } // validate_type + +} // end of TagCloud class +?> diff --git a/lib/class/tagcloud.class.php b/lib/class/tagcloud.class.php deleted file mode 100644 index 97beee09..00000000 --- a/lib/class/tagcloud.class.php +++ /dev/null @@ -1,178 +0,0 @@ -id; - - // Check if tag object exists - $sql = "SELECT tag.id from tag where name='$tagval'"; - $db_results = Dba::query($sql) ; - $ar = Dba::fetch_assoc($db_results); - - if (!sizeof($ar)) { - $sql = "INSERT into tag set name='$tagval'"; - $db_results = Dba::query($sql) ; - $sql = "SELECT tag.id from tag where name='$tagval'"; - - $db_results = Dba::query($sql); - $ar = Dba::fetch_assoc($db_results); - } - - $tid = $ar['id']; - $sql = "INSERT into tag_map set tag_id=$tid, user=$uid, object_type = '$objType', object_id=$id;"; - $db_results = Dba::query($sql) ;//or die(Dba::error()); - - } // add_tag - - /** - * show_tags - * Return all tags maching any object of type $objtype in list $id - */ - public static function get_tags($objType, $id) { - - if (!sizeof($id)) - return array(); - global $tag_cache; - $tag_cache = array(); - $lid = '(' . implode(',',$id) . ')'; - $orsql = ''; - if ($objType == 'artist' || $objType == 'album') - $orsql=" or (tag_map.object_id = song.id AND - tag_map.object_type='song' and song.$objType in $lid )"; - if ($objType == 'artist') - $orsql .= "or (tag_map.object_id = album.id AND - tag_map.object_type='album' and $objType.id in $lid )"; - $sql = "SELECT DISTINCT tag.id, tag.name, tag_map.user, $objType.id as oid - FROM tag, tag_map, song, artist, album WHERE - tag_map.tag_id = tag.id AND - ( (tag_map.object_type='$objType' AND - $objType.id in $lid AND - tag_map.object_id = $objType.id) $orsql) AND - song.album = album.id AND - song.artist = artist.id;"; - - $results = array(); - //var_dump($sql); - $db_results = Dba::query($sql) or die(Dba::error()); - while ($r = Dba::fetch_assoc($db_results)) { - $uid = intval($r['oid']); - $results[] = $r; - if (!isset($tag_cache[$uid])) - $tag_cache[$uid] = array(); - $tag_cache[$uid][] = $r; - } - return self::filter_with_prefs($results); - } - /** - * show_tagso - * Display all tags that apply to $objType objects maching - $restrictObjType == $id - */ - public static function get_tagso($objType, $restrictObjType, $id) { - $sql = "SELECT DISTINCT tag_map.id, tag.name, tag_map.user - FROM tag, tag_map, song, artist, album WHERE - tag_map.id = tag.map_id AND - tag_map.object_type='$objType' AND - $restrictObjType.id=$id AND - song.album = album.id AND - song.artist = artist.id;"; - //echo $sql . '
'; - $results = array(); - $db_results = Dba::query($sql) or die(Dba::error()); - while ($r = Dba::fetch_assoc($db_results)) { - $results[] = $r; - } - return $results; - } - - /** - * filter_with_prefs - * This filters the tags based on the users preference - */ - public static function filter_with_prefs($l) { - - $colors = array('#0000FF', - '#00FF00', '#FFFF00', '#00FFFF','#FF00FF','#FF0000'); - $prefs = 'tag company'; -// $prefs = Config::get('tags_userlist'); - - $ulist = explode(' ', $prefs); - $req = ''; - - foreach($ulist as $i) { - $req .= "'" . Dba::escape($i) . "',"; - } - $req = rtrim($req, ','); - - $sql = 'SELECT `id`,`username` FROM `user` WHERE '; - - if ($prefs=='all') { - $sql .= '1'; - } - else { - $sql .= 'username in ('.$req.')'; - } - - $db_results = Dba::query($sql); - - $uids=array(); - $usernames = array(); - $p = 0; - while ($r = Dba::fetch_assoc($db_results)) { - $usernames[$r['id']] = $r['username']; - $uids[$r['id']] = $colors[$p]; - $p++; - if ($p == sizeof($colors)) { - $p = 0; - } - } - - $res = array(); - - foreach ($l as $i) { - if ($GLOBALS['user']->id == $i['user']) { - $res[] = $i; - } - elseif (isset($uids[$i['user']])) { - $i['color'] = $uids[$i['user']]; - $i['username'] = $usernames[$i['user']]; - $res[] = $i; - } - } - - return $res; - - } // filter_with_prefs - -} // end of TagCloud class -?> -- cgit