diff options
author | z0rglub <z0rglub@piwigo.org> | 2003-07-26 09:28:58 +0000 |
---|---|---|
committer | z0rglub <z0rglub@piwigo.org> | 2003-07-26 09:28:58 +0000 |
commit | e1c6bb32bc52829b241cf9fd80bf0216935d3faf (patch) | |
tree | 08de698c08afe3523c8f18a97565c4e7338f7621 | |
parent | 5649720e235a2e2c2156ce412256faa615dbb233 (diff) |
instead of overriding individual keywords,\nyou can add a keyword to all or remove it from all
git-svn-id: http://piwigo.org/svn/trunk@40 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin/infos_images.php | 62 | ||||
-rw-r--r-- | language/francais.php | 3 | ||||
-rw-r--r-- | template/default/admin/infos_image.vtp | 10 |
3 files changed, 54 insertions, 21 deletions
diff --git a/admin/infos_images.php b/admin/infos_images.php index 62c09863f..42cb4b105 100644 --- a/admin/infos_images.php +++ b/admin/infos_images.php @@ -172,26 +172,52 @@ if ( isset( $page['cat'] ) ) echo $lang['err_date']; } } - if ( $_POST['use_common_keywords'] == 1 ) + if ( isset( $_POST['common_keywords'] ) and $_POST['keywords_cat'] != '' ) { - $keywords = get_keywords( $_POST['keywords_cat'] ); - $query = 'UPDATE '.PREFIX_TABLE.'images'; - if ( count( $keywords ) == 0 ) - { - $query.= ' SET keywords = NULL'; - } - else + $query = 'SELECT id,keywords'; + $query.= ' FROM '.PREFIX_TABLE.'images'; + $query.= ' WHERE cat_id = '.$page['cat']; + $query.= ';'; + $result = mysql_query( $query ); + while ( $row = mysql_fetch_array( $result ) ) { - $query.= ' SET keywords = "'; - foreach ( $keywords as $i => $keyword ) { - if ( $i > 0 ) $query.= ','; - $query.= $keyword; + $specific_keywords = explode( ',', $row['keywords'] ); + $common_keywords = get_keywords( $_POST['keywords_cat'] ); + // first possiblity : adding the given keywords to all the pictures + if ( $_POST['common_keywords'] == 'add' ) + { + $keywords = array_merge( $specific_keywords, $common_keywords ); + $keywords = array_unique( $keywords ); + } + // second possiblity : removing the given keywords from all pictures + // (without deleting the other specific keywords + if ( $_POST['common_keywords'] == 'remove' ) + { + $keywords = array_diff( $specific_keywords, $common_keywords ); + } + // cleaning the keywords array, sometimes, an empty value still remain + $keywords = array_remove( $keywords, '' ); + // updating the picture with new keywords array + $query = 'UPDATE '.PREFIX_TABLE.'images'; + $query.= ' SET keywords = '; + if ( count( $keywords ) == 0 ) + { + $query.= 'NULL'; } - $query.= '"'; + else + { + $query.= '"'; + $i = 0; + foreach ( $keywords as $keyword ) { + if ( $i++ > 0 ) $query.= ','; + $query.= $keyword; + } + $query.= '"'; + } + $query.= ' WHERE id = '.$row['id']; + $query.= ';'; + mysql_query( $query ); } - $query.= ' WHERE cat_id = '.$page['cat']; - $query.= ';'; - mysql_query( $query ); } //--------------------------------------------------------- form initialization $page['nb_image_page'] = 5; @@ -224,7 +250,9 @@ if ( isset( $page['cat'] ) ) $tpl = array( 'infoimage_general','author','infoimage_useforall','submit', 'infoimage_creation_date','infoimage_detailed','thumbnail', 'infoimage_title','infoimage_comment', - 'infoimage_creation_date','infoimage_keywords' ); + 'infoimage_creation_date','infoimage_keywords', + 'infoimage_addtoall','infoimage_removefromall', + 'infoimage_keyword_separation' ); templatize_array( $tpl, 'lang', $sub ); //------------------------------------------------------------------------ form $url = './admin.php?page=infos_images&cat_id='.$page['cat']; diff --git a/language/francais.php b/language/francais.php index d0d4b736f..c0ddce19d 100644 --- a/language/francais.php +++ b/language/francais.php @@ -496,6 +496,9 @@ if ( $isadmin ) // start version 1.3 // $lang['infoimage_err_date'] = 'date erron�e'; $lang['infoimage_keywords'] = 'mots-clefs'; + $lang['infoimage_keyword_separation'] = '(s�parer avec des ",")'; + $lang['infoimage_addtoall'] = 'ajouter � tous'; + $lang['infoimage_removefromall'] = 'retirer � tous'; // end version 1.3 $lang['infoimage_general'] = 'Options g�n�rale pour la cat�gorie'; $lang['infoimage_useforall'] = 'utiliser pour toutes les images ?'; diff --git a/template/default/admin/infos_image.vtp b/template/default/admin/infos_image.vtp index bd6aeea46..43aa194ac 100644 --- a/template/default/admin/infos_image.vtp +++ b/template/default/admin/infos_image.vtp @@ -27,14 +27,16 @@ </tr> <tr> <td> - <div style="margin-left:50px;">{#infoimage_keywords}</div> + <div style="margin-left:50px;">{#infoimage_keywords} {#infoimage_keyword_separation}</div> </td> <td style="text-align:center;"> - <input type="text" name="keywords_cat" value="" size="12" maxlength="255" /> + <input type="text" name="keywords_cat" value="" maxlength="255" /> </td> <td style="text-align:left;"> - <input type="checkbox" name="use_common_keywords" value="1" /> - {#infoimage_useforall} + <input type="radio" name="common_keywords" value="add" /> + {#infoimage_addtoall} + <input type="radio" name="common_keywords" value="remove" /> + {#infoimage_removefromall} </td> </tr> </table> |