phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.144,1.145 fu


From: Dan Kuykendall <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.144,1.145 functions.inc.php,1.141,1.142
Date: Fri, 31 May 2002 05:25:54 -0400

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv28212/phpgwapi/inc

Modified Files:
        class.common.inc.php functions.inc.php 
Log Message:
few minor bug fixed

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -r1.144 -r1.145
*** class.common.inc.php        31 May 2002 08:29:19 -0000      1.144
--- class.common.inc.php        31 May 2002 09:25:52 -0000      1.145
***************
*** 1234,1259 ****
  
                        /* Make sure some of the defaults are set */
!                       if (!isset($phpgw_info['theme']['css']['A']))
                        {
!                               $phpgw_info['theme']['css']['A'] = 
'text-decoration:none;';
                        }
!                       if (!isset($phpgw_info['theme']['css']['A:link']) && 
!empty($GLOBALS['phpgw_info']['theme']['link']))
                        {
!                               $phpgw_info['theme']['css']['A:link'] = 
'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['link'].';';
                        }
  
!                       if (!isset($phpgw_info['theme']['css']['A:visited']) && 
!empty($GLOBALS['phpgw_info']['theme']['vlink']))
                        {
!                               $phpgw_info['theme']['css']['A:visited'] = 
'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['vlink'].';';
                        }
  
!                       if (!isset($phpgw_info['theme']['css']['A:active']) && 
!empty($GLOBALS['phpgw_info']['theme']['alink']))
                        {
!                               $phpgw_info['theme']['css']['A:active'] = 
'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['alink'].';';
                        }
  
!                       if (!isset($phpgw_info['theme']['css']['A:hover']) && 
!empty($GLOBALS['phpgw_info']['theme']['hovlink']))
                        {
!                               $phpgw_info['theme']['css']['A:hover'] = 
'text-decoration:none; color: '.$GLOBALS['phpgw_info']['theme']['hovlink'].';';
                        }
  
--- 1234,1259 ----
  
                        /* Make sure some of the defaults are set */
!                       if (!isset($GLOBALS['phpgw_info']['theme']['css']['A']))
                        {
!                               $GLOBALS['phpgw_info']['theme']['css']['A'] = 
'text-decoration:none;';
                        }
!                       if 
(!isset($GLOBALS['phpgw_info']['theme']['css']['A:link']) && 
!empty($GLOBALS['phpgw_info']['theme']['link']))
                        {
!                               
$GLOBALS['phpgw_info']['theme']['css']['A:link'] = 'text-decoration:none; 
color: '.$GLOBALS['phpgw_info']['theme']['link'].';';
                        }
  
!                       if 
(!isset($GLOBALS['phpgw_info']['theme']['css']['A:visited']) && 
!empty($GLOBALS['phpgw_info']['theme']['vlink']))
                        {
!                               
$GLOBALS['phpgw_info']['theme']['css']['A:visited'] = 'text-decoration:none; 
color: '.$GLOBALS['phpgw_info']['theme']['vlink'].';';
                        }
  
!                       if 
(!isset($GLOBALS['phpgw_info']['theme']['css']['A:active']) && 
!empty($GLOBALS['phpgw_info']['theme']['alink']))
                        {
!                               
$GLOBALS['phpgw_info']['theme']['css']['A:active'] = 'text-decoration:none; 
color: '.$GLOBALS['phpgw_info']['theme']['alink'].';';
                        }
  
!                       if 
(!isset($GLOBALS['phpgw_info']['theme']['css']['A:hover']) && 
!empty($GLOBALS['phpgw_info']['theme']['hovlink']))
                        {
!                               
$GLOBALS['phpgw_info']['theme']['css']['A:hover'] = 'text-decoration:none; 
color: '.$GLOBALS['phpgw_info']['theme']['hovlink'].';';
                        }
  
***************
*** 1833,1837 ****
                        }
                        // This is going to be used to switch to the nntp class
!                       if (isset($phpgw_info['flags']['newsmode']) &&
                                $GLOBALS['phpgw_info']['flags']['newsmode'])
                        {
--- 1833,1837 ----
                        }
                        // This is going to be used to switch to the nntp class
!                       if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) 
&&
                                $GLOBALS['phpgw_info']['flags']['newsmode'])
                        {

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** functions.inc.php   30 May 2002 21:14:29 -0000      1.141
--- functions.inc.php   31 May 2002 09:25:52 -0000      1.142
***************
*** 54,57 ****
--- 54,61 ----
                return $value;
        }
+       function lang_char()
+       {
+               return $GLOBALS['phpgw']->translation->translator_helper;
+       }
  
        /* Just a temp wrapper. ###DELETE_ME#### (Seek3r) */
***************
*** 274,279 ****
                        
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && 
$GLOBALS['phpgw_info']['server']['enforce_ssl'] && 
!$GLOBALS['HTTP_SERVER_VARS']['HTTPS'])
                        {
!                               Header('Location: ' . 
$GLOBALS['phpgw']->redirect($GLOBALS['HTTP_SERVER_VARS']['REQUEST_URI']));
!                               exit;
                        }
                        if (@$login != '')
--- 278,282 ----
                        
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && 
$GLOBALS['phpgw_info']['server']['enforce_ssl'] && 
!$GLOBALS['HTTP_SERVER_VARS']['HTTPS'])
                        {
!                               
$GLOBALS['phpgw']->redirect($GLOBALS['HTTP_SERVER_VARS']['REQUEST_URI']);
                        }
                        if (@$login != '')
***************
*** 299,304 ****
                if (! $GLOBALS['phpgw']->session->verify())
                {
!                       Header('Location: ' . 
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->session->link('/login.php','code=10')));
!                       exit;
                }
  
--- 302,306 ----
                if (! $GLOBALS['phpgw']->session->verify())
                {
!                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->session->link('/login.php','code=10'));
                }
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]