[phpwiki-checkins] SF.net SVN: phpwiki:[7266] trunk/lib/plugin/UserPreferences.php

[<var...@us...>]

Revision: 7266
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7266&view=rev
Author:   vargenau
Date:     2009-11-10 15:13:07 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
Use "errors" class to display error; specific error for Gforge

Modified Paths:
--------------
    trunk/lib/plugin/UserPreferences.php

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2009-11-10 14:57:05 UTC (rev 7265)
+++ trunk/lib/plugin/UserPreferences.php	2009-11-10 15:13:07 UTC (rev 7266)
@@ -72,6 +72,12 @@
         $user =& $request->_user;
         if (isa($request,'MockRequest'))
             return '';
+        if (defined('GFORGE') and GFORGE) {
+            if (!($user->isAuthenticated())) {
+                return HTML::div(array('class' => 'errors'),
+                                 _("Error: You are not logged in, cannot display UserPreferences."));
+            }
+        }
         if ((!$request->isActionPage($request->getArg('pagename')) 
              and (!isset($user->_prefs->_method) 
                   or !in_array($user->_prefs->_method, array('ADODB','SQL','PDO'))))
@@ -83,7 +89,8 @@
 //            foreach ($no_args as $key => $value) {
 //                $no_args[$value] = false;
 //            }
-            $no_args['errmsg'] = HTML(HTML::h2(_("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."),HTML::hr()));
+            $no_args['errmsg'] = HTML::div(array('class' => 'errors'), 
+                                           _("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
             $no_args['isForm'] = false;
             return Template('userprefs', $no_args);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.