Index: /extensions/ContestResults/admin/admin.php
===================================================================
--- /extensions/ContestResults/admin/admin.php (revision 9418)
+++ /extensions/ContestResults/admin/admin.php (revision 9419)
@@ -3,4 +3,5 @@
load_language('plugin.lang', CR_PATH);
+$conf['ContestResults'] = unserialize($conf['ContestResults']);
// +-----------------------------------------------------------------------+
Index: /extensions/ContestResults/admin/config.php
===================================================================
--- /extensions/ContestResults/admin/config.php (revision 9418)
+++ /extensions/ContestResults/admin/config.php (revision 9419)
@@ -21,5 +21,5 @@
pwg_query("UPDATE " . CONFIG_TABLE . " SET `value` = '" . serialize($user_config) . "' WHERE `param` = 'ContestResults';");
- redirect(CR_ADMIN . '&tab=config');
+ redirect(CR_ADMIN . '&tab=config&msg=saved');
}
@@ -27,5 +27,7 @@
// Définition des variables template
// +-----------------------------------------------------------------------+
-$conf['ContestResults'] = unserialize($conf['ContestResults']);
+if (isset($_GET['msg']) AND $_GET['msg'] == 'saved')
+ array_push($page['infos'], l10n('Information data registered in database'));
+
$template->assign(array(
Index: /extensions/ContestResults/admin/manage.php
===================================================================
--- /extensions/ContestResults/admin/manage.php (revision 9418)
+++ /extensions/ContestResults/admin/manage.php (revision 9419)
@@ -8,5 +8,9 @@
pwg_query('DELETE FROM ' . CR_TABLE_1 . ' WHERE id = ' . $_GET['delete_contest'] . ';');
pwg_query('DELETE FROM ' . CR_TABLE_2 . ' WHERE contest_id = ' . $_GET['delete_contest'] . ';');
- redirect(CR_ADMIN);
+ redirect(CR_ADMIN .'&tab=manage&msg=deleted');
+}
+
+if (isset($_GET['msg'])){
+ array_push($page['infos'], l10n('CR_contest_'. $_GET['msg']));
}
Index: /extensions/ContestResults/admin/new.php
===================================================================
--- /extensions/ContestResults/admin/new.php (revision 9418)
+++ /extensions/ContestResults/admin/new.php (revision 9419)
@@ -9,60 +9,65 @@
// +-----------------------------------------------------------------------+
if (isset($_POST['new_submit'])) {
- // Modification d'un concours
- if (isset($_GET['contest_id'])) {
- pwg_query("UPDATE " . CR_TABLE_1 . " SET
- `name` = '" . $_POST['name'] ."',
- `status` = '" . $_POST['status'] ."',
- `visible` = '" . $_POST['visible'] ."',
- `date_begin` = '" . $_POST['date_begin'] ."',
- `date_end` = '" . $_POST['date_end'] ."',
- `logo` = '" . $_POST['logo'] ."',
- `banner` = '" . $_POST['banner'] ."',
- `summary` = '" . $_POST['summary'] ."',
- `presentation` = '" . $_POST['presentation'] ."',
- `rules` = '" . $_POST['rules'] ."',
- `prices` = '" . $_POST['prices'] ."',
- `final` = '" . $_POST['final'] ."'
- WHERE `id` = " . $_GET['contest_id'] .";");
-
- // redirige vers la page du concours si on en viens
- if (isset($_GET['redirect']) AND $_GET['redirect'] == 'page') {
- redirect(CR_PUBLIC . $_GET['contest_id'] . '-' . str2url(trigger_event('render_CR_content', $_POST['name'])));
+ if ($_POST['name'] != null) {
+ // Modification d'un concours
+ if (isset($_GET['contest_id'])) {
+ pwg_query("UPDATE " . CR_TABLE_1 . " SET
+ `name` = '" . $_POST['name'] ."',
+ `status` = '" . $_POST['status'] ."',
+ `visible` = '" . $_POST['visible'] ."',
+ `date_begin` = '" . $_POST['date_begin'] ."',
+ `date_end` = '" . $_POST['date_end'] ."',
+ `logo` = '" . $_POST['logo'] ."',
+ `banner` = '" . $_POST['banner'] ."',
+ `summary` = '" . $_POST['summary'] ."',
+ `presentation` = '" . $_POST['presentation'] ."',
+ `rules` = '" . $_POST['rules'] ."',
+ `prices` = '" . $_POST['prices'] ."',
+ `final` = '" . $_POST['final'] ."'
+ WHERE `id` = " . $_GET['contest_id'] .";");
+
+ // redirige vers la page du concours si on en viens
+ if (isset($_GET['redirect']) AND $_GET['redirect'] == 'page') {
+ redirect(CR_PUBLIC . $_GET['contest_id'] . '-' . str2url(trigger_event('render_CR_content', $_POST['name'])));
+ } else {
+ redirect(CR_ADMIN .'&tab=manage&msg=saved');
+ }
+
+ // Ajout d'un concours
} else {
- redirect(CR_ADMIN);
+ pwg_query("INSERT INTO " . CR_TABLE_1 . "
+ (
+ name,
+ date_begin,
+ date_end,
+ status,
+ visible,
+ logo,
+ banner,
+ summary,
+ presentation,
+ rules,
+ prices,
+ final
+ )
+ VALUES(
+ '" . $_POST['name'] ."',
+ '" . $_POST['date_begin'] ."',
+ '" . $_POST['date_end'] ."',
+ '" . $_POST['status'] ."',
+ '" . $_POST['visible'] ."',
+ '" . $_POST['logo'] ."',
+ '" . $_POST['banner'] ."',
+ '" . $_POST['summary'] ."',
+ '" . $_POST['presentation'] ."',
+ '" . $_POST['rules'] ."',
+ '" . $_POST['prices'] ."',
+ '" . $_POST['final'] ."'
+ );");
+ redirect(CR_ADMIN .'&tab=manage&msg=added');
}
- // Ajout d'un concours
} else {
- pwg_query("INSERT INTO " . CR_TABLE_1 . "
- (
- name,
- date_begin,
- date_end,
- status,
- visible,
- logo,
- banner,
- summary,
- presentation,
- rules,
- prices,
- final
- )
- VALUES(
- '" . $_POST['name'] ."',
- '" . $_POST['date_begin'] ."',
- '" . $_POST['date_end'] ."',
- '" . $_POST['status'] ."',
- '" . $_POST['visible'] ."',
- '" . $_POST['logo'] ."',
- '" . $_POST['banner'] ."',
- '" . $_POST['summary'] ."',
- '" . $_POST['presentation'] ."',
- '" . $_POST['rules'] ."',
- '" . $_POST['prices'] ."',
- '" . $_POST['final'] ."'
- );");
- redirect(CR_ADMIN);
+ array_push($page['errors'], l10n('CR_name_empty'));
}
}
@@ -71,7 +76,24 @@
// +-----------------------------------------------------------------------+
// Définition des variables template
-// +-----------------------------------------------------------------------+
+// +-----------------------------------------------------------------------+
+// Formulaire incomplet
+if ($page['errors']) {
+ $template->assign(array(
+ 'NAME' => $_POST['name'],
+ 'STATUS' => $_POST['status'],
+ 'VISIBLE' => $_POST['visible'],
+ 'DATE_BEGIN' => $_POST['date_begin'],
+ 'DATE_END' => $_POST['date_end'],
+ 'LOGO' => $_POST['logo'],
+ 'BANNER' => $_POST['banner'],
+ 'SUMMARY' => $_POST['summary'],
+ ));
+
+ foreach ($textareas AS $key) {
+ $template->assign(strtoupper($key), $_POST[$key]);
+ }
+
// Edition d'un concours
-if (isset($_GET['contest_id'])) {
+} else if (isset($_GET['contest_id'])) {
$query = "SELECT * FROM " . CR_TABLE_1 . " WHERE id = " . $_GET['contest_id'] . ";";
$contest = pwg_db_fetch_assoc(pwg_query($query));
Index: /extensions/ContestResults/admin/results.php
===================================================================
--- /extensions/ContestResults/admin/results.php (revision 9418)
+++ /extensions/ContestResults/admin/results.php (revision 9419)
@@ -26,5 +26,5 @@
}
- redirect(CR_ADMIN . '&tab=results&contest_id=' . $_GET['contest_id']);
+ redirect(CR_ADMIN . '&tab=results&msg=saved&contest_id=' . $_GET['contest_id']);
}
@@ -32,4 +32,8 @@
// Affichage des résultats
// +-----------------------------------------------------------------------+
+if (isset($_GET['msg']) AND $_GET['msg'] == 'saved')
+ array_push($page['infos'], l10n('CR_results_saved'));
+
+
// Nom du concours
$query = "SELECT name FROM " . CR_TABLE_1 . " WHERE id = " . $_GET['contest_id'] . ";";
Index: /extensions/ContestResults/admin/template/config.tpl
===================================================================
--- /extensions/ContestResults/admin/template/config.tpl (revision 9418)
+++ /extensions/ContestResults/admin/template/config.tpl (revision 9419)
@@ -10,10 +10,12 @@
Index: /extensions/ContestResults/admin/template/new.tpl
===================================================================
--- /extensions/ContestResults/admin/template/new.tpl (revision 9418)
+++ /extensions/ContestResults/admin/template/new.tpl (revision 9419)
@@ -31,5 +31,5 @@
- {if isset($NAME)}
+ {if isset($ID)}
{'CR_edit_tab'|@translate|cat:' : '|cat:$NAME}
{else}
Index: /extensions/ContestResults/changelog.txt
===================================================================
--- /extensions/ContestResults/changelog.txt (revision 9418)
+++ /extensions/ContestResults/changelog.txt (revision 9419)
@@ -1,2 +1,9 @@
+1.2.b
+- Add error and success messages on admin page
+- ...
+
+1.2.a
+- Hot fix : sql error in maintain.inc.php
+
1.2
- Code revision
Index: /extensions/ContestResults/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/ContestResults/language/en_UK/plugin.lang.php (revision 9418)
+++ /extensions/ContestResults/language/en_UK/plugin.lang.php (revision 9419)
@@ -40,4 +40,9 @@
$lang['CR_notavailable'] = 'This contest is not available';
$lang['CR_id_unknown %d'] = "The picture n°%d doesn't exist";
+$lang['CR_contest_saved'] = "Contest settings saved";
+$lang['CR_contest_added'] = "Contest added";
+$lang['CR_contest_deleted'] = "Contest deleted";
+$lang['CR_results_saved'] = "Results saved";
+$lang['CR_name_empty'] = "The name of the contest can't be empty";
$lang['CR_order_1'] = '1st';
Index: /extensions/ContestResults/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/ContestResults/language/fr_FR/plugin.lang.php (revision 9418)
+++ /extensions/ContestResults/language/fr_FR/plugin.lang.php (revision 9419)
@@ -40,4 +40,9 @@
$lang['CR_notavailable'] = "Ce concours n'est pas disponible";
$lang['CR_id_unknown %d'] = "L'image n°%d n'existe pas";
+$lang['CR_contest_saved'] = "Paramètres du concours sauvegardés";
+$lang['CR_contest_added'] = "Concours ajouté";
+$lang['CR_contest_deleted'] = "Concours supprimé";
+$lang['CR_results_saved'] = "Résultats sauvegardés";
+$lang['CR_name_empty'] = "Le nom du concours ne peut être vide";
$lang['CR_order_1'] = '1ère';
Index: /extensions/ContestResults/language/lv_LV/plugin.lang.php
===================================================================
--- /extensions/ContestResults/language/lv_LV/plugin.lang.php (revision 9418)
+++ /extensions/ContestResults/language/lv_LV/plugin.lang.php (revision 9419)
@@ -40,4 +40,9 @@
$lang['CR_notavailable'] = 'Šis konkurss nav pieejams';
$lang['CR_id_unknown %d'] = "Attēls n°%d neeksistē";
+$lang['CR_contest_saved'] = "Konkursa iestatījumi saglabāti";
+$lang['CR_contest_added'] = "Konkurss pievienots";
+$lang['CR_contest_deleted'] = "Konkurss izdzēsts";
+$lang['CR_results_saved'] = "Rezultāti saglabāti";
+$lang['CR_name_empty'] = "Konkursa nosaukums nevar būt tukšs";
$lang['CR_order_1'] = '1.';
@@ -52,5 +57,5 @@
$lang['CR_menubar_block_number'] = 'Blokā attēlojamo konkursu skaits';
-$lang['CR_help_lang'] = (CR_ED_STATE == 'active') ? "Iespējasm lietot HTML un multivalodu aprakstus." : "Varat lietot HTML.";
+$lang['CR_help_lang'] = (CR_ED_STATE == 'active') ? "Iespējasm lietot HTML un multivalodu aprakstus." : "Varat lietot HTML.";
$lang['CR_help_title'] = "" . $lang['CR_help_lang'];
$lang['CR_help_status'] = "Kad konkurss ir Pabeigts, tā rezultāti tiek atainoti konkursa lapā un tiek aktivēts marķieris (Pabeigts).
@@ -66,9 +71,3 @@
" . $lang['CR_help_lang'];
-
-$lang['CR_contest_saved'] = "Konkursa iestatījumi saglabāti";
-$lang['CR_contest_added'] = "Konkurss pievienots";
-$lang['CR_contest_deleted'] = "Konkurss izdzēsts";
-$lang['CR_results_saved'] = "Rezultāti saglabāti";
-$lang['CR_name_empty'] = "Konkursa nosaukums nevar būt tukšs";
?>
Index: /extensions/ContestResults/template/cr_main.tpl
===================================================================
--- /extensions/ContestResults/template/cr_main.tpl (revision 9418)
+++ /extensions/ContestResults/template/cr_main.tpl (revision 9419)
@@ -15,50 +15,52 @@
- {if !isset($contests)}
-
- {'CR_no_contest'|@translate}
-
-
- {else}
-
- {foreach from=$contests item=contest}
- -
-
-
-
-
- {$contest.NAME}
- {if $contest.STATUS == 'finished'}({'CR_finished'|@translate}){/if}
-
-
-
{$contest.DATE_BEGIN} - {$contest.DATE_END}
-
- {if $contest.STATUS == 'pending'}
- {if !empty($contest.SUMMARY)}
- {$contest.SUMMARY}
- {/if}
- {else}
- {foreach from=$contest.RESULTS item=result}
- {'CR_order_'|cat:$result.RANK|@translate} {'CR_place'|@translate} - {$result.AUTHOR}
- {/foreach}
- {/if}
-
-
-
-
-
- {/foreach}
-
- {/if}
+{if !isset($contests)}
+
+ {'CR_no_contest'|@translate}
+
+
+{else}
+
+ {foreach from=$contests item=contest}
+ -
+
+
+ {if $contest.STATUS == 'pending'}
+ {if !empty($contest.LOGO)}
+
+
+
+ {/if}
+ {else}
+
+
+
+ {/if}
+
+
+
+ {$contest.NAME}
+ {if $contest.STATUS == 'finished'}({'CR_finished'|@translate}){/if}
+
+
+
{$contest.DATE_BEGIN} - {$contest.DATE_END}
+
+ {if $contest.STATUS == 'pending'}
+ {if !empty($contest.SUMMARY)}
+ {$contest.SUMMARY}
+ {/if}
+ {else}
+ {foreach from=$contest.RESULTS item=result}
+ {'CR_order_'|cat:$result.RANK|@translate} {'CR_place'|@translate} - {$result.AUTHOR}
+ {/foreach}
+ {/if}
+
+
+
+
+
+ {/foreach}
+
+{/if}