extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

update cats

Browse Source
This commit is contained in:
ceb 2002-09-04 01:58:34 +00:00
parent 3a987d2164
commit aacd03d33f
6 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/inc/class.bocategories.inc.php
View File

@ -40,14 +40,14 @@
$this->read_sessiondata(); $this->read_sessiondata();
/* _debug_array($GLOBALS['HTTP_POST_VARS']); */ /* _debug_array($GLOBALS['HTTP_POST_VARS']); */
/* Might change this to '' at the end---> */
$start = $GLOBALS['HTTP_POST_VARS']['start'] ? $GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
$query = $GLOBALS['HTTP_POST_VARS']['query'] ? $GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
$sort = $GLOBALS['HTTP_POST_VARS']['sort'] ? $GLOBALS['HTTP_POST_VARS']['sort'] : $GLOBALS['HTTP_GET_VARS']['sort'];
$order = $GLOBALS['HTTP_POST_VARS']['order'] ? $GLOBALS['HTTP_POST_VARS']['order'] : $GLOBALS['HTTP_GET_VARS']['order'];
$cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ? $GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id'];
if(!empty($start) || $start == '0' || $start == 0) $start = intval(get_var('start',array('POST','GET')));
$query = get_var('query',array('POST','GET'));
$sort = get_var('sort',array('POST','GET'));
$order = get_var('order',array('POST','GET'));
$cat_id = intval(get_var('cat_id', array('POST','GET')));
if(!empty($start) || $start == 0)
{ {
if($this->debug) { echo '<br>overriding start: "' . $this->start . '" now "' . $start . '"'; } if($this->debug) { echo '<br>overriding start: "' . $this->start . '" now "' . $start . '"'; }
$this->start = $start; $this->start = $start;
@ -62,14 +62,17 @@
{ {
$this->cat_id = $cat_id; $this->cat_id = $cat_id;
} }
if($cat_id == '0' || $cat_id == 0 || $cat_id == '')
if($cat_id == 0)
{ {
unset($this->cat_id); unset($this->cat_id);
} }
if(isset($sort) && !empty($sort)) if(isset($sort) && !empty($sort))
{ {
$this->sort = $sort; $this->sort = $sort;
} }
if(isset($order) && !empty($order)) if(isset($order) && !empty($order))
{ {
$this->order = $order; $this->order = $order;
@ -125,8 +128,6 @@
function exists($data) function exists($data)
{ {
//$data['type'] = $data['type'] ? $data['type'] : '';
//$data['cat_id'] = $data['cat_id'] ? $data['cat_id'] : '';
return $this->cats->exists($data); return $this->cats->exists($data);
} }
@ -142,7 +143,7 @@
} }
} }
function delete($cat_id,$drop_subs=False,$modify_subs=True) function delete($cat_id,$drop_subs,$modify_subs)
{ {
$this->cats->delete($cat_id,$drop_subs,$modify_subs); $this->cats->delete($cat_id,$drop_subs,$modify_subs);
} }

8
admin/inc/class.uicategories.inc.php
View File

@ -474,7 +474,7 @@
} }
else else
{ {
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this category ?')); $GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this global category ?'));
$exists = $this->bo->exists(array $exists = $this->bo->exists(array
( (
@ -488,12 +488,6 @@
$sub_select = '<input type="radio" name="subs" value="move">' . lang('Do you want to move all global subcategories one level down ?') . '<br>'; $sub_select = '<input type="radio" name="subs" value="move">' . lang('Do you want to move all global subcategories one level down ?') . '<br>';
$sub_select .= '<input type="radio" name="subs" value="drop">' . lang('Do you want to delete all global subcategories ?'); $sub_select .= '<input type="radio" name="subs" value="drop">' . lang('Do you want to delete all global subcategories ?');
$GLOBALS['phpgw']->template->set_var('sub_select',$sub_select); $GLOBALS['phpgw']->template->set_var('sub_select',$sub_select);
/* $GLOBALS['phpgw']->template->set_var('lang_drop_subs',lang('Do you also want to delete all global subcategories ?'));
$GLOBALS['phpgw']->template->set_var('drop_subs','<input type="checkbox" name="drop_subs" value="True">');
$GLOBALS['phpgw']->template->set_var('lang_modify_subs',lang('Do you want to move all global subcategories one level down ?'));
$GLOBALS['phpgw']->template->set_var('subs','<input type="checkbox" name="modify_subs" value="True">'); */
} }
$GLOBALS['phpgw']->template->set_var('nolink',$nolink); $GLOBALS['phpgw']->template->set_var('nolink',$nolink);

5
admin/setup/phpgw_de.lang
View File

@ -18,13 +18,14 @@ application title admin de Titel der Anwendung
applications admin de Anwendungen applications admin de Anwendungen
are you sure you want to delete this account ? admin de Sind Sie sicher, daß Sie dieses Konto löschen wollen ? are you sure you want to delete this account ? admin de Sind Sie sicher, daß Sie dieses Konto löschen wollen ?
are you sure you want to delete this application ? admin de Sind Sie sicher, daß Sie diese Anwendung löschen wollen ? are you sure you want to delete this application ? admin de Sind Sie sicher, daß Sie diese Anwendung löschen wollen ?
are you sure you want to delete this category ? common de Sind Sie sicher, da&szlig; Sie diese Kategorie l&ouml;schen wollen ? are you sure you want to delete this global category ? common de Sind Sie sicher, da&szlig; Sie diese globale Kategorie l&ouml;schen wollen ?
are you sure you want to delete this group ? admin de Sind Sie sicher, daß Sie diese Gruppe löschen wollen ? are you sure you want to delete this group ? admin de Sind Sie sicher, daß Sie diese Gruppe löschen wollen ?
are you sure you want to kill this session ? admin de Sind Sie sicher, daß Sie diese Session killen wollen ? are you sure you want to kill this session ? admin de Sind Sie sicher, daß Sie diese Session killen wollen ?
change main screen message admin de Nachricht der Startseite ändern change main screen message admin de Nachricht der Startseite ändern
create group admin de Erstelle Gruppe create group admin de Erstelle Gruppe
display admin de Bezeichnung display admin de Bezeichnung
do you also want to delete all global subcategories ? admin de wollen Sie auch alle globalen Unterkategorien l&ouml;schen ? do you want to delete all global subcategories ? admin de Wollen Sie alle globalen Unterkategorien l&ouml;schen ?
do you want to move all global subcategories one level down ? admin de Wollen Sie alle globalen Unterkategorien einen Level nach unten verschieben ?
edit application admin de Anwendung bearbeiten edit application admin de Anwendung bearbeiten
edit global category admin de Globale Kategorie bearbeiten edit global category admin de Globale Kategorie bearbeiten
edit global category for x admin de Globale Kategorie f&uuml;r %1 bearbeiten edit global category for x admin de Globale Kategorie f&uuml;r %1 bearbeiten

5
admin/setup/phpgw_en.lang
View File

@ -27,7 +27,7 @@ applications admin en Applications
application title admin en Application title application title admin en Application title
are you sure you want to delete this account ? admin en Are you sure you want to delete this account ? are you sure you want to delete this account ? admin en Are you sure you want to delete this account ?
are you sure you want to delete this application ? admin en Are you sure you want to delete this application ? are you sure you want to delete this application ? admin en Are you sure you want to delete this application ?
are you sure you want to delete this category ? common en Are you sure you want to delete this category ? are you sure you want to delete this global category ? common en Are you sure you want to delete this global category ?
are you sure you want to delete this group ? admin en Are you sure you want to delete this group ? are you sure you want to delete this group ? admin en Are you sure you want to delete this group ?
are you sure you want to delete this server? admin en Are you sure you want to delete this server? are you sure you want to delete this server? admin en Are you sure you want to delete this server?
are you sure you want to kill this session ? admin en Are you sure you want to kill this session ? are you sure you want to kill this session ? admin en Are you sure you want to kill this session ?
@ -57,7 +57,8 @@ deny access to site configuration admin en Deny access to site configuration
deny access to user accounts admin en Deny access to user accounts deny access to user accounts admin en Deny access to user accounts
deny all users access to grant other users access to their entries ? admin en Deny all users access to grant other users access to their entries ? deny all users access to grant other users access to their entries ? admin en Deny all users access to grant other users access to their entries ?
display admin en Display display admin en Display
do you also want to delete all global subcategories ? admin en Do you also want to delete all global subcategories ? do you want to delete all global subcategories ? admin en Do you want to delete all global subcategories ?
do you want to move all global subcategories one level down ? admin en Do you want to move all global subcategories one level down ?
edit application admin en Edit application edit application admin en Edit application
edit global category admin en Edit global category edit global category admin en Edit global category
edit global category for x admin en Edit global category for %1 edit global category for x admin en Edit global category for %1

10
admin/templates/default/delete_cat.tpl
View File

@ -3,21 +3,17 @@
<!-- BEGIN form --> <!-- BEGIN form -->
<center> <center>
{error_msg}
<table border="0" width="65%" cellpadding="2" cellspacing="2"> <table border="0" width="65%" cellpadding="2" cellspacing="2">
<form method="POST" action="{action_url}">
<tr> <tr>
<td align="center" colspan=2>{messages}</td> <td align="center" colspan=2>{messages}</td>
</tr> </tr>
<tr> <tr>
<td align="center">{lang_modify_subs}</td> <td align="center">{sub_select}</td>
<td align="center">{modify_subs}</td>
</tr>
<tr>
<td align="center">{lang_drop_subs}</td>
<td align="center">{drop_subs}</td>
</tr> </tr>
<tr> <tr>
<td align="center"> <td align="center">
<form method="POST" action="{action_url}">
<input type="submit" name="confirm" value="{lang_yes}"></td> <input type="submit" name="confirm" value="{lang_yes}"></td>
</form> </form>
</td> </td>

2
phpgwapi/inc/class.categories.inc.php
View File

@ -538,7 +538,7 @@
if ($cats[$i]['level'] == 1) if ($cats[$i]['level'] == 1)
{ {
$this->db->query("UPDATE phpgw_categories set cat_level=0, cat_parent=0, cat_main='" . intval($cats[$i]['id']) $this->db->query("UPDATE phpgw_categories set cat_level=0, cat_parent=0, cat_main='" . intval($cats[$i]['id'])
. " WHERE cat_id='" . intval($cats[$i]['id']) . "' AND cat_appname='" . $this->app_name . "'",__LINE__,__FILE__); . "' WHERE cat_id='" . intval($cats[$i]['id']) . "' AND cat_appname='" . $this->app_name . "'",__LINE__,__FILE__);
$new_main = $cats[$i]['id']; $new_main = $cats[$i]['id'];
} }
else else