improved design

This commit is contained in:
katagia 2003-09-12 11:56:50 +00:00
parent e264652d53
commit fa1adc143a
3 changed files with 22 additions and 20 deletions

View File

@ -663,7 +663,6 @@ function ldapexists($values, $type, $values_old=false) { // This function will s
$keys = array_keys($_SESSION['groupDN']); $keys = array_keys($_SESSION['groupDN']);
unset ($keys[0]); unset ($keys[0]);
$keys = array_values($keys); $keys = array_values($keys);
if (in_array($search , $keys)) print "hit";
if ( ($values_old->general_username != $values->general_username) && if ( ($values_old->general_username != $values->general_username) &&
($_SESSION['groupDN'][0] != $values->general_username) && ($_SESSION['groupDN'][0] != $values->general_username) &&
(in_array($search , $keys)) ) return sprintf (_('%s already exists!'), $type); (in_array($search , $keys)) ) return sprintf (_('%s already exists!'), $type);

View File

@ -305,6 +305,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo "value=\""; echo _('Quota'); echo "\">\n<br>"; echo "value=\""; echo _('Quota'); echo "\">\n<br>";
echo "<input name=\"next_final\" type=\"submit\" value=\""; echo _('Final'); echo "<input name=\"next_final\" type=\"submit\" value=\""; echo _('Final');
echo "\"></fieldset></td>\n<td>"; echo "\"></fieldset></td>\n<td>";
echo "<table border=0 width=\"100%\">\n<tr>\n<td>";
echo "<fieldset><legend><b>"; echo "<fieldset><legend><b>";
echo _("General properties"); echo _("General properties");
echo "</b></legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>"; echo "</b></legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>";
@ -332,7 +333,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo "</select></td>\n<td><a href=\"help.php?HelpNumber=462\" target=\"lamhelp\">"._('Help'). echo "</select></td>\n<td><a href=\"help.php?HelpNumber=462\" target=\"lamhelp\">"._('Help').
"</a></td>\n</tr>\n</table>"; "</a></td>\n</tr>\n</table>";
echo _('Values with * are required'); echo _('Values with * are required');
echo "</fieldset>\n</td></tr></table>"; echo "</fieldset>\n</td></tr><tr><td>";
if (count($profilelist)!=0) { if (count($profilelist)!=0) {
echo "<fieldset><legend>"; echo "<fieldset><legend>";
echo _("Load profile"); echo _("Load profile");
@ -343,7 +344,7 @@ switch ($select_local) { // Select which part of page will be loaded
"<input name=\"load\" type=\"submit\" value=\""; echo _('Load Profile'); "<input name=\"load\" type=\"submit\" value=\""; echo _('Load Profile');
echo "\"></td>\n</tr>\n</table>\n</fieldset>\n"; echo "\"></td>\n</tr>\n</table>\n</fieldset>\n";
} }
echo "</tr>\n</table>\n"; echo "</td></tr>\n</table>\n</td></tr></table>\n";
break; break;
case 'samba': case 'samba':
@ -474,6 +475,15 @@ switch ($select_local) { // Select which part of page will be loaded
echo "value=\""; echo _('Quota'); echo "\">\n<br>"; echo "value=\""; echo _('Quota'); echo "\">\n<br>";
echo "<input name=\"next_final\" type=\"submit\" disabled value=\""; echo _('Final'); echo "<input name=\"next_final\" type=\"submit\" disabled value=\""; echo _('Final');
echo "\"></fieldset></td>\n<td>"; echo "\"></fieldset></td>\n<td>";
echo "<table border=0 width=\"100%\">\n<tr>\n<td>";
echo "<fieldset><legend>";
echo _("Save profile");
echo "</legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>";
echo '<input name="f_finish_safeProfile" type="text" size="30" maxlength="50">';
echo '</td><td><input name="save" type="submit" value="';
echo _('Save profile');
echo '"></td><td><a href="../help.php?HelpNumber=457" target="lamhelp">'._('Help');
echo "</a></td>\n</tr>\n</table>\n</fieldset>\n</td></tr>\n<tr><td>\n";
echo "<fieldset><legend><b>"; echo "<fieldset><legend><b>";
if ($_SESSION['account_old']) echo _('Modify'); if ($_SESSION['account_old']) echo _('Modify');
else echo _('Create'); else echo _('Create');
@ -510,20 +520,11 @@ switch ($select_local) { // Select which part of page will be loaded
echo "</tr>\n"; echo "</tr>\n";
} }
} }
echo '<tr><td>'. echo "<tr><td><input name=\"create\" type=\"submit\" $disabled value=\"";
'<input name="back" type="submit" value="'; echo _('back'); echo '">'.
'</td>'."\n".'<td>'.
'</td>'."\n".'<td><input name="f_finish_safeProfile" type="text" size="30" maxlength="50">'.
'<input name="save" type="submit" value="';
echo _('Save profile');
echo '"><a href="help.php?HelpNumber=457" target="lamhelp">'._('Help').'</a>'.
'</td>'."\n".'<td>'.
"<input name=\"create\" type=\"submit\" $disabled value=\"";
if ($_SESSION['account_old']) echo _('Modify Account'); if ($_SESSION['account_old']) echo _('Modify Account');
else echo _('Create Account'); else echo _('Create Account');
echo '">'. echo '">'."\n";
'</td></tr>'."\n"; echo "</td></tr></table></fieldset>\n</td></tr></table>\n</tr></table>";
echo "</table>\n</fieldset>\n</tr>\n</table>\n";
break; break;
case 'finish': case 'finish':

View File

@ -216,6 +216,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo "<input name=\"next_samba\" type=\"submit\" value=\""; echo _('Samba'); echo "\">\n<br>"; echo "<input name=\"next_samba\" type=\"submit\" value=\""; echo _('Samba'); echo "\">\n<br>";
echo "<input name=\"next_final\" type=\"submit\" value=\""; echo _('Final'); echo "<input name=\"next_final\" type=\"submit\" value=\""; echo _('Final');
echo "\"></fieldset></td>\n<td>"; echo "\"></fieldset></td>\n<td>";
echo "<table border=0 width=\"100%\">\n<tr>\n<td>";
echo "<fieldset><legend><b>"; echo "<fieldset><legend><b>";
echo _("General properties"); echo _("General properties");
echo "</b></legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>"; echo "</b></legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>";
@ -257,7 +258,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo '</select></td><td><a href="../help.php?HelpNumber=463" target="lamhelp">'._('Help').'</a>'. echo '</select></td><td><a href="../help.php?HelpNumber=463" target="lamhelp">'._('Help').'</a>'.
"</td>\n</tr>\n</table>"; "</td>\n</tr>\n</table>";
echo _('Values with * are required'); echo _('Values with * are required');
echo "</fieldset>\n</td></tr><tr><td></td><td>"; echo "</fieldset>\n</td></tr><tr><td>";
if (count($profilelist)!=0) { if (count($profilelist)!=0) {
echo "<fieldset><legend>"; echo "<fieldset><legend>";
echo _("Load profile"); echo _("Load profile");
@ -269,7 +270,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo "\"></td><td><a href=\"../help.php?HelpNumber=XXX\" target=\"lamhelp\">"; echo "\"></td><td><a href=\"../help.php?HelpNumber=XXX\" target=\"lamhelp\">";
echo _('Help-XX')."</a></td>\n</tr>\n</table>\n</fieldset>\n"; echo _('Help-XX')."</a></td>\n</tr>\n</table>\n</fieldset>\n";
} }
echo "</td></tr>\n</table>\n"; echo "</td></tr></table>\n</td></tr>\n</table>\n";
break; break;
case 'samba': case 'samba':
@ -335,6 +336,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo "<input name=\"next_samba\" type=\"submit\" value=\""; echo _('Samba'); echo "\">\n<br>"; echo "<input name=\"next_samba\" type=\"submit\" value=\""; echo _('Samba'); echo "\">\n<br>";
echo "<input name=\"next_final\" type=\"submit\" disabled value=\""; echo _('Final'); echo "<input name=\"next_final\" type=\"submit\" disabled value=\""; echo _('Final');
echo "\"></fieldset></td>\n<td>"; echo "\"></fieldset></td>\n<td>";
echo "<table border=0 width=\"100%\">\n<tr>\n<td>";
echo "<fieldset><legend>"; echo "<fieldset><legend>";
echo _("Save profile"); echo _("Save profile");
echo "</legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>"; echo "</legend>\n<table border=0 width=\"100%\">\n<tr>\n<td>";
@ -342,7 +344,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo '</td><td><input name="save" type="submit" value="'; echo '</td><td><input name="save" type="submit" value="';
echo _('Save profile'); echo _('Save profile');
echo '"></td><td><a href="../help.php?HelpNumber=457" target="lamhelp">'._('Help'); echo '"></td><td><a href="../help.php?HelpNumber=457" target="lamhelp">'._('Help');
echo "</a></td>\n</tr>\n</table>\n</fieldset>\n</td></tr>\n<tr><td></td><td>\n"; echo "</a></td>\n</tr>\n</table>\n</fieldset>\n</td></tr>\n<tr><td>\n";
echo "<fieldset><legend><b>"; echo "<fieldset><legend><b>";
if ($_SESSION['account_old']) echo _('Modify'); if ($_SESSION['account_old']) echo _('Modify');
else echo _('Create'); else echo _('Create');
@ -386,8 +388,8 @@ switch ($select_local) { // Select which part of page will be loaded
echo '<input name="create" type="submit" value="'; echo '<input name="create" type="submit" value="';
if ($_SESSION['account_old']) echo _('Modify Account'); if ($_SESSION['account_old']) echo _('Modify Account');
else echo _('Create Account'); else echo _('Create Account');
echo '"></td></tr>'."\n"; echo '">'."\n";
echo "</table>\n</fieldset>\n</tr></table>"; echo "</td></tr></table></fieldset>\n</td></tr></table>\n</tr></table>";
break; break;
case 'finish': case 'finish':
// Final Settings // Final Settings