Move background image into images directory

[misc/kostenrechnung] / lib / general.php

diff --git a/lib/general.php b/lib/general.php
index fa250f8..3f82f4a 100644 (file)
--- a/lib/general.php
+++ b/lib/general.php
@@ -1,7 +1,18 @@
 <?php
 
+function passwd($login,$pass)
+{
+  return md5(md5($pass).$login);
+}
+
 function check_session()
 {
+  if (!empty($_SESSION['sys']['login']) && !empty($_GET['logout'])) {
+    session_destroy();
+    header('Location: ./?login=true');
+    exit();
+  }
+
   if (!empty($_POST['login']) && !empty($_POST['passwd'])) {
     require_once('lib/login.php');
     if (check_passwd()) {
@@ -21,12 +32,13 @@ function sanitise_filename($file)
   return str_replace('./','x',$file);
 }
 
-function load_mask($name, $prefix = '')
+function load_mask($name)
 {
   global $mask;
+  global $jscode;
 
   $name = sanitise_filename($name);
-  $file = $prefix . 'masks/' . $name . '.php';
+  $file = $_SESSION['sys']['basedir'] . 'masks/' . $name . '.php';
 
   if (!file_exists($file))
     return false;
@@ -113,4 +125,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'];
+}
+
 ?>