Changeset 4428
- Timestamp:
- Dec 5, 2009, 4:17:17 PM (14 years ago)
- Location:
- extensions/ConcoursPhoto
- Files:
-
- 13 edited
-
admin/admin.php (modified) (1 diff)
-
admin/audit.php (modified) (3 diffs)
-
admin/params.php (modified) (2 diffs)
-
admin/template/add_concours.tpl (modified) (2 diffs)
-
admin/template/audit.tpl (modified) (1 diff)
-
admin/template/config.tpl (modified) (2 diffs)
-
admin/template/manage.tpl (modified) (4 diffs)
-
admin/template/params.tpl (modified) (1 diff)
-
include/Concours.class.php (modified) (9 diffs)
-
include/default_values.inc.php (modified) (1 diff)
-
language/fr_FR/plugin.lang.php (modified) (3 diffs)
-
main.inc.php (modified) (1 diff)
-
publish.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/ConcoursPhoto/admin/admin.php
r4368 r4428 35 35 $my_base_url.'&tab=params'); 36 36 37 $tabsheet->add('audit',37 /*$tabsheet->add('audit', 38 38 l10n('concours_audit'), 39 39 $my_base_url.'&tab=audit'); 40 40 */ 41 41 $tabsheet->select($page['tab']); 42 42 $tabsheet->assign(); 43 43 44 44 45 -
extensions/ConcoursPhoto/admin/audit.php
r4370 r4428 11 11 global $template; 12 12 13 14 if (isset($_POST['user_list'])) 15 $user_id = $_POST['user_list']; 16 else 17 $user_id = 0; 18 19 //echo "USER_ID=".$user_id; 20 13 21 // Get the concours id if present 14 22 if (isset($_GET['concours'])) … … 18 26 $concours = new Concours($concours_id); 19 27 28 // Get group authorized to participate 29 $users = array(); // contain {id;username} or each 30 $groups = $concours->concours_infos['groups']; 31 $query = 'SELECT user_id, username FROM ' . USER_GROUP_TABLE 32 .' INNER JOIN ' . USERS_TABLE .' ON id = user_id' 33 .($groups != NULL ? ' WHERE group_id = '.$groups : '') 34 .' ORDER BY username ASC' 35 .';'; 36 if ($concours->debug) echo $query."\n"; 37 $result = pwg_query($query); 38 while ($row = mysql_fetch_assoc($result)) 39 { 40 array_push($users, $row); 41 } 42 43 // Add user list 44 $template->append('user_list', 45 array( 'ID' => '0', 46 'NAME' => l10n('all_users'), 47 'SELECTED' => ($user_id == 0 ? 'selected' : ''))); 48 49 foreach ( $users as $userid ) //on parcours le tableau 50 { 51 $template->append('user_list', 52 array( 'ID' => $userid['user_id'], 53 'NAME' => $userid['username'], 54 'SELECTED' => ($user_id == $userid['user_id'] ? 'selected' : ''))); 55 } 56 57 20 58 // Send concours info to template 21 59 $template->assign( 'CONCOURS', array( … … 147 185 $user_note = array(); 148 186 $globalnote = 0; 149 if ( isset($_GET['user_id'])) // for user150 { 151 $globalnote = $concours->get_img_globalnote_user($row['id'], $concours_id, $ _GET['user_id']);152 $user_note = $concours->get_img_note_user($row['id'], $concours_id, $ _GET['user_id']);187 if ($user_id != 0) // for user 188 { 189 $globalnote = $concours->get_img_globalnote_user($row['id'], $concours_id, $user_id); 190 $user_note = $concours->get_img_note_user($row['id'], $concours_id, $user_id); 153 191 } 154 192 else // global -
extensions/ConcoursPhoto/admin/params.php
r4260 r4428 15 15 $concours->my_config['mask_author'] = isset($_POST['mask_author']); 16 16 $concours->my_config['thumb_note'] = isset($_POST['thumb_note']); 17 $concours->my_config['mask_exif'] = isset($_POST['mask_exif']); 17 18 18 19 $concours->save_config(); … … 30 31 'MASK_AUTHOR' => ($concours->my_config['mask_author'] ? 'checked="checked"' : ''), 31 32 'THUMB_NOTE' => ($concours->my_config['thumb_note'] ? 'checked="checked"' : ''), 33 'MASK_EXIF' => ($concours->my_config['mask_exif'] ? 'checked="checked"' : ''), 32 34 )); 33 35 -
extensions/ConcoursPhoto/admin/template/add_concours.tpl
r4368 r4428 182 182 <fieldset> 183 183 <legend>{'concours_criterias'|@translate}</legend> 184 <tableborder="1">185 <tr>186 <t d><b>{'concours_id'|@translate}</b></td>187 <t d><b>{'concours_name'|@translate}</b></td>188 <t d width="50%"><b>{'concours_descr'|@translate}</b></td>189 <t d><b>{'concours_min_value'|@translate}</b></td>190 <t d><b>{'concours_max_value'|@translate}</b></td>191 <t d><b>{'concours_coef'|@translate}</b></td>184 <table class="table2 littlefont" id="criteria_list" border="1"> 185 <tr class="throw"> 186 <th><b>{'concours_id2'|@translate}</b></td> 187 <th><b>{'concours_name'|@translate}</b></td> 188 <th><b>{'concours_descr'|@translate}</b></td> 189 <th><b>{'concours_min_value'|@translate}</b></td> 190 <th><b>{'concours_max_value'|@translate}</b></td> 191 <th><b>{'concours_coef'|@translate}</b></td> 192 192 {if $action != 'edit'} 193 <t d width="10%"><b>{'concours_actions'|@translate}</b></td>193 <th colspan="3"><b>{'concours_actions'|@translate}</b></td> 194 194 {/if} 195 195 </tr> 196 196 {foreach from=$concours_criteria item=concours_criteria} 197 <tr>197 <tr class="TableRow" style="cursor:pointer;"> 198 198 <td>{$concours_criteria.id}</td> 199 199 <td> … … 214 214 {if $action != 'edit'} 215 215 <td> 216 {if $concours_criteria.level == 1} 217 <a href="{$concours_criteria.U_ADD}" title="{'subcriteria_add'|@translate}" ><img src="{$IMG_URL}add.png" class="button" alt="{'subcriteria_add'|@translate}" /></a> 218 {/if} 219 </td> 220 <td> 216 221 {if isset($concours_criteria.U_EDIT)} 217 222 <a href="{$concours_criteria.U_EDIT}" title="{'criteria_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'criteria_edit'|@translate}"/></a> 218 223 219 224 {/if} 225 </td> 226 <td> 220 227 {if isset($concours_criteria.U_DELETE)} 221 228 <a href="{$concours_criteria.U_DELETE}" title="{'criteria_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" alt="{'criteria_delete'|@translate}" /></a> 222 {/if}223 {if $concours_criteria.level == 1}224 <a href="{$concours_criteria.U_ADD}" title="{'subcriteria_add'|@translate}" ><img src="{$IMG_URL}add.png" class="button" alt="{'subcriteria_add'|@translate}" /></a>225 229 {/if} 226 230 </td> -
extensions/ConcoursPhoto/admin/template/audit.tpl
r4372 r4428 17 17 </table> 18 18 </fieldset> 19 <form method="post" action="" class="properties" ENCTYPE="multipart/form-data"> 20 {'concours_username_selection'|@translate} : </b> 21 <select name="user_list"> 22 {foreach from=$user_list item=user_list} 23 <option value="{$user_list.ID}" {$user_list.SELECTED}>{$user_list.NAME}</option> 24 {/foreach} 25 </select> 26 <input type="submit" name="Submit" value="{'Submit'|@translate}" /> 27 </form> 19 28 <table align="left"> 20 29 <tr><td colspan="4"><br></td></tr> -
extensions/ConcoursPhoto/admin/template/config.tpl
r3905 r4428 9 9 <legend>{'default_criteria'|@translate}</legend> 10 10 11 <tableborder="1">12 <tr>13 <t d><b>{'concours_id'|@translate}</b></td>14 <t d><b>{'concours_name'|@translate}</b></td>15 <t d width="50%"><b>{'concours_descr'|@translate}</b></td>16 <t d><b>{'concours_min_value'|@translate}</b></td>17 <t d><b>{'concours_max_value'|@translate}</b></td>18 <t d><b>{'concours_coef'|@translate}</b></td>19 <t d width="10%"><b>{'concours_actions'|@translate}</b></td>11 <table class="table2 littlefont" id="criteria_default" border="1"> 12 <tr class="throw"> 13 <th><b>{'concours_id2'|@translate}</b></td> 14 <th><b>{'concours_name'|@translate}</b></td> 15 <th><b>{'concours_descr'|@translate}</b></td> 16 <th><b>{'concours_min_value'|@translate}</b></td> 17 <th><b>{'concours_max_value'|@translate}</b></td> 18 <th><b>{'concours_coef'|@translate}</b></td> 19 <th colspan="3"><b>{'concours_actions'|@translate}</b></td> 20 20 </tr> 21 21 {foreach from=$concours_criteria item=concours_criteria} 22 <tr>22 <tr class="TableRow" style="cursor:pointer;"> 23 23 <td>{$concours_criteria.id}</td> 24 24 <td> … … 38 38 {/if} 39 39 <td> 40 {if $concours_criteria.level == 1} 41 <a href="{$concours_criteria.U_ADD}" title="{'subcriteria_add'|@translate}" ><img src="{$IMG_URL}add.png" class="button" alt="{'subcriteria_add'|@translate}" /></a> 42 {/if} 43 </td> 44 <td> 40 45 {if isset($concours_criteria.U_EDIT)} 41 46 <a href="{$concours_criteria.U_EDIT}" title="{'criteria_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'criteria_edit'|@translate}"/></a> 42 47 43 48 {/if} 49 </td> 50 <td> 44 51 {if isset($concours_criteria.U_DELETE)} 45 52 <a href="{$concours_criteria.U_DELETE}" title="{'criteria_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" alt="{'criteria_delete'|@translate}" /></a> 46 {/if}47 {if $concours_criteria.level == 1}48 <a href="{$concours_criteria.U_ADD}" title="{'subcriteria_add'|@translate}" ><img src="{$IMG_URL}add.png" class="button" alt="{'subcriteria_add'|@translate}" /></a>49 53 {/if} 50 54 </td> -
extensions/ConcoursPhoto/admin/template/manage.tpl
r4369 r4428 11 11 <fieldset> 12 12 <legend>{'prepared_concours'|@translate}</legend> 13 <table border="1"> 14 <tr> 13 {if isset($prepared_concours)} 14 <table class="table2 littlefont" id="pconcours_list" border="1"> 15 16 <tr class="throw"> 15 17 <th><b>{'concours_id2'|@translate}</b></th> 16 18 <th><b>{'concours_name'|@translate}</b></th> 17 19 <th><b>{'concours_create_date'|@translate}</b></th> 18 <th width="50%"><b>{'concours_descr'|@translate}</b></th>20 <th><b>{'concours_descr'|@translate}</b></th> 19 21 <th><b>{'concours_begin_date'|@translate}</b></th> 20 22 <th><b>{'concours_end_date'|@translate}</b></th> 21 <th width="10%"><b>{'concours_actions'|@translate}</b></th>23 <th colspan="4"><b>{'concours_actions'|@translate}</b></th> 22 24 </tr> 23 25 {foreach from=$prepared_concours item=prepared_concours} 24 <tr>26 <tr class="TableRow" style="cursor:pointer;"> 25 27 <td>{$prepared_concours.ID}</td> 26 28 <td>{$prepared_concours.NAME}</td> … … 29 31 <td>{$prepared_concours.BEGIN_DATE}</td> 30 32 <td>{$prepared_concours.END_DATE}</td> 31 <td><a href="{$prepared_concours.U_EDIT}" title="{'concours_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'concours_edit'|@translate}"/></a> 32 <a href="{$prepared_concours.U_DELETE}" title="{'concours_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'concours_delete'|@translate}" /></a>33 33 <td><a href="{$prepared_concours.U_EDIT}" title="{'concours_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'concours_edit'|@translate}"/></a></td> 34 <td><a href="{$prepared_concours.U_DELETE}" title="{'concours_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'concours_delete'|@translate}" /></a></td> 35 <td colspan="2"></td> 34 36 </tr> 35 37 {/foreach} 36 38 </table> 39 {else} 40 <b>{'NO_concours'|@translate}</b> 41 {/if} 37 42 </fieldset> 38 43 39 44 <fieldset> 40 45 <legend>{'active_concours'|@translate}</legend> 41 <table border="1"> 42 <tr> 46 {if isset($active_concours)} 47 <table class="table2 littlefont" id="aconcours_list" border="1"> 48 <tr class="throw"> 43 49 <th><b>{'concours_id2'|@translate}</b></th> 44 50 <th><b>{'concours_name'|@translate}</b></th> 45 51 <th><b>{'concours_create_date'|@translate}</b></th> 46 <th width="50%"><b>{'concours_descr'|@translate}</b></th>52 <th><b>{'concours_descr'|@translate}</b></th> 47 53 <th><b>{'concours_begin_date'|@translate}</b></th> 48 54 <th><b>{'concours_end_date'|@translate}</b></th> 49 <th width="10%"><b>{'concours_actions'|@translate}</b></th>55 <th colspan="4"><b>{'concours_actions'|@translate}</b></th> 50 56 </tr> 51 57 {foreach from=$active_concours item=active_concours} 52 <tr>58 <tr class="TableRow" style="cursor:pointer;"> 53 59 <td>{$active_concours.ID}</td> 54 60 <td><a href="{$active_concours.U_AUDIT}" title="{'concours_audit1'|@translate}">{$active_concours.NAME}</a></td> … … 57 63 <td>{$active_concours.BEGIN_DATE}</td> 58 64 <td>{$active_concours.END_DATE}</td> 59 <td><a href="{$active_concours.U_EDIT}" title="{'concours_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'concours_edit'|@translate}"/></a> 60 <a href="{$active_concours.U_DELETE}" title="{'concours_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'concours_delete'|@translate}" /></a> 61 </td> 65 <td><a href="{$active_concours.U_EDIT}" title="{'concours_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'concours_edit'|@translate}"/></a></td> 66 <td><a href="{$active_concours.U_DELETE}" title="{'concours_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'concours_delete'|@translate}" /></a></td> 62 67 </tr> 63 68 {/foreach} 64 69 </table> 70 {else} 71 <b>{'NO_concours'|@translate}</b> 72 {/if} 65 73 </fieldset> 66 74 67 75 <fieldset> 68 76 <legend>{'closed_concours'|@translate}</legend> 69 <table border="1"> 70 <tr> 77 {if isset($closed_concours)} 78 <table class="table2 littlefont" id="cconcours_list" border="1"> 79 <tr class="throw"> 71 80 <th><b>{'concours_id2'|@translate}</b></th> 72 81 <th><b>{'concours_name'|@translate}</b></th> 73 82 <th><b>{'concours_create_date'|@translate}</b></th> 74 <th width="50%"><b>{'concours_descr'|@translate}</b></th>83 <th><b>{'concours_descr'|@translate}</b></th> 75 84 <th><b>{'concours_begin_date'|@translate}</b></th> 76 85 <th><b>{'concours_end_date'|@translate}</b></th> 77 <th ><b>{'concours_actions'|@translate}</b></th>86 <th colspan="4"><b>{'concours_actions'|@translate}</b></th> 78 87 </tr> 79 88 {foreach from=$closed_concours item=closed_concours} 80 <tr>89 <tr class="TableRow" style="cursor:pointer;"> 81 90 <td>{$closed_concours.ID}</td> 82 91 <td><a href="{$closed_concours.U_AUDIT}" title="{'concours_audit1'|@translate}">{$closed_concours.NAME}</a></td> … … 85 94 <td>{$closed_concours.BEGIN_DATE}</td> 86 95 <td>{$closed_concours.END_DATE}</td> 87 <td><a href="{$closed_concours.U_EDIT}" title="{'concours_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'concours_edit'|@translate}"/></a> 88 <a href="{$closed_concours.U_DELETE}" title="{'concours_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'concours_delete'|@translate}" /></a> 89 {if $closed_concours.U_RESULT != ''} <a href="{$closed_concours.U_RESULT}" title="{'concours_result'|@translate}"><img src="{$IMG_URL}generate.png" class="button" alt="{'concours_result'|@translate}" /></a>{/if} 90 {if $closed_concours.U_FILE != ''} <a href="{$closed_concours.U_FILE}" title="{'concours_file'|@translate}"><img src="{$IMG_URL}file.png" class="button" alt="{'concours_file'|@translate}" /></a>{/if} 91 92 </td> 96 <td><a href="{$closed_concours.U_EDIT}" title="{'concours_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'concours_edit'|@translate}"/></a></td> 97 <td><a href="{$closed_concours.U_DELETE}" title="{'concours_delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'concours_delete'|@translate}" /></a></td> 98 <td>{if $closed_concours.U_RESULT != ''} <a href="{$closed_concours.U_RESULT}" title="{'concours_result'|@translate}"><img src="{$IMG_URL}generate.png" class="button" alt="{'concours_result'|@translate}" /></a>{/if}</td> 99 <td>{if $closed_concours.U_FILE != ''} <a href="{$closed_concours.U_FILE}" title="{'concours_file'|@translate}"><img src="{$IMG_URL}file.png" class="button" alt="{'concours_file'|@translate}" /></a>{/if}</td> 93 100 </tr> 94 101 {/foreach} 95 102 </table> 103 {else} 104 <b>{'NO_concours'|@translate}</b> 105 {/if} 96 106 </fieldset> 97 107 -
extensions/ConcoursPhoto/admin/template/params.tpl
r4260 r4428 30 30 <TD colspan="2"> 31 31 <input type="checkbox" name="mask_author" {$MASK_AUTHOR}/> {'concours_mask_author'|@translate} 32 <br/> 33 </TD> 34 </TR> 35 <TR> 36 <TD colspan="2"> 37 <input type="checkbox" name="mask_exif" {$MASK_EXIF}/> {'concours_mask_exif'|@translate} 32 38 <br/> 33 39 </TD> -
extensions/ConcoursPhoto/include/Concours.class.php
r4368 r4428 755 755 756 756 757 // Add tpl to picture.php page to display concours informations and vote 758 function display_concours_to_picture() 759 { 760 // Step1 : concours is defined to this category AND concours is open AND user is authorized to access to this category (thru group) 761 // Step1 bis : dont show concours if img_author = user_id 762 // Step 2 : Recover stored informations in db for this user 763 // Step 3 : Complete tpl information 764 // Step 4 : concat tpl 765 766 global $page, $user, $template; 757 // Disable exif if a concours is open or prepared 758 function concours_disable_exifs() 759 { 760 global $page, $conf; 767 761 768 762 // Get user group. … … 771 765 $concours = array(); 772 766 773 774 // DEBUG 775 if ($this->debug) 776 foreach ($page as $id=>$val) 777 { 778 if (is_array($val)) 779 foreach ($val as $id2=>$val2) 780 echo "page[".$id."][".$id2."]=".$val2."\n"; 781 else 782 echo "page[".$id."]=".$val."\n"; 783 } 784 // END DEBUG 785 786 787 // disable author name on image which are present in a concours. 788 // check the categories where the current image is present and disable the author name 789 if ($this->my_config['mask_author'] && $this->my_config['mask_author'] == true) 767 // disable exifs on image which are present in a concours. 768 // check the categories where the current image is present and disable the exifs 769 if (isset($page['image_id']) && isset($this->my_config['mask_exifs']) && $this->my_config['mask_exifs'] == true) 790 770 { 791 771 // Get all categories where the current image is present … … 816 796 // echo $query; 817 797 $result = pwg_query($query); 818 // If one or more concours are found, the author name is masked798 // If one or more concours are found, the exifs are masked 819 799 if ($result && mysql_fetch_assoc($result)) 800 { 801 $conf['show_exif'] = false; 802 } 803 } 804 } 805 806 // End disable author name 807 808 } 809 810 811 // Add tpl to picture.php page to display concours informations and vote 812 function display_concours_to_picture() 813 { 814 // Step1 : concours is defined to this category AND concours is open AND user is authorized to access to this category (thru group) 815 // Step1 bis : dont show concours if img_author = user_id 816 // Step 2 : Recover stored informations in db for this user 817 // Step 3 : Complete tpl information 818 // Step 4 : concat tpl 819 820 global $page, $user, $template, $conf; 821 822 // Get user group. 823 $this->get_user_groups(); 824 825 $concours = array(); 826 827 828 // DEBUG 829 if ($this->debug) 830 foreach ($page as $id=>$val) 831 { 832 if (is_array($val)) 833 foreach ($val as $id2=>$val2) 834 echo "page[".$id."][".$id2."]=".$val2."\n"; 835 else 836 echo "page[".$id."]=".$val."\n"; 837 } 838 // END DEBUG 839 840 // disable author name on image which are present in a concours. 841 // check the categories where the current image is present and disable the author name 842 if (isset($this->my_config['mask_author']) && $this->my_config['mask_author'] == true) 843 { 844 // Get all categories where the current image is present 845 $query = ' 846 SELECT category_id,uppercats,commentable,global_rank 847 FROM '.IMAGE_CATEGORY_TABLE.' 848 INNER JOIN '.CATEGORIES_TABLE.' ON category_id = id 849 WHERE image_id = '.$page['image_id'].' 850 ;'; 851 // echo $query; 852 $result = pwg_query($query); 853 $related_categories = array(); 854 while ($row = mysql_fetch_array($result)) 855 { 856 array_push($related_categories, $row['category_id']); 857 } 858 // 859 //echo related_categories; 860 if (count($related_categories)) 861 { 862 // Request for all concours prepared & actived on each categories 863 $query = ' 864 SELECT * 865 FROM ' . CONCOURS_TABLE .' 866 WHERE category IN ('.implode(',', $related_categories).') 867 AND time_to_sec(TIMEDIFF(now(), end_date)) < 0 868 '; 869 // echo $query; 870 $result = pwg_query($query); 871 // If one or more concours are found, the author name is masked 872 if ($result && mysql_fetch_assoc($result)) 873 { 820 874 $template->assign('INFO_AUTHOR',l10n('concours_img_author')); 875 } 821 876 } 822 877 } … … 825 880 826 881 882 827 883 if (($page['section']) == 'categories' AND !empty($page['category'])) 828 884 { … … 1282 1338 $file = "rang, id_concours,method, img_id, img_name, img_file, date, note, moyenne, nbvotant, datas\r\n"; 1283 1339 1284 if (!(isset($this->concours_info ['method'])))1285 $this->concours_info ['method'] = 1;1340 if (!(isset($this->concours_infos['method']))) 1341 $this->concours_infos['method'] = 1; 1286 1342 1287 1343 // recover all img_id from the category … … 1292 1348 .' WHERE id_concours = '.($concours_id !== null ? $concours_id : $this->concours_id ); 1293 1349 1294 if ($this->concours_info ['method'] == 1) // total1350 if ($this->concours_infos['method'] == 1) // total 1295 1351 $query .= ' ORDER BY note DESC'; 1296 elseif ($this->concours_info ['method'] == 2) // moyenne1352 elseif ($this->concours_infos['method'] == 2) // moyenne 1297 1353 $query .= ' ORDER BY moyenne DESC'; 1298 1354 … … 1406 1462 */ 1407 1463 // recover all img_id from the category 1408 if (!(isset($this->concours_info ['method'])))1409 $this->concours_info ['method'] = 1;1464 if (!(isset($this->concours_infos['method']))) 1465 $this->concours_infos['method'] = 1; 1410 1466 $query = 'SELECT id_concours, method, img_id, IMG.name, IMG.file, IMG.author, date, note, moyenne, nbvotant, datas, comment' 1411 1467 .' FROM ' .CONCOURS_RESULT_TABLE … … 1414 1470 .' WHERE id_concours = '.($concours_id !== null ? $concours_id : $this->concours_id ); 1415 1471 1416 if ($this->concours_info ['method'] == 1) // total1472 if ($this->concours_infos['method'] == 1) // total 1417 1473 $query .= ' ORDER BY note DESC'; 1418 elseif ($this->concours_info ['method'] == 2) // moyenne1474 elseif ($this->concours_infos['method'] == 2) // moyenne 1419 1475 $query .= ' ORDER BY moyenne DESC'; 1420 1476 … … 1447 1503 foreach ($user_list as $uuser) 1448 1504 { 1449 1505 1506 $comment = $this->get_img_comment_user($row['img_id'], $concours_id, $uuser['user_id']); 1507 1450 1508 $user_note = $this->get_img_note_user($row['img_id'], $concours_id, $uuser['user_id']); 1451 1509 1452 1510 $file .= ', '.$uuser['username'].', '.$this->get_img_globalnote_user($row['img_id'], $concours_id, $uuser['user_id']) 1453 .', '.($row['comment'] != null ? str_replace(",", "",$row['comment']) : '') 1511 // .', '.($row['comment'] != null ? str_replace(",", "",$row['comment']) : '') 1512 .', '.($comment != false ? str_replace(array(",","\r\n", "\n", "\r"), " ",$comment) : '') 1454 1513 .', ' 1455 1514 ; -
extensions/ConcoursPhoto/include/default_values.inc.php
r4260 r4428 9 9 $concours_default_values['mask_author'] = true; // Mask author for prepared concours 10 10 $concours_default_values['thumb_note'] = true; // Display global note (for user) under thumbnail 11 $concours_default_values['mask_exif'] = true; // Mask exif/iptc datas during concours 11 12 ?> -
extensions/ConcoursPhoto/language/fr_FR/plugin.lang.php
r4368 r4428 24 24 $lang['concours_end_date'] = 'Date de fin'; 25 25 $lang['concours_criterias'] = 'Critères du concours'; 26 $lang['concours_min_value'] = ' Valeur minimale';27 $lang['concours_max_value'] = ' Valeur maximale';28 $lang['concours_coef'] = 'Coef ficient';26 $lang['concours_min_value'] = 'Min.'; 27 $lang['concours_max_value'] = 'Max.'; 28 $lang['concours_coef'] = 'Coef.'; 29 29 $lang['criteria_edit'] = 'Editer le critère'; 30 30 $lang['criteria_delete'] = 'Supprimer le critère'; … … 70 70 71 71 $lang['concours_mask_author'] = 'Masquer l\'auteur pour les concours préparés non actifs'; 72 $lang['concours_mask_exif'] = 'Masquer les données EXIF/IPTC pour les concours préparés non actifs'; 72 73 73 74 $lang['thumbnail_global_note'] = 'Note concours'; … … 90 91 $lang['concours_audit1'] = 'Auditer le concours'; 91 92 $lang['concours_author'] = 'Auteur'; 92 93 $lang['NO_concours'] = 'Aucun concours'; 94 $lang['concours_username_selection'] = 'Sélection d\'un utilisateur'; 95 $lang['all_users'] = '-- Tous --'; 93 96 ?> -
extensions/ConcoursPhoto/main.inc.php
r4368 r4428 46 46 47 47 // Add concours to picture page 48 add_event_handler('loc_begin_picture', array(&$concours, 'concours_disable_exifs')); 48 49 add_event_handler('loc_end_picture', array(&$concours, 'display_concours_to_picture')); 49 50 // Add admin page -
extensions/ConcoursPhoto/publish.php
r4368 r4428 25 25 $category = $concours->concours_infos['category']; 26 26 27 if (!(isset($concours->concours_infos['method']))) 28 $concours->concours_infos['method'] = 1; 29 27 30 $query = 'SELECT DISTINCT(img.id), img.name, img.file, img.path, img.tn_ext,img.author, 28 31 ic.category_id, cat.name AS catname, conc.note, conc.moyenne, conc.nbvotant' … … 31 34 .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id' 32 35 .' INNER JOIN '.CONCOURS_RESULT_TABLE.' AS conc ON conc.img_id = img.id' 33 .' WHERE ic.category_id = '.$concours->concours_infos['category'] 34 .' ORDER by note DESC;'; 36 .' WHERE ic.category_id = '.$concours->concours_infos['category']; 37 38 if ($concours->concours_infos['method'] == 1) // total 39 $query .= ' ORDER BY note DESC'; 40 elseif ($concours->concours_infos['method'] == 2) // moyenne 41 $query .= ' ORDER BY moyenne DESC'; 42 43 $query .=';'; 44 // .' ORDER by note DESC;'; 35 45 $result = pwg_query($query); 36 46 $rang = 1;
Note: See TracChangeset
for help on using the changeset viewer.
