@@ -953,24 +953,13 @@ public function install_ispconfig()
953953 //* copy the ISPConfig security part
954954 $ command = 'cp -rf ../security ' .$ install_dir ;
955955 caselog ($ command .' &> /dev/null ' , __FILE__ , __LINE__ , "EXECUTED: $ command " , "Failed to execute the command $ command " );
956-
957- //* Apply changed security_settings.ini values to new security_settings.ini file
958- if (is_file ('/usr/local/ispconfig/security/security_settings.ini~ ' )) {
959- $ security_settings_old = ini_to_array (file_get_contents ('/usr/local/ispconfig/security/security_settings.ini~ ' ));
960- $ security_settings_new = ini_to_array (file_get_contents ('/usr/local/ispconfig/security/security_settings.ini ' ));
961- if (is_array ($ security_settings_new ) && is_array ($ security_settings_old )) {
962- foreach ($ security_settings_new as $ section => $ sval ) {
963- if (is_array ($ sval )) {
964- foreach ($ sval as $ key => $ val ) {
965- if (isset ($ security_settings_old [$ section ]) && isset ($ security_settings_old [$ section ][$ key ])) {
966- $ security_settings_new [$ section ][$ key ] = $ security_settings_old [$ section ][$ key ];
967- }
968- }
969- }
970- }
971- file_put_contents ('/usr/local/ispconfig/security/security_settings.ini ' ,array_to_ini ($ security_settings_new ));
972- }
956+
957+ $ configfile = 'security_settings.ini ' ;
958+ if (is_file ($ install_dir .'/security/ ' .$ configfile )) {
959+ copy ($ install_dir .'/security/ ' .$ configfile , $ install_dir .'/security/ ' .$ configfile .'~ ' );
973960 }
961+ $ content = rfsel ($ conf ['ispconfig_install_dir ' ].'/server/conf-custom/install/ ' .$ configfile .'.master ' , 'tpl/ ' .$ configfile .'.master ' );
962+ wf ($ install_dir .'/security/ ' .$ configfile , $ content );
974963
975964 //* Create a symlink, so ISPConfig is accessible via web
976965 // Replaced by a separate vhost definition for port 8080
0 commit comments