Some backport from trunk

[gosa.git] / gosa-core / include / php_setup.inc

diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index 2b3838ea2827d397ee3ef445c0c2fa4e1999960a..8dd1005e1c04af0183335feb96589254c94b2f1f 100644 (file)
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -96,18 +96,25 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
                                 "\n\n".
                                 "*** PHP error information ***\n\n");
       }
-    
-    if (session::is_set('js') && session::get('js')==FALSE){
+   
+     
+    if (class_exists('session') && session::is_set('js') && session::get('js')==FALSE){
       $error_collector= "<div>";
     } else {
+
+        $warning_image = (is_callable('image')) ? 
+            image('images/toolbar-warning.png') : "<image src='images/toolbar-warning.png' border=0>";
+        $mailto_image = (is_callable('image')) ? 
+            image('images/mailto.png') : "<image src='images/mailto.png' border=0>";
+
         $error_collector= "
         <table summary=\"\" class='error-collector'>
           <tr>
-           <td style='width:32px'>".image('images/toolbar-warning.png')."</td>
+           <td style='width:32px'>{$warning_image}</td>
            <td><span>"._("Generating this page caused the PHP interpreter to raise some errors!")."</span></td>
            <td align='right'>
             <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&amp;body=%BUGBODY%\">
-                ".image('images/mailto.png')."&nbsp;"._("Send bug report")."
+                {$mailto_image}&nbsp;"._("Send bug report")."
             </a>
            </td>
            <td align='right'>
@@ -293,12 +300,13 @@ $smarty = new Smarty;
 $smarty->template_dir = $BASE_DIR.'/ihtml/';
 $smarty->caching= false;
 
-// To be able to switch between smarty version 2/3
-if(defined('SMARTY_PHP_REMOVE')){
-    $smarty->php_handling= SMARTY_PHP_REMOVE;
-}else{
-    $smarty->php_handling= Smarty::PHP_REMOVE;
-}
+// To be able to switch between smarty version 2/3                                                                      
+if(defined('SMARTY_PHP_REMOVE')){                                                                                       
+    $smarty->php_handling= SMARTY_PHP_REMOVE;                                                                           
+}else{                                                                                                                  
+    $smarty->php_handling= Smarty::PHP_REMOVE;                                                                          
+}                                                                                                                       
+
 
 /* Global FPDF define */
 define('FPDF_FONTPATH', '/usr/share/php/fpdf/font/');