Rename title into name for menu items

diff --git a/lib/menu.php b/lib/menu.php
index e20b4d0..1a9c2af 100644 (file)
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -13,7 +13,7 @@ function menu()
   $ret .= '<li><a href="./" title="Zurück zur Hauptseite">Start</a></li>';
   $ret .= '<li><a href="./?logout=true" title="Abmelden">Logout</a></li>';
 
   $ret .= '<li><a href="./" title="Zurück zur Hauptseite">Start</a></li>';
   $ret .= '<li><a href="./?logout=true" title="Abmelden">Logout</a></li>';
 

-  $sql = "SELECT fname,menutitle,name FROM sys_mask "
+  $sql = "SELECT fname,menutitle,sys_menu.name FROM sys_mask "

     . "JOIN sys_menu ON sys_mask.menu = sys_menu.id "
     . "JOIN sys_group_mask ON sys_mask.id = sys_group_mask.mask "
     . "WHERE sys_group_mask.gid = ".$_SESSION['sys']['group']." "
     . "JOIN sys_menu ON sys_mask.menu = sys_menu.id "
     . "JOIN sys_group_mask ON sys_mask.id = sys_group_mask.mask "
     . "WHERE sys_group_mask.gid = ".$_SESSION['sys']['group']." "

diff --git a/masks/sys_mask.php b/masks/sys_mask.php
index 1e6ecca..b8dd7ec 100644 (file)
--- a/masks/sys_mask.php
+++ b/masks/sys_mask.php
@@ -37,9 +37,10 @@ $mask = array(
                                            'name' => 'Dateiname',
                                            'width' => 100,
                                            ),
                                            'name' => 'Dateiname',
                                            'width' => 100,
                                            ),

-                             'title' => array(
-                                           'name' => 'Beschreibung',
+                             'name' => array(
+                                           'name' => 'Name',

                                            'width' => 150,
                                            'width' => 150,

+                                           'sql' => 'sys_mask.name',

                                            ),
                              'menutitle' => array(
                                            'name' => 'Menüpunkt',
                                            ),
                              'menutitle' => array(
                                            'name' => 'Menüpunkt',


@@ -84,8 +85,8 @@ $mask = array(
                                            'options' => discover_masks(),
                                            'options_string' => true,
                                            ),
                                            'options' => discover_masks(),
                                            'options_string' => true,
                                            ),

-                             'title' => array(
-                                           'name' => 'Beschreibung',
+                             'name' => array(
+                                           'name' => 'Name',

                                            'type' => 'text',
                                            'size' => 24,
                                            ),
                                            'type' => 'text',
                                            'size' => 24,
                                            ),