[isf-wifidog] Bug with Splash-Only Node & Portal Template

[Frederico Marques]

Skipped content of type multipart/alternative-------------- next part --------------
Index: wifidog/classes/User.php
===================================================================
--- wifidog/classes/User.php	(revision 1226)
+++ wifidog/classes/User.php	(working copy)
@@ -945,6 +945,7 @@
          * new roles system.
          */
         $smarty->assign('userIsValid', $user && !$user->isSplashOnlyUser() ? true : false);
+        $smarty->assign('userIsSplashOnly', $user && $user->isSplashOnlyUser());
         $smarty->assign('userIsSuperAdmin', $user && $user->isSuperAdmin());
         $smarty->assign('userIsANodeOwner', $user && $user->isOwner());
 
@@ -962,4 +963,4 @@
  * c-basic-offset: 4
  * c-hanging-comment-ender-p: nil
  * End:
- */
\ No newline at end of file
+ */
Index: wifidog/templates/classes/MainUI_ToolContent.tpl
===================================================================
--- wifidog/templates/classes/MainUI_ToolContent.tpl	(revision 1226)
+++ wifidog/templates/classes/MainUI_ToolContent.tpl	(working copy)
@@ -56,13 +56,17 @@
                     <a id="preferences_link" href="{$base_ssl_path}admin/generic_object_admin.php?object_id={$userId}&object_class=User&action=edit"><img src="{$common_images_url}profile.gif">&nbsp;{"Profile / Settings"|_}</a>
                     <a id="logout_link" href="{$base_ssl_path}login/?logout=true{$logoutParameters}"><img src="{$common_images_url}logout.gif">&nbsp;{"Logout"|_}</a>
                 {else}
+                    {if $userIsSplashOnly}
+                    {** do nothing **}
+                {else}
 					{if !$shrinkLeftArea}
                     <p>
                         {"I am not logged in."|_}<br>
                         <a id="login_link" href="{$base_ssl_path}login/{$loginParameters}">{"Login"|_}</a>
                     </p>
-					{/if}
+				    {/if}
                 {/if}
+                {/if}
         </div>
 
         {if count($languageChooser) > 1}