install/dist/lib/fedora.lib.php

@@ -865,11 +865,11 @@ class installer_dist extends installer_base {
 		if($conf['nginx']['installed'] == true){
 			$command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
 			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-			if(is_user('ispapps')){
+			//if(is_user('ispapps')){
 				// Allow the ispapps vhost access to /etc/squirrelmail
-				$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
-				caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-			}
+				//$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
+				//caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+			//}
 			if(is_group('ispapps')){
 				$command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
 				caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

install/tpl/nginx_apps.vhost.master

@@ -38,9 +38,15 @@ server {
                        try_files $uri =404;
                        root /usr/share/;
                        include /etc/nginx/fastcgi_params;
-                       fastcgi_pass unix:{fpm_socket};
+                       # To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
+                       fastcgi_pass 127.0.0.1:9000;
                        fastcgi_index index.php;
                        fastcgi_param SCRIPT_FILENAME $request_filename;
+                       fastcgi_param PATH_INFO $fastcgi_script_name;
+                       fastcgi_buffer_size 128k;
+                       fastcgi_buffers 256 4k;
+                       fastcgi_busy_buffers_size 256k;
+                       fastcgi_temp_file_write_size 256k;
                }
                location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
                        root /usr/share/;
@@ -57,9 +63,15 @@ server {
                        try_files $uri =404;
                        root /usr/share/;
                        include /etc/nginx/fastcgi_params;
-                       fastcgi_pass unix:{fpm_socket};
+                       # To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
+                       fastcgi_pass 127.0.0.1:9000;
                        fastcgi_index index.php;
                        fastcgi_param SCRIPT_FILENAME $request_filename;
+                       fastcgi_param PATH_INFO $fastcgi_script_name;
+                       fastcgi_buffer_size 128k;
+                       fastcgi_buffers 256 4k;
+                       fastcgi_busy_buffers_size 256k;
+                       fastcgi_temp_file_write_size 256k;
                }
                location ~* ^/squirrelmail/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
                        root /usr/share/;

interface/lib/lang/hr.lng

 <?php
-$wb['conf_format_dateshort'] = 'd.m.Y.';
-$wb['conf_format_datelong'] = 'l d. F Y.';
-$wb['conf_format_timeshort'] = 'H:i';
-$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'd.m.Y. H:i';
-$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = ',';
-$wb['number_format_thousands_sep'] = '.';
-$wb['delete_confirmation'] = 'Da li želite obrisati ovaj zapis?';
-$wb['error_no_view_permission'] = 'Nemate dozvolu za pregled zapisa ili zapis ne postoji!';
-$wb['error_no_delete_permission'] = 'Nemate dozvolu za brisanje zapisa!';
-$wb['page_txt'] = 'Stranica';
-$wb['page_of_txt'] = 'od';
-$wb['page_and_txt'] = 'i';
-$wb['page_next_txt'] = 'Naprijed';
-$wb['page_back_txt'] = 'Natrag';
-$wb['delete_txt'] = 'Obriši';
-$wb['filter_txt'] = 'Filter';
-$wb['add_new_record_txt'] = 'Dodaj novi zapis';
-$wb['btn_save_txt'] = 'Spremi';
-$wb['btn_cancel_txt'] = 'Natrag';
-$wb['top_menu_system'] = 'Sistem';
-$wb['top_menu_client'] = 'Klijent';
-$wb['top_menu_email'] = 'Email';
-$wb['top_menu_monitor'] = 'Monitoring';
-$wb['top_menu_sites'] = 'Stranice';
-$wb['top_menu_dns'] = 'DNS';
-$wb['top_menu_tools'] = 'Postavke';
-$wb['top_menu_help'] = 'Podrška';
-$wb['top_menu_billing'] = 'Naplata';
-$wb['top_menu_domain'] = 'Domene';
-$wb['top_menu_dashboard'] = 'Početna';
-$wb['toolsarea_head_txt'] = 'Postavke';
-$wb['latest_news_txt'] = 'Vijesti';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
-$wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
-$wb['monthnamesshort_jan'] = 'Jan';
-$wb['monthnamesshort_feb'] = 'Feb';
-$wb['monthnamesshort_mar'] = 'Mar';
-$wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
-$wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['error_301'] = 'Module not permitted for the current user.';
-$wb['error_302'] = 'Module invalid.';
-$wb['error_1001'] = 'The username and password cannot be empty !';
-$wb['error_1002'] = 'The username and/or password are not correct !';
-$wb['error_1003'] = 'The username is deactivated!';
-$wb['top_menu_vm'] = 'VServer';
+$wb['conf_format_dateshort'] = "d.m.Y.";
+$wb['conf_format_datelong'] = "l d. F Y.";
+$wb['conf_format_timeshort'] = "H:i";
+$wb['conf_format_timelong'] = "H:i:s";
+$wb['conf_format_datetime'] = "d.m.Y. H:i";
+$wb['number_format_decimals'] = "2";
+$wb['number_format_dec_point'] = ",";
+$wb['number_format_thousands_sep'] = ".";
+$wb['delete_confirmation'] = "Da li želite obrisati ovaj zapis?";
+$wb['error_no_view_permission'] = "Nemate dozvolu za pregled zapisa ili zapis ne postoji!";
+$wb['error_no_delete_permission'] = "Nemate dozvolu za brisanje zapisa!";
+$wb['page_txt'] = "Stranica";
+$wb['page_of_txt'] = "od";
+$wb['page_and_txt'] = "i";
+$wb['page_next_txt'] = "Naprijed";
+$wb['page_back_txt'] = "Natrag";
+$wb['delete_txt'] = "Obriši";
+$wb['filter_txt'] = "Filter";
+$wb['add_new_record_txt'] = "Dodaj novi zapis";
+$wb['btn_save_txt'] = "Spremi";
+$wb['btn_cancel_txt'] = "Natrag";
+$wb['top_menu_system'] = "Sistem";
+$wb['top_menu_client'] = "Klijent";
+$wb['top_menu_email'] = "Email";
+$wb['top_menu_monitor'] = "Monitoring";
+$wb['top_menu_sites'] = "Stranice";
+$wb['top_menu_dns'] = "DNS";
+$wb['top_menu_tools'] = "Postavke";
+$wb['top_menu_help'] = "Podrška";
+$wb['top_menu_billing'] = "Naplata";
+$wb['top_menu_domain'] = "Domene";
+$wb['top_menu_dashboard'] = "Početna";
+$wb['toolsarea_head_txt'] = "Postavke";
+$wb['latest_news_txt'] = "Vijesti";
+$wb['error_301'] = "Ne možete koristiti ovaj modul.";
+$wb['error_302'] = "Greška u modulu.";
+$wb['error_1001'] = "Korisničko ime i šifra ne mogu biti prazni!";
+$wb['error_1002'] = "Korisničko ime i/ili šifra nisu ispravni!";
+$wb['error_1003'] = "Korisničko ime je deaktivirano!";
+$wb['top_menu_vm'] = "VServer";
 ?>
+

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

 <?php
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
-$wb['Firewall'] = 'Firewall';
-$wb['Groups'] = 'Groups';
-$wb['groups_description'] = 'Form to edit systemuser groups.';
-$wb['Server'] = 'Server';
-$wb['Services'] = 'Services';
-$wb['Config'] = 'Config';
-$wb['Server Config'] = 'Server Config';
-$wb['Mail'] = 'Mail';
-$wb['Getmail'] = 'Getmail';
-$wb['Web'] = 'Web';
-$wb['FastCGI'] = 'FastCGI';
-$wb['Jailkit'] = 'Jailkit';
-$wb['System'] = 'System';
-$wb['Add user'] = 'Add user';
-$wb['Edit user'] = 'Edit user';
-$wb['CP Users'] = 'CP Users';
-$wb['Add group'] = 'Add group';
-$wb['Edit group'] = 'Edit group';
-$wb['Edit server'] = 'Edit server';
-$wb['Edit Server IP'] = 'Server IP addresses';
-$wb['Servers'] = 'Servers';
-$wb['Sync. Now'] = 'Sync. Now';
-$wb['DB Sync.'] = 'DB Sync.';
-$wb['Languages'] = 'Languages';
-$wb['New Language'] = 'New Language';
-$wb['Export'] = 'Export';
-$wb['Import'] = 'Import';
-$wb['Language Editor'] = 'Language Editor';
-$wb['Software'] = 'Apps & Addons';
-$wb['Repositories'] = 'Repositories';
-$wb['Server Services'] = 'Server Services';
-$wb['Interface Config'] = 'Interface Config';
-$wb['Packages'] = 'Packages';
-$wb['Updates'] = 'Updates';
-$wb['Merge'] = 'Merge';
-$wb['Remote Users'] = 'Remote Users';
-$wb['Remote Actions'] = 'Remote Actions';
-$wb['Do OS-Update'] = 'Do OS-Update';
-$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['1001'] = "Nije upisano korisničko ime ili šifra.";
+$wb['1002'] = "Pogrešno korisničko ime ili šifra.";
+$wb['Firewall'] = "Firewall";
+$wb['Groups'] = "Grupe";
+$wb['groups_description'] = "Forma za editiranje grupe korisnika sistema.";
+$wb['Server'] = "Server";
+$wb['Services'] = "Servisi";
+$wb['Config'] = "Konfiguracija";
+$wb['Server Config'] = "Konfiguracija servera";
+$wb['Mail'] = "Mail";
+$wb['Getmail'] = "Getmail";
+$wb['Web'] = "Web";
+$wb['FastCGI'] = "FastCGI";
+$wb['Jailkit'] = "Jailkit";
+$wb['System'] = "Sistem";
+$wb['Add user'] = "Dodaj korisnika";
+$wb['Edit user'] = "Editiraj korisnika";
+$wb['CP Users'] = "CP korisnici";
+$wb['Add group'] = "Dodaj grupu";
+$wb['Edit group'] = "Editiraj grupu";
+$wb['Edit server'] = "Editiraj server";
+$wb['Edit Server IP'] = "IP adresa servera";
+$wb['Servers'] = "Serveri";
+$wb['Sync. Now'] = "Sinkroniziraj";
+$wb['DB Sync.'] = "Sinkroniziraj bazu";
+$wb['Languages'] = "Jezici";
+$wb['New Language'] = "Novi jezik";
+$wb['Export'] = "Eksportiraj";
+$wb['Import'] = "Importiraj";
+$wb['Language Editor'] = "Jezični editor";
+$wb['Software'] = "Aplikacije i dodaci";
+$wb['Repositories'] = "Repositoriji";
+$wb['Server Services'] = "Serverski servisi";
+$wb['Interface Config'] = "Konfiguracija sistema";
+$wb['Packages'] = "Paketi";
+$wb['Updates'] = "Nadogradnje";
+$wb['Merge'] = "Spoji";
+$wb['Remote Users'] = "Udaljeni korisnici";
+$wb['Remote Actions'] = "Udaljene akcije";
+$wb['Do OS-Update'] = "Nadogradnja sistema";
+$wb['Do ISPConfig-Update'] = "Nadogradnja control panela";
 ?>
+

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

@@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'There is already a firewall record for this serv
 $wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
 $wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
+

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

@@ -6,3 +6,4 @@ $wb['tcp_port_txt'] = 'Open TCP ports';
 $wb['udp_port_txt'] = 'Open UDP ports';
 $wb['add_new_record_txt'] = 'Add Firewall record';
 ?>
+

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

@@ -3,3 +3,4 @@ $wb['description_txt'] = 'Description';
 $wb['name_txt'] = 'Group';
 $wb['name_err'] = 'Group must be min 1, max 30 Chars.';
 ?>
+

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

@@ -5,3 +5,4 @@ $wb['name_txt'] = 'Group';
 $wb['add_new_record_txt'] = 'Add new Group';
 $wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
 ?>
+

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

 <?php
-$wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+
+$wb["server_id_txt"] = 'Server';
+$wb["multiport_txt"] = 'Multi Port';
+$wb["singleport_txt"] = 'Single Port';
+$wb["protocol_txt"] = 'Protocol';
+$wb["table_txt"] = 'Table';
+$wb["target_txt"] = 'Target';
+$wb["state_txt"] = 'State';
+$wb["destination_ip_txt"] = 'Destination Address';
+$wb["source_ip_txt"] = 'Source Address';
+$wb["active_txt"] = 'Active';
+$wb["iptables_error_unique"] = 'There is already a firewall record for this server.';
+
 ?>
+

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

 <?php
-$wb['list_head_txt'] = 'IPTables';
-$wb['add_new_rule_txt'] = 'Add IPTables Rule';
-$wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+/*
+templates/iptables_list.htm:<h2><tmpl_var name="list_head_txt"></h2>
+templates/iptables_list.htm:          <span>{tmpl_var name="add_new_rule_txt"}</span>
+templates/iptables_list.htm:    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+templates/iptables_list.htm:            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+templates/iptables_list.htm:            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+templates/iptables_list.htm:            <!-- th class="tbl_col_source_ip" scope="col"><tmpl_var name="source_ip_txt"></th>
+templates/iptables_list.htm:            <th class="tbl_col_destination_ip" scope="col"><tmpl_var name="destination_ip_txt"></th -->
+templates/iptables_list.htm:            <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
+templates/iptables_list.htm:            <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
+templates/iptables_list.htm:            <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
+templates/iptables_list.htm:                    <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
+templates/iptables_list.htm:                <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
+templates/iptables_list.htm:                <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
+templates/iptables_list.htm:                            <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');">
+templates/iptables_list.htm:                            <span>{tmpl_var name="filter_txt"}filter_txt</span></button></div>
+templates/iptables_list.htm:                                    <span>{tmpl_var name='delete_txt'}</span></a>
+*/
+
+$wb["list_head_txt"] = 'IPTables';
+$wb["add_new_rule_txt"] = 'Add IPTables Rule';
+$wb["server_id_txt"] = 'Server';
+$wb["multiport_txt"] = 'Multi Port';
+$wb["singleport_txt"] = 'Single Port';
+$wb["protocol_txt"] = 'Protocol';
+$wb["table_txt"] = 'Table';
+$wb["target_txt"] = 'Target';
+$wb["state_txt"] = 'State';
+$wb["destination_ip_txt"] = 'Destination Address';
+$wb["source_ip_txt"] = 'Source Address';
+$wb["active_txt"] = 'Active';
+$wb["iptables_error_unique"] = 'There is already a firewall record for this server.';
+
 ?>
+

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

@@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See http:/
 $wb['btn_save_txt'] = 'Create new language file set';
 $wb['btn_cancel_txt'] = 'Back';
 ?>
+

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

@@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Select language';
 $wb['btn_save_txt'] = 'Merge files now';
 $wb['btn_cancel_txt'] = 'Back';
 ?>
+

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

@@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Language file';
 $wb['btn_save_txt'] = 'Save';
 $wb['btn_cancel_txt'] = 'Back';
 ?>
+

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

@@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Select language';
 $wb['btn_save_txt'] = 'Export the selected language file set';
 $wb['btn_cancel_txt'] = 'Back';
 ?>
+

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

@@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Overwrite file, if exists.';
 $wb['btn_cancel_txt'] = 'Back';
 $wb['ignore_version_txt'] = 'Skip ISPConfig version check';
 ?>
+

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

@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Module';
 $wb['lang_file_txt'] = 'Language file';
 $wb['lang_file_date_txt'] = 'Last modify';
 ?>
+

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

@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'User (optional)';
 $wb['repo_password_txt'] = 'Password (optional)';
 $wb['active_txt'] = 'Active';
 ?>
+

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

@@ -8,3 +8,4 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select
 $wb['action_scheduled'] = 'The action is scheduled for execution';
 $wb['select_all_server'] = 'All servers';
 ?>
+

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

@@ -41,3 +41,4 @@ $wb['DNS srv functions'] = 'DNS srv functions';
 $wb['DNS txt functions'] = 'DNS txt functions';
 $wb['Mail mailing list functions'] = 'Mail mailinglist functions';
 ?>
+

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

@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Add new user';
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'Username';
 ?>
+