Move SQL query calculation into separate general function

[misc/kostenrechnung] / lib / general.php

diff --git a/lib/general.php b/lib/general.php
index f088db0..3f82f4a 100644 (file)
--- a/lib/general.php
+++ b/lib/general.php
@@ -1,16 +1,44 @@
 <?php
 
 <?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()) {
+      header('Location: ./');
+      exit();
+    }
+  }
+
+  if (empty($_SESSION['sys']['login']) && empty($_GET['login'])) {
+    header('Location: ./?login=true');
+    exit();
+  }
+}
+

 function sanitise_filename($file)
 {
   return str_replace('./','x',$file);
 }
 
 function sanitise_filename($file)
 {
   return str_replace('./','x',$file);
 }
 

-function load_mask($name, $prefix = '')
+function load_mask($name)

 {
   global $mask;
 {
   global $mask;

+  global $jscode;

 
   $name = sanitise_filename($name);
 
   $name = sanitise_filename($name);

-  $file = $prefix . 'masks/' . $name . '.php';
+  $file = $_SESSION['sys']['basedir'] . 'masks/' . $name . '.php';

 
   if (!file_exists($file))
     return false;
 
   if (!file_exists($file))
     return false;


@@ -26,6 +54,19 @@ function connect_db()
   pg_connect($dsn);
 }
 
   pg_connect($dsn);
 }
 

+function query_db($sql)
+{
+  $sth = pg_query($sql);
+
+  if ($sth === false) return false;
+
+  $result = array();
+  while ($row = pg_fetch_assoc($sth))
+    $result[] = $row;
+
+  return $result;
+}
+

 function load_js($jsfiles, $jscode)
 {
   $ret = '';
 function load_js($jsfiles, $jscode)
 {
   $ret = '';


@@ -40,6 +81,11 @@ function load_js($jsfiles, $jscode)
 
 function process()
 {
 
 function process()
 {

+  if (!empty($_GET['login'])) {
+    require_once('lib/login.php');
+    return mask_login();
+  }
+

   if (!empty($_GET['mask'])) {
     require_once('lib/mask.php');
     return mask($_GET['mask']);
   if (!empty($_GET['mask'])) {
     require_once('lib/mask.php');
     return mask($_GET['mask']);


@@ -55,4 +101,44 @@ function process()
   return $ret;
 }
 
   return $ret;
 }
 

+function debug_log($text)
+{
+  global $debug_info;
+
+  $debug_info .= '<br>' . $text;
+}
+
+function debug_info()
+{
+  global $jsfiles;
+  global $debug_info;
+
+  if (DEBUG !== true) return '';
+
+  $jsfiles[] = 'lib/debug_joey.js';
+
+  $html = '<div style="background: #DDD; margin: 5px; padding-left: 4px; border: 1px solid #AAA;clear:both;">';
+  $html .= "\n<pre>\n\$_SESSION = " . var_export($_SESSION,true) . "\n";
+  $html .= "\n\$_COOKIE = " . var_export($_COOKIE,true) . "\n</pre>\n";
+  $html .= $debug_info;
+  $html .= '</div>';
+  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'];
+}
+

 ?>
 ?>