formatting

This commit is contained in:
bettina 2001-05-15 00:00:49 +00:00
parent c8f940a8ee
commit b1fadc4908

View File

@ -267,7 +267,6 @@
for ($i=0;$i<count($cats);$i++) for ($i=0;$i<count($cats);$i++)
{ {
$image_set = '&nbsp;'; $image_set = '&nbsp;';
if ($cats[$i]['id'] == $selected) if ($cats[$i]['id'] == $selected)
@ -287,9 +286,7 @@
$s .= '<td>' . $space_set . '<a href="' . $phpgw->link($site_link,'cat_id=' . $cats[$i]['id']) . '">' . $phpgw->strip_html($cats[$i]['name']) . '</a></td>' . "\n"; $s .= '<td>' . $space_set . '<a href="' . $phpgw->link($site_link,'cat_id=' . $cats[$i]['id']) . '">' . $phpgw->strip_html($cats[$i]['name']) . '</a></td>' . "\n";
$s .= '</tr>' . "\n"; $s .= '</tr>' . "\n";
} }
$s .= '</table>' . "\n"; $s .= '</table>' . "\n";
return $s; return $s;
} }
} }
@ -337,7 +334,6 @@
$this->db->query("update phpgw_categories set cat_main='" . $this->db2->f('max') . "' where cat_id='" $this->db->query("update phpgw_categories set cat_main='" . $this->db2->f('max') . "' where cat_id='"
. $this->db2->f('max') . "'",__LINE__,__FILE__); . $this->db2->f('max') . "'",__LINE__,__FILE__);
} }
} }
/*! /*!
@function delete @function delete
@ -346,7 +342,6 @@
*/ */
function delete($cat_id,$subs = 'False') function delete($cat_id,$subs = 'False')
{ {
if ($subs == 'True') if ($subs == 'True')
{ {
$subdelete = " OR cat_parent='$cat_id'"; $subdelete = " OR cat_parent='$cat_id'";
@ -365,7 +360,6 @@
*/ */
function edit($cat_id,$cat_parent,$cat_name,$cat_description = '',$cat_data = '',$cat_access = '',$cat_main) function edit($cat_id,$cat_parent,$cat_name,$cat_description = '',$cat_data = '',$cat_access = '',$cat_main)
{ {
if ($cat_parent && (!$cat_main)) if ($cat_parent && (!$cat_main))
{ {
$cat_main = $cat_parent; $cat_main = $cat_parent;
@ -393,7 +387,6 @@
. "cat_description='" . addslashes($cat_description) . "', cat_data='" . "cat_description='" . addslashes($cat_description) . "', cat_data='"
. "$cat_data', cat_parent='$cat_parent', cat_access='$cat_access', cat_main='$cat_id', cat_level='$cat_level' " . "$cat_data', cat_parent='$cat_parent', cat_access='$cat_access', cat_main='$cat_id', cat_level='$cat_level' "
. "where cat_appname='" . $this->app_name . "' and cat_id='$cat_id'",__LINE__,__FILE__); . "where cat_appname='" . $this->app_name . "' and cat_id='$cat_id'",__LINE__,__FILE__);
} }
} }
@ -449,10 +442,12 @@
{ {
$cat_exists = " cat_name='" . addslashes($cat_name) . "' "; $cat_exists = " cat_name='" . addslashes($cat_name) . "' ";
} }
if ($cat_id) if ($cat_id)
{ {
$cat_exists = " cat_parent='$cat_id' "; $cat_exists = " cat_parent='$cat_id' ";
} }
if ($cat_name && $cat_id) if ($cat_name && $cat_id)
{ {
$cat_exists = " cat_name='" . addslashes($cat_name) . "' AND cat_id != '$cat_id' "; $cat_exists = " cat_name='" . addslashes($cat_name) . "' AND cat_id != '$cat_id' ";
@ -474,7 +469,6 @@
function return_main($cat_id = '') function return_main($cat_id = '')
{ {
$this->db->query("select cat_main from phpgw_categories where cat_id='$cat_id'",__LINE__,__FILE__); $this->db->query("select cat_main from phpgw_categories where cat_id='$cat_id'",__LINE__,__FILE__);
$this->db->next_record(); $this->db->next_record();