Changeset 3410

Timestamp:

10/25/10 17:46:06 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1309 - Escolha automática do tema, em função da url do cliente.

Location:

branches/2.2

Files:

• contactcenter/templates/classic/head.inc.php (modified) (1 diff)
• contactcenter/templates/default/head.inc.php (modified) (1 diff)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/functions.inc.php (modified) (1 diff)

branches/2.2/contactcenter/templates/classic/head.inc.php

@@ -32 +32 @@
 
         #_debug_array($GLOBALS['phpgw_info']['user']['preferences']['common']);
-        $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+        $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.get_theme().'.css';
         if(!file_exists($theme_css))
         {
-                $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+                $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.get_theme().'.css';
         }
 

branches/2.2/contactcenter/templates/default/head.inc.php

@@ -32 +32 @@
 
         #_debug_array($GLOBALS['phpgw_info']['user']['preferences']['common']);
-        $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+        $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.get_theme().'.css';
         if(!file_exists($theme_css))
         {
-                $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+                $theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.get_theme().'.css';
         }
 

branches/2.2/phpgwapi/inc/class.common.inc.php

@@ -1273 +1273 @@
                                 $template = $GLOBALS['phpgw_info']['server']['template_set'];
                                 $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/base.css"); 
-                                $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 
-                                $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 
+                                $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/".get_theme().".css");
+                                $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".get_theme().".css");
                                 $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css"); 
 

branches/2.2/phpgwapi/inc/functions.inc.php

@@ -64 +64 @@
         }
 
+        function get_theme()
+        {
+
+            $test_cookie = get_var('THEME', 'COOKIE');
+
+            // se o cookie foi definido coloca tema na sessão
+            if (!empty($test_cookie))
+            {
+                $_SESSION['THEME'] = $test_cookie;
+            }
+
+            // se tema não estiver definido na sessão retorna $GLOBALS['phpgw_info']['user']['preferences']['common']['theme']
+            if (!$_SESSION['THEME'])
+            {
+                return $GLOBALS['phpgw_info']['user']['preferences']['common']['theme'];
+            }
+            
+            // senão retorna o tema definido na sessão
+            return $_SESSION['THEME'];
+        }
+
         /* Make sure the header.inc.php is current. */
         if ($GLOBALS['phpgw_info']['server']['versions']['header'] < $GLOBALS['phpgw_info']['server']['versions']['current_header'])