From: <ral...@us...> - 2013-07-30 12:50:24
|
Author: ralfbecker Date: Tue Jul 30 14:50:14 2013 New Revision: 43258 URL: http://svn.stylite.de/viewvc/egroupware?rev=43258&view=rev Log: * EMailAdmin: make imap classes and default smtp class usable with PHP 5.2, LDAP requires 5.3! Modified: branches/1.8/emailadmin/inc/class.cyrusimap.inc.php branches/1.8/emailadmin/inc/class.dbmaildbmailuser.inc.php branches/1.8/emailadmin/inc/class.dbmailqmailuser.inc.php branches/1.8/emailadmin/inc/class.defaultimap.inc.php branches/1.8/emailadmin/inc/class.emailadmin_dovecot.inc.php branches/1.8/emailadmin/inc/class.emailadmin_smtp.inc.php branches/1.8/emailadmin/inc/class.emailadmin_smtp_sql.inc.php branches/1.8/emailadmin/inc/class.pleskimap.inc.php Modified: branches/1.8/emailadmin/inc/class.cyrusimap.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.cyrusimap.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.cyrusimap.inc.php (original) +++ branches/1.8/emailadmin/inc/class.cyrusimap.inc.php Tue Jul 30 14:50:14 2013 @@ -46,6 +46,16 @@ var $cyrusAdminPassword; /** + * Return description for EMailAdmin + * + * @return string + */ + public static function description() + { + return self::DESCRIPTION; + } + + /** * Updates an account * * @param array $_hookValues only value for key 'account_lid' and 'new_passwd' is used Modified: branches/1.8/emailadmin/inc/class.dbmaildbmailuser.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.dbmaildbmailuser.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.dbmaildbmailuser.inc.php (original) +++ branches/1.8/emailadmin/inc/class.dbmaildbmailuser.inc.php Tue Jul 30 14:50:14 2013 @@ -29,6 +29,16 @@ * Capabilities of this class (pipe-separated): default, sieve, admin, logintypeemail */ const CAPABILITIES = 'default|sieve'; + + /** + * Return description for EMailAdmin + * + * @return string + */ + public static function description() + { + return self::DESCRIPTION; + } function addAccount($_hookValues) { return $this->updateAccount($_hookValues); Modified: branches/1.8/emailadmin/inc/class.dbmailqmailuser.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.dbmailqmailuser.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.dbmailqmailuser.inc.php (original) +++ branches/1.8/emailadmin/inc/class.dbmailqmailuser.inc.php Tue Jul 30 14:50:14 2013 @@ -29,6 +29,16 @@ * Capabilities of this class (pipe-separated): default, sieve, admin, logintypeemail */ const CAPABILITIES = 'default|sieve'; + + /** + * Return description for EMailAdmin + * + * @return string + */ + public static function description() + { + return self::DESCRIPTION; + } function addAccount($_hookValues) { return $this->updateAccount($_hookValues); Modified: branches/1.8/emailadmin/inc/class.defaultimap.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.defaultimap.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.defaultimap.inc.php (original) +++ branches/1.8/emailadmin/inc/class.defaultimap.inc.php Tue Jul 30 14:50:14 2013 @@ -195,7 +195,7 @@ */ public static function description() { - return static::DESCRIPTION; + return self::DESCRIPTION; } /** Modified: branches/1.8/emailadmin/inc/class.emailadmin_dovecot.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.emailadmin_dovecot.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.emailadmin_dovecot.inc.php (original) +++ branches/1.8/emailadmin/inc/class.emailadmin_dovecot.inc.php Tue Jul 30 14:50:14 2013 @@ -61,6 +61,16 @@ var $user_home; // = '/var/dovecot/imap/%d/%u'; /** + * Return description for EMailAdmin + * + * @return string + */ + public static function description() + { + return self::DESCRIPTION; + } + + /** * Opens a connection to a imap server * * Reimplemented to prefix adminUsername with real username (separated by an asterisk) Modified: branches/1.8/emailadmin/inc/class.emailadmin_smtp.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.emailadmin_smtp.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.emailadmin_smtp.inc.php (original) +++ branches/1.8/emailadmin/inc/class.emailadmin_smtp.inc.php Tue Jul 30 14:50:14 2013 @@ -86,7 +86,7 @@ */ public static function description() { - return static::DESCRIPTION; + return self::DESCRIPTION; } /** Modified: branches/1.8/emailadmin/inc/class.emailadmin_smtp_sql.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.emailadmin_smtp_sql.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.emailadmin_smtp_sql.inc.php (original) +++ branches/1.8/emailadmin/inc/class.emailadmin_smtp_sql.inc.php Tue Jul 30 14:50:14 2013 @@ -62,6 +62,16 @@ parent::__construct($defaultDomain); $this->db = $GLOBALS['egw']->db; + } + + /** + * Return description for EMailAdmin + * + * @return string + */ + public static function description() + { + return self::DESCRIPTION; } /** Modified: branches/1.8/emailadmin/inc/class.pleskimap.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/emailadmin/inc/class.pleskimap.inc.php?rev=43258&r1=43257&r2=43258&view=diff ============================================================================== --- branches/1.8/emailadmin/inc/class.pleskimap.inc.php (original) +++ branches/1.8/emailadmin/inc/class.pleskimap.inc.php Tue Jul 30 14:50:14 2013 @@ -55,6 +55,16 @@ * @var string/boolean $error string with last error-message or false */ var $error = false; + + /** + * Return description for EMailAdmin + * + * @return string + */ + public static function description() + { + return self::DESCRIPTION; + } /** * Create a full mailbox or just forward, depending on the given email address |