diff --git a/preferences/addcategory.php b/preferences/addcategory.php index 1b69b5f55f..ff2cc320fb 100644 --- a/preferences/addcategory.php +++ b/preferences/addcategory.php @@ -1,182 +1,181 @@ $cats_app, - 'noappheader' => True, - 'noappfooter' => True); + $phpgw_flags = array('currentapp' => $cats_app, + 'noappheader' => True, + 'noappfooter' => True); - $phpgw_info['flags'] = $phpgw_flags; - include('../header.inc.php'); + $phpgw_info['flags'] = $phpgw_flags; + include('../header.inc.php'); - $hidden_vars = "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n"; + $hidden_vars = '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n"; + $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); + $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->common->get_tpl_dir('preferences')); - $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 = $cats_app; - $c = CreateObject('phpgwapi.categories'); - $c->app_name = $cats_app; - - 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); + if ($access) + { + $cat_access = 'private'; + } + else + { + $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); - if ($access) - { - $cat_access = 'private'; - } - else - { - $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('actionurl',$phpgw->link('/preferences/addcategory.php')); + $t->set_var('title_categories',lang('Add x category for',$cats_app)); + $t->set_var('doneurl',$phpgw->link('/preferences/categories.php')); + $t->set_var('user_name',$phpgw_info['user']['fullname']); + $t->set_var('hidden_vars',$hidden_vars); + $t->set_var('font',$phpgw_info['theme']['font']); - if (($submit) && (! $error) && (! $errorcount)) - { - $t->set_var('message',lang('Category x has been added !',$cat_name)); - } + $t->set_var('lang_main',lang('Main category')); + $t->set_var('lang_new_main',lang('New main category')); - if ((! $submit) && (! $error) && (! $errorcount)) - { - $t->set_var('message',''); - } - - $t->set_var('actionurl',$phpgw->link('/preferences/addcategory.php')); - $t->set_var('title_categories',lang('Add x category for',$cats_app)); - $t->set_var('doneurl',$phpgw->link('/preferences/categories.php')); - $t->set_var('user_name',$phpgw_info['user']['fullname']); - $t->set_var('hidden_vars',$hidden_vars); - $t->set_var('font',$phpgw_info['theme']['font']); - - $t->set_var('lang_main',lang('Main category')); - $t->set_var('lang_new_main',lang('New main category')); - - if ($global_cats) - { - $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main,True)); - } - else - { - $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main)); - } - - if ($cats_level) - { if ($global_cats) { - $category_list = $c->formated_list('select','all',$cat_parent,True); + $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main,True)); } else { - $category_list = $c->formated_list('select','all',$cat_parent); + $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main)); } - $t->set_var('category_select',''); - $t->set_var('lang_parent',lang('Parent category')); - } - else - { - $t->set_var('lang_parent',''); - $t->set_var('category_select',''); - } + if ($cats_level) + { + if ($global_cats) + { + $category_list = $c->formated_list('select','all',$cat_parent,True); + } + else + { + $category_list = $c->formated_list('select','all',$cat_parent); + } - $t->set_var('lang_access',lang('Private')); + $t->set_var('category_select',''); + $t->set_var('lang_parent',lang('Parent category')); + } + else + { + $t->set_var('lang_parent',''); + $t->set_var('category_select',''); + } - if ($access) - { - $t->set_var('access', ''); - } - else - { - $t->set_var('access', ''); - } + $t->set_var('lang_access',lang('Private')); - $t->set_var('lang_name',lang('Name')); - $t->set_var('lang_descr',lang('Description')); - $t->set_var('cat_name',$cat_name); - $t->set_var('cat_description',$cat_description); + if ($access) + { + $t->set_var('access', ''); + } + else + { + $t->set_var('access', ''); + } - if ($extra) - { - $t->set_var('td_data',''); - $t->set_var('lang_data',lang($extra)); - } - else - { - $t->set_var('td_data',''); - $t->set_var('lang_data',''); - } + $t->set_var('lang_name',lang('Name')); + $t->set_var('lang_descr',lang('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'); + if ($extra) + { + $t->set_var('td_data',''); + $t->set_var('lang_data',lang($extra)); + } + else + { + $t->set_var('td_data',''); + $t->set_var('lang_data',''); + } - $phpgw->common->phpgw_footer(); + $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(); ?> diff --git a/preferences/categories.php b/preferences/categories.php index eb94ec0e8c..a95765a61a 100644 --- a/preferences/categories.php +++ b/preferences/categories.php @@ -1,192 +1,194 @@ $cats_app, - 'enable_nextmatchs_class' => True, + $phpgw_flags = array('currentapp' => $cats_app, + 'enable_nextmatchs_class' => True, 'noappheader' => True, 'noappfooter' => True); - $phpgw_info['flags'] = $phpgw_flags; - include('../header.inc.php'); + $phpgw_info['flags'] = $phpgw_flags; + include('../header.inc.php'); - $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); - $t->set_file(array('cat_list_t' => 'listcats.tpl', - 'cat_list' => 'listcats.tpl')); - $t->set_block('cat_list_t','cat_list','list'); + $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); + $t->set_file(array('cat_list_t' => 'listcats.tpl', + 'cat_list' => 'listcats.tpl')); + $t->set_block('cat_list_t','cat_list','list'); - $common_hidden_vars = "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n"; + $hidden_vars = '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n"; - $t->set_var('font',$phpgw_info['theme']['font']); - $t->set_var('user_name',$phpgw_info['user']['fullname']); - $t->set_var('title_categories',lang('categories for')); - $t->set_var('lang_action',lang('Category list')); - $t->set_var('add_action',$phpgw->link('/preferences/addcategory.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('lang_add',lang('Add')); - $t->set_var('lang_search',lang('Search')); - $t->set_var('actionurl',$phpgw->link('/preferences/categories.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('lang_done',lang('Done')); - $t->set_var('doneurl',$phpgw->link('/preferences/')); + $t->set_var('font',$phpgw_info['theme']['font']); + $t->set_var('user_name',$phpgw_info['user']['fullname']); + $t->set_var('hidden_vars',$hidden_vars); + $t->set_var('title_categories',lang('categories for')); + $t->set_var('lang_action',lang('Category list')); + $t->set_var('add_action',$phpgw->link('/preferences/addcategory.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('lang_add',lang('Add')); + $t->set_var('lang_search',lang('Search')); + $t->set_var('actionurl',$phpgw->link('/preferences/categories.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('lang_done',lang('Done')); + $t->set_var('doneurl',$phpgw->link('/preferences/')); - if (! $start) { $start = 0; } + if (! $start) { $start = 0; } - if($phpgw_info['user']['preferences']['common']['maxmatchs'] && $phpgw_info['user']['preferences']['common']['maxmatchs'] > 0) - { - $limit = $phpgw_info['user']['preferences']['common']['maxmatchs']; - } - else - { - $limit = 15; - } + if($phpgw_info['user']['preferences']['common']['maxmatchs'] && $phpgw_info['user']['preferences']['common']['maxmatchs'] > 0) + { + $limit = $phpgw_info['user']['preferences']['common']['maxmatchs']; + } + else + { + $limit = 15; + } - $c = CreateObject('phpgwapi.categories'); - $c->app_name = $cats_app; + $c = CreateObject('phpgwapi.categories'); + $c->app_name = $cats_app; - if ($global_cats) - { - $categories = $c->return_array('all',$start,$limit,$query,$sort,$order,True); - } - else - { - $categories = $c->return_array('all',$start,$limit,$query,$sort,$order); - } + if ($global_cats) + { + $categories = $c->return_array('all',$start,True,$query,$sort,$order,True); + } + else + { + $categories = $c->return_array('all',$start,True,$query,$sort,$order); + } //--------------------------------- nextmatch -------------------------------------------- - $left = $phpgw->nextmatchs->left('/preferences/categories.php',$start,$c->total_records,"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats"); - $right = $phpgw->nextmatchs->right('/preferences/categories.php',$start,$c->total_records,"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats"); - $t->set_var('left',$left); - $t->set_var('right',$right); + $left = $phpgw->nextmatchs->left('/preferences/categories.php',$start,$c->total_records,"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats"); + $right = $phpgw->nextmatchs->right('/preferences/categories.php',$start,$c->total_records,"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats"); + $t->set_var('left',$left); + $t->set_var('right',$right); - if ($c->total_records > $limit) - { - $t->set_var('lang_showing',lang('showing x - x of x',($start + 1),($start + $limit),$c->total_records)); - } - else - { - $t->set_var('lang_showing',lang('showing x',$c->total_records)); - } + if ($c->total_records > $limit) + { + $t->set_var('lang_showing',lang('showing x - x of x',($start + 1),($start + $limit),$c->total_records)); + } + else + { + $t->set_var('lang_showing',lang('showing x',$c->total_records)); + } // ------------------------------ end nextmatch ------------------------------------------ //------------------- list header variable template-declarations ------------------------- - $t->set_var('th_bg',$phpgw_info['theme']['th_bg']); - $t->set_var('sort_name',$phpgw->nextmatchs->show_sort_order($sort,'cat_name',$order,'/preferences/categories.php',lang('Name'),"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('sort_description',$phpgw->nextmatchs->show_sort_order($sort,'cat_description',$order,'/preferences/categories.php',lang('Description'),"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - if ($extra) - { - $t->set_var('sort_data','' - . $phpgw->nextmatchs->show_sort_order($sort,'cat_data',$order,'/preferences/categories.php',lang($extra),"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats") . ''); - } - else - { - $t->set_var('sort_data',''); - } + $t->set_var('th_bg',$phpgw_info['theme']['th_bg']); + $t->set_var('sort_name',$phpgw->nextmatchs->show_sort_order($sort,'cat_name',$order,'/preferences/categories.php',lang('Name'),"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('sort_description',$phpgw->nextmatchs->show_sort_order($sort,'cat_description',$order,'/preferences/categories.php',lang('Description'),"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + if ($extra) + { + $t->set_var('sort_data','' + . $phpgw->nextmatchs->show_sort_order($sort,'cat_data',$order,'/preferences/categories.php',lang($extra),"&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats") . ''); + } + else + { + $t->set_var('sort_data',''); + } - $t->set_var('lang_app',lang($cats_app)); - $t->set_var('lang_edit',lang('Edit')); - $t->set_var('lang_delete',lang('Delete')); + $t->set_var('lang_app',lang($cats_app)); + $t->set_var('lang_edit',lang('Edit')); + $t->set_var('lang_delete',lang('Delete')); // -------------------------- end header declaration -------------------------------------- - for ($i=0;$inextmatchs->alternate_row_color($tr_color); - $t->set_var('tr_color',$tr_color); - - $cat_id = $categories[$i]['id']; - $owner = $categories[$i]['owner']; - $level = $categories[$i]['level']; - $space = '  '; - - if ($categories[$i]['app_name'] == 'phpgw') + for ($i=0;$inextmatchs->alternate_row_color($tr_color); + $t->set_var('tr_color',$tr_color); + $cat_id = $categories[$i]['id']; + $owner = $categories[$i]['owner']; + $level = $categories[$i]['level']; + $space = '  '; - if ($level > 0) - { - $spaceset = str_repeat($space,$level); - $name = $spaceset .$phpgw->strip_html($categories[$i]['name']) . $appendix; - } + if ($categories[$i]['app_name'] == 'phpgw') + { + $appendix = '<' . lang('Global') . '>'; + } + else + { + $appendix = ''; + } - $descr = $phpgw->strip_html($categories[$i]['description']); - if (! $descr) { $descr = ' '; } + if ($level > 0) + { + $spaceset = str_repeat($space,$level); + $name = $spaceset .$phpgw->strip_html($categories[$i]['name']) . $appendix; + } - if ($extra) - { - $data = $categories[$i]['data']; - if (! $data) { $data = ' '; } - $t->set_var('td_data','' . $data . ''); - } - else - { - $t->set_var('td_data',''); - } + $descr = $phpgw->strip_html($categories[$i]['description']); + if (! $descr) { $descr = ' '; } - if ($level == 0) - { - $name = '' . $phpgw->strip_html($categories[$i]['name']) . '' . $appendix; - $descr = '' . $descr . ''; - $data = '' . $data . ''; - } + if ($extra) + { + $data = $categories[$i]['data']; + if (! $data) { $data = ' '; } + $t->set_var('td_data','' . $data . ''); + } + else + { + $t->set_var('td_data',''); + } + + if ($level == 0) + { + $name = '' . $phpgw->strip_html($categories[$i]['name']) . '' . $appendix; + $descr = '' . $descr . ''; + $data = '' . $data . ''; + } //-------------------------- template declaration for list records --------------------------- - $t->set_var(array('name' => $name, - 'descr' => $descr)); + $t->set_var(array('name' => $name, + 'descr' => $descr)); - $t->set_var('app_url',$phpgw->link('/' . $phpgw_info['flags']['currentapp'] . '/index.php',"cat_id=$cat_id")); + $t->set_var('app_url',$phpgw->link('/' . $phpgw_info['flags']['currentapp'] . '/index.php',"cat_id=$cat_id")); - if ($categories[$i]['owner'] == $phpgw_info['user']['account_id'] && $categories[$i]['app_name'] != 'phpgw') - { - $t->set_var('edit',$phpgw->link('/preferences/editcategory.php',"cat_id=$cat_id&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('lang_edit_entry',lang('Edit')); + if ($categories[$i]['owner'] == $phpgw_info['user']['account_id'] && $categories[$i]['app_name'] != 'phpgw') + { + $t->set_var('edit',$phpgw->link('/preferences/editcategory.php',"cat_id=$cat_id&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('lang_edit_entry',lang('Edit')); + } + else + { + $t->set_var('edit',''); + $t->set_var('lang_edit_entry',' '); + } + + if ($categories[$i]['owner'] == $phpgw_info['user']['account_id'] && $categories[$i]['app_name'] != 'phpgw') + { + $t->set_var('delete',$phpgw->link('/preferences/deletecategory.php',"cat_id=$cat_id&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('lang_delete_entry',lang('Delete')); + } + else + { + $t->set_var('delete',''); + $t->set_var('lang_delete_entry',' '); + } + + $t->parse('list','cat_list',True); } - else - { - $t->set_var('edit',''); - $t->set_var('lang_edit_entry',' '); - } - if ($categories[$i]['owner'] == $phpgw_info['user']['account_id'] && $categories[$i]['app_name'] != 'phpgw') - { - $t->set_var('delete',$phpgw->link('/preferences/deletecategory.php',"cat_id=$cat_id&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('lang_delete_entry',lang('Delete')); - } - else - { - $t->set_var('delete',''); - $t->set_var('lang_delete_entry',' '); - } - $t->parse('list','cat_list',True); - } + // ---------------------------- end record declaration ----------------------------------------- - $t->parse('out','cat_list_t',True); - $t->p('out'); + $t->parse('out','cat_list_t',True); + $t->p('out'); - $phpgw->common->phpgw_footer(); + $phpgw->common->phpgw_footer(); ?> diff --git a/preferences/deletecategory.php b/preferences/deletecategory.php index 843516c599..9642650d83 100644 --- a/preferences/deletecategory.php +++ b/preferences/deletecategory.php @@ -1,82 +1,87 @@ link('/preferences/categories.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - } - - if ($confirm) - { - $phpgw_info['flags'] = array('noheader' => True, - 'nonavbar' => True); - } - - $phpgw_info['flags']['currentapp'] = $cats_app; - $phpgw_info['flags']['noappheader'] = True; - $phpgw_info['flags']['noappfooter'] = True; - - include('../header.inc.php'); - - $c = CreateObject('phpgwapi.categories'); - $c->app_name = $cats_app; - - if ($confirm) - { - if ($subs) + if (! $cat_id) { - $c->delete($cat_id,'True'); + Header('Location: ' . $phpgw->link('/preferences/categories.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); } - else + + if ($confirm) { - $c->delete($cat_id); + $phpgw_info['flags'] = array('noheader' => True, + 'nonavbar' => True); } - Header('Location: ' . $phpgw->link('/preferences/categories.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - } - else - { - $hidden_vars = "\n" - . "\n" - . "\n" - . "\n" - . "\n"; - $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); - $t->set_file(array('category_delete' => 'delete.tpl')); - $t->set_var('deleteheader',lang('Are you sure you want to delete this category ?')); - $t->set_var('font',$phpgw_info['theme']['font']); - $t->set_var('hidden_vars',$hidden_vars); + $phpgw_info['flags']['currentapp'] = $cats_app; + $phpgw_info['flags']['noappheader'] = True; + $phpgw_info['flags']['noappfooter'] = True; - $exists = $c->exists('subs',$cat_name='',$cat_id); - if ($exists==True) + include('../header.inc.php'); + + $c = CreateObject('phpgwapi.categories'); + $c->app_name = $cats_app; + + if ($confirm) { - $t->set_var('lang_subs',lang('Do you also want to delete all subcategories ?')); - $t->set_var('subs',''); + if ($subs) + { + $c->delete($cat_id,'True'); + } + else + { + $c->delete($cat_id); + } + Header('Location: ' . $phpgw->link('/preferences/categories.php',"cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); } else { - $t->set_var('lang_subs',''); - $t->set_var('subs', ''); + $hidden_vars = '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n"; + + $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); + $t->set_file(array('category_delete' => 'delete.tpl')); + $t->set_var('deleteheader',lang('Are you sure you want to delete this category ?')); + $t->set_var('font',$phpgw_info['theme']['font']); + $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 subcategories ?')); + $t->set_var('subs',''); + } + else + { + $t->set_var('lang_subs',''); + $t->set_var('subs', ''); + } + + $t->set_var('nolink',$phpgw->link('/preferences/categories.php',"cat_id=$cat_id&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('lang_no',lang('No')); + + $t->set_var('action_url',$phpgw->link('/preferences/deletecategory.php',"cat_id=$cat_id$cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); + $t->set_var('lang_yes',lang('Yes')); + + $t->pparse('out','category_delete'); } - - $t->set_var('nolink',$phpgw->link('/preferences/categories.php',"cat_id=$cat_id&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('lang_no',lang('No')); - - $t->set_var('action_url',$phpgw->link('/preferences/deletecategory.php',"cat_id=$cat_id$cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - $t->set_var('lang_yes',lang('Yes')); - - $t->pparse('out','category_delete'); - } - $phpgw->common->phpgw_footer(); + $phpgw->common->phpgw_footer(); ?> diff --git a/preferences/editcategory.php b/preferences/editcategory.php index 1baf26fad3..2445890c02 100644 --- a/preferences/editcategory.php +++ b/preferences/editcategory.php @@ -1,159 +1,190 @@ link('/preferences/categories.php',"sort=$sort&order=$order&query=$query&start=$start" - . "&filter=$filter&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); - } - - $phpgw_info['flags']['currentapp'] = $cats_app; - $phpgw_info['flags']['noappheader'] = True; - $phpgw_info['flags']['noappfooter'] = True; - - include('../header.inc.php'); - - $hidden_vars = "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n" - . "\n"; - - $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); - $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 = $cats_app; - - if ($submit) - { - $errorcount = 0; - - if (!$cat_name) { $error[$errorcount++] = lang('Please enter a name for that category !'); } - - if (!$error) + if (! $cat_id) { - 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 !'); } + Header('Location: ' . $phpgw->link('/preferences/categories.php',"sort=$sort&order=$order&query=$query&start=$start" + . "&filter=$filter&cats_app=$cats_app&extra=$extra&cats_level=$cats_level&global_cats=$global_cats")); } - if ($cat_main && $cat_parent) { - $main = $c->return_main($cat_parent); - if ($main != $cat_main) { $error[$errorcount++] = lang('You selected an invalid main category !'); } - } + $phpgw_info['flags']['currentapp'] = $cats_app; + $phpgw_info['flags']['noappheader'] = True; + $phpgw_info['flags']['noappfooter'] = True; - $cat_name = addslashes($cat_name); - $cat_description = addslashes($cat_description); - if ($access) { $cat_access = 'private'; } - else { $cat_access = 'public'; } + include('../header.inc.php'); - if (! $error) { $c->edit($cat_id,$cat_parent,$cat_name,$cat_description,$cat_data,$cat_access,$cat_main); } - } + $hidden_vars = '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n" + . '' . "\n"; - if ($errorcount) { $t->set_var('message',$phpgw->common->error_list($error)); } - if (($submit) && (! $error) && (! $errorcount)) { $t->set_var('message',lang('Category x has been updated !',$cat_name)); } - if ((! $submit) && (! $error) && (! $errorcount)) { $t->set_var('message',''); } + $t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences')); + $t->set_file(array('form' => 'category_form.tpl')); + $t->set_block('form','add','addhandle'); + $t->set_block('form','edit','edithandle'); - $cats = $c->return_single($cat_id); + $c = CreateObject('phpgwapi.categories'); + $c->app_name = $cats_app; - $cat_main = $cats[0]['main']; - $t->set_var('lang_main',lang('Main category')); - $t->set_var('lang_new_main',lang('New main category')); + if ($submit) + { + $errorcount = 0; - if ($global_cats) - { - $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main,True)); - } - else - { - $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main)); - } + if (!$cat_name) + { + $error[$errorcount++] = lang('Please enter a name for that category !'); + } - if ($cats_level) - { - $cat_parent = $cats[0]['parent']; + 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); + if ($access) + { + $cat_access = 'private'; + } + else + { + $cat_access = 'public'; + } + + if (! $error) + { + $c->edit($cat_id,$cat_parent,$cat_name,$cat_description,$cat_data,$cat_access,$cat_main); + } + } + + if ($errorcount) + { + $t->set_var('message',$phpgw->common->error_list($error)); + } + if (($submit) && (! $error) && (! $errorcount)) + { + $t->set_var('message',lang('Category x has been updated !',$cat_name)); + } + if ((! $submit) && (! $error) && (! $errorcount)) + { + $t->set_var('message',''); + } + + $cats = $c->return_single($cat_id); + + $cat_main = $cats[0]['main']; + $t->set_var('lang_main',lang('Main category')); + $t->set_var('lang_new_main',lang('New main category')); if ($global_cats) { - $category_list = $c->formated_list('select','all',$cat_parent,True); + $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main,True)); } else { - $category_list = $c->formated_list('select','all',$cat_parent); + $t->set_var('main_category_list',$c->formated_list('select','mains',$cat_main)); } - $t->set_var('category_select',''); - $t->set_var('lang_parent',lang('Parent category')); - } - else - { - $t->set_var('lang_parent',''); - $t->set_var('category_select',''); - } + if ($cats_level) + { + $cat_parent = $cats[0]['parent']; - $t->set_var('font',$phpgw_info['theme']['font']); - $t->set_var('user_name',$phpgw_info['user']['fullname']); - $t->set_var('title_categories',lang('Edit x category for',$cats_app)); - $t->set_var('doneurl',$phpgw->link('/preferences/categories.php')); - $t->set_var('actionurl',$phpgw->link('/preferences/editcategory.php')); - $t->set_var('deleteurl',$phpgw->link('/preferences/deletecategory.php')); - $t->set_var('hidden_vars',$hidden_vars); - $t->set_var('lang_name',lang('Name')); - $t->set_var('lang_descr',lang('Description')); - $t->set_var('lang_access',lang('Private')); + if ($global_cats) + { + $category_list = $c->formated_list('select','all',$cat_parent,True); + } + else + { + $category_list = $c->formated_list('select','all',$cat_parent); + } - if ($cats[0]['access']=='private') - { - $t->set_var('access', ''); - } - else - { - $t->set_var('access', 'set_var('category_select',''); + $t->set_var('lang_parent',lang('Parent category')); + } + else + { + $t->set_var('lang_parent',''); + $t->set_var('category_select',''); + } - $cat_id = $cats[0]['id']; + $t->set_var('font',$phpgw_info['theme']['font']); + $t->set_var('user_name',$phpgw_info['user']['fullname']); + $t->set_var('title_categories',lang('Edit x category for',$cats_app)); + $t->set_var('doneurl',$phpgw->link('/preferences/categories.php')); + $t->set_var('actionurl',$phpgw->link('/preferences/editcategory.php')); + $t->set_var('deleteurl',$phpgw->link('/preferences/deletecategory.php')); + $t->set_var('hidden_vars',$hidden_vars); + $t->set_var('lang_name',lang('Name')); + $t->set_var('lang_descr',lang('Description')); + $t->set_var('lang_access',lang('Private')); - $t->set_var('cat_name',$phpgw->strip_html($cats[0]['name'])); - $t->set_var('cat_description',$phpgw->strip_html($cats[0]['description'])); + if ($cats[0]['access']=='private') + { + $t->set_var('access', ''); + } + else + { + $t->set_var('access', 'set_var('td_data',''); - $t->set_var('lang_data',lang($extra)); - } - else - { - $t->set_var('td_data',''); - $t->set_var('lang_data',''); - } + $cat_id = $cats[0]['id']; - $t->set_var('lang_edit',lang('Edit')); - $t->set_var('lang_delete',lang('Delete')); - $t->set_var('lang_done',lang('Done')); + $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('edithandle',''); - $t->set_var('addhandle',''); + if ($extra) + { + $t->set_var('td_data',''); + $t->set_var('lang_data',lang($extra)); + } + else + { + $t->set_var('td_data',''); + $t->set_var('lang_data',''); + } - $t->pparse('out','form'); - $t->pparse('edithandle','edit'); - - $phpgw->common->phpgw_footer(); + $t->set_var('lang_edit',lang('Edit')); + $t->set_var('lang_delete',lang('Delete')); + $t->set_var('lang_done',lang('Done')); + $t->set_var('edithandle',''); + $t->set_var('addhandle',''); + $t->pparse('out','form'); + $t->pparse('edithandle','edit'); + $phpgw->common->phpgw_footer(); ?> diff --git a/preferences/templates/default/category_form.tpl b/preferences/templates/default/category_form.tpl index f9a4f15ddd..15a91f9d7d 100644 --- a/preferences/templates/default/category_form.tpl +++ b/preferences/templates/default/category_form.tpl @@ -1,74 +1,80 @@ + +
- - - - -
{title_categories}: {user_name}
-{message} - - - - - - - - - - - - - - - - - - - - - - - - - - -
{lang_main}
{lang_parent}{category_select}
{lang_name}
{lang_descr}
{lang_data}{td_data}
{lang_access}{access}
+ + + + +
{title_categories}: {user_name}
+ {message} + + + + + + + + + + + + + + + + + + + + + + + + + + +
{lang_main}
{lang_parent}{category_select}
{lang_name}
{lang_descr}
{lang_data}{td_data}
{lang_access}{access}
- - - - - - -
- {hidden_vars} - - -
- {hidden_vars} -
- -
+ + + + + + + +
+ {hidden_vars} + + +
+ {hidden_vars} +
+ + - - - - - - -
- {hidden_vars} - -
- {hidden_vars} -
-
- {hidden_vars} -
- + + + + + + + +
+ {hidden_vars} + +
+ {hidden_vars} +
+
+ {hidden_vars} +
+ + - \ No newline at end of file + + diff --git a/preferences/templates/default/delete.tpl b/preferences/templates/default/delete.tpl index e721548d22..3b4ebaabbf 100644 --- a/preferences/templates/default/delete.tpl +++ b/preferences/templates/default/delete.tpl @@ -1,22 +1,25 @@ + -
- - - - - - - - - - - - - - -
{deleteheader}
{lang_subs}{subs}
- {hidden_vars} - {lang_no}
-
- \ No newline at end of file + +
+ + + + + + + + + + + + + + +
{deleteheader}
{lang_subs}{subs}
+ {hidden_vars} + {lang_no}
+
+ + diff --git a/preferences/templates/default/listcats.tpl b/preferences/templates/default/listcats.tpl index e59afc42a0..069f2196a1 100644 --- a/preferences/templates/default/listcats.tpl +++ b/preferences/templates/default/listcats.tpl @@ -1,65 +1,72 @@ -
- - - - - - - - - - - -
{lang_app} {title_categories}: {user_name}
- - - {left} - - {right} - -
{lang_showing}
-
  -
-   -
- - - - - {sort_data} - - - - + +
+
{sort_name}{sort_description}{lang_app}{lang_edit}{lang_delete}
+ + + + + + + + + + +
{lang_app} {title_categories}: {user_name}
+ + + {left} + + {right} + +
{lang_showing}
+
  +
+   +
+ + + + + {sort_data} + + + + - - - - {td_data} - - - - + + + + + {td_data} + + + + + + -
{sort_name}{sort_description}{lang_app}{lang_edit}{lang_delete}
{name}{descr}{lang_app}{lang_edit_entry}{lang_delete_entry}
{name}{descr}{lang_app}{lang_edit_entry}{lang_delete_entry}
- - - - - + +
-
- {hidden_vars} - -
- 		-
- {hidden_vars} - -
-
+ + + + + + -
+
+ {hidden_vars} + +
+ 		+
+ {hidden_vars} + +
+
+ +
\ No newline at end of file