Revision: 146
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=146&view=rev
Author: christian_boltz
Date: 2007-10-09 16:46:52 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
- replaced admin creation code with a call to create_admin(),
see commit message of r135 for details
Modified Paths:
--------------
trunk/admin/create-admin.php
Modified: trunk/admin/create-admin.php
===================================================================
--- trunk/admin/create-admin.php 2007-10-09 22:36:13 UTC (rev 145)
+++ trunk/admin/create-admin.php 2007-10-09 23:46:52 UTC (rev 146)
@@ -57,78 +57,13 @@
$fDomains = array();
if (!empty ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
- if (!check_email ($fUsername))
- {
- $error = 1;
+ list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
+
+ if ($error != 0) {
if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error1'];
}
- if (empty ($fUsername) or admin_exist ($fUsername))
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error2'];
- }
-
- if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2))
- {
- if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES")
- {
- $fPassword = generate_password ();
- }
- else
- {
- $error = 1;
- if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
- if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
- $pAdminCreate_admin_password_text = $PALANG['pAdminCreate_admin_password_text_error'];
- }
- }
-
- if ($error != 1)
- {
- $password = pacrypt($fPassword);
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
-
-
- $result = db_query ("INSERT INTO $table_admin (username,password,created,modified) VALUES ('$fUsername','$password',NOW(),NOW())");
- if ($result['rows'] != 1)
- {
- $tMessage = $PALANG['pAdminCreate_admin_result_error'] . "<br />($fUsername)<br />";
- }
- else
- {
- if (!empty ($fDomains[0]))
- {
- for ($i = 0; $i < sizeof ($fDomains); $i++)
- {
- $domain = $fDomains[$i];
- $result = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$fUsername','$domain',NOW())");
- }
- }
- $tMessage = $PALANG['pAdminCreate_admin_result_success'] . "<br />($fUsername";
- if ($CONF['generate_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- if ($CONF['show_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- $tMessage .= ")</br />";
- }
- }
- }
- }
-
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/admin_create-admin.tpl");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
