openrat-cms

commit f2cc2801478e2127a3d1702e8414046786ccbf49
parent adddec30606ad4e55d4064124aa4b867fd3d3cf7
Author: dankert <devnull@localhost>
Date:   Sun, 10 Jun 2007 23:14:49 +0200

Neue Einstellung "chmod", Korrektur "umask".

Diffstat:
config/security.ini.php
 | 
14
+++++++++++---
do.php
 | 
3
++-
serviceClasses/Publish.class.php
 | 
5
+++++

3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/config/security.ini.php b/config/security.ini.php
@@ -7,9 +7,17 @@ readonly=false
 ; Disable publishing
 nopublish=false
 
-; Unix-UMask for saved files
-; Default: 0002
-umask=0002
+; Unix-UMask for all created files
+; Default: none (uses system default)
+; Example: '0022' (means 'rw-r--r--')
+; Example: '0002' (means 'rw-rw-r--')
+umask=
+
+; CHMOD for published files
+; Default: none
+; Example: '0644' (means 'rw-r--r--')
+; Example: '0755' (means 'rwxr-xr-x')
+chmod=
 
 
 
diff --git a/do.php b/do.php
@@ -115,7 +115,8 @@ if	( !is_array( $conf ) )
 	Session::setConfig( $conf );
 }
 
-umask( $conf['security']['umask'] );
+if	( !empty($conf['security']['umask']) )
+	umask( octdec($conf['security']['umask']) );
 
 if	( !empty($conf['interface']['timeout']) )
 	set_time_limit( intval($conf['interface']['timeout']) );
diff --git a/serviceClasses/Publish.class.php b/serviceClasses/Publish.class.php
@@ -70,6 +70,7 @@ class Publish
 
 	function copy( $tmp_filename,$dest_filename )
 	{	
+		global $conf;
 		$source = $tmp_filename;
 
 		if   ( $this->with_local )
@@ -85,6 +86,10 @@ class Publish
 					die('failed writing file: '.$dest);
 				}
 			}
+			
+			
+			if	(!empty($conf['security']['chmod']))
+				chmod($dest,octdec($conf['security']['chmod']));
 		}
 		
 		if   ( $this->with_ftp )