Merge lp:~malizor/ubuntu-fr-forum/plugin-accueil into lp:ubuntu-fr-forum

[Nicolas Delvaux]

[lp:~malizor/ubuntu-fr-forum/plugin-accueil]

122. By Nicolas Delvaux on 2011-04-12

Indentation !!!!!

123. By Nicolas Delvaux on 2011-04-13

Correction du message d'erreur en cas de problème SQL.

124. By Nicolas Delvaux on 2011-04-13

Documentation de l'ensemble.

125. By Nicolas Delvaux on 2011-04-13

indentation²

=== modified file 'README'
--- README	2010-10-13 00:20:33 +0000
+++ README	2011-04-13 17:24:38 +0000
@@ -44,8 +44,10 @@
 viewforum.php L92 à L113
 
 
-Affichage de l'accueil + gagnant du mois
-index.php L58 à L74
+Mod affichage de l'accueil + gagnant du mois :
+Voir plugins/AP_Reception.php + lang/Francais/reception.php + index.php (L58 à L79)
+Les chaines correspondantes sont stockées dans deux nouvelles clefs de la table config: c_welcome_message et c_winner_message.
+Pas de modification de la structure de la base. Les clefs se créent automatiquement, rien de spécial à faire.
 
 
 Affichage de usertitle uniquement pour admins et modos.
@@ -88,4 +90,4 @@
 search.php (augmentation de la limite des 200)
 parser.php (balise apt)
 divers dans style/
-viewtopic.php (lien vers haut de page)
\ No newline at end of file
+viewtopic.php (lien vers haut de page)

=== modified file 'index.php'
--- index.php	2011-02-18 15:28:26 +0000
+++ index.php	2011-04-13 17:24:38 +0000
@@ -57,33 +57,22 @@
 
 <!-- Begin Forum accueil + gagnant du mois-->
 
-<?
-//$sql = 'SELECT winner, welcome FROM '.$db->prefix.'accueil';
-//$result = $db->query($sql) or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
-//$welc = $db->fetch_assoc($result);
-?>
 <div id="announce-welcome" class="box">
-		 <table ><tbody class="inbox">
-		    <tr>
-		      <td class="welcome"><p>
-<?php
-//echo $welc['welcome'];
-?>
-Bienvenue&nbsp;! pour utiliser au mieux ce forum, consultez les <a href="./misc.php?action=rules">règles du forum</a> ainsi que <a href="http://doc.ubuntu-fr.org/tutoriel/howto_forum">l'aide à l'utilisation du forum.</a><br />
-Avant de poser une question, vérifiez que la solution ne se trouve pas déjà dans la documentation ou le forum grâce à la &laquo;&nbsp;Recherche rapide&nbsp;&raquo; en haut de cette page. Sinon, postez dans la bonne section afin d'obtenir de meilleures réponses.<br />
-Si vous avez résolu votre problème, <a href="http://doc.ubuntu-fr.org/tutoriel/howto_forum#passer_son_sujet_en_resolu">ajoutez [Résolu]</a> au titre de la discussion, et n'oubliez pas de <a href="http://doc.ubuntu-fr.org/wiki/participer_wiki">documenter notre wiki.</a>
-</p></td>
+	<table>
+		<tbody class="inbox">
+			<tr>
+				<td class="welcome">
+					<p><?php echo $pun_config['c_welcome_message']; ?></p>
+				</td>
 
-		      <td class="winner"><div id="winner_inbox">
-<p>
-<?php
-//echo $welc['winner'];
-?>
-Gagnant de l'abonnement<br/><a name="Linux Pratique" href="http://www.linux-pratique.com/"><span class="linux_pratique">Linux Pratique</span></a><br/>du mois de novembre<br/>
-<span class="winner_name">maxjules</span>
-</p></div>
-</td>
-</tr></tbody></table>
+				<td class="winner">
+					<div id="winner_inbox">
+						<p><?php echo $pun_config['c_winner_message']; ?></p>
+					</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
 </div>
 
 

=== added file 'lang/Francais/reception.php'
--- lang/Francais/reception.php	1970-01-01 00:00:00 +0000
+++ lang/Francais/reception.php	2011-04-13 17:24:38 +0000
@@ -0,0 +1,17 @@
+<?php
+
+$lang_reception = array(
+'mod name' => "Accueil et gagnant",
+'description' => "Gérer le bandeau d'accueil ainsi que le gagnant du mois.",
+'insert update impossible' => "Impossible de mettre le bandeau d'accueil à jour.",
+'reception title' => "Texte de bienvenue :",
+'winner title' => "Cadre « gagnant du mois » :",
+'empty' => "vide",
+'edit' => "Modifier",
+'cancel' => "Annuler",
+'preview' => "Aperçu",
+'save' => "Enregistrer",
+'edit multiple annonces' => "Vous ne pouvez modifier qu'un seul champ à la fois. Veuillez terminer l'édition en cours."
+);
+
+?>

=== added file 'plugins/AP_Reception.php'
--- plugins/AP_Reception.php	1970-01-01 00:00:00 +0000
+++ plugins/AP_Reception.php	2011-04-13 17:24:38 +0000
@@ -0,0 +1,175 @@
+<?php
+/***********************************************************************
+
+  Copyright (C) 2011 Nicolas Delvaux <[e-mail]>
+
+  This file is a plugin for FluxBB, created for ubuntu-fr.
+
+  This plugin is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+
+  This plugin is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  MA  02111-1307  USA
+
+************************************************************************/
+
+/*
+
+This plugin create and use 2 new rows in the 'config' table (key -> value structure):
+  - c_welcome_message -> "The welcome-box message"
+  - c_winner_message  -> "The winner-box message"
+Both messages should be plain HTML.
+
+*/
+
+// Make sure no one attempts to run this script "directly"
+if (!defined('PUN'))
+	exit;
+
+// Tell admin_loader.php that this is indeed a plugin and that it is loaded
+define('PUN_PLUGIN_LOADED', 1);
+
+// Plugin version
+define('PLUGIN_VERSION', '1.0');
+// Load the language file
+require PUN_ROOT.'lang/'.$pun_user['language'].'/reception.php';
+
+//
+// The rest is up to you!
+//
+//define('DEBUG',1);
+
+// Let's test if we update something
+if (isset($_POST['update_field'])) {
+	if (isset($pun_config[$_POST['update_field']]))
+	{
+		$query = 'UPDATE '.$db->prefix.'config SET conf_value=\''.$db->escape($_POST['new_text']).'\' WHERE conf_name=\''.$_POST['update_field'].'\'';
+	} else {
+		$query = 'INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES (\''.$_POST['update_field'].'\', \''.$db->escape($_POST['new_text']).'\')';
+	}
+
+	$result = $db->query($query, true) or error($lang_reception['insert update impossible'], __FILE__, __LINE__, $db->error());
+	if (defined('DEBUG'))
+		error_log("[Reception] Query: ".$query);
+
+	// Update config locally (for immediate display in this page) and globally
+	$pun_config[$_POST['update_field']] = $_POST['new_text']; 
+	require PUN_ROOT.'include/cache.php';
+	generate_config_cache();
+}
+
+// Display the admin navigation menu
+generate_admin_menu($plugin);
+?>
+
+<div id="reception_plugin" class="blockform">
+	<h2><span><?php echo $lang_reception['mod name']; ?> version <?php echo PLUGIN_VERSION; ?></span></h2>
+	<p><?php echo $lang_reception['description']; ?></p>
+	<table cellspacing="0">
+		<tbody>
+			<tr>
+				<td class="tcl">
+					<div class="inform">
+						<fieldset>
+							<legend><?php echo $lang_reception['reception title']; ?></legend>
+							<div class="infldset">
+								<div id="welcome_field">
+									<div id="welcome_text">
+<?php
+	if ($pun_config['c_welcome_message'] != '')
+	{
+		echo $pun_config['c_welcome_message'].'</div><div>';
+	}
+	else
+	{
+		echo '</div><div><em>'.$lang_reception['empty'].'</em>';
+	}
+?>
+									</div>
+									<br/>
+									<input type="button" value="<?php echo $lang_reception['edit']; ?>" onclick="edit('welcome_')" />
+								</div>
+							</div>
+						</fieldset>
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td >
+					<div class="inform">
+						<fieldset>
+							<legend><?php echo $lang_reception['winner title']; ?></legend>
+							<div class="infldset">
+								<div id="winner_field">
+									<div id="winner_text">
+<?php
+	if ($pun_config['c_winner_message'] != '')
+	{
+		echo $pun_config['c_winner_message'].'</div><div>';
+	}
+	else
+	{
+		echo '</div><div><em>'.$lang_reception['empty'].'</em>';
+	}
+?>
+									</div>
+									<br/>
+									<input type="button" value="<?php echo $lang_reception['edit']; ?>" onclick="edit('winner_')" />
+								</div>
+							</div>
+						</fieldset>
+					</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+
+<script type="text/javascript">
+//<![CDATA[
+
+var oldField = "";
+
+function edit(pid) {
+
+	// Just one edition at a time
+	if (document.getElementById('new_text')) {
+		alert("<?php echo $lang_reception['edit multiple annonces']; ?>");
+	return (1);
+	}
+
+	oldField = document.getElementById(pid+'field').innerHTML.replace(/<br>/g, '<br/>');
+	var editText = document.getElementById(pid+'text').innerHTML.replace(/<br>/g, '<br/>');
+
+	var newField = "<form id='form' action='<?php echo $_SERVER['REQUEST_URI'] ?>' method='post'><div id='new_"+pid+"text'><textarea cols='90' rows='7' name='new_text' id='new_text'>"+editText+"</textarea></div><input type='button' value='<?php echo $lang_reception['preview']; ?>' onclick='preview(\""+pid+"\")' /><input type='button' value='<?php echo $lang_reception['cancel']; ?>' onclick='cancel(\""+pid+"\")' />";
+
+	document.getElementById(pid+'field').innerHTML = newField;
+}
+
+function preview(pid) {
+	var preview = document.getElementById('new_text').value;
+
+	var preview_field = "<form id='form' action='<?php echo $_SERVER['REQUEST_URI'] ?>' method='post'><div id='preview_text'>"+preview+"</div><br/><input type='submit' value='<?php echo $lang_reception['save']; ?>' /><textarea style='display:none;' name='new_text' id='new_text'>"+preview+"</textarea><input type='hidden' name='update_field' value='c_"+pid+"message' /><input type='button' value='<?php echo $lang_reception['cancel']; ?>' onclick='cancel(\""+pid+"\")' />";
+
+	document.getElementById(pid+'field').innerHTML = preview_field;
+}
+
+function cancel(pid) {
+		document.getElementById(pid+'field').innerHTML = oldField;
+		oldField = "";
+}
+
+//]]>
+</script>
+	
+<?php
+// Note that the script just ends here. The footer will be included by admin_loader.php.