[CVS] OpenPKG: openpkg-registry/ registry-ui.pl

[Thomas Lotterer]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry                 Date:   27-Nov-2005 00:43:18
  Branch: HEAD                             Handle: 2005112623431800

  Modified files:
    openpkg-registry        registry-ui.pl

  Log:
    improve text visible to user; prefer empty page over guru meditation
    on misconfigured installations

  Summary:
    Revision    Changes     Path
    1.38        +8  -6      openpkg-registry/registry-ui.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry-ui.pl
  ============================================================================
  $ cvs diff -u -r1.37 -r1.38 registry-ui.pl
  --- openpkg-registry/registry-ui.pl   26 Nov 2005 23:42:11 -0000      1.37
  +++ openpkg-registry/registry-ui.pl   26 Nov 2005 23:43:18 -0000      1.38
  @@ -1024,7 +1024,7 @@
           # nop
       }
       else {
  -        die "misconfigured identification 
mode=\"".$cfg->{identification}->{mode}."\"";
  +        # nop, misconfigured
       }
       $html .= '</td>';
       return $html;
  @@ -1087,7 +1087,7 @@
       $html .= "<img src=\"?page=gif;name=icon-x\">&nbsp;an internal 
<b>ERROR</b> occurred and prevents further processing.<br/>\n";
       $html .= sprintf("<h2>Problem scope</h2>\n%s<br/>\n", $marketingmessage) 
if (defined $marketingmessage and $marketingmessage ne "");
       $html .= sprintf("<h2>Technical details</h2>\n%s<br/>\n", 
$technicaldetail) if (defined $technicaldetail and $technicaldetail ne "");
  -    $html .= "<h2>Please come back later and try again</h2>\nSorry for the 
inconvenience.\n";
  +    $html .= "<h2>Please come back later and try again</h2>\nSorry for the 
inconvenience\n";
       return $html
   }
   
  @@ -1132,7 +1132,7 @@
           # nop
       }
       else {
  -        die "misconfigured identification 
mode=\"".$cfg->{identification}->{mode}."\"";
  +        # nop, misconfigured
       }
       $html .= '</td>';
       return $html;
  @@ -1180,7 +1180,8 @@
   
       $username = &identifyusername();
       if (not defined $username) {
  -        $html .= "<h2>Please login first</h2>";
  +        $html .= "<h2>Access&nbsp;denied</h2>";
  +        $html .= "Login to authenticate";
           return $html;
       }
   
  @@ -1262,7 +1263,8 @@
       $html = '';
       $username = &identifyusername();
       if (not defined $username) {
  -        $html .= "<h2>Please login first</h2>";
  +        $html .= "<h2>Access&nbsp;denied</h2>";
  +        $html .= "Login to authenticate";
           return $html;
       }
       $html .= sprintf("<h2>Instances related to %s</h2>", $username);
  @@ -1792,7 +1794,7 @@
           $username = $cfg->{identification}->{default};
       }
       else {
  -        die "misconfigured identification 
mode=\"".$cfg->{identification}->{mode}."\"";
  +        # nop, misconfigured
       }
       $username = undef if ($username =~ m|^[ ]+$|);
       return $username;
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org