extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 08:39:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup select and insert from integer fields which had quotes around them.

Browse Source
This commit is contained in:
Miles Lott 2004-02-09 20:18:21 +00:00
parent ca65786ae9
commit 50586e085c
2 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
phpgwapi/inc/class.contacts_ldap.inc.php
View File

@ -3,9 +3,9 @@
* phpGroupWare API - Accounts manager for LDAP * * phpGroupWare API - Accounts manager for LDAP *
* This file written by Miles Lott <milosch@phpgroupware.org> * * This file written by Miles Lott <milosch@phpgroupware.org> *
* View and manipulate contact records using LDAP * * View and manipulate contact records using LDAP *
* -------------------------------------------------------------------------* * ------------------------------------------------------------------------ *
* This library is part of the phpGroupWare API * * This library is part of the phpGroupWare API *
* http://www.phpgroupware.org/api * * http://www.phpgroupware.org/api *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it * * This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by * * under the terms of the GNU Lesser General Public License as published by *
@ -67,16 +67,16 @@
'title' => 'title', 'title' => 'title',
'adr_one_street' => 'street', 'adr_one_street' => 'street',
'adr_one_locality' => 'l', 'adr_one_locality' => 'l',
'adr_one_region' => 'st', 'adr_one_region' => 'st',
'adr_one_postalcode' => 'postalcode', 'adr_one_postalcode' => 'postalcode',
'adr_one_countryname' => 'co', 'adr_one_countryname' => 'co',
'adr_one_type' => 'phpgwadronetype', 'adr_one_type' => 'phpgwadronetype',
'label' => 'phpgwaddresslabel', 'label' => 'phpgwaddresslabel',
'adr_two_street' => 'phpgwadrtwostreet', 'adr_two_street' => 'phpgwadrtwostreet',
'adr_two_locality' => 'phpgwadrtwolocality', 'adr_two_locality' => 'phpgwadrtwolocality',
'adr_two_region' => 'phpgwadrtworegion', 'adr_two_region' => 'phpgwadrtworegion',
'adr_two_postalcode' => 'phpgwadrtwopostalcode', 'adr_two_postalcode' => 'phpgwadrtwopostalcode',
'adr_two_countryname' => 'phpgwadrtwocountryname', 'adr_two_countryname' => 'phpgwadrtwocountryname',
'adr_two_type' => 'phpgwadrtwotype', 'adr_two_type' => 'phpgwadrtwotype',
@ -84,7 +84,7 @@
'tel_work' => 'telephonenumber', 'tel_work' => 'telephonenumber',
'tel_home' => 'homephone', 'tel_home' => 'homephone',
'tel_voice' => 'phpgwvoicetelephonenumber', 'tel_voice' => 'phpgwvoicetelephonenumber',
'tel_fax' => 'facsimiletelephonenumber', 'tel_fax' => 'facsimiletelephonenumber',
'tel_msg' => 'phpgwmsgtelephonenumber', 'tel_msg' => 'phpgwmsgtelephonenumber',
'tel_cell' => 'phpgwcelltelephonenumber', 'tel_cell' => 'phpgwcelltelephonenumber',
'tel_pager' => 'phpgwpagertelephonenumber', 'tel_pager' => 'phpgwpagertelephonenumber',
@ -185,7 +185,7 @@
} }
} }
$sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id); $sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber=' . (int)$id);
$ldap_fields = ldap_get_entries($this->ldap, $sri); $ldap_fields = ldap_get_entries($this->ldap, $sri);
$return_fields[0]['id'] = $ldap_fields[0]['uidnumber'][0]; $return_fields[0]['id'] = $ldap_fields[0]['uidnumber'][0];
@ -221,7 +221,8 @@
} }
} }
$this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id='" . $id . "'",__LINE__,__FILE__); $this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id='"
. (int)$id . "'",__LINE__,__FILE__);
while($this->db->next_record()) while($this->db->next_record())
{ {
if($extra_fields[$this->db->f('contact_name')]) if($extra_fields[$this->db->f('contact_name')])
@ -250,9 +251,12 @@
} }
$id = $this->nextid; $id = $this->nextid;
if ($id == -1) { $id = 1; } if($id == -1)
{
$id = 1;
}
$sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id); $sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber=' . (int)$id);
$ldap_fields = ldap_get_entries($this->ldap, $sri); $ldap_fields = ldap_get_entries($this->ldap, $sri);
$return_fields[0]['id'] = $ldap_fields[0]['uidnumber'][0]; $return_fields[0]['id'] = $ldap_fields[0]['uidnumber'][0];
@ -289,7 +293,7 @@
} }
} }
$this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id='" . $id . "'",__LINE__,__FILE__); $this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id='" . (int)$id . "'",__LINE__,__FILE__);
while($this->db->next_record()) while($this->db->next_record())
{ {
if($extra_fields[$this->db->f('contact_name')]) if($extra_fields[$this->db->f('contact_name')])
@ -412,7 +416,7 @@
// this was very slow // this was very slow
#reset($this->stock_contact_fields); #reset($this->stock_contact_fields);
#$myfilter = $this->makefilter($filterfields,$this->stock_contact_fields,$query,$DEBUG); #$myfilter = $this->makefilter($filterfields,$this->stock_contact_fields,$query,$DEBUG);
// don't search about any fields any more // don't search about any fields any more
$search_filter = array( $search_filter = array(
'fn' => 'cn', 'fn' => 'cn',
@ -758,7 +762,7 @@
function field_exists($id,$field_name) function field_exists($id,$field_name)
{ {
$this->db->query("select count(*) from $this->ext_table where contact_id='$id' and contact_name='" $this->db->query("SELECT COUNT(*) FROM $this->ext_table where contact_id='" . (int)$id . "' AND contact_name='"
. addslashes($field_name) . "'",__LINE__,__FILE__); . addslashes($field_name) . "'",__LINE__,__FILE__);
$this->db->next_record(); $this->db->next_record();
return $this->db->f(0); return $this->db->f(0);
@ -766,14 +770,14 @@
function add_single_extra_field($id,$owner,$field_name,$field_value) function add_single_extra_field($id,$owner,$field_name,$field_value)
{ {
$this->db->query("insert into $this->ext_table values ($id,'$owner','" . addslashes($field_name) $this->db->query("INSERT INTO $this->ext_table VALUES (" . (int)$id . ",'$owner','" . addslashes($field_name)
. "','" . addslashes($field_value) . "')",__LINE__,__FILE__); . "','" . addslashes($field_value) . "')",__LINE__,__FILE__);
} }
function delete_single_extra_field($id,$field_name) function delete_single_extra_field($id,$field_name)
{ {
$this->db->query("delete from $this->ext_table where contact_id='$id' and contact_name='" $this->db->query("DELETE FROM $this->ext_table WHERE contact_id='" . (int)$id . "' AND contact_name='"
. addslashes($field_name) . "'",__LINE__,__FILE__); . addslashes($field_name) . "'",__LINE__,__FILE__);
} }
function update($id,$owner,$fields,$access='private',$cat_id='0',$tid='n') function update($id,$owner,$fields,$access='private',$cat_id='0',$tid='n')
@ -786,7 +790,7 @@
} }
/* First make sure that id number exists */ /* First make sure that id number exists */
$sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber='.$id); $sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'uidnumber=' . (int)$id);
$ldap_fields = ldap_get_entries($this->ldap, $sri); $ldap_fields = ldap_get_entries($this->ldap, $sri);
if ($ldap_fields[0]['dn']) if ($ldap_fields[0]['dn'])
@ -927,7 +931,7 @@
{ {
$this->db->query("UPDATE $this->ext_table SET contact_value='" . addslashes($x_value) $this->db->query("UPDATE $this->ext_table SET contact_value='" . addslashes($x_value)
. "',contact_owner='$owner' WHERE contact_name='" . addslashes($x_name) . "',contact_owner='$owner' WHERE contact_name='" . addslashes($x_name)
. "' AND contact_id='$id'",__LINE__,__FILE__); . "' AND contact_id='" . (int)$id . "'",__LINE__,__FILE__);
} }
} }
else else
@ -978,7 +982,7 @@
{ {
$err = ldap_delete($this->ldap,$ldap_fields[0]['dn']); $err = ldap_delete($this->ldap,$ldap_fields[0]['dn']);
$this->db->query("DELETE FROM $this->ext_table WHERE contact_id='$id' AND contact_owner='" $this->db->query("DELETE FROM $this->ext_table WHERE contact_id='" . (int)$id . "' AND contact_owner='"
. $this->account_id . "'",__LINE__,__FILE__); . $this->account_id . "'",__LINE__,__FILE__);
} }
else else

48
phpgwapi/inc/class.contacts_sql.inc.php
View File

@ -5,9 +5,9 @@
* and Miles Lott <milosch@phpgroupware.org> * * and Miles Lott <milosch@phpgroupware.org> *
* View and manipulate contact records using SQL * * View and manipulate contact records using SQL *
* Copyright (C) 2001 Joseph Engo * * Copyright (C) 2001 Joseph Engo *
* -------------------------------------------------------------------------* * ------------------------------------------------------------------------ *
* This library is part of the phpGroupWare API * * This library is part of the phpGroupWare API *
* http://www.phpgroupware.org/api * * http://www.phpgroupware.org/api *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it * * This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by * * under the terms of the GNU Lesser General Public License as published by *
@ -63,22 +63,22 @@
'org_unit' => 'org_unit', 'org_unit' => 'org_unit',
'title' => 'title', 'title' => 'title',
'adr_one_street' => 'adr_one_street', 'adr_one_street' => 'adr_one_street',
'adr_one_locality' => 'adr_one_locality', 'adr_one_locality' => 'adr_one_locality',
'adr_one_region' => 'adr_one_region', 'adr_one_region' => 'adr_one_region',
'adr_one_postalcode' => 'adr_one_postalcode', 'adr_one_postalcode' => 'adr_one_postalcode',
'adr_one_countryname' => 'adr_one_countryname', 'adr_one_countryname' => 'adr_one_countryname',
'adr_one_type' => 'adr_one_type', 'adr_one_type' => 'adr_one_type',
'label' => 'label', 'label' => 'label',
'adr_two_street' => 'adr_two_street', 'adr_two_street' => 'adr_two_street',
'adr_two_locality' => 'adr_two_locality', 'adr_two_locality' => 'adr_two_locality',
'adr_two_region' => 'adr_two_region', 'adr_two_region' => 'adr_two_region',
'adr_two_postalcode' => 'adr_two_postalcode', 'adr_two_postalcode' => 'adr_two_postalcode',
'adr_two_countryname' => 'adr_two_countryname', 'adr_two_countryname' => 'adr_two_countryname',
'adr_two_type' => 'adr_two_type', 'adr_two_type' => 'adr_two_type',
'tel_work' => 'tel_work', 'tel_work' => 'tel_work',
'tel_home' => 'tel_home', 'tel_home' => 'tel_home',
'tel_voice' => 'tel_voice', 'tel_voice' => 'tel_voice',
'tel_fax' => 'tel_fax', 'tel_fax' => 'tel_fax',
'tel_msg' => 'tel_msg', 'tel_msg' => 'tel_msg',
'tel_cell' => 'tel_cell', 'tel_cell' => 'tel_cell',
'tel_pager' => 'tel_pager', 'tel_pager' => 'tel_pager',
@ -179,7 +179,7 @@
} }
} }
$this->db->query("SELECT id,lid,tid,owner,access,cat_id $t_fields FROM $this->std_table WHERE id='". (int)$id . "'"); $this->db->query("SELECT id,lid,tid,owner,access,cat_id $t_fields FROM $this->std_table WHERE id=" . (int)$id);
$this->db->next_record(); $this->db->next_record();
$return_fields[0]['id'] = $this->db->f('id'); $return_fields[0]['id'] = $this->db->f('id');
@ -216,7 +216,7 @@
} }
} }
$this->db->query("SELECT contact_name,contact_value FROM $this->ext_table where contact_id='" . (int)$this->db->f('id') . "'",__LINE__,__FILE__); $this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id=" . (int)$this->db->f('id'),__LINE__,__FILE__);
while ($this->db->next_record()) while ($this->db->next_record())
{ {
if ($extra_fields[$this->db->f('contact_name')]) if ($extra_fields[$this->db->f('contact_name')])
@ -247,7 +247,7 @@
$id = $this->db->f(0); $id = $this->db->f(0);
$this->db->query("SELECT id,lid,tid,owner,access,cat_id $t_fields FROM $this->std_table WHERE id='" . (int)$id . "'",__LINE__,__FILE__); $this->db->query("SELECT id,lid,tid,owner,access,cat_id $t_fields FROM $this->std_table WHERE id=" . (int)$id,__LINE__,__FILE__);
$this->db->next_record(); $this->db->next_record();
$return_fields[0]['id'] = $this->db->f('id'); $return_fields[0]['id'] = $this->db->f('id');
@ -284,7 +284,7 @@
} }
} }
$this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id='" . $this->db->f('id') . "'",__LINE__,__FILE__); $this->db->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id=" . (int)$this->db->f('id'),__LINE__,__FILE__);
while ($this->db->next_record()) while ($this->db->next_record())
{ {
if ($extra_fields[$this->db->f('contact_name')]) if ($extra_fields[$this->db->f('contact_name')])
@ -394,7 +394,7 @@
} }
$filterlist = substr($filterlist,0,-1); $filterlist = substr($filterlist,0,-1);
$filterlist = str_replace(';',' AND ',$filterlist); $filterlist = str_replace(';',' AND ',$filterlist);
if ($DEBUG) if ($DEBUG)
{ {
echo '<br>DEBUG - Filter output string: #'.$filterlist.'#'; echo '<br>DEBUG - Filter output string: #'.$filterlist.'#';
@ -470,7 +470,7 @@
{ {
echo "<br>DEBUG - $ordermethod"; echo "<br>DEBUG - $ordermethod";
} }
if($lastmod >= 0 && $fwhere) if($lastmod >= 0 && $fwhere)
{ {
$fwhere .= " AND last_mod > $lastmod "; $fwhere .= " AND last_mod > $lastmod ";
@ -518,7 +518,7 @@
$sqlcount .= " UPPER($f) LIKE UPPER('%$query%') OR "; $sqlcount .= " UPPER($f) LIKE UPPER('%$query%') OR ";
} }
$sql = substr($sql,0,-3) . ') ' . $fand . $filtermethod . $ordermethod; $sql = substr($sql,0,-3) . ') ' . $fand . $filtermethod . $ordermethod;
$sqlcount = substr($sqlcount,0,-3) . ') ' . $fand . $filtermethod; $sqlcount = substr($sqlcount,0,-3) . ') ' . $fand . $filtermethod;
unset($f); unset($x); unset($f); unset($x);
} }
else else
@ -583,8 +583,8 @@
} }
reset($stock_fieldnames); reset($stock_fieldnames);
} }
$db2->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id='" $db2->query("SELECT contact_name,contact_value FROM $this->ext_table WHERE contact_id="
. $this->db->f('id') . "'" .$filterextra,__LINE__,__FILE__); . (int)$this->db->f('id') . $filterextra,__LINE__,__FILE__);
while($db2->next_record()) while($db2->next_record())
{ {
if($extra_fields[$db2->f('contact_name')]) if($extra_fields[$db2->f('contact_name')])
@ -622,7 +622,7 @@
list($stock_fields,$stock_fieldnames,$extra_fields) = $this->split_stock_and_extras($fields); list($stock_fields,$stock_fieldnames,$extra_fields) = $this->split_stock_and_extras($fields);
//this is added here so it is never tainted //this is added here so it is never tainted
$this->stock_contact_fields['last_mod'] = 'last_mod'; $this->stock_contact_fields['last_mod'] = 'last_mod';
$stock_fields['last_mod'] = $GLOBALS['phpgw']->datetime->gmtnow; $stock_fields['last_mod'] = $GLOBALS['phpgw']->datetime->gmtnow;
$sql = 'INSERT INTO ' . $this->std_table . " (owner,access,cat_id,tid," . $lid[0] $sql = 'INSERT INTO ' . $this->std_table . " (owner,access,cat_id,tid," . $lid[0]
@ -638,7 +638,7 @@
{ {
foreach($extra_fields as $name => $value) foreach($extra_fields as $name => $value)
{ {
$this->db->query("INSERT INTO $this->ext_table VALUES ('$id','" . $owner . "','" $this->db->query("INSERT INTO $this->ext_table VALUES (" . (int)$id . ",'" . $owner . "','"
. $this->db->db_addslashes($name) . "','" . $this->db->db_addslashes($value) . "')",__LINE__,__FILE__); . $this->db->db_addslashes($name) . "','" . $this->db->db_addslashes($value) . "')",__LINE__,__FILE__);
} }
} }
@ -647,7 +647,7 @@
function field_exists($id,$field_name) function field_exists($id,$field_name)
{ {
$this->db->query("SELECT COUNT(*) FROM $this->ext_table WHERE contact_id='$id' AND contact_name='" $this->db->query("SELECT COUNT(*) FROM $this->ext_table WHERE contact_id=" . (int)$id . " AND contact_name='"
. $this->db->db_addslashes($field_name) . "'",__LINE__,__FILE__); . $this->db->db_addslashes($field_name) . "'",__LINE__,__FILE__);
$this->db->next_record(); $this->db->next_record();
return $this->db->f(0); return $this->db->f(0);
@ -655,13 +655,13 @@
function add_single_extra_field($id,$owner,$field_name,$field_value) function add_single_extra_field($id,$owner,$field_name,$field_value)
{ {
$this->db->query("INSERT INTO $this->ext_table VALUES ($id,'$owner','" . $this->db->db_addslashes($field_name) $this->db->query("INSERT INTO $this->ext_table VALUES (" . (int)$id . ",'$owner','" . $this->db->db_addslashes($field_name)
. "','" . $this->db->db_addslashes($field_value) . "')",__LINE__,__FILE__); . "','" . $this->db->db_addslashes($field_value) . "')",__LINE__,__FILE__);
} }
function delete_single_extra_field($id,$field_name) function delete_single_extra_field($id,$field_name)
{ {
$this->db->query("DELETE FROM $this->ext_table WHERE contact_id='$id' AND contact_name='" $this->db->query("DELETE FROM $this->ext_table WHERE contact_id=" . (int)$id . " AND contact_name='"
. $this->db->db_addslashes($field_name) . "'",__LINE__,__FILE__); . $this->db->db_addslashes($field_name) . "'",__LINE__,__FILE__);
} }
@ -718,7 +718,7 @@
{ {
$this->db->query("UPDATE $this->ext_table SET contact_value='" . $this->db->db_addslashes($x_value) $this->db->query("UPDATE $this->ext_table SET contact_value='" . $this->db->db_addslashes($x_value)
. "',contact_owner=$owner WHERE contact_name='" . $this->db->db_addslashes($x_name) . "',contact_owner=$owner WHERE contact_name='" . $this->db->db_addslashes($x_name)
. "' AND contact_id=$id",__LINE__,__FILE__); . "' AND contact_id=" . (int)$id,__LINE__,__FILE__);
} }
} }
elseif($x_value) // dont write emtpy extra-fields elseif($x_value) // dont write emtpy extra-fields
@ -745,8 +745,8 @@
/* This is where the real work of delete() is done, shared class file contains calling function */ /* This is where the real work of delete() is done, shared class file contains calling function */
function delete_($id) function delete_($id)
{ {
$this->db->query("DELETE FROM $this->std_table WHERE id='$id'",__LINE__,__FILE__); $this->db->query("DELETE FROM $this->std_table WHERE id=" . (int)$id,__LINE__,__FILE__);
$this->db->query("DELETE FROM $this->ext_table WHERE contact_id='$id'",__LINE__,__FILE__); $this->db->query("DELETE FROM $this->ext_table WHERE contact_id=" . (int)$id,__LINE__,__FILE__);
} }
/* This is for the admin script deleteaccount.php */ /* This is for the admin script deleteaccount.php */