SF.net SVN: postfixadmin:[909] trunk/scripts
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[909] trunk/scripts
|
From: <chr...@us...> - 2010-12-25 22:38:15
|
Revision: 909
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=909&view=rev
Author: christian_boltz
Date: 2010-12-25 22:38:09 +0000 (Sat, 25 Dec 2010)
Log Message:
-----------
scripts/shells/user.php:
- adopted return value checks to true/false instead of shell-like 0/1
- fixed some messages in interactive mode
- various minor fixes
- added some TODO notes, but didn't do a full proofreading
scripts/models-ext/UserHandler.php:
- deleted, replaced with a redirect to /model/UserHandler.php
scripts/common.php, scripts/shells/shell.php:
- replaced obsolete "... =& new ..." with "... = new ..."
Modified Paths:
--------------
trunk/scripts/common.php
trunk/scripts/models-ext/UserHandler.php
trunk/scripts/shells/shell.php
trunk/scripts/shells/user.php
Modified: trunk/scripts/common.php
===================================================================
--- trunk/scripts/common.php 2010-12-25 22:29:44 UTC (rev 908)
+++ trunk/scripts/common.php 2010-12-25 22:38:09 UTC (rev 909)
@@ -136,7 +136,7 @@
function &getInstance() {
static $instance = array();
if (!$instance) {
- $instance[0] =& new Config();
+ $instance[0] = new Config();
//$instance[0]->__loadBootstrap($boot);
}
return $instance[0];
@@ -274,7 +274,7 @@
function &getInstance() {
static $instance = array();
if (!$instance) {
- $instance[0] =& new Config();
+ $instance[0] = new Config();
//$instance[0]->__loadBootstrap($boot);
}
return $instance[0];
Modified: trunk/scripts/models-ext/UserHandler.php
===================================================================
--- trunk/scripts/models-ext/UserHandler.php 2010-12-25 22:29:44 UTC (rev 908)
+++ trunk/scripts/models-ext/UserHandler.php 2010-12-25 22:38:09 UTC (rev 909)
@@ -1,313 +1,2 @@
<?php
-
-/**
- * Simple class to represent a user.
- */
-class UserHandler {
-
- protected $username = null;
-
- public $errormsg = array();
-
- public function __construct($username) {
- $this->username = strtolower($username);
-
-
- }
-
- /**
- * @return boolean true on success; false on failure
- * @param string $username
- * @param string $old_password
- * @param string $new_passwords
- *
- * All passwords need to be plain text; they'll be hashed appropriately
- * as per the configuration in config.inc.php
- */
- public function change_pw($new_password, $old_password, $match = true) {
- global $config;
- $username = $this->username;
- $tmp = preg_split ('/@/', $username);
- $domain = $tmp[1];
-
- $username = escape_string($username);
- $table_mailbox = table_by_key('mailbox');
-
- $new_db_password = escape_string(pacrypt($new_password));
-
- if ($match == true) {
- $active = db_get_boolean(True);
- $result = db_query("SELECT * FROM $table_mailbox WHERE username='$username' AND active='$active'");
- $result = $result['result'];
- if ($new_db_password != $result['password']) {
- $this->errormsg[] = 'Passwords do not Match';
- return 1;
- }
- }
-
- $set = array(
- 'password' => $new_db_password
- );
-
- $result = db_update('mailbox', 'username=\''.$username.'\'', $set, array('modified') );
-
- db_log ('CONSOLE', $domain, 'edit_password', "$username");
- if ($result != 1) {
- $this->errormsg[] = Lang::read('pEdit_mailbox_result_error');
- return 1;
- }
-
- return 0;
-
- }
-
- /**
- * Attempt to log a user in.
- * @param string $username
- * @param string $password
- * @return boolean true on successful login (i.e. password matches etc)
- */
- public static function login($username, $password) {
- global $config;
- $username = escape_string($username);
-
- $table_mailbox = table_by_key('mailbox');
- $active = db_get_boolean(True);
- $query = "SELECT password FROM $table_mailbox WHERE username='$username' AND active='$active'";
-
- $result = db_query ($query);
- if ($result['rows'] == 1)
- {
- $row = db_array ($result['result']);
- $crypt_password = pacrypt ($password, $row['password']);
-
- if($row['password'] == $crypt_password) {
- return true;
- }
- }
- return false;
- }
-/**
- * Add mailbox
- * @param password string password of account
- * @param gen boolean
- * @param name string
- *
- */
- public function add($password, $name = '', $quota = 0, $active = true, $mail = true ) {
-# FIXME: change default value of $quota to something that is not an allowed value, like "-9" (0 is "unlimited", and I don't like that as default)
-# FIXME: Should the parameters be optional at all?
-# TODO: check if parameters are valid/allowed (quota?). Checks should live in a separate function that can be used by add and edit.
-# TODO: On the longer term, the web interface should also use this class.
- global $config;
- $username = $this->username;
- $tmp = preg_split ('/@/', $username);
- $domain = $tmp[1];
- $address = escape_string($username);
- $username = $tmp[0];
-
- $table_mailbox = table_by_key('mailbox');
- $table_alias = table_by_key('alias');
-
- $active = db_get_boolean($active);
-
- if(!check_mailbox ($domain)) {
- $this->errormsg[] = Lang::read('pCreate_mailbox_username_text_error3');
- return 1;
- }
- $result = db_query ("SELECT * FROM $table_alias WHERE address='$address'");
- if ($result['rows'] == 1){
- $this->errormsg[] = Lang::read('pCreate_mailbox_username_text_error2');
- return 1;
- }
-
-
- $plain = $password;
- $password = pacrypt ($password);
-
-# TODO: Decide if we want to have the encryption method in the encrypted password string, and edit pacrypt() accordingly. No special handling here, please!
- if ( preg_match("/^dovecot:/", Config::read('encrypt')) ) {
- $split_method = preg_split ('/:/', Config::read('encrypt'));
- $method = strtoupper($split_method[1]);
- $password = '{' . $method . '}' . $password;
- }
-
- if (Config::read('domain_path') == "YES")
- {
- if (Config::read('domain_in_mailbox') == "YES")
- {
- $maildir = $domain . "/" . $address . "/";
- }
- else
- {
- $maildir = $domain . "/" . $username . "/";
- }
- }
- else
- {
- $maildir = $address . "/";
- }
-
- $quota = multiply_quota ($quota);
-
-
- if ('pgsql'== Config::read('database_type'))
- {
- db_query('BEGIN');
- }
-
- //$result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$address','$address','$domain',NOW(),NOW(),'$active')");
- $arr = array(
- 'address' => $address,
- 'goto' => $address,
- 'domain' => $domain,
- 'active' => $active,
- );
-
- $result = db_insert('alias', $arr, array('created', 'modified') );
- if ($result != 1)
- {
- $this->errormsg[] = Lang::read('pAlias_result_error') . "\n($address -> $address)\n";
- return 1;
- }
-
- // apparently uppercase usernames really confuse some IMAP clients.
- $local_part = '';
- if(preg_match('/^(.*)@/', $address, $matches)) {
- $local_part = $matches[1];
- }
-
- //$result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,local_part,quota,domain,created,modified,active) VALUES ('$username','$password','$name','$maildir','$local_part','$quota','$domain',NOW(),NOW(),'$active')");
-
-
- $arr2 = array(
- 'username' => $address,
- 'password' => $password,
- 'name' => $name,
- 'maildir' => $maildir,
- 'local_part' => $local_part,
- 'quota' => $quota,
- 'domain' => $domain,
- 'active' => $active,
- );
- $result = db_insert('mailbox', $arr2, array('created', 'modified') );
- if ($result != 1 || !mailbox_postcreation($address,$domain,$maildir, $quota))
- {
- $this->errormsg[] = Lang::read('pCreate_mailbox_result_error') . "\n($address)\n";
- db_query('ROLLBACK');
- return 1;
- }
- else
- {
- db_query('COMMIT');
- db_log ('CONSOLE', $domain, 'create_mailbox', "$address");
-
-
- if ($mail == true)
- {
- $fTo = $address;
- $fFrom = Config::read('admin_email');
- $fHeaders = "To: " . $fTo . "\n";
- $fHeaders .= "From: " . $fFrom . "\n";
-
- $fHeaders .= "Subject: " . encode_header (Lang::read('pSendmail_subject_text')) . "\n";
- $fHeaders .= "MIME-Version: 1.0\n";
- $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
- $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
-
- $fHeaders .= Config::read('welcome_text');
-
- if (!smtp_mail ($fTo, $fFrom, $fHeaders))
- {
- $this->errormsg[] = Lang::read('pSendmail_result_error');
- return 1;
- }
- }
-
- create_mailbox_subfolders($address,$plain);
-
- }
- return 0;
- }
-
-
-
-
- public function view() {
- global $config;
-
-
-
- $username = $this->username;
- $table_mailbox = table_by_key('mailbox');
-
- $result = db_query("SELECT username, name, maildir, quota, local_part, domain, DATE_FORMAT(created, '%d.%m.%y') AS created, DATE_FORMAT(modified, '%d.%m.%y') AS modified, active FROM $table_mailbox WHERE username='$username'");
- if ($result['rows'] != 0) {
- $this->return = db_array($result['result']);
- return 0;
- }
- $this->errormsg = $result['error'];
- return 1;
- }
-
- public function delete() {
- global $config;
- $username = $this->username;
- $tmp = preg_split ('/@/', $username);
- $domain = $tmp[1];
- $username = escape_string($username);
-
-
-
- $table_mailbox = table_by_key('mailbox');
- $table_alias = table_by_key('alias');
- $table_vacation = table_by_key('vacation');
- $table_vacation_notification = table_by_key('vacation_notification');
-
- if (Config::read('database_type') == "pgsql") db_query('BEGIN');
- /* there may be no aliases to delete */
- $result = db_query("SELECT * FROM $table_alias WHERE address = '$username' AND domain = '$domain'");
- if($result['rows'] == 1) {
- //$result = db_query ("DELETE FROM $table_alias WHERE address='$username' AND domain='$domain'");
- $result = db_delete('alias', 'address', $username);
- db_log ('CONSOLE', $domain, 'delete_alias', $username);
- }
-
- /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */
- $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$username' AND domain='$domain'");
- if ($result['rows'] == 1)
- {
- //$result = db_query ("DELETE FROM $table_mailbox WHERE username='$username' AND domain='$domain'");
- $result = db_delete('mailbox', 'username', $username);
- $postdel_res=mailbox_postdeletion($username,$domain);
- if ($result != 1 || !$postdel_res)
- {
-
- $tMessage = Lang::read('pDelete_delete_error') . "$username (";
- if ($result['rows']!=1)
- {
- $tMessage.='mailbox';
- if (!$postdel_res) $tMessage.=', ';
- }
- if (!$postdel_res)
- {
- $tMessage.='post-deletion';
- }
- $this->errormsg[] = $tMessage.')';
- return 1;
- }
- db_log ('CONSOLE', $domain, 'delete_mailbox', $username);
- }
- $result = db_query("SELECT * FROM $table_vacation WHERE email = '$username' AND domain = '$domain'");
- if($result['rows'] == 1) {
- //db_query ("DELETE FROM $table_vacation WHERE email='$username' AND domain='$domain'");
- db_delete('vacation', 'email', $username);
- //db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$username' "); /* should be caught by cascade, if PgSQL */
- db_delete('vacation_notification', 'on_vacation', $username);
- }
- return 0;
- }
-
-}
-
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
+require('../model/UserHandler.php');
Modified: trunk/scripts/shells/shell.php
===================================================================
--- trunk/scripts/shells/shell.php 2010-12-25 22:29:44 UTC (rev 908)
+++ trunk/scripts/shells/shell.php 2010-12-25 22:38:09 UTC (rev 909)
@@ -215,7 +215,7 @@
$this->taskNames[] = $taskName;
if (!PHP5) {
- $this->{$taskName} =& new $taskClass($this->Dispatch);
+ $this->{$taskName} = new $taskClass($this->Dispatch);
} else {
$this->{$taskName} = new $taskClass($this->Dispatch);
}
@@ -350,4 +350,4 @@
- }
\ No newline at end of file
+ }
Modified: trunk/scripts/shells/user.php
===================================================================
--- trunk/scripts/shells/user.php 2010-12-25 22:29:44 UTC (rev 908)
+++ trunk/scripts/shells/user.php 2010-12-25 22:38:09 UTC (rev 909)
@@ -157,7 +157,7 @@
$handler = new UserHandler($address);
$return = $handler->add($pw, $name, $quota, true, true );
- if($return == 1) {
+ if( ! $return) {
$this->err(join("\n", $handler->errormsg));
} else {
$this->out("");
@@ -256,7 +256,7 @@
* @access private
*/
function __interactive() {
- $question[] = "Which Address do you want to view?";
+ $question[] = "Which Address do you want to delete?";
$address = $this->in(join("\n", $question));
@@ -269,8 +269,6 @@
if ($create)
$this->__handle($address);
-
-
}
/**
@@ -283,11 +281,10 @@
$handler = new UserHandler($address);
$status = $handler->delete();
- if ($status == 0) {
+ if ( ! $status ) {
+ $this->err(join("\n", $handler->errormsg));
+ } else {
$this->out("Mailbox of '$address' was deleted.");
-
- } else {
- $this->err(join("\n", $handler->errormsg));
}
return;
@@ -316,6 +313,7 @@
* @access public
*/
function execute() {
+ $random = false;
if (empty($this->args)) {
$this->__interactive();
}
@@ -327,7 +325,7 @@
if (isset($this->params['g']) && $this->params['g'] == true ) {
$random = true;
$password = NULL;
- } elseif (isset($this->args[1]) && length($this->args[1]) > 8) {
+ } elseif (isset($this->args[1]) && strlen($this->args[1]) > 8) { # TODO use $CONF['min_password_length']
$password = $this->args[1];
} else {
@@ -399,7 +397,7 @@
if ($password != NULL) {
$handler = new UserHandler($address);
- if ($handler->change_pw($password, NULL, false) == 1){
+ if ( ! $handler->change_pw($password, NULL, false) ){
$this->error("Change Password",join("\n", $handler->errormsg));
}
}
@@ -473,8 +471,12 @@
$handler = new UserHandler($address);
- $status = $handler->view();
- if ($status == 0) {
+ if ( ! $handler->view() ) {
+ return ;
+ # TODO: display error message "not found"
+ }
+# TODO: offer alternative output formats (based on parameter)
+# TODO: whitespace fix - 8 lines below
$result = $handler->return;
$this->out(sprintf("Entries for: %s\n", $address));
$this->out("");
@@ -484,7 +486,6 @@
$this->out(sprintf('|%25s|%15s|%10s|%20s|%8s|%8s|%6s|', $result['username'], $result['name'], $result['quota'], $result['maildir'], $result['created'], $result['modified'], $result['active']));
$this->out(sprintf("+%'-25s+%'-15s+%'-10s+%'-20s+%'-8s+%'-8s+%'-6s+",'','','','','','',''));
- }
return;
}
@@ -505,4 +506,4 @@
$this->_stop();
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|