Configurable permission for web directory, #6804

octdec() is needed to preserve the octal value.

Author: helmo

install/tpl/server.ini.master

@@ -121,6 +121,7 @@ add_web_users_to_sshusers_group=y
 connect_userid_to_webid=n
 connect_userid_to_webid_start=10000
 web_folder_protection=y
+web_folder_permission=0710
 php_ini_check_minutes=1
 overtraffic_disable_web=y
 overquota_notify_threshold=90

interface/web/admin/form/server_config.tform.php

@@ -1074,6 +1074,12 @@
 			'default' => 'n',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'web_folder_permission' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '0710',
+			'maxlength' => '4'
+		),
 		'web_folder_protection' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/en_server_config.lng

@@ -208,6 +208,7 @@ $wb['firewall_txt'] = 'Firewall';
 $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
 $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
 $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
+$wb['web_folder_permission_txt'] = 'Default permission for the web folder';
 $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
 $wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller';
 $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';

interface/web/admin/templates/server_config_web_edit.htm

@@ -263,7 +263,13 @@ <h4 class="panel-title">
     <div id="collapsePerms" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPerms">
       <div class="panel-body">
 	  <!-- Begin content -->
-	  <div class="form-group">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name=web_folder_permission_txt'}</label>
+                    <div class="col-sm-9">
+                        <input type="text" name="web_folder_permission" id="web_folder_permission" value="{tmpl_var name='web_folder_permission'}" class="form-control" />
+                    </div>
+                </div>
+                <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name='set_folder_permissions_on_update_txt'}</label>
                     <div class="col-sm-9">
                         {tmpl_var name='set_folder_permissions_on_update'}

server/plugins-available/apache2_plugin.inc.php

@@ -1026,7 +1026,7 @@ function update($event_name, $data) {
 			if($web_config['security_level'] == 20) {
 
 				$app->system->chmod($data['new']['document_root'], 0755);
-				$app->system->chmod($data['new']['document_root'].'/web', 0711);
+				$app->system->chmod($data['new']['document_root'].'/web', octdec($web_config['web_folder_permission']));
 				$app->system->chmod($data['new']['document_root'].'/webdav', 0710);
 				$app->system->chmod($data['new']['document_root'].'/private', 0710);
 				$app->system->chmod($data['new']['document_root'].'/ssl', 0755);

server/plugins-available/nginx_plugin.inc.php

@@ -878,7 +878,7 @@ function update($event_name, $data) {
 			if($web_config['security_level'] == 20) {
 
 				$app->system->chmod($data['new']['document_root'], 0755);
-				$app->system->chmod($data['new']['document_root'].'/web', 0751);
+				$app->system->chmod($data['new']['document_root'].'/web', octdec($web_config['web_folder_permission']));
 				//$app->system->chmod($data['new']['document_root'].'/webdav',0710);
 				$app->system->chmod($data['new']['document_root'].'/private', 0710);
 				$app->system->chmod($data['new']['document_root'].'/ssl', 0755);