changed to public/private

This commit is contained in:
Roland Gruber 2007-10-13 17:28:37 +00:00
parent 4598a24714
commit 4cbc52cc22
11 changed files with 50 additions and 41 deletions

View File

@ -335,25 +335,25 @@ function cmp_domain($a, $b) {
class samba3domain { class samba3domain {
/** DN */ /** DN */
var $dn; public $dn;
/** Domain name */ /** Domain name */
var $name; public $name;
/** Domain SID */ /** Domain SID */
var $SID; public $SID;
/** Next RID */ /** Next RID */
var $nextRID; public $nextRID;
/** Next user RID */ /** Next user RID */
var $nextUserRID; public $nextUserRID;
/** Next group RID */ /** Next group RID */
var $nextGroupRID; public $nextGroupRID;
/** RID base to calculate RIDs, default 1000 */ /** RID base to calculate RIDs, default 1000 */
var $RIDbase = 1000; public $RIDbase = 1000;
} }
/** /**

View File

@ -35,7 +35,7 @@ $Id$
class kolabUser extends baseModule { class kolabUser extends baseModule {
/** list of invitation policies */ /** list of invitation policies */
var $invitationPolicies; private $invitationPolicies;
/** /**
* Creates a new kolabUser object. * Creates a new kolabUser object.

View File

@ -42,11 +42,11 @@ class posixAccount extends baseModule {
// Variables // Variables
/* These two variables keep an array of groups the user is also member of. */ /* These two variables keep an array of groups the user is also member of. */
var $groups; private $groups;
var $groups_orig; private $groups_orig;
var $createhomedir; private $createhomedir;
var $lamdaemonServer; private $lamdaemonServer;
var $clearTextPassword; private $clearTextPassword;
/** /**
* This function fills the error message array with messages. * This function fills the error message array with messages.
@ -1708,6 +1708,15 @@ class posixAccount extends baseModule {
} }
return $return; return $return;
} }
/**
* Returns the clear text password.
*
* @return string password
*/
public function getClearTextPassword() {
return $this->clearTextPassword;
}
} }

View File

@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
class posixGroup extends baseModule { class posixGroup extends baseModule {
/** change GIDs of users and hosts? */ /** change GIDs of users and hosts? */
var $changegids; private $changegids;
/** /**

View File

@ -141,7 +141,7 @@ class quota extends baseModule {
} }
/** Saves the quota settings */ /** Saves the quota settings */
var $quota; private $quota;
/** /**
* Initializes the quota values. * Initializes the quota values.

View File

@ -424,16 +424,16 @@ class sambaAccount extends baseModule {
// Variables // Variables
/** use Unix password as samba password? */ /** use Unix password as samba password? */
var $useunixpwd; private $useunixpwd;
/** use no password? */ /** use no password? */
var $nopwd; private $nopwd;
/** password does not expire? */ /** password does not expire? */
var $noexpire; private $noexpire;
/** account deactivated? */ /** account deactivated? */
var $deactivated; private $deactivated;
/** Array of well known rids */ /** Array of well known rids */
var $rids; private $rids;
function module_ready() { function module_ready() {
$attrs = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes(); $attrs = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes();
@ -591,8 +591,8 @@ class sambaAccount extends baseModule {
else $this->useunixpwd = false; else $this->useunixpwd = false;
if ($_POST['useunixpwd']) { if ($_POST['useunixpwd']) {
$this->useunixpwd = true; $this->useunixpwd = true;
$this->attributes['lmPassword'][0] = lmPassword($this->getAccountContainer()->getAccountModule('posixAccount')->clearTextPassword); $this->attributes['lmPassword'][0] = lmPassword($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword());
$this->attributes['ntPassword'][0] = ntPassword($this->getAccountContainer()->getAccountModule('posixAccount')->clearTextPassword); $this->attributes['ntPassword'][0] = ntPassword($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword());
$this->attributes['pwdLastSet'][0] = time(); $this->attributes['pwdLastSet'][0] = time();
} }
else $this->useunixpwd = false; else $this->useunixpwd = false;
@ -732,7 +732,7 @@ class sambaAccount extends baseModule {
0 => array('kind' => 'text', 'text' => _('Repeat password') ), 0 => array('kind' => 'text', 'text' => _('Repeat password') ),
1 => array('kind' => 'input', 'name' => 'lmPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => ''), 1 => array('kind' => 'input', 'name' => 'lmPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => ''),
2 => array('kind' => 'help', 'value' => 'password')); 2 => array('kind' => 'help', 'value' => 'password'));
if (isset($this->getAccountContainer()->getAccountModule('posixAccount')->clearTextPassword)) { if (isset($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword())) {
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Use Unix password') ), $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Use Unix password') ),
1 => array ( 'kind' => 'input', 'name' => 'useunixpwd', 'type' => 'checkbox', 'checked' => $this->useunixpwd, 'value' => true), 1 => array ( 'kind' => 'input', 'name' => 'useunixpwd', 'type' => 'checkbox', 'checked' => $this->useunixpwd, 'value' => true),
2 => array ('kind' => 'help', 'value' => 'pwdUnix')); 2 => array ('kind' => 'help', 'value' => 'pwdUnix'));

View File

@ -40,9 +40,9 @@ class sambaGroupMapping extends baseModule {
// Variables // Variables
/** Array of well known RIDs */ /** Array of well known RIDs */
var $rids; private $rids;
/** Array of sambaGroupTypes */ /** Array of sambaGroupTypes */
var $sambaGroupTypes; private $sambaGroupTypes;
/** /**
* Creates a new module for Samba 3 groups. * Creates a new module for Samba 3 groups.

View File

@ -40,17 +40,17 @@ class sambaSamAccount extends baseModule {
// Variables // Variables
/** use Unix password as samba password? */ /** use Unix password as samba password? */
var $useunixpwd; private $useunixpwd;
/** use no password? */ /** use no password? */
var $nopwd; private $nopwd;
/** password does not expire? */ /** password does not expire? */
var $noexpire; private $noexpire;
/** account deactivated? */ /** account deactivated? */
var $deactivated; private $deactivated;
/** array of well known rids */ /** array of well known rids */
var $rids; private $rids;
/** HEX to binary conversion table */ /** HEX to binary conversion table */
var $hex2bitstring = array('0' => '0000', '1' => '0001', '2' => '0010', '3' => '0011', '4' => '0100', private $hex2bitstring = array('0' => '0000', '1' => '0001', '2' => '0010', '3' => '0011', '4' => '0100',
'5' => '0101', '6' => '0110', '7' => '0111', '8' => '1000', '9' => '1001', 'A' => '1010', '5' => '0101', '6' => '0110', '7' => '0111', '8' => '1000', '9' => '1001', 'A' => '1010',
'B' => '1011', 'C' => '1100', 'D' => '1101', 'E' => '1110', 'F' => '1111'); 'B' => '1011', 'C' => '1100', 'D' => '1101', 'E' => '1110', 'F' => '1111');
@ -669,8 +669,8 @@ class sambaSamAccount extends baseModule {
if ($_POST['useunixpwd']) { if ($_POST['useunixpwd']) {
$this->useunixpwd = true; $this->useunixpwd = true;
$this->attributes['sambaLMPassword'][0] = lmPassword($this->getAccountContainer()->getAccountModule('posixAccount')->clearTextPassword); $this->attributes['sambaLMPassword'][0] = lmPassword($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword());
$this->attributes['sambaNTPassword'][0] = ntPassword($this->getAccountContainer()->getAccountModule('posixAccount')->clearTextPassword); $this->attributes['sambaNTPassword'][0] = ntPassword($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword());
$this->attributes['sambaPwdLastSet'][0] = time(); $this->attributes['sambaPwdLastSet'][0] = time();
} }
else $this->useunixpwd = false; else $this->useunixpwd = false;
@ -897,7 +897,7 @@ class sambaSamAccount extends baseModule {
$return[] = array( $return[] = array(
0 => array('kind' => 'text', 'text' => _('Repeat password')), 0 => array('kind' => 'text', 'text' => _('Repeat password')),
1 => array('kind' => 'input', 'name' => 'sambaLMPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255')); 1 => array('kind' => 'input', 'name' => 'sambaLMPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255'));
if (isset($this->getAccountContainer()->getAccountModule('posixAccount')->clearTextPassword)) { if (isset($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword())) {
$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Use Unix password') ), $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Use Unix password') ),
1 => array ( 'kind' => 'input', 'name' => 'useunixpwd', 'type' => 'checkbox', 'checked' => $this->useunixpwd), 1 => array ( 'kind' => 'input', 'name' => 'useunixpwd', 'type' => 'checkbox', 'checked' => $this->useunixpwd),
2 => array ('kind' => 'help', 'value' => 'useunixpwd')); 2 => array ('kind' => 'help', 'value' => 'useunixpwd'));

View File

@ -160,7 +160,7 @@ class shadowAccount extends baseModule {
), ),
'shadowMin' => array ( 'shadowMin' => array (
"Headline" => _("Minimum password age"), "Headline" => _("Minimum password age"),
"Text" => _("Number of days a user has to wait until he\'s allowed to change his password again. If set value must be 0<."). ' '. _("Can be left empty.") "Text" => _("Number of days a user has to wait until he is allowed to change his password again. If set value must be 0<."). ' '. _("Can be left empty.")
), ),
'shadowMax' => array ( 'shadowMax' => array (
"Headline" => _("Maximum password age"), "Headline" => _("Maximum password age"),

View File

@ -100,14 +100,14 @@ class group extends baseType {
class lamGroupList extends lamList { class lamGroupList extends lamList {
/** Controls if include primary group members into group memebers */ /** Controls if include primary group members into group memebers */
var $include_primary = ""; private $include_primary = "";
/** Primary group members hash */ /** Primary group members hash */
var $primary_hash = array(); private $primary_hash = array();
/** Controls if primary group members needs refresh */ /** Controls if primary group members needs refresh */
var $refresh_primary = false; private $refresh_primary = false;
/** Controls if primary group members are using */ /** Controls if primary group members are using */
// This is here for future use with primary group members listing // This is here for future use with primary group members listing
var $use_primary = false; private $use_primary = false;
/** /**
* Constructor * Constructor

View File

@ -106,10 +106,10 @@ class user extends baseType {
class lamUserList extends lamList { class lamUserList extends lamList {
/** Controls if GID number is translated to group name */ /** Controls if GID number is translated to group name */
var $trans_primary = false; private $trans_primary = false;
/** translates GID to group name */ /** translates GID to group name */
var $trans_primary_hash = array(); private $trans_primary_hash = array();
/** /**
* Constructor * Constructor