Merge lp:~malizor/ubuntu-fr-forum/fixe-384088 into lp:ubuntu-fr-forum

[Nicolas Delvaux]

=== modified file 'plugins/AP_Forum_Annonces.php' (properties changed: -x to +x)
--- plugins/AP_Forum_Annonces.php	2008-07-12 15:48:50 +0000
+++ plugins/AP_Forum_Annonces.php	2011-04-08 17:21:44 +0000
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2007 Christophe Sauthier ([e-mail]).
+  Copyright (C) 2011 Christophe Sauthier ([e-mail]).
 
   This file is a plugin for PunBB. Created for ubuntu-fr.
 
@@ -22,6 +22,19 @@
 
 ************************************************************************/
 
+/*
+
+This plugin needs an 'annonces' table.
+Here is a script for MySQL (don't forget to add your db prefix!):
+
+CREATE TABLE `annonces` (
+  `forum_id` int(11) NOT NULL default '0',
+  `forum_annonce` text,
+  `forum_annonce_visible` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`forum_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+*/
 
 
 
@@ -33,7 +46,7 @@
 define('PUN_PLUGIN_LOADED', 1);
 
 // Plugin version
-define('PLUGIN_VERSION', '1.0.1');
+define('PLUGIN_VERSION', '1.0.2');
 // Load the annonces language files
 require PUN_ROOT.'lang/'.$pun_user['language'].'/annonces.php';
 
@@ -54,7 +67,7 @@
 	}
 	else {
 		if ($_POST['new_annonce_text']!='') 
-			$query = 'INSERT INTO '.$db->prefix.'annonces  (forum_id, forum_annonce, forum_annonce_visible) VALUES (\''.$db->escape($_POST['annonce_id']).'\',\''.$db->escape($_POST['new_annonce_text']).'\',\''.$db->escape($_POST['annonce_visible']).'\')';
+			$query = 'INSERT INTO '.$db->prefix.'annonces  (forum_id, forum_annonce, forum_annonce_visible) VALUES (\''.$db->escape($_POST['annonce_id']).'\',\''.$db->escape($_POST['new_annonce_text']).'\',\''.$db->escape(($_POST['isVisible'] == 'True') ? "1":"0").'\')';
 	}
 	if (defined('DEBUG'))
 		error_log("[ForumAnnonces] Query : ".$query);
@@ -100,7 +113,8 @@
 
 ?>
 
-<script language="javascript">
+<script type="text/javascript">
+//<![CDATA[
 var old_annonce_text="";
 
 function editAnnonce(fid, checked) {
@@ -120,14 +134,13 @@
     if (! document.getElementById('new_forum_'+fid)) {
 	var annonceText = document.getElementById('forum_'+fid).innerHTML;
 	var newAnnonceText;
-	old_annonce_text=annonceText;
-	newAnnonceText = "<div id='new_forum_"+fid+"'><form id=\"form\" action=\"<?php echo $_SERVER['REQUEST_URI'] ?>\" method=\"post\"><input type=\"hidden\" name=\"annonce_id\" value=\""+fid+"\"><textarea cols='80' name=\"new_annonce_text\" id=\"new_annonce_text\">"+annonceText+"</textarea><div><?php echo $lang_annonces['is visible'] ?><input type=\"checkbox\" name=\"isVisible\" id=\"isVisible\" value=\"True\" "+checked+"></div>";
+	old_annonce_text = annonceText;	
+	newAnnonceText = "<div id='new_forum_"+fid+"'><form id='form' action='<?php echo $_SERVER['REQUEST_URI'] ?>' method='post'><input type='hidden' name='annonce_id' value='"+fid+"'/><textarea cols='80' rows='3' name='new_annonce_text' id='new_annonce_text'>"+annonceText.replace(/<br>/g, '<br/>')+"</textarea><div><?php echo $lang_annonces['is visible'] ?><input type='checkbox' name='isVisible' id='isVisible' value='True' checked='"+checked+"'/></div>";
 
 	if (annonceText!='') {
-		newAnnonceText += "<input type=\"hidden\" name=\"annonce_exists\" value=\"1\">";
+		newAnnonceText += "<input type='hidden' name='annonce_exists' value='1'/>";
 	}
-
-	newAnnonceText += "</div><div><input type='button' value='<?php echo $lang_annonces['save'] ?>' onclick='saveAnnonceModification("+fid+")'><input type='button' value='<?php echo $lang_annonces['cancel'] ?>' onclick='cancelAnnonceModification("+fid+")'></div></form></div>";
+	newAnnonceText += "<div><input type='button' value='<?php echo $lang_annonces['save'] ?>' onclick='saveAnnonceModification("+fid+")'/><input type='button' value='<?php echo $lang_annonces['cancel'] ?>' onclick='cancelAnnonceModification("+fid+")'/></div></form></div>";
 	document.getElementById('forum_'+fid).innerHTML = newAnnonceText;
     }
   }
@@ -145,8 +158,9 @@
 		old_annonce_text="";
 	}
 }
+//]]>
 </script>
-<br>
+<br/>
 <div id="idx<?php echo $cat_count ?>" class="blocktable">
 	<h2><span><?php echo pun_htmlspecialchars($cur_forum['cat_name']) ?></span></h2>
 	<div class="box">
@@ -164,7 +178,6 @@
 	}
 	$checked = ($cur_forum['forum_annonce_visible'] == 1) ? "checked": "";
 	$forum_field = '<div style="cursor:pointer"><h3><a onclick="editAnnonce(\''.$cur_forum['fid'].'\',\''.$checked.'\')">'.pun_htmlspecialchars($cur_forum['forum_name']).'</a></h3></div>';
-//		$forum_field .= "\n\t\t\t\t\t\t\t\t<div id='forum_".$cur_forum['fid']."'>Ceci est un test</div>";
 	
 	$forum_field .= "\n\t\t\t\t\t\t\t\t<div id='forum_".$cur_forum['fid']."'>";
 	if ($cur_forum['forum_annonce'] != '') {