diff options
| author | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-09 06:55:37 +0000 |
|---|---|---|
| committer | Matthew Grooms <mgrooms@pfsense.org> | 2008-09-09 06:55:37 +0000 |
| commit | e30001cf1904c47885781f068261f895108fd00b (patch) | |
| tree | 89bd1aa6fe5094a1b93f0d363e7510a79d9fb685 | |
| parent | 96c7a492be8dbc04a0d494a91522c3167c148abf (diff) | |
| download | pfsense-e30001cf1904c47885781f068261f895108fd00b.zip pfsense-e30001cf1904c47885781f068261f895108fd00b.tar.gz | |
Cleanup the tab format of the system user/group/server management pages.
The edges were square instead of rounded like most pfSense pages. Also
make sure tabs and cancel buttons are present in the add privilege and
add certificate pages.
| -rw-r--r-- | usr/local/www/system_authservers.php | 568 | ||||
| -rw-r--r-- | usr/local/www/system_groupmanager.php | 418 | ||||
| -rw-r--r-- | usr/local/www/system_groupmanager_addprivs.php | 93 | ||||
| -rw-r--r-- | usr/local/www/system_usermanager.php | 643 | ||||
| -rw-r--r-- | usr/local/www/system_usermanager_addcert.php | 161 | ||||
| -rw-r--r-- | usr/local/www/system_usermanager_addprivs.php | 93 |
6 files changed, 1013 insertions, 963 deletions
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php index 40687cc..12d9564 100644 --- a/usr/local/www/system_authservers.php +++ b/usr/local/www/system_authservers.php @@ -339,7 +339,7 @@ function radius_srvcschange(){ ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td class="tabnavtbl"> + <td> <?php $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); @@ -351,301 +351,303 @@ function radius_srvcschange(){ </td> </tr> <tr> - <td class="tabcont"> - - <?php if ($act == "new" || $act == "edit" || $input_errors): ?> - - <form action="system_authservers.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> - <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Type");?></td> - <td width="78%" class="vtable"> - <?php if (!isset($id)): ?> - <select name='type' id='type' class="formselect" onchange='server_typechange()'> - <?php - foreach ($auth_server_types as $typename => $typedesc ): - $selected = ""; - if ($pconfig['type'] == $typename) - $selected = "selected"; - ?> - <option value="<?=$typename;?>" <?=$selected;?>><?=$typedesc;?></option> - <?php endforeach; ?> - </select> - <?php else: ?> - <strong><?=$auth_server_types[$pconfig['type']];?></strong> - <input name='type' type='hidden' id='type' value="<?=htmlspecialchars($pconfig['type']);?>"/> - <?php endif; ?> - </td> - </tr> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="ldap"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">LDAP Server Settings</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td> - <td width="78%" class="vtable"> - <input name="ldap_host" type="text" class="formfld unknown" id="ldap_host" size="20" value="<?=htmlspecialchars($pconfig['ldap_host']);?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Port value");?></td> - <td width="78%" class="vtable"> - <input name="ldap_port" type="text" class="formfld unknown" id="ldap_port" size="5" value="<?=htmlspecialchars($pconfig['ldap_port']);?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Transport");?></td> - <td width="78%" class="vtable"> - <select name='ldap_urltype' id='ldap_urltype' class="formselect" onchange='ldap_urlchange()'> - <?php - foreach ($ldap_urltypes as $urltype => $urlport): - $selected = ""; - if ($pconfig['ldap_urltype'] == $urltype) - $selected = "selected"; - ?> - <option value="<?=$urltype;?>" <?=$selected;?>><?=$urltype;?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol version");?></td> - <td width="78%" class="vtable"> - <select name='ldap_protver' id='ldap_protver' class="formselect"> - <?php - foreach ($ldap_protvers as $version): - $selected = ""; - if ($pconfig['ldap_protver'] == $version) - $selected = "selected"; - ?> - <option value="<?=$version;?>" <?=$selected;?>><?=$version;?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Search scope");?></td> - <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> - <tr> - <td>Level: </td> - <td> - <select name='ldap_scope' id='ldap_scope' class="formselect"> - <?php - foreach ($ldap_scopes as $scopename => $scopedesc): - $selected = ""; - if ($pconfig['ldap_scope'] == $scopename) - $selected = "selected"; - ?> - <option value="<?=$scopename;?>" <?=$selected;?>><?=$scopedesc;?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <tr> - <td>Base DN: </td> - <td> - <input name="ldap_basedn" type="text" class="formfld unknown" id="ldap_basedn" size="40" value="<?=htmlspecialchars($pconfig['ldap_basedn']);?>"/> - </td> - </tr> - </table> - - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Bind credentials");?></td> - <td width="78%" class="vtable"> - <table border="0" cellspacing="0" cellpadding="2"> - <tr> - <td> - <input name="ldap_anon" type="checkbox" id="ldap_anon" value="yes" <?php if ($pconfig['ldap_anon']) echo "checked"; ?> onClick="ldap_bindchange()"> - </td> - <td> - Use anonymous binds to resolve distinguished names - </td> - </tr> - </table> - <table border="0" cellspacing="0" cellpadding="2" id="ldap_bind"> - <tr> - <td colspan="2"></td> - </tr> - <tr> - <td>User DN: </td> - <td> - <input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/> - </td> - </tr> - <tr> - <td>Password: </td> - <td> - <input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/> - </td> - </tr> - </table> - </td> - </tr> - <?php if (!isset($id)): ?> + <td id="mainarea"> + <div class="tabcont"> + + <?php if ($act == "new" || $act == "edit" || $input_errors): ?> + + <form action="system_authservers.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> + <td width="78%" class="vtable"> + <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Type");?></td> + <td width="78%" class="vtable"> + <?php if (!isset($id)): ?> + <select name='type' id='type' class="formselect" onchange='server_typechange()'> + <?php + foreach ($auth_server_types as $typename => $typedesc ): + $selected = ""; + if ($pconfig['type'] == $typename) + $selected = "selected"; + ?> + <option value="<?=$typename;?>" <?=$selected;?>><?=$typedesc;?></option> + <?php endforeach; ?> + </select> + <?php else: ?> + <strong><?=$auth_server_types[$pconfig['type']];?></strong> + <input name='type' type='hidden' id='type' value="<?=htmlspecialchars($pconfig['type']);?>"/> + <?php endif; ?> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="ldap"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">LDAP Server Settings</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td> + <td width="78%" class="vtable"> + <input name="ldap_host" type="text" class="formfld unknown" id="ldap_host" size="20" value="<?=htmlspecialchars($pconfig['ldap_host']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Port value");?></td> + <td width="78%" class="vtable"> + <input name="ldap_port" type="text" class="formfld unknown" id="ldap_port" size="5" value="<?=htmlspecialchars($pconfig['ldap_port']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Transport");?></td> + <td width="78%" class="vtable"> + <select name='ldap_urltype' id='ldap_urltype' class="formselect" onchange='ldap_urlchange()'> + <?php + foreach ($ldap_urltypes as $urltype => $urlport): + $selected = ""; + if ($pconfig['ldap_urltype'] == $urltype) + $selected = "selected"; + ?> + <option value="<?=$urltype;?>" <?=$selected;?>><?=$urltype;?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol version");?></td> + <td width="78%" class="vtable"> + <select name='ldap_protver' id='ldap_protver' class="formselect"> + <?php + foreach ($ldap_protvers as $version): + $selected = ""; + if ($pconfig['ldap_protver'] == $version) + $selected = "selected"; + ?> + <option value="<?=$version;?>" <?=$selected;?>><?=$version;?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Search scope");?></td> + <td width="78%" class="vtable"> + <table border="0" cellspacing="0" cellpadding="2"> + <tr> + <td>Level: </td> + <td> + <select name='ldap_scope' id='ldap_scope' class="formselect"> + <?php + foreach ($ldap_scopes as $scopename => $scopedesc): + $selected = ""; + if ($pconfig['ldap_scope'] == $scopename) + $selected = "selected"; + ?> + <option value="<?=$scopename;?>" <?=$selected;?>><?=$scopedesc;?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <tr> + <td>Base DN: </td> + <td> + <input name="ldap_basedn" type="text" class="formfld unknown" id="ldap_basedn" size="40" value="<?=htmlspecialchars($pconfig['ldap_basedn']);?>"/> + </td> + </tr> + </table> + + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Bind credentials");?></td> + <td width="78%" class="vtable"> + <table border="0" cellspacing="0" cellpadding="2"> + <tr> + <td> + <input name="ldap_anon" type="checkbox" id="ldap_anon" value="yes" <?php if ($pconfig['ldap_anon']) echo "checked"; ?> onClick="ldap_bindchange()"> + </td> + <td> + Use anonymous binds to resolve distinguished names + </td> + </tr> + </table> + <table border="0" cellspacing="0" cellpadding="2" id="ldap_bind"> + <tr> + <td colspan="2"></td> + </tr> + <tr> + <td>User DN: </td> + <td> + <input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/> + </td> + </tr> + <tr> + <td>Password: </td> + <td> + <input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/> + </td> + </tr> + </table> + </td> + </tr> + <?php if (!isset($id)): ?> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Initial Template");?></td> + <td width="78%" class="vtable"> + <select name='ldap_tmpltype' id='ldap_tmpltype' class="formselect" onchange='ldap_tmplchange()'> + <?php + foreach ($ldap_templates as $tmplname => $tmpldata): + $selected = ""; + if ($pconfig['ldap_template'] == $tmplname) + $selected = "selected"; + ?> + <option value="<?=$tmplname;?>" <?=$selected;?>><?=$tmpldata['desc'];?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <?php endif; ?> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("User naming attribute");?></td> + <td width="78%" class="vtable"> + <input name="ldap_attr_user" type="text" class="formfld unknown" id="ldap_attr_user" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_user']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Group naming attribute");?></td> + <td width="78%" class="vtable"> + <input name="ldap_attr_group" type="text" class="formfld unknown" id="ldap_attr_group" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_group']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Group member attribute");?></td> + <td width="78%" class="vtable"> + <input name="ldap_attr_member" type="text" class="formfld unknown" id="ldap_attr_member" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_member']);?>"/> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0" id="radius"> + <tr> + <td colspan="2" class="list" height="12"></td> + </tr> + <tr> + <td colspan="2" valign="top" class="listtopic">Radius Server Settings</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td> + <td width="78%" class="vtable"> + <input name="radius_host" type="text" class="formfld unknown" id="radius_host" size="20" value="<?=htmlspecialchars($pconfig['radius_host']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Shared Secret");?></td> + <td width="78%" class="vtable"> + <input name="radius_secret" type="password" class="formfld pwd" id="radius_secret" size="20" value="<?=htmlspecialchars($pconfig['radius_secret']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Services offered");?></td> + <td width="78%" class="vtable"> + <select name='radius_srvcs' id='radius_srvcs' class="formselect" onchange='radius_srvcschange()'> + <?php + foreach ($radius_srvcs as $srvcname => $srvcdesc): + $selected = ""; + if ($pconfig['radius_srvcs'] == $srvcname) + $selected = "selected"; + ?> + <option value="<?=$srvcname;?>" <?=$selected;?>><?=$srvcdesc;?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <tr id="radius_auth"> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Authentication port value");?></td> + <td width="78%" class="vtable"> + <input name="radius_auth_port" type="text" class="formfld unknown" id="radius_auth_port" size="5" value="<?=htmlspecialchars($pconfig['radius_auth_port']);?>"/> + </td> + </tr> + <tr id="radius_acct"> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Accounting port value");?></td> + <td width="78%" class="vtable"> + <input name="radius_acct_port" type="text" class="formfld unknown" id="radius_acct_port" size="5" value="<?=htmlspecialchars($pconfig['radius_acct_port']);?>"/> + </td> + </tr> + </table> + + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> + <?php if (isset($id) && $a_server[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>" /> + <?php endif;?> + </td> + </tr> + </table> + </form> + + <?php else: ?> + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Initial Template");?></td> - <td width="78%" class="vtable"> - <select name='ldap_tmpltype' id='ldap_tmpltype' class="formselect" onchange='ldap_tmplchange()'> - <?php - foreach ($ldap_templates as $tmplname => $tmpldata): - $selected = ""; - if ($pconfig['ldap_template'] == $tmplname) - $selected = "selected"; - ?> - <option value="<?=$tmplname;?>" <?=$selected;?>><?=$tmpldata['desc'];?></option> - <?php endforeach; ?> - </select> - </td> + <td width="25%" class="listhdrr">Server Name</td> + <td width="25%" class="listhdrr">Type</td> + <td width="35%" class="listhdrr">Host Name</td> + <td width="10%" class="list"></td> </tr> - <?php endif; ?> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("User naming attribute");?></td> - <td width="78%" class="vtable"> - <input name="ldap_attr_user" type="text" class="formfld unknown" id="ldap_attr_user" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_user']);?>"/> + <?php + $i = 0; + foreach($a_server as $server): + $name = htmlspecialchars($server['name']); + $type = htmlspecialchars($auth_server_types[$server['type']]); + $host = htmlspecialchars($server['host']); + ?> + <tr ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'"> + <td class="listlr"><?=$name?> </td> + <td class="listr"><?=$type;?> </td> + <td class="listr"><?=$host;?> </td> + <td valign="middle" nowrap class="list"> + <a href="system_authservers.php?act=edit&id=<?=$i;?>"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit server" alt="edit server" width="17" height="17" border="0" /> + </a> + + <a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete server" alt="delete server" width="17" height="17" border="0" /> + </a> </td> </tr> + <?php + $i++; + endforeach; + ?> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Group naming attribute");?></td> - <td width="78%" class="vtable"> - <input name="ldap_attr_group" type="text" class="formfld unknown" id="ldap_attr_group" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_group']);?>"/> + <td class="list" colspan="3"></td> + <td class="list"> + <a href="system_authservers.php?act=new"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add server" alt="add server" width="17" height="17" border="0" /> + </a> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Group member attribute");?></td> - <td width="78%" class="vtable"> - <input name="ldap_attr_member" type="text" class="formfld unknown" id="ldap_attr_member" size="20" value="<?=htmlspecialchars($pconfig['ldap_attr_member']);?>"/> + <td colspan="3"> + <p> + <?=gettext("Additional authentication servers can be added here.");?> + </p> </td> </tr> </table> - <table width="100%" border="0" cellpadding="6" cellspacing="0" id="radius"> - <tr> - <td colspan="2" class="list" height="12"></td> - </tr> - <tr> - <td colspan="2" valign="top" class="listtopic">Radius Server Settings</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP address");?></td> - <td width="78%" class="vtable"> - <input name="radius_host" type="text" class="formfld unknown" id="radius_host" size="20" value="<?=htmlspecialchars($pconfig['radius_host']);?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Shared Secret");?></td> - <td width="78%" class="vtable"> - <input name="radius_secret" type="password" class="formfld pwd" id="radius_secret" size="20" value="<?=htmlspecialchars($pconfig['radius_secret']);?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Services offered");?></td> - <td width="78%" class="vtable"> - <select name='radius_srvcs' id='radius_srvcs' class="formselect" onchange='radius_srvcschange()'> - <?php - foreach ($radius_srvcs as $srvcname => $srvcdesc): - $selected = ""; - if ($pconfig['radius_srvcs'] == $srvcname) - $selected = "selected"; - ?> - <option value="<?=$srvcname;?>" <?=$selected;?>><?=$srvcdesc;?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <tr id="radius_auth"> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Authentication port value");?></td> - <td width="78%" class="vtable"> - <input name="radius_auth_port" type="text" class="formfld unknown" id="radius_auth_port" size="5" value="<?=htmlspecialchars($pconfig['radius_auth_port']);?>"/> - </td> - </tr> - <tr id="radius_acct"> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Accounting port value");?></td> - <td width="78%" class="vtable"> - <input name="radius_acct_port" type="text" class="formfld unknown" id="radius_acct_port" size="5" value="<?=htmlspecialchars($pconfig['radius_acct_port']);?>"/> - </td> - </tr> - </table> - - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> - <?php if (isset($id) && $a_server[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>" /> - <?php endif;?> - </td> - </tr> - </table> - </form> - - <?php else: ?> - - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="25%" class="listhdrr">Server Name</td> - <td width="25%" class="listhdrr">Type</td> - <td width="35%" class="listhdrr">Host Name</td> - <td width="10%" class="list"></td> - </tr> - <?php - $i = 0; - foreach($a_server as $server): - $name = htmlspecialchars($server['name']); - $type = htmlspecialchars($auth_server_types[$server['type']]); - $host = htmlspecialchars($server['host']); - ?> - <tr ondblclick="document.location='system_authservers.php?act=edit&id=<?=$i;?>'"> - <td class="listlr"><?=$name?> </td> - <td class="listr"><?=$type;?> </td> - <td class="listr"><?=$host;?> </td> - <td valign="middle" nowrap class="list"> - <a href="system_authservers.php?act=edit&id=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit server" alt="edit server" width="17" height="17" border="0" /> - </a> - - <a href="system_authservers.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Server?");?>')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete server" alt="delete server" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <?php - $i++; - endforeach; - ?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_authservers.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add server" alt="add server" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <tr> - <td colspan="3"> - <p> - <?=gettext("Additional authentication servers can be added here.");?> - </p> - </td> - </tr> - </table> - - <?php endif; ?> + <?php endif; ?> + </div> </td> </tr> </table> diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index 31f3779..79a691f 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -219,8 +219,7 @@ function presubmit() { ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td class="tabnavtbl"> - <ul id="tabnav"> + <td> <?php $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); @@ -229,235 +228,236 @@ function presubmit() { $tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); ?> - </ul> </td> </tr> <tr> - <td class="tabcont"> + <td id="mainarea"> + <div class="tabcont"> + + <?php if($_GET['act']=="new" || $_GET['act']=="edit"): ?> + + <form action="system_groupmanager.php" method="post" name="iform" id="iform" onsubmit="presubmit()"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <?php + $ro = ""; + if ($pconfig['gtype'] == "system") + $ro = "readonly = \"readonly\""; + ?> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Defined by");?></td> + <td width="78%" class="vtable"> + <strong><?=strtoupper($pconfig['gtype']);?></strong> + <input name="gtype" type="hidden" value="<?=$pconfig['gtype']?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq">Group name</td> + <td width="78%" class="vtable"> + <input name="groupname" type="text" class="formfld group" id="groupname" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" <?=$ro;?>> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell">Description</td> + <td width="78%" class="vtable"> + <input name="description" type="text" class="formfld unknown" id="description" size="20" value="<?=htmlspecialchars($pconfig['description']);?>"> + <br> + Group description, for your own information only + </td> + </tr> + + <?php if ($pconfig['gid'] != 1998): // all users group ?> + + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td> + <td width="78%" class="vtable" align="center"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td align="center" width="50%"> + <strong>Not Members</strong><br/> + <br/> + <select size="10" style="width: 75%" name="notmembers[]" class="formselect" id="notmembers" onChange="clear_selected('members')" multiple> + <?php + foreach ($config['system']['user'] as $user): + if (in_array($user['uid'],$pconfig['members'])) + continue; + ?> + <option value="<?=$user['uid'];?>" <?=$selected;?>> + <?=htmlspecialchars($user['name']);?> + </option> + <?php endforeach; ?> + </select> + <br/> + </td> + <td> + <br/> + <a href="javascript:move_selected('notmembers','members')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_right.gif" title="Add Members" alt="Add Members" width="17" height="17" border="0" /> + </a> + <br/><br/> + <a href="javascript:move_selected('members','notmembers')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_left.gif" title="Remove Members" alt="Remove Members" width="17" height="17" border="0" /> + </a> + </td> + <td align="center" width="50%"> + <strong>Members</strong><br/> + <br/> + <select size="10" style="width: 75%" name="members[]" class="formselect" id="members" onChange="clear_selected('notmembers')" multiple> + <?php + foreach ($config['system']['user'] as $user): + if (!in_array($user['uid'],$pconfig['members'])) + continue; + ?> + <option value="<?=$user['uid'];?>"> + <?=htmlspecialchars($user['name']);?> + </option> + <?php endforeach; ?> + </select> + <br/> + </td> + </tr> + </table> + <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> + </td> + </tr> - <?php if($_GET['act']=="new" || $_GET['act']=="edit"): ?> + <?php endif; ?> - <form action="system_groupmanager.php" method="post" name="iform" id="iform" onsubmit="presubmit()"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <?php - $ro = ""; - if ($pconfig['gtype'] == "system") - $ro = "readonly = \"readonly\""; - ?> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Assigned Privileges");?></td> + <td width="78%" class="vtable"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td width="40%" class="listhdrr"><?=gettext("Name");?></td> + <td width="60%" class="listhdrr"><?=gettext("Description");?></td> + <td class="list"></td> + </tr> + <?php + if(is_array($pconfig['priv'])): + $i = 0; + foreach ($pconfig['priv'] as $priv): + ?> + <tr> + <td class="listr"> + <?=htmlspecialchars($priv_list[$priv]['name']);?> + </td> + <td class="listbg"> + <font color="#FFFFFF"> + <?=htmlspecialchars($priv_list[$priv]['descr']);?> + </font> + </td> + <td valign="middle" nowrap class="list"> + <a href="system_groupmanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" /> + </a> + </td> + </tr> + <?php + $i++; + endforeach; + endif; + ?> + <tr> + <td class="list" colspan="2"></td> + <td class="list"> + <a href="system_groupmanager_addprivs.php?groupid=<?=$id?>"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> + </a> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="save" type="submit" class="formbtn" value="Save"> + <?php if (isset($id) && $a_group[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>"> + <input name="gid" type="hidden" value="<?=$pconfig['gid'];?>"> + <?php endif; ?> + </td> + </tr> + </table> + </form> + + <?php else: ?> + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Defined by");?></td> - <td width="78%" class="vtable"> - <strong><?=strtoupper($pconfig['gtype']);?></strong> - <input name="gtype" type="hidden" value="<?=$pconfig['gtype']?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq">Group name</td> - <td width="78%" class="vtable"> - <input name="groupname" type="text" class="formfld group" id="groupname" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" <?=$ro;?>> - </td> + <td width="25%" class="listhdrr">Group name</td> + <td width="25%" class="listhdrr">Description</td> + <td width="30%" class="listhdrr">Member Count</td> + <td width="10%" class="list"></td> </tr> - <tr> - <td width="22%" valign="top" class="vncell">Description</td> - <td width="78%" class="vtable"> - <input name="description" type="text" class="formfld unknown" id="description" size="20" value="<?=htmlspecialchars($pconfig['description']);?>"> - <br> - Group description, for your own information only - </td> - </tr> - - <?php if ($pconfig['gid'] != 1998): // all users group ?> - + <?php + $i = 0; + foreach($a_group as $group): + + if($group['scope'] == "system") + $grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group-grey.png"; + else + $grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group.png"; + ?> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td> - <td width="78%" class="vtable" align="center"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <td class="listlr"> + <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td align="center" width="50%"> - <strong>Not Members</strong><br/> - <br/> - <select size="10" style="width: 75%" name="notmembers[]" class="formselect" id="notmembers" onChange="clear_selected('members')" multiple> - <?php - foreach ($config['system']['user'] as $user): - if (in_array($user['uid'],$pconfig['members'])) - continue; - ?> - <option value="<?=$user['uid'];?>" <?=$selected;?>> - <?=htmlspecialchars($user['name']);?> - </option> - <?php endforeach; ?> - </select> - <br/> + <td align="left" valign="center"> + <img src="<?=$grpimg;?>" alt="User" title="User" border="0" height="16" width="16" /> </td> - <td> - <br/> - <a href="javascript:move_selected('notmembers','members')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_right.gif" title="Add Members" alt="Add Members" width="17" height="17" border="0" /> - </a> - <br/><br/> - <a href="javascript:move_selected('members','notmembers')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_left.gif" title="Remove Members" alt="Remove Members" width="17" height="17" border="0" /> - </a> </td> - <td align="center" width="50%"> - <strong>Members</strong><br/> - <br/> - <select size="10" style="width: 75%" name="members[]" class="formselect" id="members" onChange="clear_selected('notmembers')" multiple> - <?php - foreach ($config['system']['user'] as $user): - if (!in_array($user['uid'],$pconfig['members'])) - continue; - ?> - <option value="<?=$user['uid'];?>"> - <?=htmlspecialchars($user['name']);?> - </option> - <?php endforeach; ?> - </select> - <br/> + <td align="left" valign="middle"> + <?=htmlspecialchars($group['name']); ?> </td> </tr> </table> - <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> </td> - </tr> - - <?php endif; ?> - - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Assigned Privileges");?></td> - <td width="78%" class="vtable"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="40%" class="listhdrr"><?=gettext("Name");?></td> - <td width="60%" class="listhdrr"><?=gettext("Description");?></td> - <td class="list"></td> - </tr> - <?php - if(is_array($pconfig['priv'])): - $i = 0; - foreach ($pconfig['priv'] as $priv): - ?> - <tr> - <td class="listr"> - <?=htmlspecialchars($priv_list[$priv]['name']);?> - </td> - <td class="listbg"> - <font color="#FFFFFF"> - <?=htmlspecialchars($priv_list[$priv]['descr']);?> - </font> - </td> - <td valign="middle" nowrap class="list"> - <a href="system_groupmanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" /> - </a> - </td> - </tr> - <?php - $i++; - endforeach; - endif; - ?> - <tr> - <td class="list" colspan="2"></td> - <td class="list"> - <a href="system_groupmanager_addprivs.php?groupid=<?=$id?>"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> - </a> - </td> - </tr> - </table> + <td class="listr"> + <?=htmlspecialchars($group['description']);?> + </td> + <td class="listbg"> + <font color="white"> + <?=count($group['member'])?> + </font> + </td> + <td valign="middle" nowrap class="list"> + <a href="system_groupmanager.php?act=edit&id=<?=$i;?>"> + <img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="edit group" width="17" height="17" border="0"> + </a> + + <?php if($group['scope'] != "system"): ?> + <a href="system_groupmanager.php?act=delgroup&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this group?')"> + <img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="delete group" width="17" height="17" border="0"> + </a> + <?php endif; ?> </td> </tr> + <?php + $i++; + endforeach; + ?> <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input name="save" type="submit" class="formbtn" value="Save"> - <?php if (isset($id) && $a_group[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>"> - <input name="gid" type="hidden" value="<?=$pconfig['gid'];?>"> - <?php endif; ?> + <td class="list" colspan="3"></td> + <td class="list"> + <a href="system_groupmanager.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="add group" width="17" height="17" border="0"> + </a> + </td> + </tr> + <tr> + <td colspan="3"> + <p> + <?=gettext("Additional webConfigurator groups can be added here.");?> + <?=gettext("Group permissions can be assinged which will be inherited by users.");?> + <?=gettext("An icon that appears grey indicates that it is a system defined object.");?> + <?=gettext("Some system object properties can be modified but they cannot be deleted.");?> + </p> </td> </tr> </table> - </form> - - <?php else: ?> - - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="25%" class="listhdrr">Group name</td> - <td width="25%" class="listhdrr">Description</td> - <td width="30%" class="listhdrr">Member Count</td> - <td width="10%" class="list"></td> - </tr> - <?php - $i = 0; - foreach($a_group as $group): - - if($group['scope'] == "system") - $grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group-grey.png"; - else - $grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group.png"; - ?> - <tr> - <td class="listlr"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td align="left" valign="center"> - <img src="<?=$grpimg;?>" alt="User" title="User" border="0" height="16" width="16" /> - </td> - </td> - <td align="left" valign="middle"> - <?=htmlspecialchars($group['name']); ?> - </td> - </tr> - </table> - </td> - <td class="listr"> - <?=htmlspecialchars($group['description']);?> - </td> - <td class="listbg"> - <font color="white"> - <?=count($group['member'])?> - </font> - </td> - <td valign="middle" nowrap class="list"> - <a href="system_groupmanager.php?act=edit&id=<?=$i;?>"> - <img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="edit group" width="17" height="17" border="0"> - </a> - - <?php if($group['scope'] != "system"): ?> - <a href="system_groupmanager.php?act=delgroup&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this group?')"> - <img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="delete group" width="17" height="17" border="0"> - </a> - <?php endif; ?> - </td> - </tr> - <?php - $i++; - endforeach; - ?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_groupmanager.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="add group" width="17" height="17" border="0"> - </a> - </td> - </tr> - <tr> - <td colspan="3"> - <p> - <?=gettext("Additional webConfigurator groups can be added here.");?> - <?=gettext("Group permissions can be assinged which will be inherited by users.");?> - <?=gettext("An icon that appears grey indicates that it is a system defined object.");?> - <?=gettext("Some system object properties can be modified but they cannot be deleted.");?> - </p> - </td> - </tr> - </table> - <? endif; ?> - + <? endif; ?> + + </div> </td> </tr> </table> diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php index a449b2d..9e625c5 100644 --- a/usr/local/www/system_groupmanager_addprivs.php +++ b/usr/local/www/system_groupmanager_addprivs.php @@ -140,43 +140,62 @@ function update_description() { if ($savemsg) print_info_box($savemsg); ?> - <form action="system_groupmanager_addprivs.php" method="post" name="iform" id="iform"> - <div id="inputerrors"></div> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("System Privileges");?></td> - <td width="78%" class="vtable"> - <select name="sysprivs[]" id="sysprivs" class="formselect" onchange="update_description();" multiple> - <?php - foreach($priv_list as $pname => $pdata): - if (in_array($pname, $a_group['priv'])) - continue; - ?> - <option value="<?=$pname;?>"><?=$pdata['name'];?></option> - <?php endforeach; ?> - </select> - <br/> - <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> - </td> - </tr> - <tr height="60"> - <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> - <td width="78%" valign="top" class="vtable" id="pdesc"> - <em>Select a privilege from the list above for a description</em> - </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submitt" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> - <input id="cancelbutton" class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" /> - <?php if (isset($groupid)): ?> - <input name="groupid" type="hidden" value="<?=$groupid;?>" /> - <?php endif; ?> - </td> - </tr> - </table> - </form> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); + $tab_array[] = array(gettext("Groups"), true, "system_groupmanager.php"); + $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); + $tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); + display_top_tabs($tab_array); + ?> + </td> + </tr> + <tr> + <td id="mainarea"> + <div class="tabcont"> + <form action="system_groupmanager_addprivs.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("System Privileges");?></td> + <td width="78%" class="vtable"> + <select name="sysprivs[]" id="sysprivs" class="formselect" onchange="update_description();" multiple> + <?php + foreach($priv_list as $pname => $pdata): + if (in_array($pname, $a_group['priv'])) + continue; + ?> + <option value="<?=$pname;?>"><?=$pdata['name'];?></option> + <?php endforeach; ?> + </select> + <br/> + <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> + </td> + </tr> + <tr height="60"> + <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> + <td width="78%" valign="top" class="vtable" id="pdesc"> + <em>Select a privilege from the list above for a description</em> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submitt" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> + <input id="cancelbutton" class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" /> + <?php if (isset($groupid)): ?> + <input name="groupid" type="hidden" value="<?=$groupid;?>" /> + <?php endif; ?> + </td> + </tr> + </table> + </form> + </div> + </td> + </tr> +</table> <?php include("fend.inc"); ?> </body> </html> diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index cdb2c35..c6ebc5a 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -304,7 +304,7 @@ function presubmit() { ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td class="tabnavtbl"> + <td> <?php $tab_array = array(); $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); @@ -316,316 +316,319 @@ function presubmit() { </td> </tr> <tr> - <td class="tabcont"> + <td id="mainarea"> + <div class="tabcont"> + + <?php if ($_GET['act'] == "new" || $_GET['act'] == "edit" || $input_errors): ?> + + <form action="system_usermanager.php" method="post" name="iform" id="iform" onsubmit="presubmit()"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <?php + $ro = ""; + if ($pconfig['utype'] == "system") + $ro = "readonly = \"readonly\""; + ?> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Defined by");?></td> + <td width="78%" class="vtable"> + <strong><?=strtoupper($pconfig['utype']);?></strong> + <input name="utype" type="hidden" value="<?=$pconfig['utype']?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td> + <td width="78%" class="vtable"> + <input name="usernamefld" type="text" class="formfld user" id="usernamefld" size="20" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" <?=$ro;?>/> + <input name="oldusername" type="hidden" id="oldusername" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" /> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq" rowspan="2"><?=gettext("Password");?></td> + <td width="78%" class="vtable"> + <input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" value="" /> + </td> + </tr> + <tr> + <td width="78%" class="vtable"> + <input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" value="" /> <?= gettext("(confirmation)"); ?> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Full name");?></td> + <td width="78%" class="vtable"> + <input name="fullname" type="text" class="formfld unknown" id="fullname" size="20" value="<?=htmlspecialchars($pconfig['fullname']);?>" <?=$ro;?>/> + <br/> + <?=gettext("User's full name, for your own information only");?> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td> + <td width="78%" class="vtable" align="center"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td align="center" width="50%"> + <strong>Not Member Of</strong><br/> + <br/> + <select size="10" style="width: 75%" name="notgroups[]" class="formselect" id="notgroups" onChange="clear_selected('groups')" multiple> + <?php + foreach ($config['system']['group'] as $group): + if ($group['gid'] == 1998) /* all users group */ + continue; + if (in_array($group['name'],$pconfig['groups'])) + continue; + ?> + <option value="<?=$group['name'];?>" <?=$selected;?>> + <?=htmlspecialchars($group['name']);?> + </option> + <?php endforeach; ?> + </select> + <br/> + </td> + <td> + <br/> + <a href="javascript:move_selected('notgroups','groups')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_right.gif" title="Add Groups" alt="Add Groups" width="17" height="17" border="0" /> + </a> + <br/><br/> + <a href="javascript:move_selected('groups','notgroups')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_left.gif" title="Remove Groups" alt="Remove Groups" width="17" height="17" border="0" /> + </a> + </td> + <td align="center" width="50%"> + <strong>Member Of</strong><br/> + <br/> + <select size="10" style="width: 75%" name="groups[]" class="formselect" id="groups" onChange="clear_selected('nogroups')" multiple> + <?php + foreach ($config['system']['group'] as $group): + if ($group['gid'] == 1998) /* all users group */ + continue; + if (!in_array($group['name'],$pconfig['groups'])) + continue; + ?> + <option value="<?=$group['name'];?>"> + <?=htmlspecialchars($group['name']);?> + </option> + <?php endforeach; ?> + </select> + <br/> + </td> + </tr> + </table> + <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> + </td> + </tr> + + <?php if ($pconfig['uid']): ?> + + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Effective Privileges");?></td> + <td width="78%" class="vtable"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td width="20%" class="listhdrr"><?=gettext("Inherited From");?></td> + <td width="30%" class="listhdrr"><?=gettext("Name");?></td> + <td width="40%" class="listhdrr"><?=gettext("Description");?></td> + <td class="list"></td> + </tr> + <?php + + $privdesc = get_user_privdesc($a_user[$id]); + if(is_array($privdesc)): + $i = 0; + foreach ($privdesc as $priv): + $group = false; + if ($priv['group']) + $group = $priv['group']; + ?> + <tr> + <td class="listlr"><?=$group;?></td> + <td class="listr"> + <?=htmlspecialchars($priv['name']);?> + </td> + <td class="listbg"> + <font color="#FFFFFF"> + <?=htmlspecialchars($priv['descr']);?> + </font> + </td> + <td valign="middle" nowrap class="list"> + <?php if (!$group): ?> + <a href="system_usermanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" /> + </a> + <?php endif; ?> + </td> + </tr> + <?php + /* can only delete user priv indexes */ + if (!$group) + $i++; + endforeach; + endif; + ?> + <tr> + <td class="list" colspan="3"></td> + <td class="list"> + <a href="system_usermanager_addprivs.php?userid=<?=$id?>"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> + </a> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("User Certificates");?></td> + <td width="78%" class="vtable"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td width="45%" class="listhdrr"><?=gettext("Name");?></td> + <td width="45%" class="listhdrr"><?=gettext("CA");?></td> + <td class="list"></td> + </tr> + <?php + + $a_cert = $a_user[$id]['cert']; + if(is_array($a_cert)): + $i = 0; + foreach ($a_cert as $cert): + $ca = lookup_ca($cert['caref']); + ?> + <tr> + <td class="listlr"> + <?=htmlspecialchars($cert['name']);?> + </td> + <td class="listr"> + <?=htmlspecialchars($ca['name']);?> + </td> + <td valign="middle" nowrap class="list"> + <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export private key" alt="export private key" width="17" height="17" border="0" /> + </a> + <a href="system_usermanager.php?act=expcert&id=<?=$id;?>&certid=<?=$i;?>"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export cert" alt="export cert" width="17" height="17" border="0" /> + </a> + <a href="system_usermanager.php?act=delcert&id=<?=$id?>&certid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this certificate?");?>')"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete cert" /> + </a> + </td> + </tr> + <?php + $i++; + endforeach; + endif; + ?> + <tr> + <td class="list" colspan="2"></td> + <td class="list"> + <a href="system_usermanager_addcert.php?userid=<?=$id?>"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> + </a> + </td> + </tr> + </table> + </td> + </tr> - <?php if ($_GET['act'] == "new" || $_GET['act'] == "edit" || $input_errors): ?> + <?php endif; ?> - <form action="system_usermanager.php" method="post" name="iform" id="iform" onsubmit="presubmit()"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <?php - $ro = ""; - if ($pconfig['utype'] == "system") - $ro = "readonly = \"readonly\""; - ?> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Defined by");?></td> - <td width="78%" class="vtable"> - <strong><?=strtoupper($pconfig['utype']);?></strong> - <input name="utype" type="hidden" value="<?=$pconfig['utype']?>"/> - </td> - </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td> + <td width="78%" class="vtable"> + <textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert" wrap="off"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea> + <br/> + <?=gettext("Paste an authorized keys file here.");?> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> + <?php if (isset($id) && $a_user[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>" /> + <?php endif;?> + </td> + </tr> + </table> + </form> + + <?php else: ?> + + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td> - <td width="78%" class="vtable"> - <input name="usernamefld" type="text" class="formfld user" id="usernamefld" size="20" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" <?=$ro;?>/> - <input name="oldusername" type="hidden" id="oldusername" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" /> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq" rowspan="2"><?=gettext("Password");?></td> - <td width="78%" class="vtable"> - <input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" value="" /> - </td> + <td width="25%" class="listhdrr">Username</td> + <td width="25%" class="listhdrr">Full name</td> + <td width="30%" class="listhdrr">Groups</td> + <td width="10%" class="list"></td> </tr> - <tr> - <td width="78%" class="vtable"> - <input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" value="" /> <?= gettext("(confirmation)"); ?> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Full name");?></td> - <td width="78%" class="vtable"> - <input name="fullname" type="text" class="formfld unknown" id="fullname" size="20" value="<?=htmlspecialchars($pconfig['fullname']);?>" <?=$ro;?>/> - <br/> - <?=gettext("User's full name, for your own information only");?> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td> - <td width="78%" class="vtable" align="center"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <?php + $i = 0; + foreach($a_user as $userent): + ?> + <tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'"> + <td class="listlr"> + <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td align="center" width="50%"> - <strong>Not Member Of</strong><br/> - <br/> - <select size="10" style="width: 75%" name="notgroups[]" class="formselect" id="notgroups" onChange="clear_selected('groups')" multiple> - <?php - foreach ($config['system']['group'] as $group): - if ($group['gid'] == 1998) /* all users group */ - continue; - if (in_array($group['name'],$pconfig['groups'])) - continue; - ?> - <option value="<?=$group['name'];?>" <?=$selected;?>> - <?=htmlspecialchars($group['name']);?> - </option> - <?php endforeach; ?> - </select> - <br/> - </td> - <td> - <br/> - <a href="javascript:move_selected('notgroups','groups')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_right.gif" title="Add Groups" alt="Add Groups" width="17" height="17" border="0" /> - </a> - <br/><br/> - <a href="javascript:move_selected('groups','notgroups')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_left.gif" title="Remove Groups" alt="Remove Groups" width="17" height="17" border="0" /> - </a> + <td align="left" valign="center"> + <?php + if($userent['scope'] != "user") + $usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user-grey.png"; + else + $usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user.png"; + ?> + <img src="<?=$usrimg;?>" alt="User" title="User" border="0" height="16" width="16" /> </td> - <td align="center" width="50%"> - <strong>Member Of</strong><br/> - <br/> - <select size="10" style="width: 75%" name="groups[]" class="formselect" id="groups" onChange="clear_selected('nogroups')" multiple> - <?php - foreach ($config['system']['group'] as $group): - if ($group['gid'] == 1998) /* all users group */ - continue; - if (!in_array($group['name'],$pconfig['groups'])) - continue; - ?> - <option value="<?=$group['name'];?>"> - <?=htmlspecialchars($group['name']);?> - </option> - <?php endforeach; ?> - </select> - <br/> + <td align="left" valign="middle"> + <?=htmlspecialchars($userent['name']);?> </td> </tr> </table> - <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> </td> - </tr> - - <?php if ($pconfig['uid']): ?> - - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Effective Privileges");?></td> - <td width="78%" class="vtable"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="20%" class="listhdrr"><?=gettext("Inherited From");?></td> - <td width="30%" class="listhdrr"><?=gettext("Name");?></td> - <td width="40%" class="listhdrr"><?=gettext("Description");?></td> - <td class="list"></td> - </tr> - <?php - - $privdesc = get_user_privdesc($a_user[$id]); - if(is_array($privdesc)): - $i = 0; - foreach ($privdesc as $priv): - $group = false; - if ($priv['group']) - $group = $priv['group']; - ?> - <tr> - <td class="listlr"><?=$group;?></td> - <td class="listr"> - <?=htmlspecialchars($priv['name']);?> - </td> - <td class="listbg"> - <font color="#FFFFFF"> - <?=htmlspecialchars($priv['descr']);?> - </font> - </td> - <td valign="middle" nowrap class="list"> - <?php if (!$group): ?> - <a href="system_usermanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" /> - </a> - <?php endif; ?> - </td> - </tr> - <?php - /* can only delete user priv indexes */ - if (!$group) - $i++; - endforeach; - endif; - ?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_usermanager_addprivs.php?userid=<?=$id?>"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> - </a> - </td> - </tr> - </table> + <td class="listr"><?=htmlspecialchars($userent['fullname']);?> </td> + <td class="listbg"> + <font color="white"> + <?=implode(",",local_user_get_groups($userent));?> + </font> + </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("User Certificates");?></td> - <td width="78%" class="vtable"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="45%" class="listhdrr"><?=gettext("Name");?></td> - <td width="45%" class="listhdrr"><?=gettext("CA");?></td> - <td class="list"></td> - </tr> - <?php - - $a_cert = $a_user[$id]['cert']; - if(is_array($a_cert)): - $i = 0; - foreach ($a_cert as $cert): - $ca = lookup_ca($cert['caref']); - ?> - <tr> - <td class="listlr"> - <?=htmlspecialchars($cert['name']);?> - </td> - <td class="listr"> - <?=htmlspecialchars($ca['name']);?> - </td> - <td valign="middle" nowrap class="list"> - <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export private key" alt="export private key" width="17" height="17" border="0" /> - </a> - <a href="system_usermanager.php?act=expcert&id=<?=$id;?>&certid=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="export cert" alt="export cert" width="17" height="17" border="0" /> - </a> - <a href="system_usermanager.php?act=delcert&id=<?=$id?>&certid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this certificate?");?>')"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete cert" /> - </a> - </td> - </tr> - <?php - $i++; - endforeach; - endif; - ?> - <tr> - <td class="list" colspan="2"></td> - <td class="list"> - <a href="system_usermanager_addcert.php?userid=<?=$id?>"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> - </a> - </td> - </tr> - </table> + <td valign="middle" nowrap class="list"> + <a href="system_usermanager.php?act=edit&id=<?=$i;?>"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit user" alt="edit user" width="17" height="17" border="0" /> + </a> + <?php if($userent['scope'] != "system"): ?> + + <a href="system_usermanager.php?act=deluser&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete user" alt="delete user" width="17" height="17" border="0" /> + </a> + <?php endif; ?> </td> </tr> - - <?php endif; ?> - + <?php + $i++; + endforeach; + ?> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td> - <td width="78%" class="vtable"> - <textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert" wrap="off"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea> - <br/> - <?=gettext("Paste an authorized keys file here.");?> + <td class="list" colspan="3"></td> + <td class="list"> + <a href="system_usermanager.php?act=new"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add user" alt="add user" width="17" height="17" border="0" /> + </a> </td> </tr> <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> - <?php if (isset($id) && $a_user[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>" /> - <?php endif;?> + <td colspan="3"> + <p> + <?=gettext("Additional webConfigurator users can be added here.");?> + <?=gettext("User permissions can be assinged diretly or inherited from group memberships.");?> + <?=gettext("An icon that appears grey indicates that it is a system defined object.");?> + <?=gettext("Some system object properties can be modified but they cannot be deleted.");?> + </p> </td> </tr> </table> - </form> - - <?php else: ?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="25%" class="listhdrr">Username</td> - <td width="25%" class="listhdrr">Full name</td> - <td width="30%" class="listhdrr">Groups</td> - <td width="10%" class="list"></td> - </tr> - <?php - $i = 0; - foreach($a_user as $userent): - ?> - <tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'"> - <td class="listlr"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td align="left" valign="center"> - <?php - if($userent['scope'] != "user") - $usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user-grey.png"; - else - $usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user.png"; - ?> - <img src="<?=$usrimg;?>" alt="User" title="User" border="0" height="16" width="16" /> - </td> - <td align="left" valign="middle"> - <?=htmlspecialchars($userent['name']);?> - </td> - </tr> - </table> - </td> - <td class="listr"><?=htmlspecialchars($userent['fullname']);?> </td> - <td class="listbg"> - <font color="white"> - <?=implode(",",local_user_get_groups($userent));?> - </font> - - </td> - <td valign="middle" nowrap class="list"> - <a href="system_usermanager.php?act=edit&id=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit user" alt="edit user" width="17" height="17" border="0" /> - </a> - <?php if($userent['scope'] != "system"): ?> - - <a href="system_usermanager.php?act=deluser&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete user" alt="delete user" width="17" height="17" border="0" /> - </a> - <?php endif; ?> - </td> - </tr> - <?php - $i++; - endforeach; - ?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_usermanager.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add user" alt="add user" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <tr> - <td colspan="3"> - <p> - <?=gettext("Additional webConfigurator users can be added here.");?> - <?=gettext("User permissions can be assinged diretly or inherited from group memberships.");?> - <?=gettext("An icon that appears grey indicates that it is a system defined object.");?> - <?=gettext("Some system object properties can be modified but they cannot be deleted.");?> - </p> - </td> - </tr> - </table> - <?php endif; ?> + <?php endif; ?> + </div> </td> </tr> </table> @@ -685,35 +688,39 @@ function presubmit() { exit; } ?> -<form action="system_usermanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td colspan="2" valign="top" class="listtopic"><?=$HTTP_SERVER_VARS['AUTH_USER']?>'s Password</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell" rowspan="2">Password</td> - <td width="78%" class="vtable"> - <input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" /> - </td> - </tr> - <tr> - <td width="78%" class="vtable"> - <input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" /> - <?=gettext("(confirmation)");?> - <br/> - <span class="vexpl"> - <?=gettext("Select a new password");?> - </span> - </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> - </td> - </tr> - </table> -</form> +<div id="mainarea"> + <div class="tabcont"> + <form action="system_usermanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td colspan="2" valign="top" class="listtopic"><?=$HTTP_SERVER_VARS['AUTH_USER']?>'s Password</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell" rowspan="2">Password</td> + <td width="78%" class="vtable"> + <input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" /> + </td> + </tr> + <tr> + <td width="78%" class="vtable"> + <input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" /> + <?=gettext("(confirmation)");?> + <br/> + <span class="vexpl"> + <?=gettext("Select a new password");?> + </span> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> + </td> + </tr> + </table> + </form> + </div> +</div> <?php include("fend.inc");?> </body> diff --git a/usr/local/www/system_usermanager_addcert.php b/usr/local/www/system_usermanager_addcert.php index 3b3a417..d975c19 100644 --- a/usr/local/www/system_usermanager_addcert.php +++ b/usr/local/www/system_usermanager_addcert.php @@ -168,7 +168,7 @@ function internalca_change() { ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td class="tabnavtbl"> + <td> <?php $tab_array = array(); $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); @@ -180,84 +180,87 @@ function internalca_change() { </td> </tr> <tr> - <td class="tabcont"> - <form action="system_usermanager_addcert.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - - <?php if (!$internal_ca_count): ?> - - <tr> - <td colspan="2" align="center" class="vtable"> - No internal Certificate Authorities have been defined. You must - <a href="system_camanager.php?act=new&method=internal">create</a> - an internal CA before creating an internal certificate. - </td> - </tr> - - <?php else: ?> - - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> - <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate authority");?></td> - <td width="78%" class="vtable"> - <select name='caref' id='caref' class="formselect" onChange='internalca_change()'> - <?php - foreach( $a_ca as $ca): - if (!$ca['prv']) - continue; - $selected = ""; - if ($pconfig['caref'] == $ca['refid']) - $selected = "selected"; - ?> - <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['name'];?></option> - <?php endforeach; ?> - </select> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> - <td width="78%" class="vtable"> - <select name='keylen' class="formselect"> - <?php - foreach( $cert_keylens as $len): - $selected = ""; - if ($pconfig['keylen'] == $len) - $selected = "selected"; - ?> - <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> - <?php endforeach; ?> - </select> - bits - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> - <td width="78%" class="vtable"> - <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> - days - </td> - </tr> - - <?php endif; ?> - - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <?php if ($internal_ca_count): ?> - <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> - <?php endif; ?> - <?php if (isset($userid) && $a_user[$userid]): ?> - <input name="userid" type="hidden" value="<?=$userid;?>" /> - <?php endif;?> - </td> - </tr> - </table> - </form> + <td id="mainarea"> + <div class="tabcont"> + <form action="system_usermanager_addcert.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + + <?php if (!$internal_ca_count): ?> + + <tr> + <td colspan="2" align="center" class="vtable"> + No internal Certificate Authorities have been defined. You must + <a href="system_camanager.php?act=new&method=internal">create</a> + an internal CA before creating an internal certificate. + </td> + </tr> + + <?php else: ?> + + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> + <td width="78%" class="vtable"> + <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate authority");?></td> + <td width="78%" class="vtable"> + <select name='caref' id='caref' class="formselect" onChange='internalca_change()'> + <?php + foreach( $a_ca as $ca): + if (!$ca['prv']) + continue; + $selected = ""; + if ($pconfig['caref'] == $ca['refid']) + $selected = "selected"; + ?> + <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['name'];?></option> + <?php endforeach; ?> + </select> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td> + <td width="78%" class="vtable"> + <select name='keylen' class="formselect"> + <?php + foreach( $cert_keylens as $len): + $selected = ""; + if ($pconfig['keylen'] == $len) + $selected = "selected"; + ?> + <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option> + <?php endforeach; ?> + </select> + bits + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> + <td width="78%" class="vtable"> + <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/> + days + </td> + </tr> + + <?php endif; ?> + + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <?php if ($internal_ca_count): ?> + <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> + <input id="cancelbutton" class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" /> + <?php endif; ?> + <?php if (isset($userid) && $a_user[$userid]): ?> + <input name="userid" type="hidden" value="<?=$userid;?>" /> + <?php endif;?> + </td> + </tr> + </table> + </form> + </div> </td> </tr> </table> diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php index 0214d63..8a7da15 100644 --- a/usr/local/www/system_usermanager_addprivs.php +++ b/usr/local/www/system_usermanager_addprivs.php @@ -139,43 +139,62 @@ function update_description() { if ($savemsg) print_info_box($savemsg); ?> - <form action="system_usermanager_addprivs.php" method="post" name="iform" id="iform"> - <div id="inputerrors"></div> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("System Privileges");?></td> - <td width="78%" class="vtable"> - <select name="sysprivs[]" id="sysprivs" class="formselect" onchange="update_description();" multiple> - <?php - foreach($priv_list as $pname => $pdata): - if (in_array($pname, $a_user['priv'])) - continue; - ?> - <option value="<?=$pname;?>"><?=$pdata['name'];?></option> - <?php endforeach; ?> - </select> - <br/> - <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> - </td> - </tr> - <tr height="60"> - <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> - <td width="78%" valign="top" class="vtable" id="pdesc"> - <em>Select a privilege from the list above for a description</em> - </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submitt" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> - <input id="cancelbutton" class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" /> - <?php if (isset($userid)): ?> - <input name="userid" type="hidden" value="<?=$userid;?>" /> - <?php endif; ?> - </td> - </tr> - </table> - </form> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); + $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php"); + $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); + $tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); + display_top_tabs($tab_array); + ?> + </td> + </tr> + <tr> + <td id="mainarea"> + <div class="tabcont"> + <form action="system_usermanager_addprivs.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("System Privileges");?></td> + <td width="78%" class="vtable"> + <select name="sysprivs[]" id="sysprivs" class="formselect" onchange="update_description();" multiple> + <?php + foreach($priv_list as $pname => $pdata): + if (in_array($pname, $a_user['priv'])) + continue; + ?> + <option value="<?=$pname;?>"><?=$pdata['name'];?></option> + <?php endforeach; ?> + </select> + <br/> + <?=gettext("Hold down CTRL (pc)/COMMAND (mac) key to select multiple items");?> + </td> + </tr> + <tr height="60"> + <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> + <td width="78%" valign="top" class="vtable" id="pdesc"> + <em>Select a privilege from the list above for a description</em> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input id="submitt" name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> + <input id="cancelbutton" class="formbtn" type="button" value="<?=gettext("Cancel");?>" onclick="history.back()" /> + <?php if (isset($userid)): ?> + <input name="userid" type="hidden" value="<?=$userid;?>" /> + <?php endif; ?> + </td> + </tr> + </table> + </form> + </div> + </td> + </tr> +</table> <?php include("fend.inc"); ?> </body> </html> |
