[Phpgroupware-cvs] comic/admin_comics.php, 1.1.4.4.2.2

[nomail]

Update of /comic
Modified Files:
        Branch: Version-0_9_16-branch
          admin_comics.php

date: 2004/07/15 00:01:23;  author: skwashd;  state: Exp;  lines: +34 -16

Log Message:
close bugs #897, #3358 & patch #3173
=====================================================================
Index: comic/admin_comics.php
diff -u comic/admin_comics.php:1.1.4.4.2.1 comic/admin_comics.php:1.1.4.4.2.2
--- comic/admin_comics.php:1.1.4.4.2.1  Thu Oct  9 21:33:02 2003
+++ comic/admin_comics.php      Thu Jul 15 00:01:23 2004
@@ -21,16 +21,34 @@
        include('../header.inc.php');
        include('inc/comic_data.inc.php');
 
+       if(!$GLOBALS['phpgw_info']['user']['apps']['comic'])
+       {
+               Header('Location: '. $GLOBALS['phpgw']->link('/home.php') );
+               exit;
+       }
+
        $title             = lang('Daily Comics Data');
 
        $done_label        = lang('Done');
-       $doneurl           = $GLOBALS['phpgw']->link('/admin/index.php');
+       $doneurl           = $GLOBALS['phpgw']->link('/admin/index.php') . 
'#comic';
 
        $message           = '';
+
+       $act            = get_var('act', array('POST', 'GET'), '');
+       $order          = get_var('order', array('POST', 'GET'), 'data_title');
+       $sort           = get_var('sort', array('POST', 'GET'), 'ASC');
+       $start          = get_var('start', array('POST', 'GET'), 0);
+       $query          = get_var('query', array('POST', 'GET'), '');
+       $qfield         = get_var('qfield', array('POST', 'GET'), 'data_title');
+       $filter         = get_var('filter', array('POST', 'GET'), '');
+       $con            = get_var('con', array('POST', 'GET'), 0);
+       $submit         = get_var('submit', array('POST'), false);
+       $comic_name     = get_var('comic_name', array('POST'), '');
+       $data_id        = intval( get_var('data_id', array('POST'), 0) );
     
-       if ($_POST['submit'])
+       if ($submit)
        {
-               switch($_GET['act'])
+               switch($act)
                {
                        case 'edit':
                                $message = 'modification';
@@ -42,20 +60,20 @@
                                $message = 'addition';
                                break;
                }
-               $message = lang('Performed %1 of element', $message);
+               $message = lang('Performed %1 of element', lang($message) );
        }
 
        $other_c           = '';
-
-       switch($_GET['act'])
+       
+       switch($act)
        {
                case 'edit':
-                       if ($_POST['submit'])
+                       if ($submit)
                        {
                                $GLOBALS['phpgw']->db->lock('phpgw_comic_data');
                                $GLOBALS['phpgw']->db->query('UPDATE 
phpgw_comic_data'
-                                               . " SET 
comic_name='".$GLOBALS['phpgw']->db->db_addslashes($comic_name)."'"
-                                               . ' WHERE 
data_id='.intval($data_id),__LINE__,__FILE__);
+                                               . " SET data_title = 
'".$GLOBALS['phpgw']->db->db_addslashes($comic_name)."'"
+                                               . " WHERE data_id = 
$data_id",__LINE__,__FILE__);
                                $GLOBALS['phpgw']->db->unlock();
 
                                
comic_table($order,$sort,$filter,$start,$query,$qfield,$table_c);
@@ -64,16 +82,16 @@
                        else
                        {
                                
comic_table($order,$sort,$filter,$start,$query,$qfield,$table_c);
-                               
comic_entry('','add',$order,$sort,$filter,$start,$query,$qfield,$add_c);
+                               
//comic_entry('','add',$order,$sort,$filter,$start,$query,$qfield,$add_c);
                                
comic_entry($con,$act,$order,$sort,$filter,$start,$query,$qfield,$other_c);
                        }
                        break;
                case 'delete':
-                       if ($_POST['submit'])
+                       if ($submit)
                        {
                                $GLOBALS['phpgw']->db->lock('phpgw_comic_data');
                                $GLOBALS['phpgw']->db->query('DELETE FROM 
phpgw_comic_data'
-                                       . ' WHERE data_id=' . 
intval($data_id),__LINE__,__FILE__);
+                                       . " WHERE data_id =  
$data_id",__LINE__,__FILE__);
                                $GLOBALS['phpgw']->db->unlock();
 
                                
comic_table($order,$sort,$filter,$start,$query,$qfield,$table_c);
@@ -82,15 +100,15 @@
                        else
                        {
                                
comic_table($order,$sort,$filter,$start,$query,$qfield,$table_c);
-                               
comic_entry('','add',$order,$sort,$filter,$start,$query,$qfield,$add_c);
+                               
//comic_entry('','add',$order,$sort,$filter,$start,$query,$qfield,$add_c);
                                
comic_entry($con,$act,$order,$sort,$filter,$start,$query,$qfield,$other_c);
                        }
                        break;
                case 'add':
-                       if ($_POST['submit'])
+                       if ($submit)
                        {
                                $GLOBALS['phpgw']->db->lock('phpgw_comic_data');
-                               $GLOBALS['phpgw']->db->query('INSERT INTO 
phpgw_comic_data(comic_name) '
+                               $GLOBALS['phpgw']->db->query('INSERT INTO 
phpgw_comic_data(data_name) '
                                        . " VALUES 
('".$GLOBALS['phpgw']->db->db_addslashes($comic_name)."')",__LINE__,__FILE__);
                                $GLOBALS['phpgw']->db->unlock();
                        }