[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] comic/inc/comic_data.inc.php, 1.1.4.2.2.1
From: |
nomail |
Subject: |
[Phpgroupware-cvs] comic/inc/comic_data.inc.php, 1.1.4.2.2.1 |
Date: |
Thu, 15 Jul 2004 02:01:33 +0200 |
Update of /comic/inc
Modified Files:
Branch: Version-0_9_16-branch
comic_data.inc.php
date: 2004/07/15 00:01:33; author: skwashd; state: Exp; lines: +27 -20
Log Message:
close bugs #897, #3358 & patch #3173
=====================================================================
Index: comic/inc/comic_data.inc.php
diff -u comic/inc/comic_data.inc.php:1.1.4.2
comic/inc/comic_data.inc.php:1.1.4.2.2.1
--- comic/inc/comic_data.inc.php:1.1.4.2 Tue Mar 4 22:20:03 2003
+++ comic/inc/comic_data.inc.php Thu Jul 15 00:01:33 2004
@@ -14,7 +14,7 @@
function get_db_var($field)
{
- $new_var = $GLOBALS['phpgw']->db->f($field);
+ $new_var = $GLOBALS['phpgw']->db->f($field, True);
if(!$new_var)
{
$new_var = ' ';
@@ -56,11 +56,12 @@
if($order)
{
- $ordermethod = "order by $order $sort ";
+ $ordermethod = 'ORDER BY ' .
$GLOBALS['phpgw']->db->db_addslashes($order)
+ . ' ' .
$GLOBALS['phpgw']->db->db_addslashes($sort);
}
else
{
- $ordermethod = "order by data_title asc ";
+ $ordermethod = "ORDER by data_title asc ";
}
if(!$start)
@@ -72,9 +73,14 @@
{
$filter = 'none';
}
+
+ if(!$qfield)
+ {
+ $qfield = 'data_title';
+ }
- $likeness = 'like';
- $myquery = '%'.$query.'%';
+ $likeness = 'LIKE';
+ $myquery = '%' . $GLOBALS['phpgw']->db->db_addslashes($query)
. '%';
if ($qfield == 'data_censorlvl')
{
@@ -89,7 +95,7 @@
}
}
- $sql_query = 'select count(*) from phpgw_comic_data';
+ $sql_query = 'SELECT COUNT(*) FROM phpgw_comic_data';
$GLOBALS['phpgw']->db->query($sql_query,__LINE__,__FILE__);
@@ -116,11 +122,11 @@
if(!$query)
{
- $sql_query = 'select * from phpgw_comic_data
'.$ordermethod;
+ $sql_query = 'SELECT * FROM phpgw_comic_data
'.$ordermethod;
}
else
{
- $sql_query = 'select * from phpgw_comic_data WHERE
'.$qfield.' '.$likeness." '$myquery' ".$ordermethod;
+ $sql_query = 'SELECT * FROM phpgw_comic_data WHERE
'.$qfield.' '.$likeness." '$myquery' ".$ordermethod;
}
$GLOBALS['phpgw']->db->limit_query($sql_query,intval($start),__LINE__,__FILE__);
@@ -233,13 +239,14 @@
$comic_name = '';
- if($con!='')
+ if( intval($con) )
{
- $GLOBALS['phpgw']->db->query('select * from
phpgw_comic_data where data_id='.$con);
+ $GLOBALS['phpgw']->db->query('SELECT * FROM
phpgw_comic_data '
+ . ' WHERE data_id=' .
intval($con), __LINE__, __FILE__ );
$GLOBALS['phpgw']->db->next_record();
- $comic_name = $GLOBALS['phpgw']->db->f('data_title');
+ $comic_name = $GLOBALS['phpgw']->db->f('data_title',
True);
}
$modify_tpl =
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('comic'));
@@ -248,17 +255,17 @@
$modify_tpl->set_var(
Array(
- 'bg_color' => $bg_color,
- 'comic_id' => $con,
- 'comic_label' => lang('Title'),
- 'comic_name' => $comic_name,
- 'action_url' => $action_url,
- 'action_label' => lang($act),
- 'reset_label' => lang('Reset')
+ 'bg_color' => $bg_color,
+ 'data_id' => $con,
+ 'comic_label' => lang('Title'),
+ 'comic_name' => $comic_name,
+ 'action_url' => $action_url,
+ 'action_label' => lang($act),
+ 'reset_label' => lang('Reset')
)
);
$modify_tpl->parse(form_part, 'form');
$form_c = $modify_tpl->get('form_part');
-}
+ }
?>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] comic/inc/comic_data.inc.php, 1.1.4.2.2.1,
nomail <=