Removed obsolete stock_move.person_id field and related handling.

[fa-stable.git] / admin / create_coy.php

diff --git a/admin/create_coy.php b/admin/create_coy.php
index c84219b3e941bb29224c7de9efb87280c7a93075..03267f96ef757f6968f59043de9f6eb97c387404 100644 (file)
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -109,7 +109,8 @@ function handle_submit($selected_id)
        if ($new) {
                $db_connections[$selected_id]['host'] = $_POST['host'];
                $db_connections[$selected_id]['dbuser'] = $_POST['dbuser'];
-               $db_connections[$selected_id]['dbpassword'] = $_POST['dbpassword'];
+               $db_connections[$selected_id]['dbpassword'] = html_entity_decode($_POST['dbpassword'], ENT_QUOTES, 
+                       $_SESSION['language']->encoding=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding);
                $db_connections[$selected_id]['dbname'] = $_POST['dbname'];
                if (is_numeric($_POST['tbpref']))
                {
@@ -127,6 +128,8 @@ function handle_submit($selected_id)
                        display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually"));
                        $error = true;
                } else {
+                       if (strncmp(db_get_version(), "5.6", 3) >= 0) 
+                               db_query("SET sql_mode = ''");
                        if (!db_import($path_to_root.'/sql/'.get_post('coa'), $conn, $selected_id)) {
                                display_error(_('Cannot create new company due to bugs in sql file.'));
                                $error = true;
@@ -240,10 +243,10 @@ function display_companies()
 {
        global $def_coy, $db_connections;
 
-       $coyno = $_SESSION["wa_current_user"]->company;
+       $coyno = user_company();
 
        echo "
-               <script language='javascript'>
+               <script type='text/javascript'>
                function deleteCompany(id, name) {
                        if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
                                return