[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[15582] trunk

[<gi...@us...>]

Revision: 15582
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15582&view=rev
Author:   gillesm
Date:     2008-11-09 23:14:58 +0000 (Sun, 09 Nov 2008)

Log Message:
-----------
[ENH] File Galery implementation of email alert

Modified Paths:
--------------
    trunk/lang/fr/language.php
    trunk/lib/groupalert/index.php
    trunk/tiki-upload_file.php

Modified: trunk/lang/fr/language.php
===================================================================
--- trunk/lang/fr/language.php	2008-11-09 23:13:25 UTC (rev 15581)
+++ trunk/lang/fr/language.php	2008-11-09 23:14:58 UTC (rev 15582)
@@ -8163,6 +8163,8 @@
 "You have to make %d choice(s) for the question" => "Vous devez donner %s réponses à la question",
 "You have to make at least %d choice(s) for the question" => "Vous devez donner au moins %s réponses à la question",
 "You have to make less than %d choice(s) for the question" => "Vous devez donner moins de %s réponses à la question",
-
+"You are alerted by the server "=>"Alerte du serveur",
+"You can check the modifications at : "=>"Vous pouvez accéder à la modification à l'adresse ",
+"You are alerted of a changement on "=>"Vous êtes alerté d'un changement sur",
 "###end###"=>"###end###");
 ?>

Modified: trunk/lib/groupalert/index.php
===================================================================
--- trunk/lib/groupalert/index.php	2008-11-09 23:13:25 UTC (rev 15581)
+++ trunk/lib/groupalert/index.php	2008-11-09 23:14:58 UTC (rev 15582)
@@ -1,5 +1,21 @@
+<<<<<<< .mine
 <?php
 
+// $Id: /cvsroot/tikiwiki/tiki/lib/Date/index.php,v 1.6 2007-03-06 19:29:58 sylvieg Exp $
+
+// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+// All Rights Reserved. See copyright.txt for details and a complete list of authors.
+// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+
+// This redirects to the sites root to prevent directory browsing
+
+header ("location: ../index.php");
+die;
+
+?>
+=======
+<?php
+
 // $Id: /cvsroot/tikiwiki/tiki/lib/notifications/index.php,v 1.6 2007-03-06 19:30:14 sylvieg Exp $
 
 // Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
@@ -12,3 +28,4 @@
 die;
 
 ?>
+>>>>>>> .r15581

Modified: trunk/tiki-upload_file.php
===================================================================
--- trunk/tiki-upload_file.php	2008-11-09 23:13:25 UTC (rev 15581)
+++ trunk/tiki-upload_file.php	2008-11-09 23:14:58 UTC (rev 15582)
@@ -350,16 +350,7 @@
 					$cat_name =  empty($_REQUEST['name'][$key])? $name: $_REQUEST['name'][$key];
 					$cat_href = $aux['dllink'];
 
-					foreach ( $_REQUEST['listtoalert'] as $user ){
-						$email=$userlib->get_user_email($user);
-						if ( ! empty($email) ){
-							include_once ('lib/webmail/tikimaillib.php');
-							$mail = new TikiMail();
-							$mail->setText("There is a changement in file gallery (message will be redefined)");
-							$mail->setSubject("You are alerted of a changement" );
-							$mail->send(array($email));
-						}
-					}
+					$groupalertlib->Notify($_REQUEST['listtoalert'],"tiki-download_file.php?fileId=".$fileId);
 
 					include_once ('categorize.php');
 					// Print progress


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.