Changeset 521

Timestamp:

03/31/05 12:54:46 (8 years ago)

Author:

fproulx

Message:

Missing files

Location:

trunk/wifidog-auth/wifidog

Files:

• classes/User.php (modified) (3 diffs)
• config.php (modified) (9 diffs)
• include/common.php (modified) (1 diff)
• include/language.php (modified) (1 diff)

trunk/wifidog-auth/wifidog/classes/User.php

@@ -355 +355 @@
                 $headers .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
                 $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
-                $subject = LOST_USERNAME_EMAIL_SUBJECT;
+                $subject = HOTSPOT_NETWORK_NAME._(" lost username request");
                 $body = _("Hello,<br>You have requested that the authentication server send you your username:<br>Username: ").$username._("<br><br>Have a nice day,<br>The Team");
                 
@@ -378 +378 @@
                                 $headers .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
                                 $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
-                                $subject = VALIDATION_EMAIL_SUBJECT;
+                                $subject = HOTSPOT_NETWORK_NAME._(" new user validation");
                                 $url = "http://".$_SERVER["SERVER_NAME"]."/validate.php?user_id=".$this->getId()."&token=".$this->getValidationToken();
                                 $body = _("Hello,<br>Please follow the link below to validate your account.<br>").$url._("<br><br>Thank you,<br>The Team.");
@@ -398 +398 @@
                 $headers .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
                 $headers .= "From: ".VALIDATION_EMAIL_FROM_ADDRESS;
-                $subject = LOST_PASSWORD_EMAIL_SUBJECT;
+                $subject = HOTSPOT_NETWORK_NAME._(" new password request");
                 $body = _("Hello,<br>You have requested that the authentication server send you a new password:<br>Username: ").$username._("<br>Password: ").$new_password._("<br><br>Have a nice day,<br>The Team");
                 

trunk/wifidog-auth/wifidog/config.php

@@ -7 +7 @@
  *
  *     $Log$
+ *     Revision 1.25  2005/03/31 17:54:45  fproulx
+ *     Missing files
+ *
  *     Revision 1.24  2005/03/30 20:04:42  fproulx
- *     2005-03-30 Fran�ois Proulx  <francois.proulx@gmail.com>
+ *     2005-03-30 Fran?ois Proulx  <francois.proulx@gmail.com>
  *      * Finished RADIUS authentication and accounting
  *      * Accounting Unique session ID is now based on the same token we use
@@ -19 +22 @@
  *
  *     Revision 1.23  2005/03/29 22:13:27  fproulx
- *     2005-03-28 Fran�ois Proulx  <francois.proulx@gmail.com>
+ *     2005-03-28 Fran?ois Proulx  <francois.proulx@gmail.com>
  *      * schema_validate.php : Modified schema : dropped e-mail + account unique index, dropped email not empty constraint
  *      * Schema is now at version 3
@@ -31 +34 @@
  *
  *     Revision 1.22  2005/03/28 19:49:52  benoitg
- *     2005-03-28 Benoit Gr�goire  <bock@step.polymtl.ca>
+ *     2005-03-28 Benoit Gr?goire  <bock@step.polymtl.ca>
  *      * common.php:  Add get_guid() function
  *      * validate_schema.php: New auto-upgrade script to allow autaumatic schema upgrade.  Note that you must still update dump_initial_data_postgres.sh and use sync_sql_for_cvs.sh so new users aren't left in the cold.
@@ -44 +47 @@
  *
  *     Revision 1.19  2005/01/26 03:46:30  benoitg
- *     2005-01-25 Benoit Gr�goire  <bock@step.polymtl.ca>
+ *     2005-01-25 Benoit Gr?goire  <bock@step.polymtl.ca>
  *      * classes/Node.php:  New file, untested code example
  *      * wifidog/admin/admin_common.php: Remove double-defined BASEPATH
@@ -61 +64 @@
  *
  *     Revision 1.14  2005/01/12 00:57:42  benoitg
- *     2004-01-10 Benoit Gr�goire  <bock@step.polymtl.ca>
+ *     2004-01-10 Benoit Gr?goire  <bock@step.polymtl.ca>
  *      * wifidog/config.php:  Add list of hotspot to network rss feed list (not yet functionnal)
  *      * wifidog/hotspot_status.php:  Allow RSS export of the list of deployed HotSpots.
@@ -69 +72 @@
  *
  *     Revision 1.13  2004/12/03 19:42:32  benoitg
- *     2004-12-03 Benoit Gr�goire  <bock@step.polymtl.ca>
+ *     2004-12-03 Benoit Gr?goire  <bock@step.polymtl.ca>
  *      * wifidog/admin/user_stats.php,  wifidog/classes/Statistics.php:  Embryonic aggregate user stats.  Currently allows you to find out the rate at which your users subscribe.
  *      * wifidog/config.php, wifidog/local_content/default/login.html, wifidog/include/user_management_menu.php:  Add hotspot status page to login page.
@@ -77 +80 @@
  *
  *     Revision 1.12  2004/11/20 03:28:25  benoitg
- *     2004-11-19 Benoit Gr�goire  <bock@step.polymtl.ca>
+ *     2004-11-19 Benoit Gr?goire  <bock@step.polymtl.ca>
  *      * TODO: Add email domains to blacklist
  *      * wifidog/config.php, wifidog/include/user_management_menu.php: Add tech support email address
@@ -119 +122 @@
 define('UNKNOWN_HOSTPOT_NAME', 'Unknown HotSpot');
 
+define('VALIDATION_GRACE_TIME', 20); /**< Number of minutes after new account creation during which internet access is available to validate your account.  Once elapsed, you have to validate from home... */
 define('VALIDATION_EMAIL_FROM_ADDRESS', 'validation@ilesansfil.org');
-define('VALIDATION_EMAIL_SUBJECT', HOTSPOT_NETWORK_NAME._(" new user validation"));
-define('VALIDATION_GRACE_TIME', 20); /**< Number of minutes after new account creation during which internet access is available to validate your account.  Once elapsed, you have to validate from home... */
-define('LOST_PASSWORD_EMAIL_SUBJECT', HOTSPOT_NETWORK_NAME._(" new password request"));
-define('LOST_USERNAME_EMAIL_SUBJECT', HOTSPOT_NETWORK_NAME._(" lost username request"));
 /* RSS support.  If set to true, MAGPIERSS must be installed in MAGPIE_REL_PATH */
 define('RSS_SUPPORT', true); 
@@ -198 +198 @@
 
 define('DEFAULT_NODE_ID', 'default');
-define('DEFAULT_LANG', 'fr_FR');
-
+ define('DEFAULT_LANG', 'fr_FR');
+ 
 /*** FOR TESTING ONLY *** UNCOMMENT THE NEXT LINES
  *** WHEN READY TO TEST **************************

trunk/wifidog-auth/wifidog/include/common.php

@@ -8 +8 @@
 $db = new AbstractDb();
 validate_schema();
-/* Gettext support */
-if(!function_exists ('gettext'))
-  {
-    define('GETTEXT_AVAILABLE', false);
-    /* Redefine the gettext functions if gettext isn't installed */
-    function gettext($string)
-    {
-      return $string;
-    }
-    function _($string)
-    {
-      return $string;
-    }
-  }
-else
-  {
-    define('GETTEXT_AVAILABLE', true);
-  }
 
 /* NEVER edit these, as they mush match the C code of the gateway */

trunk/wifidog-auth/wifidog/include/language.php

@@ -1 +1 @@
 <?php
+require_once BASEPATH.'classes/Session.php';
+$session = new Session();
+/* Gettext support */
+if(!function_exists ('gettext'))
+  {
+    define('GETTEXT_AVAILABLE', false);
+    /* Redefine the gettext functions if gettext isn't installed */
+    function gettext($string)
+    {
+      return $string;
+    }
+    function _($string)
+    {
+      return $string;
+    }
+  }
+else
+  {
+    define('GETTEXT_AVAILABLE', true);
+  }
+
 if (!empty($_REQUEST['lang'])) {
     $session->set('SESS_LANGUAGE_VAR', $_REQUEST['lang']);