X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_log.inc;h=5ac8483793bb5c6b1f00e453e0cc6ad6b9da5b3a;hb=42886e5cc4e1ec51ecb4faf4c669268040c81f25;hp=859b1c0f83750febaf936123e964e838760de36b;hpb=b97327caa07546659cc3baeb12c36dc1b8f9c23d;p=gosa.git

diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc
index 859b1c0f8..5ac848379 100644
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -1,24 +1,25 @@
 <?php
 /*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2003  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 /*! \brief   The logging base class
   \author  Fabian Hickert <hickert@gonicus.de>
   \version 2.6
@@ -141,40 +142,104 @@ class log {
     if(isset($this->config->data['SERVERS']['LOGGING'])){
       $servers = $this->config->data['SERVERS']['LOGGING'];
     }else{
-      msg_dialog::display(_("Error"), _("You have enabled the logging into mysql databse, but there are no logging servers available."), ERROR_DIALOG);
+      msg_dialog::display(_("Error"), _("You have enabled the logging into mysql database, but there are no logging servers available."), ERROR_DIALOG);
       return(FALSE);
     }
 
+    /* Log into each configured server 
+     */
     foreach($servers as $server_name => $server){
  
+      /* Connect to the database 
+       */
       $con = @mysql_pconnect($server_name,$server['USER'],$server['PWD']);
       if(!$con){
         msg_dialog::display(_("Error"), sprintf(_("Cannot connect to logging server '%s'."),$server_name), ERROR_DIALOG);
         return(FALSE);
       }else{
+
+        /* Check if the database is available 
+         */
         $db = mysql_select_db($server['DB'],$con);
         if(!$db){
           msg_dialog::display(_("Error"), sprintf(_("Cannot select database '%s' on server '%s': %s"),$server['DB'],$server['SERVER'], mysql_error($con)), ERROR_DIALOG);
           return(FALSE);
         }else{
 
+          /* Check for required tables 
+          */
+          $query = "SHOW TABLES;";
+          $res    = @mysql_query($query,$con);
+          $tables = array();
+          while($attrs  = mysql_fetch_row($res)){
+            $tables[] = $attrs[0];
+          }
+          $error = FALSE;
+          foreach(array("gosa_log","gosa_locations") as $required){
+            if(!in_array($required,$tables)){
+              msg_dialog::display(_("Error"), 
+              sprintf(_("Missing logging table (%s.%s) update your GOsa logging database schema."),
+                $server['DB'],$required), ERROR_DIALOG);
+              $error = TRUE;
+            }
+            if($error) return(FALSE);
+          }
+ 
+          /* Check if our current location is already registerd 
+              in this case get its id.
+             If it wasn't registered yet, create it. 
+           */
+          $base = mysql_escape_string($this->config->current['BASE']);
+          $query= "SELECT id FROM gosa_locations WHERE location=\"".$base."\";";
+          $res  = mysql_query($query);  
+          $location_id = -1;
+          while($attrs = mysql_fetch_assoc($res)){
+            $location_id = $attrs['id'];
+            break;
+          }
+  
+          /* No location found that matches our location.
+             Create it.
+           */
+          if($location_id == -1){
+            $query = "INSERT INTO gosa_locations (location) VALUES ('".$base."');";
+            mysql_query($query,$con);
+ 
+            /* Try to detect the location again 
+             */ 
+            $query= "SELECT id FROM gosa_locations WHERE location=\"".$base."\";";
+            $res  = mysql_query($query);
+            $location_id = -1;
+            while($attrs = mysql_fetch_assoc($res)){
+              $location_id = $attrs['id'];
+              break;
+            }
+            if($location_id == -1){
+              msg_dialog::display(_("Error"), sprintf(_("Couldn't add your location to the logging database, the error was: %s."),
+                mysql_error($con)), ERROR_DIALOG);
+              return(FALSE);
+            }
+          }  
+
           /* Create mysql syntax */
           $query ="INSERT INTO gosa_log 
-                    (timestamp,user,action,objecttype,object,changes,result)
-                   VALUES 
-                    (
-                        \"".addslashes($entry['timestamp'])."\", 
-                        \"".addslashes($entry['user'])."\", 
-                        \"".addslashes($entry['action'])."\", 
-                        \"".addslashes($entry['objecttype'])."\", 
-                        \"".addslashes($entry['object'])."\", 
-                        \"".addslashes($entry['changes'])."\", 
-                        \"".addslashes($entry['result'])."\" 
-                    );
-              ";
+            (timestamp,user,action,objecttype,object,changes,result,location_id)
+            VALUES 
+            (
+             \"".mysql_escape_string($entry['timestamp'])."\", 
+             \"".mysql_escape_string($entry['user'])."\", 
+             \"".mysql_escape_string($entry['action'])."\", 
+             \"".mysql_escape_string($entry['objecttype'])."\", 
+             \"".mysql_escape_string($entry['object'])."\", 
+             \"".mysql_escape_string($entry['changes'])."\", 
+             \"".mysql_escape_string($entry['result'])."\", 
+             \"".mysql_escape_string($location_id)."\" 
+            );
+          ";
           $res = mysql_query($query,$con);
           if(!$res){
-            msg_dialog::display(_("Error"), sprintf(_("Cannot query database '%s' on server '%s': %s"),$server['DB'],$server['SERVER'], mysql_error($con)), ERROR_DIALOG);
+            msg_dialog::display(_("Error"), sprintf(_("Cannot query database '%s' on server '%s': %s"),
+                  $server['DB'],$server['SERVER'], mysql_error($con)), ERROR_DIALOG);
             return(FALSE);
           } 
         }