Changeset 27027 for extensions/ExtendedDescription
- Timestamp:
- Jan 28, 2014, 11:42:57 AM (10 years ago)
- Location:
- extensions/ExtendedDescription/include
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/ExtendedDescription/include/events.inc.php
r26424 r27027 129 129 130 130 // [cat=xx] 131 $patterns[] = '#\[cat=(\d*)\]#ie';132 $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_cat_thumb("$1")';133 134 131 // [img=xx.yy,xx.yy,xx.yy;left|right|;name|titleName|] 135 $patterns[] = '#\[img([^\]]*)\]#ie';136 $replacements[] = ($param == 'subcatify_category_description') ? '' : '[img] must be replaced by [photo]';137 138 132 // [photo id=xx album=yy size=SQ|TH|XXS|XS|S|M|L|XL|XXL html=yes|no link=yes|no] 139 $patterns[] = '#\[photo ([^\]]+)\]#ie';140 $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_photo_sized("$1")';141 142 133 // [random album=xx size=SQ|TH|XXS|XS|S|M|L|XL|XXL html=yes|no link=yes|no] 143 $patterns[] = '#\[random([^\]]*)\]#ie';144 $replacements[] = ($param == 'subcatify_category_description') ? '' : 'extdesc_get_random_photo("$1")';145 146 134 // [slider album=xx nb_images=yy random=yes|no list=aa,bb,cc size=SQ|TH|XXS|XS|S|M|L|XL|XXL speed=z title=yes|no effect=... arrows=yes|no control=yes|no|thumb elastic=yes|no thumbs_size=dd] 147 $patterns[] = '#\[slider ([^\]]+)\]#ie'; 148 $replacements[] = ($param == 'subcatify_category_description') ? '' : 'get_slider("$1")'; 135 $generic_pattern = '#\[(cat=|img|photo|random|slider)([^\]]*)\]#i'; 149 136 150 137 // <!--complete-->, <!--more--> et <!--up-down--> … … 153 140 case 'subcatify_category_description' : 154 141 $patterns[] = '#^(.*?)(' . preg_quote($conf['ExtendedDescription']['complete']) . '|' . preg_quote($conf['ExtendedDescription']['more']) . '|' . preg_quote($conf['ExtendedDescription']['up-down']) . ').*$#is'; 155 $replacement s[]= '$1';142 $replacement = '$1'; 156 143 $desc = preg_replace($patterns, $replacements, $desc); 144 $desc = preg_replace($generic_pattern, '', $desc); 157 145 break; 158 146 … … 161 149 $replacements[] = ''; 162 150 $desc = preg_replace($patterns, $replacements, $desc); 151 $desc = preg_replace_callback($generic_pattern, 'extended_desc_generic_callback', $desc); 163 152 164 153 if (substr_count($desc, $conf['ExtendedDescription']['up-down'])) … … 170 159 171 160 default: 172 $desc = preg_replace ($patterns, $replacements, $desc);161 $desc = preg_replace_callback($generic_pattern, 'extended_desc_generic_callback', $desc); 173 162 } 174 163 … … 176 165 } 177 166 167 function extended_desc_generic_callback($matches) 168 { 169 switch ($matches[1]) 170 { 171 case 'cat=': 172 return get_cat_thumb($matches[2]); 173 break; 174 175 case 'img': 176 return '[img] must be replaced by [photo]'; 177 break; 178 179 case 'photo': 180 return get_photo_sized($matches[2]); 181 break; 182 183 case 'random': 184 return extdesc_get_random_photo($matches[2]); 185 break; 186 187 case 'slider': 188 return get_slider($matches[2]); 189 break; 190 } 191 } 192 178 193 /** 179 194 * Parse ED tags on NBM mail … … 195 210 global $template, $conf; 196 211 197 $template->concat('PLUGIN_INDEX_CONTENT_END', ' 198 <div class="additional_info"> 199 ' . $conf['ExtendedDescription']['bottom_comment'] . ' 200 </div>'); 212 if (!empty($conf['ExtendedDescription']['bottom_comment'])) 213 { 214 $template->concat('PLUGIN_INDEX_CONTENT_END', ' 215 <div class="additional_info"> 216 ' . $conf['ExtendedDescription']['bottom_comment'] . ' 217 </div>' 218 ); 219 } 201 220 } 202 221 -
extensions/ExtendedDescription/include/functions.inc.php
r26424 r27027 8 8 { 9 9 global $template, $user; 10 11 $elem_id = intval($elem_id); 12 if ($elem_id<=0) 13 { 14 return ''; 15 } 10 16 11 17 $query = ' … … 193 199 if (empty($params['album'])) 194 200 { 195 $query 201 $query.= ' 196 202 WHERE 1=1 ' 197 203 .get_sql_condition_FandF(array(
Note: See TracChangeset
for help on using the changeset viewer.