diff --git a/admin/addcategory.php b/admin/addcategory.php
index 4af9fad678..762baacf87 100644
--- a/admin/addcategory.php
+++ b/admin/addcategory.php
@@ -11,99 +11,99 @@
\**************************************************************************/
/* $Id$ */
- $phpgw_info['flags']['currentapp'] = 'admin';
- include('../header.inc.php');
+ $phpgw_info['flags']['currentapp'] = 'admin';
+ include('../header.inc.php');
- $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
- $t->set_file(array('form' => 'category_form.tpl'));
- $t->set_block('form','add','addhandle');
- $t->set_block('form','edit','edithandle');
+ $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+ $t->set_file(array('form' => 'category_form.tpl'));
+ $t->set_block('form','add','addhandle');
+ $t->set_block('form','edit','edithandle');
- $c = CreateObject('phpgwapi.categories');
- $c->app_name = 'phpgw';
+ $c = CreateObject('phpgwapi.categories');
+ $c->app_name = 'phpgw';
- if ($submit)
- {
- $errorcount = 0;
-
- if (!$cat_name)
+ if ($submit)
{
- $error[$errorcount++] = lang('Please enter a name for that category !');
+ $errorcount = 0;
+
+ if (!$cat_name)
+ {
+ $error[$errorcount++] = lang('Please enter a name for that category !');
+ }
+
+ if (!$error)
+ {
+ if (!$cat_parent)
+ {
+ $exists = $c->exists('appandmains',$cat_name,$cat_id='');
+ }
+ else
+ {
+ $exists = $c->exists('appandsubs',$cat_name,$cat_id='');
+ }
+
+ if ($exists == True)
+ {
+ $error[$errorcount++] = lang('That category name has been used already !');
+ }
+ }
+
+ if ($cat_main && $cat_parent)
+ {
+ $main = $c->return_main($cat_parent);
+ if ($main != $cat_main)
+ {
+ $error[$errorcount++] = lang('You selected an invalid main category !');
+ }
+ }
+
+ if (!$error)
+ {
+ $cat_name = addslashes($cat_name);
+ $cat_description = addslashes($cat_description);
+ $cat_access = 'public';
+
+ $c->add($cat_name,$cat_parent,$cat_description,$cat_data,$cat_access,$cat_main);
+ }
}
- if (!$error)
+ if ($errorcount)
{
- if (!$cat_parent)
- {
- $exists = $c->exists('appandmains',$cat_name,$cat_id='');
- }
- else
- {
- $exists = $c->exists('appandsubs',$cat_name,$cat_id='');
- }
-
- if ($exists == True)
- {
- $error[$errorcount++] = lang('That category name has been used already !');
- }
+ $t->set_var('message',$phpgw->common->error_list($error));
}
- if ($cat_main && $cat_parent)
+ if (($submit) && (! $error) && (! $errorcount))
{
- $main = $c->return_main($cat_parent);
- if ($main != $cat_main)
- {
- $error[$errorcount++] = lang('You selected an invalid main category !');
- }
+ $t->set_var('message',lang('Category x has been added !', $cat_name));
}
- if (!$error)
+ if ((! $submit) && (! $error) && (! $errorcount))
{
- $cat_name = addslashes($cat_name);
- $cat_description = addslashes($cat_description);
- $cat_access = 'public';
-
- $c->add($cat_name,$cat_parent,$cat_description,$cat_data,$cat_access,$cat_main);
+ $t->set_var('message','');
}
- }
- if ($errorcount)
- {
- $t->set_var('message',$phpgw->common->error_list($error));
- }
+ $t->set_var('title_categories',lang('Add global category'));
+ $t->set_var('actionurl',$phpgw->link('/admin/addcategory.php'));
+ $t->set_var('doneurl',$phpgw->link('/admin/categories.php'));
+ $t->set_var('hidden_vars','');
+ $t->set_var('lang_main',lang('Main category'));
+ $t->set_var('lang_new_main',lang('New main category'));
+ $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main));
+ $t->set_var('lang_parent',lang('Parent category'));
+ $t->set_var('lang_select_parent',lang('Select parent category'));
+ $t->set_var('category_list',$c->formated_list('select','all',$cat_parent));
+ $t->set_var('lang_name',lang('Category name'));
+ $t->set_var('lang_descr',lang('Category description'));
+ $t->set_var('cat_name',$cat_name);
+ $t->set_var('cat_description',$cat_description);
+ $t->set_var('lang_add',lang('Add'));
+ $t->set_var('lang_reset',lang('Clear Form'));
+ $t->set_var('lang_done',lang('Done'));
- if (($submit) && (! $error) && (! $errorcount))
- {
- $t->set_var('message',lang('Category x has been added !', $cat_name));
- }
+ $t->set_var('edithandle','');
+ $t->set_var('addhandle','');
+ $t->pparse('out','form');
+ $t->pparse('addhandle','add');
- if ((! $submit) && (! $error) && (! $errorcount))
- {
- $t->set_var('message','');
- }
-
- $t->set_var('title_categories',lang('Add global category'));
- $t->set_var('actionurl',$phpgw->link('/admin/addcategory.php'));
- $t->set_var('doneurl',$phpgw->link('/admin/categories.php'));
- $t->set_var('hidden_vars','');
- $t->set_var('lang_main',lang('Main category'));
- $t->set_var('lang_new_main',lang('New main category'));
- $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main));
- $t->set_var('lang_parent',lang('Parent category'));
- $t->set_var('lang_select_parent',lang('Select parent category'));
- $t->set_var('category_list',$c->formated_list('select','all',$cat_parent));
- $t->set_var('lang_name',lang('Category name'));
- $t->set_var('lang_descr',lang('Category description'));
- $t->set_var('cat_name',$cat_name);
- $t->set_var('cat_description',$cat_description);
- $t->set_var('lang_add',lang('Add'));
- $t->set_var('lang_reset',lang('Clear Form'));
- $t->set_var('lang_done',lang('Done'));
-
- $t->set_var('edithandle','');
- $t->set_var('addhandle','');
- $t->pparse('out','form');
- $t->pparse('addhandle','add');
-
- $phpgw->common->phpgw_footer();
+ $phpgw->common->phpgw_footer();
?>
diff --git a/admin/deletecategory.php b/admin/deletecategory.php
index ab33645663..615efe3904 100644
--- a/admin/deletecategory.php
+++ b/admin/deletecategory.php
@@ -11,94 +11,94 @@
\**************************************************************************/
/* $Id$ */
- if (! $cat_id)
- {
- Header('Location: ' . $phpgw->link('/admin/categories.php'));
- }
-
- if ($confirm)
- {
- $phpgw_info['flags'] = array('noheader' => True,
- 'nonavbar' => True);
- }
-
- $phpgw_info['flags']['currentapp'] = 'admin';
- include('../header.inc.php');
-
- $c = CreateObject('phpgwapi.categories');
- $c->app_name = 'phpgw';
-
- if ($confirm)
- {
- if ($subs)
+ if (! $cat_id)
{
- $c->delete($cat_id,'True');
+ Header('Location: ' . $phpgw->link('/admin/categories.php'));
+ }
+
+ if ($confirm)
+ {
+ $phpgw_info['flags'] = array('noheader' => True,
+ 'nonavbar' => True);
+ }
+
+ $phpgw_info['flags']['currentapp'] = 'admin';
+ include('../header.inc.php');
+
+ $c = CreateObject('phpgwapi.categories');
+ $c->app_name = 'phpgw';
+
+ if ($confirm)
+ {
+ if ($subs)
+ {
+ $c->delete($cat_id,'True');
+ }
+ else
+ {
+ $c->delete($cat_id);
+ }
+ Header('Location: ' . $phpgw->link('/admin/categories.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
}
else
{
- $c->delete($cat_id);
+ $hidden_vars = '' . "\n"
+ . '' . "\n"
+ . '' . "\n"
+ . '' . "\n"
+ . '' . "\n"
+ . '' . "\n";
+
+ $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+ $t->set_file(array('category_delete' => 'delete_cat.tpl'));
+ $t->set_block('category_delete','delete','deletehandle');
+ $t->set_block('category_delete','done','donehandle');
+
+ $nolink = $phpgw->link('/admin/categories.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter");
+
+ $apps_cats = $c->exists('subs',$cat_name='',$cat_id);
+
+ if ($apps_cats==True)
+ {
+ $t->set_var('messages',lang('This category is currently being used by applications as a parent category.
You will need to remove the subcategories before you can delete the parent category !'));
+ $t->set_var('hidden_vars',$hidden_vars);
+ $t->set_var('lang_subs','');
+ $t->set_var('subs','');
+ $t->set_var('nolink',$nolink);
+ $t->set_var('lang_done',lang('Done'));
+ $t->set_var('deletehandle','');
+ $t->set_var('donehandle','');
+ $t->pparse('out','category_delete');
+ $t->pparse('donehandle','done');
+ $phpgw->common->phpgw_footer();
+ }
+ else
+ {
+ $t->set_var('messages',lang('Are you sure you want to delete this category ?'));
+ $t->set_var('hidden_vars',$hidden_vars);
+
+ $exists = $c->exists('subs',$cat_name='',$cat_id);
+
+ if ($exists==True)
+ {
+ $t->set_var('lang_subs',lang('Do you also want to delete all global subcategories ?'));
+ $t->set_var('subs','');
+ }
+ else
+ {
+ $t->set_var('lang_subs','');
+ $t->set_var('subs', '');
+ }
+
+ $t->set_var('nolink',$nolink);
+ $t->set_var('lang_no',lang('No'));
+ $t->set_var('action_url',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id"));
+ $t->set_var('lang_yes',lang('Yes'));
+ $t->set_var('deletehandle','');
+ $t->set_var('donehandle','');
+ $t->pparse('out','category_delete');
+ $t->pparse('deletehandle','delete');
+ $phpgw->common->phpgw_footer();
+ }
}
- Header('Location: ' . $phpgw->link('/admin/categories.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
- }
- else
- {
- $hidden_vars = "\n"
- . "\n"
- . "\n"
- . "\n"
- . "\n"
- . "\n";
-
- $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
- $t->set_file(array('category_delete' => 'delete_cat.tpl'));
- $t->set_block('category_delete','delete','deletehandle');
- $t->set_block('category_delete','done','donehandle');
-
- $nolink = $phpgw->link('/admin/categories.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter");
-
- $apps_cats = $c->exists('subs',$cat_name='',$cat_id);
-
- if ($apps_cats==True)
- {
- $t->set_var('messages',lang('This category is currently being used by applications as a parent category.
You will need to remove the subcategories before you can delete the parent category !'));
- $t->set_var('hidden_vars',$hidden_vars);
- $t->set_var('lang_subs','');
- $t->set_var('subs','');
- $t->set_var('nolink',$nolink);
- $t->set_var('lang_done',lang('Done'));
- $t->set_var('deletehandle','');
- $t->set_var('donehandle','');
- $t->pparse('out','category_delete');
- $t->pparse('donehandle','done');
- $phpgw->common->phpgw_footer();
- }
- else
- {
- $t->set_var('messages',lang('Are you sure you want to delete this category ?'));
- $t->set_var('hidden_vars',$hidden_vars);
-
- $exists = $c->exists('subs',$cat_name='',$cat_id);
-
- if ($exists==True)
- {
- $t->set_var('lang_subs',lang('Do you also want to delete all global subcategories ?'));
- $t->set_var('subs','');
- }
- else
- {
- $t->set_var('lang_subs','');
- $t->set_var('subs', '');
- }
-
- $t->set_var('nolink',$nolink);
- $t->set_var('lang_no',lang('No'));
- $t->set_var('action_url',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id"));
- $t->set_var('lang_yes',lang('Yes'));
- $t->set_var('deletehandle','');
- $t->set_var('donehandle','');
- $t->pparse('out','category_delete');
- $t->pparse('deletehandle','delete');
- $phpgw->common->phpgw_footer();
- }
- }
?>
diff --git a/admin/editcategory.php b/admin/editcategory.php
index 63ee672c34..012df77dd9 100644
--- a/admin/editcategory.php
+++ b/admin/editcategory.php
@@ -11,117 +11,117 @@
\**************************************************************************/
/* $Id$ */
- if (! $cat_id)
- {
- Header('Location: ' . $phpgw->link('/admin/categories.php',"sort=$sort&order=$order&query=$query&start=$start"
- . "&filter=$filter"));
- }
-
- $phpgw_info['flags']['currentapp'] = 'admin';
- include('../header.inc.php');
-
- $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
- $t->set_file(array('form' => 'category_form.tpl'));
- $t->set_block('form','add','addhandle');
- $t->set_block('form','edit','edithandle');
-
- $c = CreateObject('phpgwapi.categories');
- $c->app_name = 'phpgw';
-
- $hidden_vars = "\n"
- . "\n"
- . "\n"
- . "\n"
- . "\n"
- . "\n";
-
- if ($submit)
- {
- $errorcount = 0;
-
- if (!$cat_name)
+ if (! $cat_id)
{
- $error[$errorcount++] = lang('Please enter a name for that category !');
+ Header('Location: ' . $phpgw->link('/admin/categories.php',"sort=$sort&order=$order&query=$query&start=$start"
+ . "&filter=$filter"));
}
- if (!$error)
- {
- if (!$cat_parent)
- {
- $exists = $c->exists('appandmains',$cat_name,$cat_id);
- }
- else
- {
- $exists = $c->exists('appandsubs',$cat_name,$cat_id);
- }
+ $phpgw_info['flags']['currentapp'] = 'admin';
+ include('../header.inc.php');
- if ($exists == True)
- {
- $error[$errorcount++] = lang('That category name has been used already !');
- }
+ $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
+ $t->set_file(array('form' => 'category_form.tpl'));
+ $t->set_block('form','add','addhandle');
+ $t->set_block('form','edit','edithandle');
+
+ $c = CreateObject('phpgwapi.categories');
+ $c->app_name = 'phpgw';
+
+ $hidden_vars = '' . "\n"
+ . '' . "\n"
+ . '' . "\n"
+ . '' . "\n"
+ . '' . "\n"
+ . '' . "\n";
+
+ if ($submit)
+ {
+ $errorcount = 0;
+
+ if (!$cat_name)
+ {
+ $error[$errorcount++] = lang('Please enter a name for that category !');
+ }
+
+ if (!$error)
+ {
+ if (!$cat_parent)
+ {
+ $exists = $c->exists('appandmains',$cat_name,$cat_id);
+ }
+ else
+ {
+ $exists = $c->exists('appandsubs',$cat_name,$cat_id);
+ }
+
+ if ($exists == True)
+ {
+ $error[$errorcount++] = lang('That category name has been used already !');
+ }
+ }
+
+ if ($cat_main && $cat_parent)
+ {
+ $main = $c->return_main($cat_parent);
+ if ($main != $cat_main)
+ {
+ $error[$errorcount++] = lang('You selected an invalid main category !');
+ }
+ }
+
+ $cat_name = addslashes($cat_name);
+ $cat_description = addslashes($cat_description);
+ $cat_access = 'public';
+
+ if (! $error)
+ {
+ $c->edit($cat_id,$cat_parent,$cat_name,$cat_description,$cat_data,$cat_access,$cat_main);
+ }
}
- if ($cat_main && $cat_parent)
+ if ($errorcount)
{
- $main = $c->return_main($cat_parent);
- if ($main != $cat_main)
- {
- $error[$errorcount++] = lang('You selected an invalid main category !');
- }
+ $t->set_var('message',$phpgw->common->error_list($error));
}
- $cat_name = addslashes($cat_name);
- $cat_description = addslashes($cat_description);
- $cat_access = 'public';
-
- if (! $error)
+ if (($submit) && (! $error) && (! $errorcount))
{
- $c->edit($cat_id,$cat_parent,$cat_name,$cat_description,$cat_data,$cat_access,$cat_main);
+ $t->set_var('message',lang('Category x has been updated !',$cat_name));
}
- }
- if ($errorcount)
- {
- $t->set_var('message',$phpgw->common->error_list($error));
- }
+ if ((! $submit) && (! $error) && (! $errorcount))
+ {
+ $t->set_var('message','');
+ }
- if (($submit) && (! $error) && (! $errorcount))
- {
- $t->set_var('message',lang('Category x has been updated !',$cat_name));
- }
+ $cats = $c->return_single($cat_id);
- if ((! $submit) && (! $error) && (! $errorcount))
- {
- $t->set_var('message','');
- }
+ $t->set_var('title_categories',lang('Edit global category'));
+ $t->set_var('lang_parent',lang('Parent category'));
+ $t->set_var('lang_select_parent',lang('Select parent category'));
+ $t->set_var('actionurl',$phpgw->link('/admin/editcategory.php'));
+ $t->set_var('deleteurl',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
+ $t->set_var('doneurl',$phpgw->link('/admin/categories.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
+ $t->set_var('hidden_vars',$hidden_vars);
+ $t->set_var('lang_name',lang('Category name'));
+ $t->set_var('lang_descr',lang('Category description'));
+ $t->set_var('lang_done',lang('Done'));
+ $t->set_var('lang_edit',lang('Edit'));
+ $t->set_var('lang_delete',lang('Delete'));
+ $t->set_var('lang_main',lang('Main category'));
+ $t->set_var('lang_new_main',lang('New main category'));
+ $t->set_var('main_category_list',$c->formated_list('select','mains',$cats[0]['main']));
- $cats = $c->return_single($cat_id);
+ $cat_id = $cats[0]['id'];
+ $t->set_var('cat_name',$phpgw->strip_html($cats[0]['name']));
+ $t->set_var('cat_description',$phpgw->strip_html($cats[0]['description']));
+ $t->set_var('category_list',$c->formated_list('select','all',$cats[0]['parent']));
- $t->set_var('title_categories',lang('Edit global category'));
- $t->set_var('lang_parent',lang('Parent category'));
- $t->set_var('lang_select_parent',lang('Select parent category'));
- $t->set_var('actionurl',$phpgw->link('/admin/editcategory.php'));
- $t->set_var('deleteurl',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
- $t->set_var('doneurl',$phpgw->link('/admin/categories.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
- $t->set_var('hidden_vars',$hidden_vars);
- $t->set_var('lang_name',lang('Category name'));
- $t->set_var('lang_descr',lang('Category description'));
- $t->set_var('lang_done',lang('Done'));
- $t->set_var('lang_edit',lang('Edit'));
- $t->set_var('lang_delete',lang('Delete'));
- $t->set_var('lang_main',lang('Main category'));
- $t->set_var('lang_new_main',lang('New main category'));
- $t->set_var('main_category_list',$c->formated_list('select','mains',$cats[0]['main']));
+ $t->set_var('edithandle','');
+ $t->set_var('addhandle','');
+ $t->pparse('out','form');
+ $t->pparse('edithandle','edit');
- $cat_id = $cats[0]['id'];
- $t->set_var('cat_name',$phpgw->strip_html($cats[0]['name']));
- $t->set_var('cat_description',$phpgw->strip_html($cats[0]['description']));
- $t->set_var('category_list',$c->formated_list('select','all',$cats[0]['parent']));
-
- $t->set_var('edithandle','');
- $t->set_var('addhandle','');
- $t->pparse('out','form');
- $t->pparse('edithandle','edit');
-
- $phpgw->common->phpgw_footer();
+ $phpgw->common->phpgw_footer();
?>
diff --git a/admin/templates/default/category_form.tpl b/admin/templates/default/category_form.tpl
index dca5aa06c6..d36dbdb358 100644
--- a/admin/templates/default/category_form.tpl
+++ b/admin/templates/default/category_form.tpl
@@ -1,66 +1,72 @@
+
-
-
-
- | {title_categories} |
-
-
-{message}
-
+
+
+
+
+ | {title_categories} |
+
+
+ {message}
+
-
-
-
+
+
+
+
-
-
+
+
+
+
-
\ No newline at end of file
+
+
diff --git a/admin/templates/default/delete_cat.tpl b/admin/templates/default/delete_cat.tpl
index babcbc9eb7..8e873ce072 100644
--- a/admin/templates/default/delete_cat.tpl
+++ b/admin/templates/default/delete_cat.tpl
@@ -1,39 +1,42 @@
+
+
-
-
+
-
-
- |
- {hidden_vars}
- {lang_done} |
-
-
-
+
+
+ |
+ {hidden_vars}
+ {lang_done} |
+
+
+
diff --git a/admin/templates/default/listcats.tpl b/admin/templates/default/listcats.tpl
index 366bf39fcd..eb04cd0b54 100644
--- a/admin/templates/default/listcats.tpl
+++ b/admin/templates/default/listcats.tpl
@@ -1,61 +1,61 @@
-
-
-
- | {title_categories} |
-
-
-
-
-
- {left}
- | {lang_showing} |
- {right}
-
-
- |
-
-
- | |
-
- |
-
-
- | {sort_name} |
- {sort_description} |
- {lang_edit} |
- {lang_delete} |
-
+
+
+
-
-
+
+