Merge branch 'master' into stable-v0.5

Author: jbtronics

install.php

@@ -153,6 +153,7 @@
                 $database = new Database(); // test the connection --> Exception if it doesn't work
 
                 $config['installation_complete']['database'] = true; // database settings successful set
+                $config['installation_complete']['db_backup_path'] = true; //Workaround, because we removed the dialog for this
             } catch (Exception $e) {
                 $messages[] = array('text' => nl2br($e->getMessage()), 'strong' => true, 'color' => 'red');
             }
@@ -217,12 +218,12 @@
             $html->setVariable('db_name', $config['db']['name'], 'string');
             $html->setVariable('db_user', $config['db']['user'], 'string');
             $html->setVariable("space_fix", $config['db']['space_fix'], 'boolean');
-        } elseif (!$config['installation_complete']['db_backup_path']) {
+        } /* elseif (!$config['installation_complete']['db_backup_path']) {
             // step "set_db_backup_path"
             $tmpl_site_to_show = 'set_db_backup_path';
             $html->setVariable('db_backup_name', $config['db']['backup']['name'], 'string');
             $html->setVariable('db_backup_path', $config['db']['backup']['url'], 'string');
-        } else {
+        }*/ else {
             // installation/update complete
             $tmpl_site_to_show = 'finish';
         }

lib/Database.php

@@ -964,7 +964,7 @@ public function getDatabaseSize()
         $query = 'SELECT '
             . ' ROUND(SUM(data_length + index_length) / 1024 / 1024, 3) AS `size`'
             . ' FROM information_schema.TABLES'
-            . ' WHERE table_schema = "part-db"'
+            . ' WHERE table_schema = ?'
             . ' GROUP BY table_schema; ';
 
         $values[] = $config['db']['name'];

templates/nextgen/install.php/smarty_finish.tpl

@@ -6,6 +6,7 @@
         <b><span style="color: green; ">{t escape=off}Herzlichen Glückwunsch, die Installation bzw. das Update von Part-DB ist fast abgeschlossen!<br>
                 Weitere Einstellungen finden Sie unter dem Menüpunkt "System".{/t}</span></b>
         <p><b>{t}Sie können sich nun mit dem Nutzernamen "admin" und dem eben festgelegten Password einloggen.{/t}</b></p>
+        <p><b>{t}Prüfen sie unter System->Benutzer bzw. System->Gruppen ob die Berechtigungen die von die gewünschten Werte haben{/t}</b></p>
         <form action="index.php" method="post">
             <button class="btn btn-primary" type="submit" name="finish">{t}Fertigstellen{/t}</button>
         </form>

templates/nextgen/system_database.php/smarty_system_database.tpl

@@ -53,6 +53,8 @@
             <div class="card-body" style="padding-top: 0;">
                 {if isset($update_required) && $update_required}
                     <strong><span class="text-danger">{t}Die Datenbank benötigt ein Update!{/t}</span></strong><br>
+
+                    <strong>{t}Achtung:{/t} </strong><span>{t}Prüfen sie nach dem Update, ob die Berechtigungen der Benutzer und Gruppen noch korrekt sind!{/t}</span><br>
                     {if $last_update_failed}
                         <br>
                         <strong><span class="text-danger">

updates/db_update_steps.php

@@ -816,18 +816,17 @@ function get_db_update_steps($current_version)
                 `perms_storelocations`,`perms_footprints`,`perms_categories`,
                 `perms_suppliers`,`perms_manufacturers`,`perms_attachement_types`,
                 `perms_tools`)
-                VALUES (1,'admins',NULL,
-                'Users of this group can do everything: Read, Write and Administrative actions.'
-                ,1,1365,21845,21,85,21,349525,5,5,5,5,5,5,5,5,5,325,325,325,1365,
-                325,1365,1365,1365,1365,1365,341,1365),
-              (2,'readonly',NULL,
-              'Users of this group can only read informations, use tools, and don\'t have access to administrative tools.'
-              ,2,2730,43690,25,170,42,349865,9,9,9,9,9,9,9,9,9,649,649,649,1705,
-              649,1705,1705,1705,1705,1705,681,1366),
-              (3,'users',NULL,
-              'Users of this group, can edit part informations, create new ones, etc. but are not allowed to use administrative tools. (But can read current configuration, and see Server status)'
-              ,2,2730,43690,25,105,41,349525,5,5,5,5,5,5,5,5,5,325,325,325,1365,
-              325,1365,1365,1365,1365,1365,341,1365); 
+                VALUES (1, 'admins', NULL, 'Users of this group can do everything: Read, Write and Administrative actions.',
+                    21, 1365, 87381, 85, 85, 21, 1431655765, 5, 5, 5, 5, 5, 5, 5, 5, 5, 325, 325, 325, 5461, 325, 5461, 5461,
+                    5461, 5461, 5461, 1365, 1365),
+                (2, 'readonly', NULL, 
+                   'Users of this group can only read informations, use tools, and don\'t have access to administrative tools.', 
+                    42, 2730, 174762, 154, 170, 42, -1516939607, 9, 9, 9, 9, 9, 9, 9, 9, 9, 649, 649, 649, 1705, 649, 1705, 1705,
+                    1705, 1705, 1705, 681, 1366),
+                (3, 'users', NULL,
+                    'Users of this group, can edit part informations, create new ones, etc. but are not allowed to use administrative tools. (But can read current configuration, and see Server status)',
+                    42, 2730, 109226, 89, 105, 41, 1431655765, 5, 5, 5, 5, 5, 5, 5, 5, 5, 325, 325, 325, 5461, 325, 5461, 5461, 5461,
+                    5461, 5461, 1365, 1365); 
 EOD;