[Phpgroupware-cvs] phpgwapi/inc/sso include_login.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/12/14 09:31:04

Modified files:
        inc/sso        : include_login.inc.php 

Log message:
        fix variables and improve detection of css files

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/sso/include_login.inc.php?cvsroot=phpgwapi&r1=1.3&r2=1.4

Patches:
Index: include_login.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/sso/include_login.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include_login.inc.php       29 Oct 2006 18:59:27 -0000      1.3
+++ include_login.inc.php       14 Dec 2006 09:31:04 -0000      1.4
@@ -8,7 +8,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgroupware
-       * @version $Id: include_login.inc.php,v 1.3 2006/10/29 18:59:27 
sigurdne Exp $
+       * @version $Id: include_login.inc.php,v 1.4 2006/12/14 09:31:04 skwashd 
Exp $
        */
        
        /* 
@@ -42,7 +42,7 @@
 
        $GLOBALS['phpgw_info']['server']['template_set'] = 
$GLOBALS['phpgw_info']['login_template_set'];
        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT
-                       . 
"/phpgwapi/templates/{$GLOBALS['phpgw_info']['login_template_set']}";
+                       . 
"/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}";
 
        $tmpl = CreateObject('phpgwapi.Template', 
$GLOBALS["phpgw_info"]['server']['template_dir']);
 
@@ -70,7 +70,8 @@
        if( isset($GLOBALS['phpgw_info']['server']['deny_all_logins'])
                && $GLOBALS['phpgw_info']['server']['deny_all_logins'] )
        {
-               $tmpl->set_file(
+               $tmpl->set_file
+               (
                        array
                        (
                                'login_form'  => 'login_denylogin.tpl'
@@ -412,24 +413,22 @@
 
                        $this->tmpl->set_var('template_set', 
$GLOBALS['phpgw_info']['login_template_set']);
                        
-                       if( is_file( PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP 
. 'templates' 
-                               . SEP . 
$GLOBALS['phpgw_info']['login_template_set'] . SEP . 'css' . SEP . 'base.css') )
+                       if( 
is_file("{$GLOBALS['phpgw_info']['server']['template_dir']}/css/base.css") )
                        {
-                               $base_css = 
$GLOBALS['phpgw']->link('phpgwapi/templates/' . 
$GLOBALS['phpgw_info']['login_template_set'] . '/css/base.css');
+                               $base_css = 
"phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/base.css";
                        }
                        else
                        {
-                               $base_css = 
$GLOBALS['phpgw']->link('phpgwapi/templates/base/css/base.css');
+                               $base_css = 
'phpgwapi/templates/base/css/base.css';
                        }
 
-                       if( is_file( PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP 
. 'templates' 
-                               . SEP . 
$GLOBALS['phpgw_info']['login_template_set'] . SEP . 'css' . SEP . 'login.css') 
)
+                       if( 
is_file("{$GLOBALS['phpgw_info']['server']['template_dir']}/css/login.css") )
                        {
-                               $login_css = 
$GLOBALS['phpgw']->link('phpgwapi/templates/' . 
$GLOBALS['phpgw_info']['login_template_set'] . '/css/login.css');
+                               $login_css = 
"phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/login.css";
                        }
                        else
                        {
-                               $login_css = 
$GLOBALS['phpgw']->link('phpgwapi/templates/base/css/login.css');
+                               $login_css = 
'phpgwapi/templates/base/css/login.css';
                        }
 
                        $this->tmpl->set_var('base_css', $base_css);