Index: ossp-pkg/tabea/tabea.cgi
RCS File: /v/ossp/cvs/ossp-pkg/tabea/tabea.cgi,v
rcsdiff -q -kk '-r1.31' '-r1.32' -u '/v/ossp/cvs/ossp-pkg/tabea/tabea.cgi,v' 2>/dev/null
--- tabea.cgi	2002/06/28 15:02:08	1.31
+++ tabea.cgi	2002/07/05 12:05:31	1.32
@@ -962,9 +962,14 @@
     "  </tr>" . 
     "  <tr>" .
     "    <td colspan=2 align=right>" .
-    $cgi->reset() .
-    $cgi->submit(-name => 'dialog_mainw', -value => 'Back').
-    $cgi->submit(-name => 'dialog_changepwd', -value => 'Change') .
+    $cgi->reset() ;
+    if ( $cgi->param('username') eq $cfghash{'TabeaUser'}) {
+        $ctext .= $cgi->submit(-name => 'dialog_admin', -value => 'Back');
+    } else {
+        $ctext .= $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+    }
+
+    $ctext .= $cgi->submit(-name => 'dialog_changepwd', -value => 'Change') .
     "    </td>" .
     "  </tr>" . 
     "</table>" ;
@@ -995,8 +1000,12 @@
         $valid = 1; 
     }
     if ( !$valid ) {
-        $cptext .= "<font color=red>The password is incorrect.<br><br>\n". 
-        $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+        $cptext .= "<font color=red>The password is incorrect.<br><br>\n";
+        if ( $cgi->param('username') eq $cfghash{'TabeaUser'}) {
+            $cptext .= $cgi->submit(-name => 'dialog_admin', -value => 'Back');
+        } else {
+            $cptext .= $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+        }
     } else {
         if ($new1_password eq $new2_password) {
             $pwdfp = IO::File->new("<$pwdfile");
@@ -1055,7 +1064,7 @@
     "<table>" . 
 
     "<td>" .
-    $cgi->submit(-name => 'dialog_mainw', -value => 'Back').
+    $cgi->submit(-name => 'dialog_admin', -value => 'Back').
     "</td>" .
     "<td>" .
     $cgi->submit(-name => 'dialog_newuser', -value => 'Write User').
@@ -1091,7 +1100,7 @@
         $ntext .= "<font color=red>" .
         "<br>Username wrong<br><br>" .
         "</font>" .
-        $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+        $cgi->submit(-name => 'dialog_admin', -value => 'Back');
     } else {
         $pwdin = IO::File->new("<$pwdfile");
         while (<$pwdin>) {
@@ -1130,14 +1139,14 @@
            
             $ntext .= "<font color=red>" .
                 "User $nuser created</font><br><br>" .
-                $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+                $cgi->submit(-name => 'dialog_admin', -value => 'Back');
                 
 
         } else {
             $ntext .= "<font color=red>" .
             "<br>User exists <br><br>" .
             "</font>" .
-            $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+            $cgi->submit(-name => 'dialog_admin', -value => 'Back');
         }
     }
 
@@ -1189,7 +1198,7 @@
         "<table>" .
 
         "<td>" .
-        $cgi->submit(-name => 'dialog_mainw', -value => 'Back').
+        $cgi->submit(-name => 'dialog_admin', -value => 'Back').
         "</td>" .
         "<td>" .
         $cgi->submit(-name => 'dialog_d2user', -value => 'Del User').
@@ -1203,7 +1212,7 @@
         "It is not allowed to delet tabea user!!!" .
         "</font>" .
         "<br><br>" .
-        $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+        $cgi->submit(-name => 'dialog_admin', -value => 'Back');
     }
 
 
@@ -1245,7 +1254,7 @@
     "<table>" .
 
     "<td>" .
-    $cgi->submit(-name => 'dialog_mainw', -value => 'Back').
+    $cgi->submit(-name => 'dialog_admin', -value => 'Back').
     "</td>" .
     "<td>" .
     $cgi->submit(-name => 'dialog_d3user', -value => 'Really delete user').
@@ -1317,7 +1326,7 @@
 
     $d3text .= "<br>" .
 
-    $cgi->submit(-name => 'dialog_mainw', -value => 'Back');
+    $cgi->submit(-name => 'dialog_admin', -value => 'Back');
 
 
     return $d3text;