Changeset 359

Timestamp:

03/27/07 17:24:40 (5 years ago)

Author:

cryptronic

Message:

Added support for idn in mail check
Fixed the customer template issue
Fixed customer mail template was blank
Thanks to perry for reporting

Location:

trunk/webinterface

Files:

• core/mysql.sql (modified) (2 diffs)
• core/openvcp.conf (modified) (1 diff)
• mods/super/admins/main.php (modified) (2 diffs)
• mods/super/functions.php (modified) (1 diff)
• themes/default/theme.css (modified) (1 diff)

trunk/webinterface/core/mysql.sql

@@ -68 +68 @@
 ('vserver_prefix_last', '0', 'int'),
 ('language', 'en_US', 'dropdown'),
-('theme', 'default', 'dropdown');
+('theme', 'default', 'dropdown'),
+('add_user_mail_subject', 'New user account created', 'string'),
+('add_user_mail_body', 'Hello %firstname %lastname, a new useraccount was created for you: %loginname %password you can login using %url regards openVCP Team', 'text');
 
 CREATE TABLE IF NOT EXISTS `openvcp_network` (
@@ -118 +120 @@
 ('add_admin_mail_subject', 'New admin account created', 'string'),
 ('add_admin_mail_body', 'Hello %firstname %lastname,\r\n\r\na new adminaccount was created for you:\r\n%loginname\r\n%password\r\n\r\nyou can login using %url\r\n\r\nregards\r\n\r\nopenVCP Team', 'text'),
-('url', 'http://www.openvcp.org', 'string');
+('url', 'http://www.openvcp.org', 'string'),
+('add_user_mail_subject', 'New user account created', 'string'),
+('add_user_mail_body', 'Hello %firstname %lastname,\r\n\r\na new useraccount was created for you:\r\n%loginname\r\n%password\r\n\r\nyou can login using %url\r\n\r\nregards\r\n\r\nopenVCP Team', 'text');
 
 CREATE TABLE IF NOT EXISTS `openvcp_user` (

trunk/webinterface/core/openvcp.conf

@@ -72 +72 @@
         table TABLE_USER_SETTINGS user_settings
         table TABLE_USER_SETTINGS_AVAILABLE user_settings_available
+        table TABLE_USER_TEMPLATES user_templates
         table TABLE_ADMIN admin
         table TABLE_ADMIN_PRIVILEGES admin_privileges

trunk/webinterface/mods/super/admins/main.php

@@ -164 +164 @@
         $AUTH->getPrivileges('manage_admins') == "y" ? "" : OpenVCP::gotoURL("super/admins");
         $nok = true;
-        if($PARAMS[1] == "submit")
+        if(in_array("submit", $PARAMS))
         {
                 if(checkEmail($_POST['email']) && ($_POST['company'] != "" || $_POST['firstname'] != "" && $_POST['lastname'] != ""))
@@ -239 +239 @@
                 }
                         
-                $form = $GUI->form(0, "add_admin", (isset($_POST['id']) ? "submit" : "add/submit"));
+                $form = $GUI->form(0, "add_admin", (in_array("submit", $PARAMS) ? "submit" : "add/submit"));
                 $table = $GUI->table($form);
                 $thead = $GUI->tableAddHead($table);

trunk/webinterface/mods/super/functions.php

@@ -266 +266 @@
 function checkEmail($email)
 {
-        return preg_match("/(.*)@[a-z|A-Z|0-9]+\.[a-z|A-Z]+/i", $email) ? true : false;
+        return preg_match("/(.*)@[a-z|A-Z|0-9|á|é|í|ó|ú|à|è|ì|ò|ù|ä|ë|ï|ö|ü|â|ê|î|ô|û|ñ|ç|þ|æ|ð|å|ý]+\.[a-z|A-Z]+/i", $email) ? true : false;
 }
 

trunk/webinterface/themes/default/theme.css

@@ -12 +12 @@
         background-color: #dddddd;
         height:100%;
+        font-family: Geneva, Arial, Helvetica, sans-serif;
 }