aboutsummaryrefslogtreecommitdiffstats
path: root/admin/element_set_global.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-02 22:26:19 +0000
committerplegall <plg@piwigo.org>2006-04-02 22:26:19 +0000
commit42abf4c57664d2596872d437f70b95193f9a5d18 (patch)
treea1262b8601d5ac5b04b5b2e71af52c453712b9df /admin/element_set_global.php
parent68ed2ea617ede199a0e2f15fdd4886095ae600cb (diff)
improvement: tags replace keywords. Better data model, less
limitations. Each image can be associated to as many tag as needed. Tags can contain non ASCII characters. Oriented navigation with tags by association. git-svn-id: http://piwigo.org/svn/trunk@1119 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/element_set_global.php134
1 files changed, 42 insertions, 92 deletions
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 61ef2d6ee..f4b8aae2b 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -44,40 +44,6 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
check_status(ACCESS_ADMINISTRATOR);
// +-----------------------------------------------------------------------+
-// | functions |
-// +-----------------------------------------------------------------------+
-
-/**
- * returns the list of uniq keywords among given elements
- *
- * @param array element_ids
- */
-function get_elements_keywords($element_ids)
-{
- if (0 == count($element_ids))
- {
- return array();
- }
-
- $keywords = array();
-
- $query = '
-SELECT keywords
- FROM '.IMAGES_TABLE.'
- WHERE id IN ('.implode(',', $element_ids).')
-;';
- $result = pwg_query($query);
- while ($row = mysql_fetch_array($result))
- {
- if (isset($row['keywords']) and !empty($row['keywords']))
- {
- $keywords = array_merge($keywords, explode(',', $row['keywords']));
- }
- }
- return array_unique($keywords);
-}
-
-// +-----------------------------------------------------------------------+
// | global mode form submission |
// +-----------------------------------------------------------------------+
@@ -111,6 +77,22 @@ if (isset($_POST['submit']))
}
}
+ if (isset($_POST['add_tags']) and count($collection) > 0)
+ {
+ add_tags($_POST['add_tags'], $collection);
+ }
+
+ if (isset($_POST['del_tags']) and count($collection) > 0)
+ {
+ $query = '
+DELETE
+ FROM '.IMAGE_TAG_TABLE.'
+ WHERE image_id IN ('.implode(',', $collection).')
+ AND tag_id IN ('.implode(',', $_POST['del_tags']).')
+;';
+ pwg_query($query);
+ }
+
if ($_POST['associate'] != 0 and count($collection) > 0)
{
$datas = array();
@@ -192,11 +174,6 @@ DELETE
$datas = array();
$dbfields = array('primary' => array('id'), 'update' => array());
- if (!empty($_POST['add_keywords']) or $_POST['remove_keyword'] != '0')
- {
- array_push($dbfields['update'], 'keywords');
- }
-
$formfields = array('author', 'name', 'date_creation');
foreach ($formfields as $formfield)
{
@@ -210,7 +187,7 @@ DELETE
if (count($dbfields['update']) > 0 and count($collection) > 0)
{
$query = '
-SELECT id, keywords
+SELECT id
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $collection).')
;';
@@ -221,44 +198,6 @@ SELECT id, keywords
$data = array();
$data['id'] = $row['id'];
- if (!empty($_POST['add_keywords']))
- {
- $data['keywords'] =
- implode(
- ',',
- array_unique(
- array_merge(
- get_keywords(empty($row['keywords']) ? '' : $row['keywords']),
- get_keywords($_POST['add_keywords'])
- )
- )
- );
- }
-
- if ($_POST['remove_keyword'] != '0')
- {
- if (!isset($data['keywords']))
- {
- $data['keywords'] = empty($row['keywords']) ? '' : $row['keywords'];
- }
-
- $data['keywords'] =
- implode(
- ',',
- array_unique(
- array_diff(
- get_keywords($data['keywords']),
- array($_POST['remove_keyword'])
- )
- )
- );
-
- if ($data['keywords'] == '')
- {
- unset($data['keywords']);
- }
- }
-
if ('set' == $_POST['author_action'])
{
$data['author'] = $_POST['author'];
@@ -384,25 +323,36 @@ SELECT DISTINCT(category_id) AS id, c.name, uppercats, global_rank
display_select_cat_wrapper($query, array(), $blockname, true);
}
-$blockname = 'remove_keyword_option';
-
-$template->assign_block_vars(
- $blockname,
- array('VALUE'=> 0,
- 'OPTION' => '------------'
- ));
+// add tags
+$template->assign_vars(
+ array(
+ 'ADD_TAG_SELECTION' => get_html_tag_selection(get_all_tags(), 'add_tags'),
+ )
+ );
-$keywords = get_elements_keywords($page['cat_elements_id']);
+// remove tags
+$query = '
+SELECT tag_id, name, url_name, count(*) counter
+ FROM '.IMAGE_TAG_TABLE.'
+ INNER JOIN '.TAGS_TABLE.' ON tag_id = id
+ WHERE image_id IN ('.implode(',', $page['cat_elements_id']).')
+ GROUP BY tag_id
+ ORDER BY name ASC
+;';
+$result = pwg_query($query);
-foreach ($keywords as $keyword)
+$tags = array();
+while($row = mysql_fetch_array($result))
{
- $template->assign_block_vars(
- $blockname,
- array('VALUE'=> $keyword,
- 'OPTION' => $keyword
- ));
+ array_push($tags, $row);
}
+$template->assign_vars(
+ array(
+ 'DEL_TAG_SELECTION' => get_html_tag_selection($tags, 'del_tags'),
+ )
+ );
+
// creation date
$day =
empty($_POST['date_creation_day']) ? date('j') : $_POST['date_creation_day'];