[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php |
|
Date: |
Fri, 20 Oct 2006 13:15:27 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/10/20 13:15:27
Modified files:
inc/accounts : class.accounts_.inc.php
Log message:
update banned users list to make it neater and include some commonly
used ubuntu users and groups
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_.inc.php?cvsroot=phpgwapi&r1=1.9&r2=1.10
Patches:
Index: class.accounts_.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/accounts/class.accounts_.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.accounts_.inc.php 2 Oct 2006 10:24:39 -0000 1.9
+++ class.accounts_.inc.php 20 Oct 2006 13:15:27 -0000 1.10
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.accounts_.inc.php,v 1.9 2006/10/02 10:24:39
Caeies Exp $
+ * @version $Id: class.accounts_.inc.php,v 1.10 2006/10/20 13:15:27
skwashd Exp $
*/
if (empty($GLOBALS['phpgw_info']['server']['account_repository']))
{
@@ -26,42 +26,169 @@
*/
/**
- * @internal Moved again at least temporarily since sql and ldap use it.
+ * @ignore
+ * @global array list of banned user account names
*/
- $GLOBALS['phpgw_info']['server']['global_denied_users'] = array(
- 'root' => True, 'bin' => True, 'daemon' => True,
- 'adm' => True, 'lp' => True, 'sync' => True,
- 'shutdown' => True, 'halt' => True, 'ldap' => True,
- 'mail' => True, 'news' => True, 'uucp' => True,
- 'operator' => True, 'games' => True, 'gopher' => True,
- 'nobody' => True, 'xfs' => True, 'pgsql' => True,
- 'mysql' => True, 'postgres' => True, 'oracle' => True,
- 'ftp' => True, 'gdm' => True, 'named' => True,
- 'alias' => True, 'web' => True, 'sweep' => True,
- 'cvs' => True, 'qmaild' => True, 'qmaill' => True,
- 'qmaillog' => True, 'qmailp' => True, 'qmailq' => True,
- 'qmailr' => True, 'qmails' => True, 'rpc' => True,
- 'rpcuser' => True, 'amanda' => True, 'apache' => True,
- 'pvm' => True, 'squid' => True, 'ident' => True,
- 'nscd' => True, 'mailnull' => True, 'cyrus' => True,
- 'backup' => True
- );
-
- $GLOBALS['phpgw_info']['server']['global_denied_groups'] = array(
- 'root' => True, 'bin' => True, 'daemon' => True,
- 'sys' => True, 'adm' => True, 'tty' => True,
- 'disk' => True, 'lp' => True, 'mem' => True,
- 'kmem' => True, 'wheel' => True, 'mail' => True,
- 'uucp' => True, 'man' => True, 'games' => True,
- 'dip' => True, 'ftp' => True, 'nobody' => True,
- 'floppy' => True, 'xfs' => True, 'console' => True,
- 'utmp' => True, 'pppusers' => True, 'popusers' => True,
- 'slipusers' => True, 'slocate' => True, 'mysql' => True,
- 'dnstools' => True, 'web' => True, 'named' => True,
- 'dba' => True, 'oinstall' => True, 'oracle' => True,
- 'gdm' => True, 'sweep' => True, 'cvs' => True,
- 'postgres' => True, 'qmail' => True, 'nofiles' => True,
- 'ldap' => True, 'backup' => True
+ $GLOBALS['phpgw_info']['server']['global_denied_users'] = array
+ (
+ 'adm' => True,
+ 'alias' => True,
+ 'amanda' => True,
+ 'apache' => True,
+ 'avahi' => True,
+ 'backup' => True,
+ 'backup' => True,
+ 'beagleindex' => True,
+ 'bin' => True,
+ 'cupsys' => True,
+ 'cvs' => True,
+ 'cyrus' => True,
+ 'daemon' => True,
+ 'dhcp' => True,
+ 'dnsmasq' => True,
+ 'fetchmail' => True,
+ 'ftp' => True,
+ 'games' => True,
+ 'gdm' => True,
+ 'gnats' => True,
+ 'gopher' => True,
+ 'haldaemon' => True,
+ 'hal' => True,
+ 'halt' => True,
+ 'hplip' => True,
+ 'ident' => True,
+ 'irc' => True,
+ 'klog' => True,
+ 'ldap' => True,
+ 'list' => True,
+ 'lp' => True,
+ 'mailnull' => True,
+ 'mail' => True,
+ 'messagebus' => True,
+ 'mysql' => True,
+ 'named' => True,
+ 'news' => True,
+ 'nobody' => True,
+ 'nscd' => True,
+ 'operator' => True,
+ 'oracle' => True,
+ 'pgsql' => True,
+ 'postfix' => True,
+ 'postgres' => True,
+ 'proxy' => True,
+ 'pvm' => True,
+ 'qmaild' => True,
+ 'qmaillog' => True,
+ 'qmaill' => True,
+ 'qmailp' => True,
+ 'qmailq' => True,
+ 'qmailr' => True,
+ 'qmails' => True,
+ 'root' => True,
+ 'rpc' => True,
+ 'rpcuser' => True,
+ 'sabayon-admin' => True,
+ 'saned' => True,
+ 'shutdown' => True,
+ 'squid' => True,
+ 'sshd' => True,
+ 'sweep' => True,
+ 'sync' => True,
+ 'syslog' => True,
+ 'sys' => True,
+ 'uucp' => True,
+ 'web' => True,
+ 'www-data' => True,
+ 'xfs' => True
+ );
+
+ /**
+ * @ignore
+ * @global array list of banned user group names
+ */
+ $GLOBALS['phpgw_info']['server']['global_denied_groups'] = array
+ (
+ 'admin' => True,
+ 'adm' => True,
+ 'audio' => True,
+ 'avahi' => True,
+ 'backup' => True,
+ 'bin' => True,
+ 'cdrom' => True,
+ 'console' => True,
+ 'crontab' => True,
+ 'cvs' => True,
+ 'daemon' => True,
+ 'dba' => True,
+ 'dhcp' => True,
+ 'dialout' => True,
+ 'dip' => True,
+ 'dirmngr' => True,
+ 'disk' => True,
+ 'dnstools' => True,
+ 'fax' => True,
+ 'floppy' => True,
+ 'ftp' => True,
+ 'games' => True,
+ 'gdm' => True,
+ 'gnats' => True,
+ 'haldaemon' => True,
+ 'hal' => True,
+ 'irc' => True,
+ 'klog' => True,
+ 'kmem' => True,
+ 'ldap' => True,
+ 'list' => True,
+ 'lpadmin' => True,
+ 'lp' => True,
+ 'lp' => True,
+ 'mail' => True,
+ 'man' => True,
+ 'messagebus' => True,
+ 'mysql' => True,
+ 'named' => True,
+ 'news' => True,
+ 'nobody' => True,
+ 'nofiles' => True,
+ 'nogroup' => True,
+ 'oinstall' => True,
+ 'operator' => True,
+ 'oracle' => True,
+ 'plugdev' => True,
+ 'popusers' => True,
+ 'postdrop' => True,
+ 'postfix' => True,
+ 'postgres' => True,
+ 'pppusers' => True,
+ 'proxy' => True,
+ 'qmail' => True,
+ 'root' => True,
+ 'sabayon-admin' => True,
+ 'saned' => True,
+ 'sasl' => True,
+ 'scanner' => True,
+ 'shadow' => True,
+ 'slipusers' => True,
+ 'slocate' => True,
+ 'src' => True,
+ 'ssh' => True,
+ 'ssl-cert' => True,
+ 'staff' => True,
+ 'sudo' => True,
+ 'sweep' => True,
+ 'syslog' => True,
+ 'sys' => True,
+ 'tape' => True,
+ 'tty' => True,
+ 'users' => True,
+ 'utmp' => True,
+ 'uucp' => True,
+ 'video' => True,
+ 'voice' => True,
+ 'web' => True,
+ 'wheel' => True,
+ 'www-data' => True,
+ 'xfs' => True,
);
/**
@@ -81,6 +208,10 @@
var $status;
var $expires;
var $person_id;
+ /**
+ * @var int the user's quota in Mb - i think
+ */
+ var $quota = 0; //sane default
var $data;
var $db;
var $memberships = array();
@@ -767,14 +898,14 @@
function set_data($data)
{
- $this->account_id = (int)$data['account_id']
? (int)$data['account_id'] : $this->account_id;
- $this->lid = $data['account_lid']
? $data['account_lid'] : $this->lid;
+ $this->account_id =
isset($data['account_id']) ? (int)$data['account_id'] : $this->account_id;
+ $this->lid =
isset($data['account_lid']) ? $data['account_lid'] : $this->lid;
$this->firstname = $data['account_firstname']
? $data['account_firstname'] : $this->firstname;
$this->lastname = $data['account_lastname']
? $data['account_lastname'] : $this->lastname;
$this->password = $data['account_passwd']
? $data['account_passwd'] : $this->password;
$data['account_status'] = !$data['account_status']
? $data['status'] : $data['account_status'];
$this->status = $data['account_status']
? $data['account_status'] : $this->status;
- $data['account_expires'] = !$data['account_expires']
? $data['expires'] : $data['account_expires'];
+ $data['account_expires']= !$data['account_expires'] ?
$data['expires'] : $data['account_expires'];
$this->expires = $data['account_expires']
? $data['account_expires'] : $this->expires;
$this->person_id = $data['person_id']
? $data['person_id'] : $this->person_id;
return true;