improved new modules
This commit is contained in:
parent
280c1f3be4
commit
0bde012f49
|
@ -344,8 +344,13 @@ class accountContainer {
|
||||||
*/
|
*/
|
||||||
function continue_main($post) {
|
function continue_main($post) {
|
||||||
if ($this->module['main']->subpage=='') $this->module['main']->subpage='attributes';
|
if ($this->module['main']->subpage=='') $this->module['main']->subpage='attributes';
|
||||||
$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->proccess_'.$this->module['main']->subpage.'($post);';
|
if ($post['form_main_reset']) {
|
||||||
eval ($function);
|
$this->load_account($this->dn_orig);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->proccess_'.$this->module['main']->subpage.'($post);';
|
||||||
|
eval ($function);
|
||||||
|
}
|
||||||
if (is_string($result)) $this->module['main']->subpage = $result;
|
if (is_string($result)) $this->module['main']->subpage = $result;
|
||||||
if (is_int($result))
|
if (is_int($result))
|
||||||
for ($i=0; $i<count($this->order); $i++ )
|
for ($i=0; $i<count($this->order); $i++ )
|
||||||
|
@ -353,11 +358,11 @@ class accountContainer {
|
||||||
$this->module['main']->current_page = $i;
|
$this->module['main']->current_page = $i;
|
||||||
$this->module['main']->subpage='attributes';
|
$this->module['main']->subpage='attributes';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write HTML-Code
|
// Write HTML-Code
|
||||||
echo $_SESSION[$this->header2];
|
echo $_SESSION[$this->header2];
|
||||||
echo "<title>";
|
echo "<title>";
|
||||||
echo _("Create new Account");
|
if ($this->dn_orig!='') echo _("Modify Account");
|
||||||
|
else echo _("Create new Account");
|
||||||
echo "</title>\n";
|
echo "</title>\n";
|
||||||
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\">\n";
|
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\">\n";
|
||||||
echo "</head><body>\n";
|
echo "</head><body>\n";
|
||||||
|
@ -365,7 +370,6 @@ class accountContainer {
|
||||||
// Display errir-messages
|
// Display errir-messages
|
||||||
if (is_array($result))
|
if (is_array($result))
|
||||||
for ($i=0; $i<sizeof($result); $i++) StatusMessage($result[$i][0], $result[$i][1], $result[$i][2]);
|
for ($i=0; $i<sizeof($result); $i++) StatusMessage($result[$i][0], $result[$i][1], $result[$i][2]);
|
||||||
|
|
||||||
// Create left module-menu
|
// Create left module-menu
|
||||||
echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >";
|
echo "<table border=0 width=\"100%\">\n<tr><td valign=\"top\" width=\"15%\" >";
|
||||||
echo "<table><tr>";
|
echo "<table><tr>";
|
||||||
|
@ -387,13 +391,17 @@ class accountContainer {
|
||||||
echo "\">\n<br>";
|
echo "\">\n<br>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// *** Fixme add reset-button
|
if ($this->dn_orig!='') echo "<input name=\"form_main_reset\" type=\"submit\" value=\"" . _('Reset changes') . "\"><br>\n";
|
||||||
echo "</fieldset></td></tr>\n";
|
echo "</fieldset></td></tr>\n";
|
||||||
echo "</table></td>\n<td>";
|
echo "</table></td>\n<td>";
|
||||||
|
echo "<td><fieldset class=\"".$this->type."edit-dark\"><legend class=\"".$this->type."edit-bright\"><b>";
|
||||||
|
echo $this->module[$this->order[$this->module['main']->current_page]]->alias;
|
||||||
|
echo "</b></legend>\n";
|
||||||
// display html-code from mdule
|
// display html-code from mdule
|
||||||
$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->display_html_'.$this->module['main']->subpage.'($post);';
|
$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->display_html_'.$this->module['main']->subpage.'($post);';
|
||||||
eval ($function);
|
eval ($function);
|
||||||
// Display rest of html-page
|
// Display rest of html-page
|
||||||
|
echo "</fieldset>\n";
|
||||||
echo "</td></tr></table>\n";
|
echo "</td></tr></table>\n";
|
||||||
echo "</form>\n";
|
echo "</form>\n";
|
||||||
echo "</body>\n";
|
echo "</body>\n";
|
||||||
|
@ -674,7 +682,7 @@ class accountContainer {
|
||||||
$entry = ldap_first_entry($_SESSION[$this->ldap]->server(), $result);
|
$entry = ldap_first_entry($_SESSION[$this->ldap]->server(), $result);
|
||||||
$this->dn = substr($dn, strpos($dn, ',')+1);
|
$this->dn = substr($dn, strpos($dn, ',')+1);
|
||||||
$this->dn_orig = $dn;
|
$this->dn_orig = $dn;
|
||||||
$attr = ldap_get_attributes($_SESSION['ldap']->server(), $entry);
|
$attr = ldap_get_attributes($_SESSION[$this->ldap]->server(), $entry);
|
||||||
if (isset($attr['objectClass']['count'])) unset($attr['objectClass']['count']);
|
if (isset($attr['objectClass']['count'])) unset($attr['objectClass']['count']);
|
||||||
// load attributes
|
// load attributes
|
||||||
foreach ($attr['objectClass'] as $objectClass) {
|
foreach ($attr['objectClass'] as $objectClass) {
|
||||||
|
@ -899,6 +907,7 @@ class accountContainer {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
// This class keeps all needed values for any account
|
// This class keeps all needed values for any account
|
||||||
class account {
|
class account {
|
||||||
// Type : user | group | host
|
// Type : user | group | host
|
||||||
|
@ -947,6 +956,7 @@ class account {
|
||||||
* mountpoint, used blocks, soft block limit, hard block limit, grace block period, used inodes,
|
* mountpoint, used blocks, soft block limit, hard block limit, grace block period, used inodes,
|
||||||
* soft inode limit, hard inode limit, grace inode period
|
* soft inode limit, hard inode limit, grace inode period
|
||||||
*/
|
*/
|
||||||
|
/*
|
||||||
// Personal Settings
|
// Personal Settings
|
||||||
var $personal_title; // string title of user
|
var $personal_title; // string title of user
|
||||||
var $personal_mail; // string mailaddress of user
|
var $personal_mail; // string mailaddress of user
|
||||||
|
@ -958,6 +968,9 @@ class account {
|
||||||
var $personal_postalAddress; // string postal Address of user
|
var $personal_postalAddress; // string postal Address of user
|
||||||
var $personal_employeeType; // string employe type of user
|
var $personal_employeeType; // string employe type of user
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Return a list of all shells listed in ../config/shells
|
/* Return a list of all shells listed in ../config/shells
|
||||||
* Normally ../config/shells is a symbolic link to /etc/shells
|
* Normally ../config/shells is a symbolic link to /etc/shells
|
||||||
|
|
|
@ -79,7 +79,6 @@ class posixAccount {
|
||||||
// Make references to attributes which already esists in ldap
|
// Make references to attributes which already esists in ldap
|
||||||
$newattributes = array_keys($this->attributes);
|
$newattributes = array_keys($this->attributes);
|
||||||
$module = array_keys($_SESSION[$this->base]->module);
|
$module = array_keys($_SESSION[$this->base]->module);
|
||||||
// fixme *** do we have to unset module posixAccuont itself
|
|
||||||
for ($i=0; $i<count($module); $i++) {
|
for ($i=0; $i<count($module); $i++) {
|
||||||
foreach ($newattributes as $attribute)
|
foreach ($newattributes as $attribute)
|
||||||
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
||||||
|
|
|
@ -74,7 +74,6 @@ class sambaAccount {
|
||||||
// Make references to attributes which already esists in ldap
|
// Make references to attributes which already esists in ldap
|
||||||
$newattributes = array_keys($this->attributes);
|
$newattributes = array_keys($this->attributes);
|
||||||
$module = array_keys($_SESSION[$this->base]->module);
|
$module = array_keys($_SESSION[$this->base]->module);
|
||||||
// fixme *** do we have to unset module sambaAccount itself
|
|
||||||
for ($i=0; $i<count($module); $i++) {
|
for ($i=0; $i<count($module); $i++) {
|
||||||
foreach ($newattributes as $attribute)
|
foreach ($newattributes as $attribute)
|
||||||
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
||||||
|
|
|
@ -74,7 +74,6 @@ class sambaSamAccount {
|
||||||
// Make references to attributes which already esists in ldap
|
// Make references to attributes which already esists in ldap
|
||||||
$newattributes = array_keys($this->attributes);
|
$newattributes = array_keys($this->attributes);
|
||||||
$module = array_keys($_SESSION[$this->base]->module);
|
$module = array_keys($_SESSION[$this->base]->module);
|
||||||
// fixme *** do we have to unset module sambaSamAccount itself
|
|
||||||
for ($i=0; $i<count($module); $i++) {
|
for ($i=0; $i<count($module); $i++) {
|
||||||
foreach ($newattributes as $attribute)
|
foreach ($newattributes as $attribute)
|
||||||
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
||||||
|
|
|
@ -70,7 +70,6 @@ class shadowAccount {
|
||||||
// Make references to attributes which already esists in ldap
|
// Make references to attributes which already esists in ldap
|
||||||
$newattributes = array_keys($this->attributes);
|
$newattributes = array_keys($this->attributes);
|
||||||
$module = array_keys($_SESSION[$this->base]->module);
|
$module = array_keys($_SESSION[$this->base]->module);
|
||||||
// fixme *** do we have to unset module shadowAccount itself
|
|
||||||
for ($i=0; $i<count($module); $i++) {
|
for ($i=0; $i<count($module); $i++) {
|
||||||
foreach ($newattributes as $attribute)
|
foreach ($newattributes as $attribute)
|
||||||
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute];
|
||||||
|
|
Loading…
Reference in New Issue