Adjust page naming

diff --git a/lib/general.php b/lib/general.php
index 1efb039..0a187b5 100644 (file)
--- a/lib/general.php
+++ b/lib/general.php
@@ -30,11 +30,14 @@ function format_xml($errmsg)
 
 function check_permissions($name)
 {
+  $parts = explode('__', $name);
+  $form = $parts[0] . '|' . $parts[1];
+
   $sql = sprintf("SELECT count(*) AS count 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 = %d AND fname = '%s'",
-                $_SESSION['sys']['group'], pg_escape_string(str_replace('__','|',$name)));
+                $_SESSION['sys']['group'], pg_escape_string($form));
 
   $sth = pg_query($sql);
 
@@ -236,6 +239,8 @@ function grid_sql_join($mask)
 
 function grid_lookup_sql($table,$id,$text)
 {
+  if (empty($_GET['mask'])) return;
+
   $sql = "SELECT $id,$text FROM $table ORDER BY $id";
   $sth = pg_query($sql);