Multiple edit

[gosa.git] / html / combine.php

diff --git a/html/combine.php b/html/combine.php
index 9564c3f914889dc796048cc1e45d1f2188fd3757..d5c23fc79d80365f0fe7901f5ce8ae921c681d04 100644 (file)
--- a/html/combine.php
+++ b/html/combine.php
@@ -26,8 +26,8 @@ session_start ();
 
 /* Logged in? Simple security check */
 if (!isset($_SESSION['ui'])){
-  gosa_log ("Error: combine.php called without session");
-  header ("Location: ../index.php");
+  new log("security","all/all","",array(),"Error: combine.php called without session") ;
+  header ("Location: index.php");
   exit;
 }
 
@@ -60,7 +60,7 @@ imagecopy ($pic, $image1, 0, 0, 0, 0, imagesx($image1), imagesy($image1));
 imagecopy ($pic, $image2, imagesx($image1), 0, 0, 0, imagesx($image2), imagesy($image2));
 imagePng($pic); 
 
-error_reporting (E_ALL);
+error_reporting (E_ALL | E_STRICT);
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>