Widen textarea

[misc/kostenrechnung] / lib / general.php

diff --git a/lib/general.php b/lib/general.php
index 524be12..9ec2941 100644 (file)
--- a/lib/general.php
+++ b/lib/general.php
@@ -13,7 +13,8 @@ function check_session()
     exit();
   }
 
-  if (!empty($_POST['login']) && !empty($_POST['passwd'])) {
+  if (substr($_SERVER["SCRIPT_FILENAME"],-10) == '/index.php' &&
+      !empty($_POST['login']) && !empty($_POST['passwd'])) {
     require_once('lib/login.php');
     if (check_passwd()) {
       header('Location: ./');
@@ -35,6 +36,7 @@ function sanitise_filename($file)
 function load_mask($name)
 {
   global $mask;
+  global $jscode;
 
   $name = sanitise_filename($name);
   $file = $_SESSION['sys']['basedir'] . 'masks/' . $name . '.php';
@@ -124,4 +126,20 @@ function debug_info()
   return $html;
 }
 
+function grid_sql($name, $mask)
+{
+  $fields = array();
+  foreach ($mask['list'] as $field => $data) {
+    if (array_key_exists('sql', $data))
+      $fields[] = $data['sql'] . ' AS ' . $field;
+    else
+      $fields[] = $field;
+  }
+
+  $_SESSION['grid_' . $name] = sprintf("SELECT %s FROM %s",
+                                      implode(',', $fields), $mask['table']);
+  if (array_key_exists('join', $mask)) $_SESSION['grid_' . $name] .= ' JOIN ' . join(' JOIN ', $mask['join']);
+  if (array_key_exists('where', $mask)) $_SESSION['grid_' . $name] .= ' WHERE ' . $mask['where'];
+}
+
 ?>