From a20386dc5d9d4ad087959a565cf2d3f96657ff33 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 8 Mar 2008 09:58:05 +0000
Subject: [PATCH] ebl  Send new testimonials to rt      Change passwd arg to p

---
 docs/home-page/en/pages/testimonial.php | 36 ++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/docs/home-page/en/pages/testimonial.php b/docs/home-page/en/pages/testimonial.php
index b5d1cc7a..1afaacdf 100644
--- a/docs/home-page/en/pages/testimonial.php
+++ b/docs/home-page/en/pages/testimonial.php
@@ -1,5 +1,6 @@
-<? require_once("inc/header.php"); ?>
-<?
+<? 
+require_once("inc/header.php"); 
+
 $dat_dir = '/var/www/testimonials';
 $upload_dir = '/var/www/bacula';
 $password='';
@@ -654,7 +655,7 @@ if ($_REQUEST['action'] == 'Modify') {
                 $form['visible']=0;
                 save_formul($form);
 
-                send_email($form['id'], $form['email_address']);
+                send_email($form['id'], $form['contact_name'], $form['email_address']);
                 echo "You can modify your profile <a href='?page=testimonial&action=Modify&id=" . $form['id'] . "'>here</a> (keep this link as bookmark)<br><br>";
                 print_formul($form);
         }
@@ -678,10 +679,10 @@ if ($_REQUEST['action'] == 'Modify') {
         $form = load_formul($filename);
         
         if ($form['org_logo'] && file_exists($form['org_logo'])) {
-            unlink($upload_dir + $form['org_logo']);
+            rename($upload_dir + $form['org_logo'], $upload_dir + $form['org_logo'] + '.remove');
         }
         if (file_exists($filename)) {
-            unlink($filename);
+            rename($filename, "$filename.remove");
             echo "Profile deleted";
         }
 
@@ -842,7 +843,7 @@ function get_file_from_id()
     return $filename;
 }
 
-function send_email($id, $email)
+function send_email($id, $name, $email)
 {
         // Your email address
 //        $from = 'kern@sibbald.com';
@@ -859,8 +860,15 @@ Best regards.
 ";
 
         mail($email, $subject, $message, "From: Bacula WebMaster <$from>");
-        mail($from, $subject, $message, "From: Bacula WebMaster <$from>");
-        mail('eric@eb.homelinux.org', $subject, $message, "From: Bacula WebMaster <$from>");
+
+        $message = "Hello, 
+You can review this testimonial at http://www.bacula.org/en/?page=testimonial&action=Modify&id=$id
+
+Best regards.
+";
+
+        
+        mail('testimonials@rt.baculasystems.com', $subject, $message, "From: $name <$email>");
 
         echo "The email has been sent for approval.<br/>";
 }
@@ -957,7 +965,7 @@ function form_set_text($formul,$val)
 function is_admin()
 {
    global $dat_dir;
-   $id = $_REQUEST['passwd'];
+   $id = $_REQUEST['p'];
 
    if (!$id) {
        return(false);
@@ -978,9 +986,9 @@ function admin_link()
 {
    global $password;
    if (is_admin()) {
-      $pass = $_REQUEST['passwd'];
+      $pass = $_REQUEST['p'];
       $waiting = $_REQUEST['waiting'];    
-      $password = "&passwd=$pass";
+      $password = "&p=$pass";
       print "Admin: ";
       if ($waiting) {
          print "<a href='?page=testimonial&action=Admin$password'> View all</a><br>";
@@ -1178,13 +1186,17 @@ function print_formul($formul)
    <? if ($formul['publish_contact']) { ?>
         <tr align='right'><td></td><td><i><? echo $formul['contact_name'] ?> </i></td></tr>
    <? } ?>
+<!--
    </table>
    </td>
-   <td align='center' valign='center'>
+-->
+   <tr><td></td>
+   <td>
    <? if ($formul['org_logo']) { ?>
         <a href="<? echo $formul['org_logo'] ?>" ><img width='150' src="<? echo $formul['org_logo'] ?>"></a>
    <? } ?>
    </td>
+   </tr> <!-- added -->
    </table>
 <?
    return 1;
-- 
2.39.5