[Phpgroupware-cvs] property login.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/30 10:11:55

Modified files:
        .              : login.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/login.php?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: login.php
===================================================================
RCS file: /sources/phpgroupware/property/login.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- login.php   29 Oct 2006 20:04:40 -0000      1.1
+++ login.php   30 Oct 2006 10:11:55 -0000      1.2
@@ -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: login.php,v 1.1 2006/10/29 20:04:40 sigurdne Exp $
+       * @version $Id: login.php,v 1.2 2006/10/30 10:11:55 sigurdne Exp $
        */
 
        $phpgw_info = array();
@@ -39,7 +39,6 @@
        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT 
                                                        . 
"/phpgwapi/templates/{$GLOBALS['phpgw_info']['login_template_set']}";
                                                        
-//     $tmpl = CreateObject('phpgwapi.Template', 
$GLOBALS['phpgw_info']['server']['template_dir']);
        $tmpl = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . 
'/property/templates/base');
 
        // This is used for system downtime, to prevent new logins.
@@ -476,24 +475,24 @@
 
        $tmpl->set_var('template_set', 
$GLOBALS['phpgw_info']['login_template_set']);
        
-       if( is_file( PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP . 'templates' 
+       if( is_file( PHPGW_SERVER_ROOT . SEP . 'property' . SEP . 'templates' 
                . SEP . $GLOBALS['phpgw_info']['login_template_set'] . SEP . 
'css' . SEP . 'base.css') )
        {
-               $base_css = '../phpgwapi/templates/' . 
$GLOBALS['phpgw_info']['login_template_set'] . '/css/base.css';
+               $base_css = '../property/templates/' . 
$GLOBALS['phpgw_info']['login_template_set'] . '/css/base.css';
        }
        else
        {
-               $base_css = '../phpgwapi/templates/base/css/base.css';
+               $base_css = '../property/templates/base/css/base.css';
        }
 
-       if( is_file( PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP . 'templates' 
+       if( is_file( PHPGW_SERVER_ROOT . SEP . 'property' . SEP . 'templates' 
                . SEP . $GLOBALS['phpgw_info']['login_template_set'] . SEP . 
'css' . SEP . 'login.css') )
        {
-               $login_css = '../phpgwapi/templates/' . 
$GLOBALS['phpgw_info']['login_template_set'] . '/css/login.css';
+               $login_css = '../property/templates/' . 
$GLOBALS['phpgw_info']['login_template_set'] . '/css/login.css';
        }
        else
        {
-               $login_css = '../phpgwapi/templates/base/css/login.css';
+               $login_css = '../property/templates/base/css/login.css';
        }
 
        $tmpl->set_var('base_css', $base_css);