From 2f27b7dfb7187ce252379ac4c9bfa2efd55bb6ae Mon Sep 17 00:00:00 2001
From: Vladimir H <vladimiroski@gmail.com>
Date: Thu, 18 Dec 2008 06:25:25 -0600
Subject: [PATCH] Ajustado mailer.php de acuerdo a las necesidades del
 proyecto.

---
 include/constants.php | 118 +++++++++++---------------------------------------
 include/mailer.php    | 107 ++++++++++++++++-----------------------------
 2 files changed, 64 insertions(+), 161 deletions(-)
 rewrite include/constants.php (75%)
 rewrite include/mailer.php (79%)

diff --git a/include/constants.php b/include/constants.php
dissimilarity index 75%
index 7d56b18..850b78d 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,92 +1,26 @@
-<?
-/**
- * Constants.php
- *
- * This file is intended to group all constants to
- * make it easier for the site administrator to tweak
- * the login script.
- *
- * Written by: Jpmaster77 a.k.a. The Grandmaster of C++ (GMC)
- * Last Updated: August 19, 2004
- */
- 
-/**
- * Database Constants - these constants are required
- * in order for there to be a successful connection
- * to the MySQL database. Make sure the information is
- * correct.
- */
- require_once("data.php");
-define("DB_SERVER", $motor);
-define("DB_USER", $usuario);
-define("DB_PASS", $clave);
-define("DB_NAME", $base);
-
-/**
- * Database Table Constants - these constants
- * hold the names of all the database tables used
- * in the script.
- */
-define("TBL_USERS", "users");
-define("TBL_ACTIVE_USERS",  "active_users");
-define("TBL_ACTIVE_GUESTS", "active_guests");
-define("TBL_BANNED_USERS",  "banned_users");
-
-/**
- * Special Names and Level Constants - the admin
- * page will only be accessible to the user with
- * the admin name and also to those users at the
- * admin user level. Feel free to change the names
- * and level constants as you see fit, you may
- * also add additional level specifications.
- * Levels must be digits between 0-9.
- */
-define("ADMIN_NAME", "admin");
-define("GUEST_NAME", "Visitante");
-define("ADMIN_LEVEL", 9);
-define("USER_LEVEL",  1);
-define("GUEST_LEVEL", 0);
-
-/**
- * This boolean constant controls whether or
- * not the script keeps track of active users
- * and active guests who are visiting the site.
- */
-define("TRACK_VISITORS", true);
-
-/**
- * Timeout Constants - these constants refer to
- * the maximum amount of time (in minutes) after
- * their last page fresh that a user and guest
- * are still considered active visitors.
- */
-define("USER_TIMEOUT", 10);
-define("GUEST_TIMEOUT", 5);
-
-/**
- * Cookie Constants - these are the parameters
- * to the setcookie function call, change them
- * if necessary to fit your website. If you need
- * help, visit www.php.net for more info.
- * <http://www.php.net/manual/en/function.setcookie.php>
- */
-define("COOKIE_EXPIRE", 60*60*24*100);  //100 days by default
-define("COOKIE_PATH", "/");  //Avaible in whole domain
-
-/**
- * Email Constants - these specify what goes in
- * the from field in the emails that the script
- * sends to users, and whether to send a
- * welcome email to newly registered users.
- */
-define("EMAIL_FROM_NAME", "Ajelandro");
-define("EMAIL_FROM_ADDR", "buho.uca@todosv.com");
-define("EMAIL_WELCOME", true);
-
-/**
- * This constant forces all users to have
- * lowercase usernames, capital letters are
- * converted automatically.
- */
-define("ALL_LOWERCASE", false);
-?>
+<?
+
+ require_once("data.php");
+define("DB_SERVER", $motor);
+define("DB_USER", $usuario);
+define("DB_PASS", $clave);
+define("DB_NAME", $base);
+define("TBL_USERS", "users");
+define("TBL_ACTIVE_USERS",  "active_users");
+define("TBL_ACTIVE_GUESTS", "active_guests");
+define("TBL_BANNED_USERS",  "banned_users");
+define("ADMIN_NAME", "admin");
+define("GUEST_NAME", "Visitante");
+define("ADMIN_LEVEL", 9);
+define("USER_LEVEL",  1);
+define("GUEST_LEVEL", 0);
+define("TRACK_VISITORS", true);
+define("USER_TIMEOUT", 10);
+define("GUEST_TIMEOUT", 5);
+define("COOKIE_EXPIRE", 60*60*24*100);
+define("COOKIE_PATH", "/");
+define("EMAIL_FROM_NAME", "Sistema de Horarios");
+define("EMAIL_FROM_ADDR", "buho.uca@todosv.com");
+define("EMAIL_WELCOME", true);
+define("ALL_LOWERCASE", false);
+?>
diff --git a/include/mailer.php b/include/mailer.php
dissimilarity index 79%
index 3ca9536..09c3904 100644
--- a/include/mailer.php
+++ b/include/mailer.php
@@ -1,69 +1,38 @@
-<? 
-/**
- * Mailer.php
- *
- * The Mailer class is meant to simplify the task of sending
- * emails to users. Note: this email system will not work
- * if your server is not setup to send mail.
- *
- * If you are running Windows and want a mail server, check
- * out this website to see a list of freeware programs:
- * <http://www.snapfiles.com/freeware/server/fwmailserver.html>
- *
- * Written by: Jpmaster77 a.k.a. The Grandmaster of C++ (GMC)
- * Last Updated: August 19, 2004
- */
- 
-class Mailer
-{
-   /**
-    * sendWelcome - Sends a welcome message to the newly
-    * registered user, also supplying the username and
-    * password.
-    */
-   function sendWelcome($user, $email, $pass){
-      $from = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM_ADDR.">";
-      $subject = "Jpmaster77's Site - Welcome!";
-      $body = $user.",\n\n"
-             ."Welcome! You've just registered at Jpmaster77's Site "
-             ."with the following information:\n\n"
-             ."Username: ".$user."\n"
-             ."Password: ".$pass."\n\n"
-             ."If you ever lose or forget your password, a new "
-             ."password will be generated for you and sent to this "
-             ."email address, if you would like to change your "
-             ."email address you can do so by going to the "
-             ."My Account page after signing in.\n\n"
-             ."- Jpmaster77's Site";
-
-      return mail($email,$subject,$body,$from);
-   }
-   
-   /**
-    * sendNewPass - Sends the newly generated password
-    * to the user's email address that was specified at
-    * sign-up.
-    */
-   function sendNewPass($user, $email, $pass){
-      $from = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM_ADDR.">";
-      $subject = "Jpmaster77's Site - Your new password";
-      $body = $user.",\n\n"
-             ."We've generated a new password for you at your "
-             ."request, you can use this new password with your "
-             ."username to log in to Jpmaster77's Site.\n\n"
-             ."Username: ".$user."\n"
-             ."New Password: ".$pass."\n\n"
-             ."It is recommended that you change your password "
-             ."to something that is easier to remember, which "
-             ."can be done by going to the My Account page "
-             ."after signing in.\n\n"
-             ."- Jpmaster77's Site";
-             
-      return mail($email,$subject,$body,$from);
-   }
-};
-
-/* Initialize mailer object */
-$mailer = new Mailer;
- 
-?>
+<? 
+
+class Mailer
+{
+   function sendWelcome($user, $email, $pass){
+      $from = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM_ADDR.">";
+      $subject = "¡Bienvenido al Sistema de Horarios!";
+      $body = $user.",\n\n"
+             ."¡Bienvenido! acabas de se registrado como instructor en el Sistema de Horarios"
+             ." con la siguiente información:\n\n"
+             ."Usuario: ".$user."\n"
+             ."Clave: ".$pass."\n\n"
+	     ."Si tu clave esta en blanco significa que no necesitas de ella para ingresar al sistema\n"
+             ."De lo contrario será necesario que la ingreses para poder acceder a tu cuenta";
+
+      return mail($email,$subject,$body,$from);
+   }
+   
+   function sendNewPass($user, $email, $pass){
+      $from = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM_ADDR.">";
+      $subject = "Sistema de Horarios - Nueva contraseña";
+      $body = $user.",\n\n"
+             ."Hemos generado una nueva contraseña a tu petición "
+             ."para que puedas reingresar al sistema con ella. "
+             ."username to log in to Jpmaster77's Site.\n\n"
+             ."Usuario: ".$user."\n"
+             ."Clave: ".$pass."\n\n"
+	     ."Si tu clave esta en blanco significa que no necesitas de ella para ingresar al sistema\n"
+             ."De lo contrario será necesario que la ingreses para poder acceder a tu cuenta\n"
+             ."Se recomienda solicitar un cambio de contraseña una vez ingrese al sistema";
+             
+      return mail($email,$subject,$body,$from);
+   }
+};
+
+$mailer = new Mailer;
+ 
+?>
-- 
2.11.4.GIT