Changeset 773 for sandbox/expresso/novos_templates/phpgwapi/inc

Timestamp:

04/28/09 17:15:52 (15 years ago)

Author:

niltonneto

Message:

Resolve #475

Location:

sandbox/expresso/novos_templates

Files:

• . (copied) (copied from trunk) (1 prop)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/class.jscalendar.inc.php (copied) (copied from trunk/phpgwapi/inc/class.jscalendar.inc.php)
• phpgwapi/inc/class.preferences.inc.php (copied) (copied from trunk/phpgwapi/inc/class.preferences.inc.php)
• phpgwapi/inc/functions.inc.php (modified) (1 diff)

sandbox/expresso/novos_templates/phpgwapi/inc/class.common.inc.php

@@ -736 +736 @@
                         while ($entry=$d->read())
                         {
-                                if ($entry != 'CVS' && $entry != '.' && $entry != '..'
-                                        && $entry != 'phpgw_website'
-                                        && is_dir(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry))
-                                {
+                                if ($entry != '.' && $entry != '..' && is_dir(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry) && file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/head.inc.php'))
+                                {
+                                        $list[$entry]['title'] = $entry;
                                         $list[$entry]['name'] = $entry;
+
                                         $f = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/details.inc.php';
                                         if (file_exists ($f))
                                         {
                                                 include($f);
-                                                $list[$entry]['title'] = 'Use '.$GLOBALS['phpgw_info']['template'][$entry]['title'].'interface';
-                                        }
-                                        else
-                                        {
-                                                $list[$entry]['title'] = $entry;
+                                                if ( defined( $entry.'_TEMPLATE_TITLE' ) )
+                                                        $list[$entry]['title'] = utf8_decode( constant($entry.'_TEMPLATE_TITLE') );
                                         }
                                 }

sandbox/expresso/novos_templates/phpgwapi/inc/functions.inc.php

@@ -385 +385 @@
                 {
                         $GLOBALS['phpgw']->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+                        preg_match('/(.*)\/(.*)/', PHPGW_APP_TPL, $matches);
+
+                        if ($GLOBALS['phpgw_info']['flags']['currentapp'] != "jabberit_messenger")
+                        $_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']['preferences']['common']['template_set'] = $matches[2];
                 }