SF.net SVN: postfixadmin:[1300] trunk
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[1300] trunk
|
From: <chr...@us...> - 2011-12-20 00:06:17
|
Revision: 1300
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1300&view=rev
Author: christian_boltz
Date: 2011-12-20 00:06:11 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Delete the now unused files
- edit-admin.php
- create-admin.php
- templates/admin_edit-admin.tpl
Total: about 300 lines deleted
Removed Paths:
-------------
trunk/create-admin.php
trunk/edit-admin.php
trunk/templates/admin_edit-admin.tpl
Deleted: trunk/create-admin.php
===================================================================
--- trunk/create-admin.php 2011-12-19 23:51:47 UTC (rev 1299)
+++ trunk/create-admin.php 2011-12-20 00:06:11 UTC (rev 1300)
@@ -1,68 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: create-admin.php
- * Used to create new administrators.
- * Template File: admin_edit-admin.tpl
- *
- *
- * Template Variables:
- *
- * tUsername
- * tDomains
- *
- * Form POST \ GET Variables:
- *
- * fUsername
- * fPassword
- * fPassword2
- * fDomains
- */
-
-require_once('common.php');
-
-authentication_require_role('global-admin');
-$list_domains = list_domains ();
-$tDomains = array();
-$pAdminCreate_admin_username_text_error = "";
-$pAdminCreate_admin_password_text_error = "";
-
-if ($_SERVER['REQUEST_METHOD'] == "POST") {
- $fUsername = safepost('fUsername');
- $fPassword = safepost('fPassword');
- $fPassword2 = safepost('fPassword2');
- $fDomains = safepost('fDomains', array());
-
- list ($error, $infoMessage, $pAdminCreate_admin_username_text_error, $pAdminCreate_admin_password_text_error) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
-
- if ($error != 0) {
- $tUsername = $fUsername;
- $tDomains = $fDomains;
- }
-
- if(!empty($infoMessage)) flash_info($infoMessage);
-}
-
-$smarty->assign ('mode', 'create');
-$smarty->assign ('tUsername', $tUsername);
-$smarty->assign ('pAdminCreate_admin_username_text', $PALANG['pAdminCreate_admin_username_text']);
-$smarty->assign ('pAdminCreate_admin_username_text_error', $pAdminCreate_admin_username_text_error, false);
-$smarty->assign ('admin_password_text_error', $pAdminCreate_admin_password_text_error, false);
-$smarty->assign ('select_options', select_options ($list_domains, $tDomains), false);
-
-$smarty->assign ('smarty_template', 'admin_edit-admin');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>
Deleted: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php 2011-12-19 23:51:47 UTC (rev 1299)
+++ trunk/edit-admin.php 2011-12-20 00:06:11 UTC (rev 1300)
@@ -1,164 +0,0 @@
-<?php
-/**
- * Postfix Admin
- *
- * LICENSE
- * This source file is subject to the GPL license that is bundled with
- * this package in the file LICENSE.TXT.
- *
- * Further details on the project are available at :
- * http://www.postfixadmin.com or http://postfixadmin.sf.net
- *
- * @version $Id$
- * @license GNU GPL v2 or later.
- *
- * File: edit-admin.php
- * Edits a normal administrator's details.
- *
- * Template File: admin_edit-admin.tpl
- *
- * Template Variables:
- *
- * tAllDomains
- * tDomains
- * tActive_checked
- * tSadmin_checked
- *
- * Form POST \ GET Variables:
- *
- * fDescription
- * fAliases
- * fMailboxes
- * fMaxquota
- * fActive
- */
-
-require_once('common.php');
-
-authentication_require_role('global-admin');
-
-$error = 1;
-$pAdminEdit_admin_password_text_error = "";
-
-if(isset($_GET['username'])) {
- $username = escape_string ($_GET['username']);
- $result = db_query("SELECT * FROM $table_admin WHERE username = '$username'");
- if($result['rows'] == 1) {
- $admin_details = db_array($result['result']);
- $error = 0;
- }
-}
-if($error == 1){
- flash_error($PALANG['pAdminEdit_admin_result_error']);
- header("Location: list-admin.php");
- exit(0);
-}
-
-// we aren't ensuring the password is longer than x characters, should we?
-if ($_SERVER['REQUEST_METHOD'] == "POST")
-{
- $fPassword = '';
- $fPassword2 = '';
- if(isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
- if(isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
-
-
- $fActive=(isset($_POST['fActive'])) ? escape_string ($_POST['fActive']) : FALSE;
- $fSadmin=(isset($_POST['fSadmin'])) ? escape_string ($_POST['fSadmin']) : FALSE;
-
- $fDomains = false;
- if (isset ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
-
- $tAllDomains = list_domains ();
-
- // has the password changed?
- $originalPassword = $admin_details['password'];
- if($fPassword != '') {
- if($fPassword != $originalPassword) {
- // if it has, ensure both fields are the same...
- if ($fPassword == $fPassword2)
- {
- $validpass = validate_password($fPassword);
- if(count($validpass) > 0) {
- $pAdminEdit_admin_password_text_error = $validpass[0]; # TODO: honor all error messages, not only the first one
- $error = 1;
- }
- }
- else {
- $error = 1;
- $pAdminEdit_admin_password_text_error = $PALANG['pAdminEdit_admin_password_text_error'];
- }
- }
- }
- $fDomains = array();
- if (array_key_exists('fDomains', $_POST)) $fDomains = escape_string ($_POST['fDomains']);
- if ($error != 1)
- {
- if ($fActive == "on") {
- $sqlActive = db_get_boolean(True);
- }
- else {
- $sqlActive = db_get_boolean(False);
- }
-
- $password_query = '';
- if ($fPassword != '') { # do not change password to empty one
- $fPassword = pacrypt($fPassword);
- $password_query = ", password='$fPassword'";
- }
- $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive' $password_query WHERE username='$username'");
-
- if ($fSadmin == "on") $fSadmin = 'ALL';
-
- // delete everything, and put it back later on..
- db_query("DELETE FROM $table_domain_admins WHERE username = '$username'");
- if($fSadmin == 'ALL') {
- $fDomains = array('ALL');
- }
-
- foreach($fDomains as $domain)
- {
- $result = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$username','$domain',NOW())");
- }
- flash_info($PALANG['pAdminEdit_admin_result_success']);
- header("Location: list-admin.php");
- exit(0);
- }
- else {
- flash_error($PALANG['pAdminEdit_admin_result_error']);
- }
-}
-if (isset($_GET['username'])) $username = escape_string ($_GET['username']);
-
-$tAllDomains = list_domains();
-$tDomains = list_domains_for_admin ($username);
-$tActive_checked = '';
-$tPassword = $admin_details['password'];
-
-if($admin_details['active'] == 't' || $admin_details['active'] == 1) {
- $tActive_checked = ' checked="checked"';
-}
-$tSadmin_checked = '';
-$result = db_query ("SELECT * FROM $table_domain_admins WHERE username='$username'");
-// could/should be multiple matches to query;
-if ($result['rows'] >= 1) {
- $result = $result['result'];
- while($row = db_array($result)) {
- if ($row['domain'] == 'ALL') {
- $tSadmin_checked = ' checked="checked"';
- $tDomains = array(); /* empty the list, they're an admin */
- }
- }
-}
-
-$smarty->assign ('mode', 'edit');
-$smarty->assign ('username', $username);
-$smarty->assign ('admin_password_text_error', $pAdminEdit_admin_password_text_error, false);
-$smarty->assign ('tActive_checked', $tActive_checked);
-$smarty->assign ('tSadmin_checked', $tSadmin_checked);
-$smarty->assign ('select_options', select_options ($tAllDomains, $tDomains), false);
-$smarty->assign ('smarty_template', 'admin_edit-admin');
-$smarty->display ('index.tpl');
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-?>
Deleted: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl 2011-12-19 23:51:47 UTC (rev 1299)
+++ trunk/templates/admin_edit-admin.tpl 2011-12-20 00:06:11 UTC (rev 1300)
@@ -1,61 +0,0 @@
-<div id="edit_form">
-<form name="admin" method="post" action="">
-<table>
- <tr>
- <th colspan="4">
- {if $mode == 'edit'}
- {$PALANG.pAdminEdit_admin_welcome}
- {else}
- {$PALANG.pAdminCreate_admin_welcome}
- {/if}
- </th>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pAdminEdit_admin_username}:</label></td>
-{if $mode == 'edit'}
- <td>{$username}</td>
- <td colspan="2"> </td>
-{else}
- <td><input class="flat" type="text" name="fUsername" value="{$tUsername}" /></td>
- <td>{$pAdminCreate_admin_username_text}</td>
- <td><span class="error_msg">{$pAdminCreate_admin_username_text_error}</span></td>
-{/if}
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pAdminEdit_admin_password}:</label></td>
- <td><input class="flat" type="password" name="fPassword" /></td>
- <td> </td>
- <td><span class="error_msg">{$admin_password_text_error}</span></td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pAdminEdit_admin_password2}:</label></td>
- <td><input class="flat" type="password" name="fPassword2" /></td>
- <td colspan="2"> </td>
- </tr>
-{if $mode == 'edit'}
-<!-- TODO: these options should also be available in create-admin -->
- <tr>
- <td class="label"><label>{$PALANG.pAdminEdit_admin_active}:</label></td>
- <td><input class="flat" type="checkbox" name="fActive"{$tActive_checked}/></td>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td class="label"><label>{$PALANG.pAdminEdit_admin_super_admin}:</label></td>
- <td><input class="flat" type="checkbox" name="fSadmin"{$tSadmin_checked}/></td>
- <td colspan="2"> </td>
- </tr>
-{/if}
- <tr>
- <td class="label"><label>{$PALANG.pAdminCreate_admin_address}:</label></td>
- <td><select name="fDomains[]" size="10" multiple="multiple">{$select_options}</select></td>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td> </td>
- <td><input class="button" type="submit" name="submit"
- value="{if $mode == 'edit'}{$PALANG.save}{else}{$PALANG.pAdminCreate_admin_button}{/if}" /></td>
- <td colspan="2"> </td>
- </tr>
-</table>
-</form>
-</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
