Changeset 3708 for extensions/piclens
- Timestamp:
- Jul 30, 2009, 10:58:32 PM (15 years ago)
- Location:
- extensions/piclens
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/piclens/CHANGELOG
r3649 r3708 1 1 TODO for next versions : 2 - double select in administration page3 2 ------------- 3 - 4 4 5 5 6 6 Version 0.4.x 7 7 ------------- 8 0.4.1 --> Suppression render sur le commentaire (suppression des div) et l'auteur du commentaire 9 Ajout double select dans la page d'administration + jquery dans l'admin 10 Ajout compatibilité video wat.tv (plugin PY GVideo) 11 Correction lecture fichiers video (depuis cooliris 1.11) 12 Modifications %I2 pour définir le nom du fichier si le nom de l'image est absent 13 Suppression des slashes dans les zones 'name' et 'description' de config rss (page d'admin) 8 14 0.4.0 --> Changement methode pour parametrer les noms et decriptions des images 9 15 Ajout integration piclens sur les tags -
extensions/piclens/admin/piclenswallconfig.php
r3645 r3708 13 13 14 14 $template->set_filenames( 15 array('plugin_admin_content' => PICLENS_ROOT.'/admin/piclenswallconfig.tpl' 15 array('plugin_admin_content' => PICLENS_ROOT.'/admin/piclenswallconfig.tpl', 16 'double_select' => 'double_select.tpl' 16 17 ) ); 17 18 19 20 21 // Switch on right side (=> ) 22 if ( isset($_POST['falsify']) and !is_adviser() 23 and $_POST['from']=='wallcat' 24 and isset($_POST['cat_true']) and count($_POST['cat_true']) > 0) 25 { 26 foreach ($_POST['cat_true'] as $cat) 27 unset($me->my_config['piclens_wall_categories'][array_search($cat,$me->my_config['piclens_wall_categories'])]); 28 29 $me->save_config(); 30 31 } 32 // Switch on left side ( <=) 33 if ( isset($_POST['trueify']) and !is_adviser() 34 and $_POST['from']=='wallcat' 35 and isset($_POST['cat_false']) and count($_POST['cat_false']) > 0) 36 { 37 38 $query = ' 39 SELECT id, name, uppercats, global_rank 40 FROM '.CATEGORIES_TABLE. 41 ' WHERE id IN ("'.implode('","', $_POST['cat_false']).'");'; 42 43 $result = pwg_query($query); 44 $categories = array(); 45 if (!empty($result)) 46 { 47 while ($row = mysql_fetch_assoc($result)) 48 array_push($categories, $row); 49 } 50 usort($categories, 'global_rank_compare'); 51 52 if (!empty($result)) 53 { 54 foreach ($categories as $cat) 55 { 56 array_push($me->my_config['piclens_wall_categories'], $cat['id']); 57 } 58 } 59 60 $me->save_config(); 61 } 18 62 19 63 … … 22 66 $me->my_config['piclens_wall_title'] = $_POST['piclens_wall_title']; 23 67 $me->my_config['piclens_wall_height'] = $_POST['piclens_wall_height']; 24 $me->my_config['piclens_wall_categories'] = isset($_POST['categories']) ?25 array_map("mysql_escape_string", $_POST['categories']) :26 array();27 68 28 69 $me->my_config['piclens_wall_nav'] = isset($_POST['piclens_wall_nav']); … … 68 109 FROM '.CATEGORIES_TABLE.';'; 69 110 70 display_select_cat_wrapper($query, 71 $me->my_config['piclens_wall_categories'], 72 'categories', 73 true); 74 75 display_select_cat_wrapper($query, 111 display_select_cat_wrapper($query, 76 112 $me->my_config['piclens_wall_cat_nav_replace'], 77 113 'categories_nav', 78 114 true); 79 115 80 116 117 // Test double select wall categories 118 // Categories non prises en compte 119 $query = ' 120 SELECT id, name, uppercats, global_rank 121 FROM '.CATEGORIES_TABLE. 122 ' WHERE id not IN ("'.implode('","', $me->my_config['piclens_wall_categories']).'");'; 123 124 $result = pwg_query($query); 125 $categories = array(); 126 if (!empty($result)) 127 { 128 while ($row = mysql_fetch_assoc($result)) 129 array_push($categories, $row); 130 } 131 usort($categories, 'global_rank_compare'); 132 133 $tpl = array(); 134 if (!empty($result)) 135 { 136 foreach ($categories as $cat) 137 { 138 $tpl[$cat['id']] = get_cat_display_name_cache($cat['uppercats'], 139 null, 140 false); 141 142 } 143 } 144 $template->assign( 'category_option_false', $tpl); 145 $template->assign( 'category_option_false_selected', array()); 146 147 148 149 150 // Categories prises en compte 151 152 $query = ' 153 SELECT id, name, uppercats, global_rank 154 FROM '.CATEGORIES_TABLE. 155 ' WHERE id IN ("'.implode('","', $me->my_config['piclens_wall_categories']).'");'; 156 157 $result = pwg_query($query); 158 $categories = array(); 159 if (!empty($result)) 160 { 161 while ($row = mysql_fetch_assoc($result)) 162 array_push($categories, $row); 163 } 164 usort($categories, 'global_rank_compare'); 165 $tpl2 = array(); 166 if (!empty($result)) 167 { 168 foreach ($categories as $cat) 169 { 170 $tpl2[$cat['id']] = get_cat_display_name_cache($cat['uppercats'], 171 null, 172 false); 173 174 } 175 } 176 $template->assign( 'category_option_true', $tpl2); 177 $template->assign( 'category_option_true_selected', array()); 178 179 180 $template->assign(Array( 181 'F_ACTION' => '', 182 'L_CAT_OPTIONS_TRUE' => l10n('SelectedCat'), 183 'L_CAT_OPTIONS_FALSE' => l10n('NonSelectedCat'), 184 )); 81 185 82 186 … … 104 208 )); 105 209 210 $template->assign_var_from_handle('DOUBLE_SELECT', 'double_select'); 106 211 $template->assign_var_from_handle( 'ADMIN_CONTENT', 'plugin_admin_content'); 107 212 -
extensions/piclens/admin/piclenswallconfig.tpl
r3637 r3708 82 82 <td><input type="text" size="3" maxlength="3" value="{$PICLENS_WALL_HEIGHT}" name="piclens_wall_height"> px</td> 83 83 </tr> 84 <br> 84 <tr> 85 <td colspan="2"><br> </td> 86 </tr> 85 87 <tr> 86 88 <td align="right">{'piclens_wallcfg_param'|@translate} </td> … … 95 97 </tr> 96 98 <TR> 97 <td align="right">{'piclens_wallcfg_cat'|@translate} </td> 98 <td align="center"> 99 <select class="categoryList" name="categories[]" multiple="multiple" size="30"> 100 {html_options options=$categories selected=$categories_selected value=$categories_value} 101 </select> 99 <td align="center" colspan="2"> 100 <div id="cat_select0"> 101 <b><u>{'piclens_wallcfg_cat'|@translate} </u></b> 102 </div> 103 </td> 104 </tr> 105 <tr> 106 <td colspan="2"> 107 <div id="cat_select"> 108 {$DOUBLE_SELECT} 109 <div><input type="hidden" name="from" value="wallcat" /></div> 110 </div> 102 111 </td> 103 112 </tr> … … 116 125 </TD> 117 126 </TR> 118 <TR >127 <TR class="cat_replace" style="display:none;"> 119 128 <td align="right">{'piclens_wallcfg_cat_nav1'|@translate} </td> 120 129 <td align="center"> 121 <select class="categoryList " name="categories_nav[]" multiple="multiple" size="30">130 <select class="categoryList1" name="categories_nav[]" multiple="multiple" size="10" style="width:300px"> 122 131 {html_options options=$categories_nav selected=$categories_nav_selected value=$categories_nav_value} 123 132 </select> … … 129 138 - <input type="checkbox" name="piclens_wall_spec" {$PICLENS_WALL_SPEC}/> {'piclens_wallcfg_spec_nav'|@translate} 130 139 </TD> 131 <TD align="rignt">140 <TD class="spec_selection" style="display:none;" align="rignt"> 132 141 <input type="checkbox" name="piclens_wall_spec_favorites" {$PICLENS_WALL_SPEC_FAVORITES}/> {'piclens_favorites_label'|@translate} 133 142 <br/> … … 148 157 {literal} 149 158 <script type="text/javascript"> 150 jQuery().ready(function(){ 151 // Resize possible for categories selection 152 jQuery('.categoryList').resizable({ 159 resize = false; 160 function show_cat_list() 161 { 162 jQuery('.cat_replace').show(); 163 if (!resize) 164 { 165 resize = true; 166 jQuery('.categoryList1').resizable({ 153 167 handles: "all", 154 168 animate: true, … … 160 174 ghost: true 161 175 }); 176 } 177 } 178 179 function hide_cat_list() 180 { 181 jQuery('.cat_replace').hide(); 182 } 183 184 185 jQuery().ready( function () { 186 jQuery("input[name='piclens_wall_nav']").click( function() { 187 if (this.checked) 188 { 189 show_cat_list(); 190 } 191 else 192 { 193 hide_cat_list(); 194 } 162 195 }); 196 jQuery("input[name='piclens_wall_spec']").click( function() { 197 if (this.checked) 198 { 199 jQuery('.spec_selection').show(); 200 } 201 else 202 { 203 jQuery('.spec_selection').hide(); 204 } 205 }); 206 207 }); 208 209 if (document.getElementsByName("piclens_wall_nav")[0].checked) 210 { 211 show_cat_list(); 212 } 213 if (document.getElementsByName("piclens_wall_spec")[0].checked) 214 { 215 jQuery('.spec_selection').show(); 216 } 217 163 218 </script> 164 219 {/literal} -
extensions/piclens/admin/rssfeed.php
r3649 r3708 49 49 $me->my_config['piclens_sort_cat'] = 1; // defaut PIWIGO 50 50 51 $me->my_config['piclens_rss_name'] = $_POST['piclens_rss_name'];52 $me->my_config['piclens_rss_desc'] = $_POST['piclens_rss_desc'];51 $me->my_config['piclens_rss_name'] = stripslashes($_POST['piclens_rss_name']); 52 $me->my_config['piclens_rss_desc'] = stripslashes($_POST['piclens_rss_desc']); 53 53 $me->my_config['piclens_exclude_double'] = isset($_POST['piclens_exclude_double']); 54 54 $me->my_config['piclens_maxcomment_nb'] = $_POST['piclens_maxcomment_nb']; … … 138 138 'PICLENS_VIDEO' => $me->my_config['piclens_video'] ? 'checked="checked"' : '', 139 139 'PICLENS_CAT_VIEW' => $me->my_config['piclens_cat_view'] ? 'checked="checked"' : '', 140 'PICLENS_RSS_NAME' => $me->my_config['piclens_rss_name'],141 'PICLENS_RSS_DESC' => $me->my_config['piclens_rss_desc'],140 'PICLENS_RSS_NAME' => stripslashes($me->my_config['piclens_rss_name']), 141 'PICLENS_RSS_DESC' => stripslashes($me->my_config['piclens_rss_desc']), 142 142 'PICLENS_EXCLUDE_DOUBLE' => $me->my_config['piclens_exclude_double'] ? 'checked="checked"' : '', 143 143 'PICLENS_MAXCOMMENT_NB' => $me->my_config['piclens_maxcomment_nb'], -
extensions/piclens/admin/rssfeed.tpl
r3649 r3708 227 227 <tr> 228 228 <td>{'piclens_rsscfg_name'|@translate} :</td> 229 <td><input type="text" size="65" maxlength="255" value="{$PICLENS_RSS_NAME}" name="piclens_rss_name" /></td> 229 <td> 230 <textarea cols="50" rows="1" name="piclens_rss_name" id="piclens_rss_name" style="height: 2em">{$PICLENS_RSS_NAME}</textarea> 231 </td> 230 232 </tr> 231 233 <tr> 232 234 <td>{'piclens_rsscfg_desc'|@translate} :</td> 233 <td><input type="text" size="65" maxlength="255" value="{$PICLENS_RSS_DESC}" name="piclens_rss_desc" /></td> 235 <td> 236 <textarea cols="50" rows="1" name="piclens_rss_desc" id="piclens_rss_desc" style="height: 2em">{$PICLENS_RSS_DESC}</textarea> 237 </td> 234 238 </tr> 235 239 -
extensions/piclens/generate_rss.php
r3650 r3708 19 19 20 20 // extensions video 21 $py_addext = array("gvideo", "dm", "ytube", "wideo", "vimeo" );21 $py_addext = array("gvideo", "dm", "ytube", "wideo", "vimeo", "wat"); 22 22 $video_ext_piclens = array("flv"); 23 23 … … 654 654 { 655 655 case "dm" : 656 echo "< enclosureurl=\"http://www.dailymotion.com/swf/".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n";656 echo "<<media:content url=\"http://www.dailymotion.com/swf/".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n"; 657 657 break; 658 658 case "ytube": 659 echo "< enclosureurl=\"http://youtube.com/v/".$sp[0].".swf\" type=\"application/x-shockwave-flash\" />\n";659 echo "<media:content url=\"http://youtube.com/v/".$sp[0].".swf\" type=\"application/x-shockwave-flash\" />\n"; 660 660 break; 661 661 case "wideo": 662 echo "< enclosureurl=\"http://www.kewego.com/swf/p3/epix.swf?language_code=fr&playerKey=0df9b773a15b&skinKey=7109c4112f57&sig=".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n";662 echo "<<media:content url=\"http://www.kewego.com/swf/p3/epix.swf?language_code=fr&playerKey=0df9b773a15b&skinKey=7109c4112f57&sig=".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n"; 663 663 break; 664 664 case "gvideo": 665 echo "< enclosureurl=\"http://video.google.com/googleplayer.swf?docid=".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n";665 echo "<<media:content url=\"http://video.google.com/googleplayer.swf?docid=".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n"; 666 666 break; 667 667 case "vimeo": 668 echo "<enclosure url=\"http://vimeo.com/moogaloop.swf?clip_id=".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n"; 668 echo "<<media:content url=\"http://vimeo.com/moogaloop.swf?clip_id=".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n"; 669 break; 670 case "wat": 671 echo "<media:content url=\"http://www.wat.tv/swf2/".$sp[0]."\" type=\"application/x-shockwave-flash\" />\n"; 669 672 break; 670 673 } … … 733 736 // Format : "Commentaire (Utilisateur - Date)" 734 737 $commentstring .= ($first ? '' : " / \n") 735 .trigger_event('render_comment_content',$row['content']) 736 .' ('. trigger_event('render_comment_author', 737 empty($row['author']) 738 // .trigger_event('render_comment_content',$row['content']) 739 .empty($row['content']) ? '': $row['content'] 740 // .' ('. trigger_event('render_comment_author', 741 .(empty($row['author']) 738 742 ? l10n('guest') 739 743 : $row['author']) -
extensions/piclens/include/config_param.inc.php
r3645 r3708 6 6 // Fichier contenant les parametres du plugin (pour le parser) 7 7 8 if ( isset($row['file']) ) { 9 $file_wo_ext = get_filename_wo_extension($row['file']); 10 $file_wo_ext = str_replace('_', ' ', $file_wo_ext); 11 } else{ 12 $file_wo_ext = ''; 13 } 14 8 15 $piclens_parse = array( 9 16 // '%I0' => isset($row['id']) ? get_thumbnail_title($row) : '', … … 12 19 ($plugins_ExtendedDesc ? trigger_event('render_element_description',$row['name']) 13 20 : $row['name']) 14 : '',21 : $file_wo_ext , 15 22 '%I3' => isset($row['comment']) ? 16 23 ($plugins_ExtendedDesc ? trigger_event('render_element_description',$row['comment']) -
extensions/piclens/language/en_UK/plugin.lang.php
r3649 r3708 208 208 $lang['piclens_rsscfg_exclude_double'] = 'Suppress double picture in the feed (same path)'; 209 209 $lang['piclens_rss_icon'] = 'URL for Cooliris feed Icon'; 210 211 $lang['SelectedCat'] = 'Selected Categories'; 212 $lang['NonSelectedCat'] = 'Categories not selected'; 210 213 ?> -
extensions/piclens/language/es_ES/plugin.lang.php
r3649 r3708 214 214 $lang['piclens_rsscfg_exclude_double'] = 'Supresión de los doblones de imagen en el flujo (el mismo repertorio de acceso)'; 215 215 $lang['piclens_rss_icon'] = 'URL de la alimentación en el icono de Cooliris'; 216 217 $lang['SelectedCat'] = 'Categorías seleccionadas'; 218 $lang['NonSelectedCat'] = 'Categorías no seleccionados'; 216 219 ?> -
extensions/piclens/language/fr_FR/plugin.lang.php
r3649 r3708 210 210 $lang['piclens_rsscfg_exclude_double'] = 'Suppression des doublons d\'image dans le flux (même répertoire d\'accès)'; 211 211 $lang['piclens_rss_icon'] = 'URL de l\'icone du flux dans Cooliris'; 212 213 $lang['SelectedCat'] = 'Catégories sélectionnées'; 214 $lang['NonSelectedCat'] = 'Catégories non sélectionnées'; 212 215 ?> -
extensions/piclens/language/it_IT/plugin.lang.php
r3678 r3708 210 210 $lang['piclens_rsscfg_exclude_double'] = 'Soppressione delle doppie immagini nel flusso (stessa directory d\'accesso)'; 211 211 $lang['piclens_rss_icon'] = 'URL dell\'icona del flusso in Cooliris'; 212 213 $lang['SelectedCat'] = 'Categorie selezionate'; 214 $lang['NonSelectedCat'] = 'Categorie non selezionati'; 212 215 ?> -
extensions/piclens/language/zh_CN/plugin.lang.php
r3649 r3708 207 207 $lang['piclens_tags_label'] = '标签'; 208 208 $lang['piclens_rsscfg_exclude_double'] = '在RSS订阅里禁止重复图片 (相同的路径)'; 209 //TO DO 210 $lang['piclens_rss_icon'] = 'URL for Cooliris feed Icon'; 209 $lang['piclens_rss_icon'] = '网址Cooliris饲料图示'; 210 211 $lang['SelectedCat'] = '选择类别'; 212 $lang['NonSelectedCat'] = '类别未选中'; 211 213 ?> -
extensions/piclens/main.inc.php
r3645 r3708 2 2 /* 3 3 * Plugin Name: CoolIris-Piclens 4 * Version: 0.4. 04 * Version: 0.4.1 5 5 * Description: Cooliris/Piclens activation 6 * Plugin URI: http:// fr.piwigo.org/ext/extension_view.php?eid=2346 * Plugin URI: http://piwigo.org/ext/extension_view.php?eid=234 7 7 * Author: Tiico 8 8 * Author URI:
Note: See TracChangeset
for help on using the changeset viewer.