ZP-358 #comment moved FixFileOwner() to Utils as it also needs to be accessed...

ZP-358 #comment moved FixFileOwner() to Utils as it also needs to be accessed from the FileStateMachine #time 5m

git-svn-id: https://z-push.org/svn/z-push/trunk@1639 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/lib/core/zpush.php

@@ -237,8 +237,8 @@ class ZPush {
             throw new FatalMisconfigurationException("The configured LOGERRORFILE can not be modified.");
 
         // check ownership on the (eventually) just created files
-        self::checkFileOwner(LOGFILE);
-        self::checkFileOwner(LOGERRORFILE);
+        Utils::FixFileOwner(LOGFILE);
+        Utils::FixFileOwner(LOGERRORFILE);
 
         // set time zone
         // code contributed by Robert Scheck (rsc) - more information: https://developer.berlios.de/mantis/view.php?id=479
@@ -810,29 +810,5 @@ END;
         return $defcapa;
     }
 
-    /**
-     * Checks if a file has the same owner and group as the parent directory.
-     * If not, owner and group are updated.
-     * Function code contributed by Robert Scheck aka rsc.
-     *
-     * @param string $file
-     *
-     * @access private
-     * @return boolean
-     */
-    static private function checkFileOwner($file) {
-        if(posix_getuid() == 0 && file_exists($file)) {
-            $dir = dirname($file);
-            $perm_dir = stat($dir);
-            $perm_log = stat($file);
-
-            if($perm_dir[4] !== $perm_log[4] || $perm_dir[5] !== $perm_log[5]) {
-                chown($file, $perm_dir[4]);
-                chgrp($file, $perm_dir[5]);
-            }
-        }
-        return true;
-    }
-
 }
 ?>
\ No newline at end of file

src/lib/utils/utils.php

@@ -868,6 +868,30 @@ class Utils {
         return $plaintext;
     }
     /* END fmbiete's contribution r1516, ZP-318 */
+
+    /**
+     * Checks if a file has the same owner and group as the parent directory.
+     * If not, owner and group are fixed (being updated to the owner/group of the directory).
+     * Function code contributed by Robert Scheck aka rsc.
+     *
+     * @param string $file
+     *
+     * @access public
+     * @return boolean
+     */
+    public static function FixFileOwner($file) {
+        if(posix_getuid() == 0 && file_exists($file)) {
+            $dir = dirname($file);
+            $perm_dir = stat($dir);
+            $perm_log = stat($file);
+
+            if($perm_dir[4] !== $perm_log[4] || $perm_dir[5] !== $perm_log[5]) {
+                chown($file, $perm_dir[4]);
+                chgrp($file, $perm_dir[5]);
+            }
+        }
+        return true;
+    }
 }