Code

Added pChart classes and GOsa mapping class to enable auto-include
[gosa.git] / gosa-core / redhat / 02_fix_class_mapping.patch
index e23f535a547010a2e6170eba350f6088f20c9da3..95b8ea858d14b5679cee4a2c3b76196a397976a2 100644 (file)
@@ -1,28 +1,7 @@
-diff -urNad gosa-core~/include/class_config.inc gosa-core/include/class_config.inc
---- gosa-core~/include/class_config.inc 2008-07-10 17:18:52.000000000 +0200
-+++ gosa-core/include/class_config.inc  2008-07-15 10:00:12.000000000 +0200
-@@ -76,12 +76,12 @@
-         if we have installed or removed plugins.
-      */
-     if(session::global_is_set("class_location.inc:timestamp")){
--      $tmp = stat("../include/class_location.inc");
-+      $tmp = stat("/var/cache/gosa/class.cache");
-       if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){
-         session::global_un_set("plist");
-       }
-     }
--    $tmp = stat("../include/class_location.inc");
-+    $tmp = stat("/var/cache/gosa/class.cache");
-     session::global_set("class_location.inc:timestamp",$tmp['mtime']);
-
-     if($this->filename != "" && filemtime($this->filename) != $this->last_modified){
-
-
-diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc
---- gosa-core~/include/functions.inc   2008-07-15 09:58:50.000000000 +0200
-+++ gosa-core/include/functions.inc    2008-07-15 09:58:51.000000000 +0200
+--- gosa-core~/include/functions.inc   2009-02-16 14:19:18.000000000 +0100
++++ gosa-core/include/functions.inc    2009-02-16 14:18:15.000000000 +0100
 @@ -73,7 +73,7 @@
- $svn_revision = '$Revision: 9246 $';
+ $svn_revision = '$Revision: 13395 $';
  
  /* Include required files */
 -require_once("class_location.inc");
@@ -30,9 +9,8 @@ diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc
  require_once ("functions_debug.inc");
  require_once ("accept-to-gettext.inc");
  
-diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
---- gosa-core~/update-gosa     2008-06-10 09:56:22.000000000 +0200
-+++ gosa-core/update-gosa      2008-07-15 09:58:51.000000000 +0200
+--- gosa-core~/update-gosa     2009-02-16 14:19:18.000000000 +0100
++++ gosa-core/update-gosa      2009-02-16 14:18:15.000000000 +0100
 @@ -21,7 +21,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -53,3 +31,20 @@ diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
  
        /* Sanity checks */
        if (!file_exists($filename) || is_writable($filename)) {
+--- gosa-core~/include/class_config.inc        2009-02-16 14:19:18.000000000 +0100
++++ gosa-core/include/class_config.inc 2009-02-16 14:18:15.000000000 +0100
+@@ -76,12 +76,12 @@
+         if we have installed or removed plugins. 
+      */
+     if(session::global_is_set("class_location.inc:timestamp")){
+-      $tmp = stat("../include/class_location.inc");
++      $tmp = $tmp = stat("/var/cache/gosa/class.cache");
+       if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){
+         session::global_un_set("plist");
+       }
+     }
+-    $tmp = stat("../include/class_location.inc");
++    $tmp = stat("/var/cache/gosa/class.cache");
+     session::global_set("class_location.inc:timestamp",$tmp['mtime']);
+     if($this->filename != "" && filemtime($this->filename) != $this->last_modified){