From 7f32bbd73c782449684cf6c6bf987e5bfbae9eb7 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 27 Jul 2017 08:30:59 +0200 Subject: [PATCH] Database connection issue with non standard port. --- admin/create_coy.php | 22 +- admin/db/maintenance_db.inc | 2 + includes/db/connect_db_mysql.inc | 14 +- includes/db/connect_db_mysqli.inc | 9 +- install/index.php | 9 + .../LC_MESSAGES/empty.po | 280 +++++++++--------- .../LC_MESSAGES/empty.po | 22 +- 7 files changed, 196 insertions(+), 162 deletions(-) diff --git a/admin/create_coy.php b/admin/create_coy.php index 56b4fe21..205f9046 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -43,6 +43,12 @@ function check_data($selected_id) display_error(_("Database settings are not specified.")); return false; } + if ($_POST['port'] != '' && !is_numeric($_POST['port'])) + { + display_error(_('Database port has to be numeric or empty.')); + return false; + } + foreach($db_connections as $id=>$con) { if($id != $selected_id && $_POST['host'] == $con['host'] @@ -96,6 +102,7 @@ function handle_submit($selected_id) $db_connections[$selected_id]['name'] = $_POST['name']; if ($new) { $db_connections[$selected_id]['host'] = $_POST['host']; + $db_connections[$selected_id]['port'] = $_POST['port']; $db_connections[$selected_id]['dbuser'] = $_POST['dbuser']; $db_connections[$selected_id]['dbpassword'] = html_entity_decode($_POST['dbpassword'], ENT_QUOTES, $_SESSION['language']->encoding=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding); @@ -237,7 +244,7 @@ function display_companies() start_table(TABLESTYLE); - $th = array(_("Company"), _("Database Host"), _("Database User"), + $th = array(_("Company"), _("Database Host"), _("Database Port"), _("Database User"), _("Database Name"), _("Table Pref"), _("Charset"), _("Default"), "", ""); table_header($th); @@ -253,10 +260,11 @@ function display_companies() label_cell($conn[$i]['name']); label_cell($conn[$i]['host']); + label_cell(isset($conn[$i]['port']) ? $conn[$i]['port'] : ''); label_cell($conn[$i]['dbuser']); label_cell($conn[$i]['dbname']); label_cell($conn[$i]['tbpref']); - label_cell($supported_collations[$conn[$i]['collation']]); + label_cell(isset($conn[$i]['collation']) ? $supported_collations[$conn[$i]['collation']] : ''); label_cell($i == $def_coy ? _("Yes") : _("No")); edit_button_cell("Edit".$i, _("Edit")); if ($i != $coyno) @@ -273,6 +281,7 @@ function display_companies() end_table(); display_note(_("The marked company is the current company which cannot be deleted."), 0, 0, "class='currentfg'"); display_note(_("If no Admin Password is entered, the new Admin Password will be 'password' by default ")); + display_note(_("Set Only Port value if you cannot use the default port 3306.")); } //--------------------------------------------------------------------------------------------- @@ -288,13 +297,14 @@ function display_company_edit($selected_id) $conn = $db_connections[$selected_id]; $_POST['name'] = $conn['name']; $_POST['host'] = $conn['host']; + $_POST['port'] = isset($conn['port']) ? $conn['port'] : ''; $_POST['dbuser'] = $conn['dbuser']; $_POST['dbpassword'] = $conn['dbpassword']; $_POST['dbname'] = $conn['dbname']; $_POST['tbpref'] = $conn['tbpref']; $_POST['def'] = $selected_id == $def_coy; $_POST['dbcreate'] = false; - $_POST['collation'] = $conn['collation']; + $_POST['collation'] = isset($conn['collation']) ? $conn['collation'] : ''; hidden('tbpref', $_POST['tbpref']); hidden('dbpassword', $_POST['dbpassword']); } @@ -306,10 +316,11 @@ function display_company_edit($selected_id) $conn = $db_connections[user_company()]; $_POST['name'] = ''; $_POST['host'] = $conn['host']; + $_POST['port'] = isset($conn['port']) ? $conn['port'] : ''; $_POST['dbuser'] = $conn['dbuser']; $_POST['dbpassword'] = $conn['dbpassword']; $_POST['dbname'] = $conn['dbname']; - $_POST['collation'] = $conn['collation']; + $_POST['collation'] = isset($conn['collation']) ? $conn['collation'] : ''; unset($_POST['def']); } @@ -318,6 +329,7 @@ function display_company_edit($selected_id) if ($selected_id == -1) { text_row_ex(_("Host"), 'host', 30, 60); + text_row_ex(_("Port"), 'port', 30, 60); text_row_ex(_("Database User"), 'dbuser', 30); text_row_ex(_("Database Password"), 'dbpassword', 30); text_row_ex(_("Database Name"), 'dbname', 30); @@ -328,8 +340,10 @@ function display_company_edit($selected_id) text_row_ex(_("New script Admin Password"), 'admpassword', 20); } else { label_row(_("Host"), $_POST['host']); + label_row(_("Port"), $_POST['port']); label_row(_("Database User"), $_POST['dbuser']); label_row(_("Database Name"), $_POST['dbname']); + collations_list_row(_("Database Collation:"), 'collation'); label_row(_("Table Pref"), $_POST['tbpref']); if (!get_post('def')) check_row(_("Default Company"), 'def'); diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc index f621c2c2..1f3d8cdc 100644 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@ -75,10 +75,12 @@ function write_config_db($new = false) $msg .= "/*Connection Information for the database\n"; $msg .= "\$def_coy - the default company that is pre-selected on login\n\n"; $msg .= "'host' - the computer ip address or name where the database is. The default is 'localhost' assuming that the web server is also the sql server.\n\n"; + $msg .= "'port' - the computer port where the database is. The default is '3306'. Set empty for default.\n\n"; $msg .= "'dbuser' - the user name under which the company database should be accessed.\n"; $msg .= " NB it is not secure to use root as the dbuser with no password - a user with appropriate privileges must be set up.\n\n"; $msg .= "'dbpassword' - the password required for the dbuser to authorise the above database user.\n\n"; $msg .= "'dbname' - the name of the database as defined in the RDMS being used. Typically RDMS allow many databases to be maintained under the same server.\n"; + $msg .= "'collation' - the character set used for the database.\n"; $msg .= "'tbpref' - prefix on table names, or '' if not used. Always use non-empty prefixes if multiply company use the same database.\n"; $msg .= "*/\n\n\n"; diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc index 56e36a0a..d3857cab 100644 --- a/includes/db/connect_db_mysql.inc +++ b/includes/db/connect_db_mysql.inc @@ -25,9 +25,13 @@ function set_global_connection($company=-1) $_SESSION["wa_current_user"]->cur_con = $company; $connection = $db_connections[$company]; + + $server = $connection["host"]; + if (!empty($connection["port"])) + $server .= ":".$connection["port"]; - $db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]); - mysql_select_db($connection["dbname"], $db); + $db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]); + mysql_select_db($connection["dbname"], $db); ///// From MySql release 5.6.6 the sql_mode is no longer empty as it was prior to ///// this release. Just for safety we make it empty for all 5.6 release and higher. ///// This non empty sql_mode values can interphere with FA, so all is set empty during @@ -197,8 +201,10 @@ function db_set_collation($db, $fa_collation) */ function db_create_db($connection) { - $db = mysql_connect($connection["host"] , - $connection["dbuser"], $connection["dbpassword"]); + $server = $connection["host"]; + if (!empty($connection["port"])) + $server .= ":".$connection["port"]; + $db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]); if (!mysql_select_db($connection["dbname"], $db)) { diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc index 897316d6..48b57402 100644 --- a/includes/db/connect_db_mysqli.inc +++ b/includes/db/connect_db_mysqli.inc @@ -29,8 +29,10 @@ function set_global_connection($company=-1) $connection = $db_connections[$company]; - $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]); - mysqli_select_db($db, $connection["dbname"]); + $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"], "", + !empty($connection["port"]) ? $connection["port"] : 3306); // default port in mysql is 3306 + + mysqli_select_db($db, $connection["dbname"]); ///// From mysqli release 5.6.6 the sql_mode is no longer empty as it was prior to ///// this release. Just for safety we make it empty for all 5.6 release and higher. ///// This non empty sql_mode values can interphere with FA, so all is set empty during @@ -200,7 +202,8 @@ function db_create_db($connection) { global $db; - $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]); + $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"], "", + !empty($connection["port"]) ? $connection["port"] : 3306); // default port in mysql is 3306 if (!mysqli_select_db($db, $connection["dbname"])) { diff --git a/install/index.php b/install/index.php index 2d67867b..6a2efdfe 100644 --- a/install/index.php +++ b/install/index.php @@ -144,6 +144,7 @@ function do_install() { $db_connections = array (0=> array ( 'name' => $con['name'], 'host' => $con['host'], + 'port' => $con['port'], 'dbname' => $con['dbname'], 'collation' => $con['collation'], 'tbpref' => $table_prefix, @@ -190,6 +191,7 @@ function do_install() { if (!isset($_SESSION['inst_set'])) // default settings $_SESSION['inst_set'] = array( 'host'=>'localhost', + 'port' => '', // 3306 'dbuser' => 'root', 'dbpassword' => '', 'username' => 'admin', @@ -216,6 +218,10 @@ elseif (isset($_POST['db_test'])) { display_error(_('Host name cannot be empty.')); set_focus('host'); } + elseif ($_POST['port'] != '' && !is_numeric($_POST['port'])) { + display_error(_('Database port have to be numeric or empty.')); + set_focus('port'); + } elseif ($_POST['dbuser']=='') { display_error(_('Database user name cannot be empty.')); set_focus('dbuser'); @@ -227,6 +233,7 @@ elseif (isset($_POST['db_test'])) { else { $_SESSION['inst_set'] = array_merge($_SESSION['inst_set'], array( 'host' => $_POST['host'], + 'port' => $_POST['port'], 'dbuser' => $_POST['dbuser'], 'dbpassword' => $_POST['dbpassword'], 'dbname' => $_POST['dbname'], @@ -342,6 +349,7 @@ start_form(); subpage_title(_('Database Server Settings')); start_table(TABLESTYLE); text_row_ex(_("Server Host:"), 'host', 30, 60); + text_row_ex(_("Server Port:"), 'port', 30, 60); text_row_ex(_("Database Name:"), 'dbname', 30); text_row_ex(_("Database User:"), 'dbuser', 30); text_row_ex(_("Database Password:"), 'dbpassword', 30); @@ -353,6 +361,7 @@ start_form(); display_note(_("Select collation you want to use. If you are unsure or you will use various languages, select unicode collation.")); display_note(_("Use table prefix if you share selected database for more than one FA company using the same collation.")); display_note(_("Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later.")); + display_note(_("Set Only Port value if you cannot use the default port 3306.")); submit_center_first('back', _('<< Back')); submit_center_last('db_test', _('Continue >>')); break; diff --git a/install/lang/new_language_template/LC_MESSAGES/empty.po b/install/lang/new_language_template/LC_MESSAGES/empty.po index 11770d09..461b36a3 100644 --- a/install/lang/new_language_template/LC_MESSAGES/empty.po +++ b/install/lang/new_language_template/LC_MESSAGES/empty.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-11 13:17+0100\n" +"POT-Creation-Date: 2017-07-26 10:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,533 +17,517 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: /install/index.php:20 -#: /install/index.php:41 +#: install/index.php:20 install/index.php:41 msgid "FrontAccouting ERP Installation Wizard" msgstr "" -#: /install/index.php:42 +#: install/index.php:42 #, php-format msgid "Step %d: %s" msgstr "" -#: /install/index.php:49 +#: install/index.php:49 msgid "Chart of accounts" msgstr "" -#: /install/index.php:49 -#: /install/index.php:76 +#: install/index.php:49 install/index.php:76 msgid "Encoding" msgstr "" -#: /install/index.php:49 -#: /install/index.php:76 +#: install/index.php:49 install/index.php:76 msgid "Description" msgstr "" -#: /install/index.php:49 -#: /install/index.php:76 -#: /install/index.php:395 +#: install/index.php:49 install/index.php:76 install/index.php:403 msgid "Install" msgstr "" -#: /install/index.php:66 -#: /install/index.php:94 +#: install/index.php:66 install/index.php:94 msgid "Installed" msgstr "" -#: /install/index.php:76 +#: install/index.php:76 msgid "Language" msgstr "" -#: /install/index.php:124 +#: install/index.php:124 msgid "" "Cannot connect to database. User or password is invalid or you have no " "permittions to create database." msgstr "" -#: /install/index.php:164 +#: install/index.php:165 msgid "Cannot save system configuration file 'config.php'." msgstr "" -#: /install/index.php:171 +#: install/index.php:172 msgid "Cannot open 'config_db.php' configuration file." msgstr "" -#: /install/index.php:174 +#: install/index.php:175 msgid "Cannot write to the 'config_db.php' configuration file." msgstr "" -#: /install/index.php:177 +#: install/index.php:178 msgid "" "Configuration file 'config_db.php' is not writable. Change its permissions " "so it is, then re-run installation step." msgstr "" -#: /install/index.php:216 +#: install/index.php:218 msgid "Host name cannot be empty." msgstr "" -#: /install/index.php:220 +#: install/index.php:222 +msgid "Database port have to be numeric or empty." +msgstr "" + +#: install/index.php:226 msgid "Database user name cannot be empty." msgstr "" -#: /install/index.php:224 +#: install/index.php:230 msgid "Database name cannot be empty." msgstr "" -#: /install/index.php:278 +#: install/index.php:285 msgid "Company name cannot be empty." msgstr "" -#: /install/index.php:282 +#: install/index.php:289 msgid "Company admin name cannot be empty." msgstr "" -#: /install/index.php:286 +#: install/index.php:293 msgid "Company admin password cannot be empty." msgstr "" -#: /install/index.php:290 +#: install/index.php:297 msgid "Company admin passwords differ." msgstr "" -#: /install/index.php:320 +#: install/index.php:327 msgid "System Diagnostics" msgstr "" -#: /install/index.php:322 +#: install/index.php:329 msgid "Select install wizard language:" msgstr "" -#: /install/index.php:328 +#: install/index.php:335 msgid "" "All application preliminary requirements seems to be correct. Please press " "Continue button below." msgstr "" -#: /install/index.php:329 -#: /install/index.php:357 -#: /install/index.php:364 -#: /install/index.php:371 +#: install/index.php:336 install/index.php:365 install/index.php:372 +#: install/index.php:379 msgid "Continue >>" msgstr "" -#: /install/index.php:331 +#: install/index.php:338 msgid "" "Application cannot be installed. Please fix problems listed below in red, " "and press Refresh button." msgstr "" -#: /install/index.php:332 +#: install/index.php:339 msgid "Refresh" msgstr "" -#: /install/index.php:342 +#: install/index.php:349 msgid "Database Server Settings" msgstr "" -#: /install/index.php:344 +#: install/index.php:351 msgid "Server Host:" msgstr "" -#: /install/index.php:345 -msgid "Database Name:" +#: install/index.php:352 +msgid "Server Port:" msgstr "" -#: /install/index.php:346 +#: install/index.php:353 +msgid "Database Name:" +msgstr "" +#: install/index.php:354 msgid "Database User:" msgstr "" -#: /install/index.php:347 +#: install/index.php:355 msgid "Database Password:" msgstr "" -#: /install/index.php:348 +#: install/index.php:356 msgid "Database Collation:" msgstr "" -#: /install/index.php:349 +#: install/index.php:357 msgid "Use '0_' Table Prefix:" msgstr "" -#: /install/index.php:349 -#: /includes/system_tests.inc:38 -#: /includes/system_tests.inc:113 -#: /includes/system_tests.inc:126 +#: install/index.php:357 includes/system_tests.inc:38 +#: includes/system_tests.inc:113 includes/system_tests.inc:126 msgid "Yes" msgstr "" -#: /install/index.php:349 -#: /includes/system_tests.inc:38 -#: /includes/system_tests.inc:113 -#: /includes/system_tests.inc:126 +#: install/index.php:357 includes/system_tests.inc:38 +#: includes/system_tests.inc:113 includes/system_tests.inc:126 msgid "No" msgstr "" -#: /install/index.php:350 +#: install/index.php:358 msgid "Install Additional Language Packs from FA Repository:" msgstr "" -#: /install/index.php:351 +#: install/index.php:359 msgid "Install Additional COAs from FA Repository:" msgstr "" -#: /install/index.php:353 +#: install/index.php:361 msgid "" "Select collation you want to use. If you are unsure or you will use various " "languages, select unicode collation." msgstr "" -#: /install/index.php:354 +#: install/index.php:362 msgid "" "Use table prefix if you share selected database for more than one FA company " "using the same collation." msgstr "" -#: /install/index.php:355 +#: install/index.php:363 msgid "" "Do not select additional langs nor COAs if you have no working internet " "connection right now. You can install them later." msgstr "" -#: /install/index.php:356 -#: /install/index.php:363 -#: /install/index.php:370 -#: /install/index.php:394 +#: install/index.php:364 install/index.php:371 install/index.php:378 +#: install/index.php:402 msgid "<< Back" msgstr "" -#: /install/index.php:361 +#: install/index.php:369 msgid "User Interface Languages Selection" msgstr "" -#: /install/index.php:368 +#: install/index.php:376 msgid "Charts of Accounts Selection" msgstr "" -#: /install/index.php:385 +#: install/index.php:393 msgid "Company Settings" msgstr "" -#: /install/index.php:387 +#: install/index.php:395 msgid "Company Name:" msgstr "" -#: /install/index.php:388 +#: install/index.php:396 msgid "Admin Login:" msgstr "" -#: /install/index.php:389 +#: install/index.php:397 msgid "Admin Password:" msgstr "" -#: /install/index.php:390 +#: install/index.php:398 msgid "Reenter Password:" msgstr "" -#: /install/index.php:391 +#: install/index.php:399 msgid "Select Chart of Accounts:" msgstr "" -#: /install/index.php:392 +#: install/index.php:400 msgid "Select Default Language:" msgstr "" -#: /install/index.php:395 +#: install/index.php:403 msgid "Start installation process" msgstr "" -#: /install/index.php:399 +#: install/index.php:407 msgid "FrontAccounting ERP has been installed successsfully." msgstr "" -#: /install/index.php:400 +#: install/index.php:408 msgid "Please do not forget to remove install wizard folder." msgstr "" -#: /install/index.php:403 +#: install/index.php:411 msgid "Click here to start." msgstr "" -#: /includes/system_tests.inc:15 +#: includes/system_tests.inc:15 msgid "Info" msgstr "" -#: /includes/system_tests.inc:16 +#: includes/system_tests.inc:16 msgid "Optional" msgstr "" -#: /includes/system_tests.inc:17 +#: includes/system_tests.inc:17 msgid "Recommended" msgstr "" -#: /includes/system_tests.inc:18 +#: includes/system_tests.inc:18 msgid "Required " msgstr "" -#: /includes/system_tests.inc:24 +#: includes/system_tests.inc:24 msgid "MySQL version" msgstr "" -#: /includes/system_tests.inc:28 +#: includes/system_tests.inc:28 msgid "Upgrade MySQL server to version at least 4.1" msgstr "" -#: /includes/system_tests.inc:35 +#: includes/system_tests.inc:35 msgid "PHP MySQL extension" msgstr "" -#: /includes/system_tests.inc:40 +#: includes/system_tests.inc:40 msgid "Your PHP has to have MySQL extension enabled." msgstr "" -#: /includes/system_tests.inc:46 +#: includes/system_tests.inc:46 msgid "PHP version" msgstr "" -#: /includes/system_tests.inc:50 +#: includes/system_tests.inc:50 msgid "Upgrade PHP to version at least 5.0.0" msgstr "" -#: /includes/system_tests.inc:57 +#: includes/system_tests.inc:57 msgid "Server system" msgstr "" -#: /includes/system_tests.inc:67 +#: includes/system_tests.inc:67 msgid "Session save path" msgstr "" -#: /includes/system_tests.inc:79 +#: includes/system_tests.inc:79 msgid "Removed install wizard folder" msgstr "" -#: /includes/system_tests.inc:82 +#: includes/system_tests.inc:82 msgid "Not removed" msgstr "" -#: /includes/system_tests.inc:83 +#: includes/system_tests.inc:83 msgid "Remove or rename install wizard folder for security reasons." msgstr "" -#: /includes/system_tests.inc:90 +#: includes/system_tests.inc:90 msgid "Browser type" msgstr "" -#: /includes/system_tests.inc:94 +#: includes/system_tests.inc:94 msgid "Any browser is supported" msgstr "" -#: /includes/system_tests.inc:101 +#: includes/system_tests.inc:101 msgid "Http server type" msgstr "" -#: /includes/system_tests.inc:105 +#: includes/system_tests.inc:105 msgid "Any server is supported" msgstr "" -#: /includes/system_tests.inc:112 +#: includes/system_tests.inc:112 msgid "Native gettext" msgstr "" -#: /includes/system_tests.inc:116 +#: includes/system_tests.inc:116 msgid "In case of no gettext support, php emulation is used" msgstr "" -#: /includes/system_tests.inc:124 +#: includes/system_tests.inc:124 msgid "Debugging mode" msgstr "" -#: /includes/system_tests.inc:128 +#: includes/system_tests.inc:128 msgid "To switch debugging on set $go_debug>0 in config.php file" msgstr "" -#: /includes/system_tests.inc:138 +#: includes/system_tests.inc:138 msgid "Error logging" msgstr "" -#: /includes/system_tests.inc:146 +#: includes/system_tests.inc:146 msgid "Disabled" msgstr "" -#: /includes/system_tests.inc:149 +#: includes/system_tests.inc:149 msgid "To switch error logging set $error_logging in config.php file" msgstr "" -#: /includes/system_tests.inc:152 +#: includes/system_tests.inc:152 msgid "Log file is not writeable" msgstr "" -#: /includes/system_tests.inc:162 +#: includes/system_tests.inc:162 msgid "Current database version" msgstr "" -#: /includes/system_tests.inc:166 +#: includes/system_tests.inc:166 msgid "Database structure seems to be not upgraded to current version" msgstr "" -#: /includes/system_tests.inc:181 +#: includes/system_tests.inc:181 msgid "Company subdirectories consistency" msgstr "" -#: /includes/system_tests.inc:194 -#: /includes/system_tests.inc:201 -#: /includes/system_tests.inc:209 -#: /includes/system_tests.inc:226 -#: /includes/system_tests.inc:341 -#: /includes/system_tests.inc:350 -#: /includes/system_tests.inc:359 -#: /includes/system_tests.inc:367 +#: includes/system_tests.inc:194 includes/system_tests.inc:201 +#: includes/system_tests.inc:209 includes/system_tests.inc:226 +#: includes/system_tests.inc:341 includes/system_tests.inc:350 +#: includes/system_tests.inc:359 includes/system_tests.inc:367 #, php-format msgid "'%s' is not writeable" msgstr "" -#: /includes/system_tests.inc:222 +#: includes/system_tests.inc:222 msgid "Temporary directory" msgstr "" -#: /includes/system_tests.inc:234 +#: includes/system_tests.inc:234 msgid "Language configuration consistency" msgstr "" -#: /includes/system_tests.inc:243 +#: includes/system_tests.inc:243 msgid "Languages folder should be writeable." msgstr "" -#: /includes/system_tests.inc:252 +#: includes/system_tests.inc:252 msgid "Languages configuration file should be writeable." msgstr "" -#: /includes/system_tests.inc:271 +#: includes/system_tests.inc:271 #, php-format msgid "Missing %s translation file." msgstr "" -#: /includes/system_tests.inc:276 +#: includes/system_tests.inc:276 #, php-format msgid "Missing system locale: %s" msgstr "" -#: /includes/system_tests.inc:289 +#: includes/system_tests.inc:289 msgid "Main config file" msgstr "" -#: /includes/system_tests.inc:296 -#: /includes/system_tests.inc:318 +#: includes/system_tests.inc:296 includes/system_tests.inc:318 #, php-format msgid "Can't write '%s' file. Check FA directory write permissions." msgstr "" -#: /includes/system_tests.inc:297 -#: /includes/system_tests.inc:319 +#: includes/system_tests.inc:297 includes/system_tests.inc:319 #, php-format msgid "'%s' file exists." msgstr "" -#: /includes/system_tests.inc:301 +#: includes/system_tests.inc:301 #, php-format msgid "'%s' file should be read-only" msgstr "" -#: /includes/system_tests.inc:310 +#: includes/system_tests.inc:310 msgid "Database auth file" msgstr "" -#: /includes/system_tests.inc:323 +#: includes/system_tests.inc:323 #, php-format msgid "" "'%s' file should be read-only if you do not plan to add or change companies" msgstr "" -#: /includes/system_tests.inc:334 +#: includes/system_tests.inc:334 msgid "Extensions system" msgstr "" -#: /includes/system_tests.inc:372 +#: includes/system_tests.inc:372 msgid "Extensions configuration files and directories should be writeable" msgstr "" -#: /includes/system_tests.inc:385 +#: includes/system_tests.inc:385 #, php-format msgid "Non-standard theme directory '%s' is not writable" msgstr "" -#: /includes/system_tests.inc:395 +#: includes/system_tests.inc:395 msgid "" "OpenSSL PHP extension have to be enabled to use extension repository system." msgstr "" -#: /includes/system_tests.inc:398 +#: includes/system_tests.inc:398 msgid "" "OpenSSL have to be available on your server to use extension repository " "system." msgstr "" -#: /includes/system_tests.inc:421 +#: includes/system_tests.inc:421 msgid "Test" msgstr "" -#: /includes/system_tests.inc:421 +#: includes/system_tests.inc:421 msgid "Test type" msgstr "" -#: /includes/system_tests.inc:421 +#: includes/system_tests.inc:421 msgid "Value" msgstr "" -#: /includes/system_tests.inc:421 +#: includes/system_tests.inc:421 msgid "Comments" msgstr "" -#: /includes/system_tests.inc:445 +#: includes/system_tests.inc:445 msgid "Ok" msgstr "" -#: /includes/packages.inc:189 +#: includes/packages.inc:189 #, php-format msgid "No key field '%s' in file '%s'" msgstr "" -#: /includes/packages.inc:294 +#: includes/packages.inc:294 msgid "Cannot download repo index file." msgstr "" -#: /includes/packages.inc:306 -#: /includes/packages.inc:343 +#: includes/packages.inc:306 includes/packages.inc:343 #, php-format msgid "Cannot delete outdated '%s' file." msgstr "" -#: /includes/packages.inc:310 +#: includes/packages.inc:310 msgid "Release file in repository is invalid, or public key is outdated." msgstr "" -#: /includes/packages.inc:327 +#: includes/packages.inc:327 msgid "Repository version does not match application version." msgstr "" -#: /includes/packages.inc:335 -#: /includes/packages.inc:377 +#: includes/packages.inc:335 includes/packages.inc:377 #, php-format msgid "Cannot download '%s' file." msgstr "" -#: /includes/packages.inc:347 +#: includes/packages.inc:347 #, php-format msgid "" "Security alert: broken index file in repository '%s'. Please inform " "repository administrator about this issue." msgstr "" -#: /includes/packages.inc:383 +#: includes/packages.inc:383 #, php-format msgid "" "Security alert: broken package '%s' in repository. Please inform repository " "administrator about this issue." msgstr "" -#: /includes/packages.inc:641 -#: /includes/packages.inc:696 +#: includes/packages.inc:641 includes/packages.inc:696 #, php-format msgid "Package '%s' not found." msgstr "" diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po index 61e437fb..d9f9cde7 100644 --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@ -742,6 +742,10 @@ msgstr "" msgid "Database settings are not specified." msgstr "" +#: admin/create_coy.php:48 +msgid "Database port has to be numeric or empty." +msgstr "" + #: admin/create_coy.php:53 msgid "This database settings are already used by another company." msgstr "" @@ -824,6 +828,10 @@ msgstr "" msgid "Database Host" msgstr "" +#: admin/create_coy.php:240 +msgid "Database Port" +msgstr "" + #: admin/create_coy.php:240 admin/create_coy.php:321 admin/create_coy.php:331 msgid "Database User" msgstr "" @@ -874,20 +882,28 @@ msgid "" "Do you want to continue ?" msgstr "" -#: admin/create_coy.php:274 +#: admin/create_coy.php:282 msgid "The marked company is the current company which cannot be deleted." msgstr "" -#: admin/create_coy.php:275 +#: admin/create_coy.php:283 msgid "" "If no Admin Password is entered, the new Admin Password will be " "'password' by default " msgstr "" -#: admin/create_coy.php:320 admin/create_coy.php:330 admin/printers.php:84 +#: admin/create_coy.php:284 +msgid "Set Only Port value if you cannot use the default port 3306." +msgstr "" + +#: admin/create_coy.php:320 admin/create_coy.php:331 admin/printers.php:84 msgid "Host" msgstr "" +#: admin/create_coy.php:332 +msgid "Port" +msgstr "" + #: admin/create_coy.php:322 msgid "Database Password" msgstr "" -- 2.30.2