update categories

admin/addcategory.php

@@ -9,7 +9,7 @@
   *  Free Software Foundation; either version 2 of the License, or (at your  *
   *  option) any later version.                                              *
   \**************************************************************************/
-/* $Id$ */
+  /* $Id$ */
 
     $phpgw_info['flags']['currentapp'] = 'admin';
     include('../header.inc.php');
@@ -20,24 +20,41 @@
     $t->set_block('form','edit','edithandle');
 
     $c = CreateObject('phpgwapi.categories');
-	$c->categories($phpgw_info['user']['account_id'],'phpgw');
+    $c->app_name = 'phpgw';
 
     if ($submit)
     {
 	$errorcount = 0;
 
-		if (!$cat_name) { $error[$errorcount++] = lang('Please enter a name for that category !'); }
+	if (!$cat_name)
+	{
+	    $error[$errorcount++] = lang('Please enter a name for that category !');
+	}
+
 	if (!$error)
 	{
-			if (!$cat_parent) { $exists = $c->exists('mains',$cat_name,$cat_id=''); }
+	    if (!$cat_parent)
-			else { $exists = $c->exists('subs',$cat_name,$cat_id=''); }
+	    {
-			if ($exists == True) { $error[$errorcount++] = lang('That category name has been used already !'); }
+		$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 ($main != $cat_main)
+	    {
+		$error[$errorcount++] = lang('You selected an invalid main category !');
+	    }
 	}
 
 	if (!$error)
@@ -50,15 +67,25 @@
 	}
     }
 
-	if ($errorcount) { $t->set_var('message',$phpgw->common->error_list($error)); }
+    if ($errorcount)
-	if (($submit) && (! $error) && (! $errorcount)) { $t->set_var('message',lang('Category x has been added !', $cat_name)); }
+    {
-	if ((! $submit) && (! $error) && (! $errorcount)) { $t->set_var('message',''); }
+	$t->set_var('message',$phpgw->common->error_list($error));
+    }
+
+    if (($submit) && (! $error) && (! $errorcount))
+    {
+	$t->set_var('message',lang('Category x has been added !', $cat_name));
+    }
+
+    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','<input type="hidden" name="cat_id" value="' . $cat_id . '">');
-
     $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));

admin/categories.php

@@ -11,19 +11,15 @@
   \**************************************************************************/
   /* $Id$ */
 
-	$phpgw_info['flags'] = array(
+    $phpgw_info['flags'] = array('currentapp' => 'admin',
-		'currentapp' => 'admin',
+		    'enable_nextmatchs_class' => True);
-		'enable_nextmatchs_class' => True
-	);
 
     include('../header.inc.php');
 
     $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 
-	$t->set_file(array(
+    $t->set_file(array('cat_list_t' => 'listcats.tpl',
-		'cat_list_t' => 'listcats.tpl',
+			'cat_list'   => 'listcats.tpl'));
-		'cat_list'   => 'listcats.tpl'
-	));
     $t->set_block('cat_list_t','cat_list','list');
 
     $common_hidden_vars = "<input type=\"hidden\" name=\"sort\" value=\"$sort\">\n"
@@ -56,7 +52,8 @@
     $c->categories($phpgw_info['user']['account_id'],'phpgw');
     $categories = $c->return_array('all',$start,$limit,$query,$sort,$order);
 
-	//--------------------------------- nextmatch --------------------------------------------
+//--------------------------------- nextmatch --------------------------------------------
+
     $left = $phpgw->nextmatchs->left('/admin/categories.php',$start,$c->total_records);
     $right = $phpgw->nextmatchs->right('/admin/categories.php',$start,$c->total_records);
     $t->set_var('left',$left);
@@ -72,15 +69,17 @@
     }
     $t->set_var('lang_showing',$lang_showing);
 
-	// ------------------------------ end nextmatch ------------------------------------------
+// ------------------------------ end nextmatch ------------------------------------------
+
+//------------------- list header variable template-declarations ------------------------- 
 
-	//------------------- 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,'/admin/categories.php',lang('Name')));
     $t->set_var('sort_description',$phpgw->nextmatchs->show_sort_order($sort,'cat_description',$order,'/admin/categories.php',lang('Description')));
     $t->set_var('lang_edit',lang('Edit'));
     $t->set_var('lang_delete',lang('Delete'));
-	// -------------------------- end header declaration --------------------------------------
+	
+// -------------------------- end header declaration --------------------------------------
 
     for ($i=0;$i<count($categories);$i++)
     {
@@ -109,13 +108,12 @@
 		$descr = '<font color="FF0000"><b>' . $descr . '</b></font>';
 	    }
 
-			//-------------------------- template declaration for list records ---------------------------
+//-------------------------- template declaration for list records ---------------------------
-			$t->set_var(array(
-				'name' => $name,
-				'descr' => $descr
-			));
 
-			if ($categories[$i]["owner"] == $phpgw_info['user']['account_id'])
+	    $t->set_var(array('name' => $name,
+				'descr' => $descr));
+
+	    if ($categories[$i]['owner'] == $phpgw_info['user']['account_id'])
 	    {
 		$t->set_var('edit',$phpgw->link('/admin/editcategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
 		$t->set_var('lang_edit_entry',lang('Edit'));
@@ -125,7 +123,8 @@
 		$t->set_var('edit','');
 		$t->set_var('lang_edit_entry','&nbsp;');
 	    }
-			if ($categories[$i]["owner"] == $phpgw_info['user']['account_id'])
+
+	    if ($categories[$i]['owner'] == $phpgw_info['user']['account_id'])
 	    {
 		$t->set_var('delete',$phpgw->link('/admin/deletecategory.php',"cat_id=$cat_id&start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
 		$t->set_var('lang_delete_entry',lang('Delete'));
@@ -135,10 +134,12 @@
 		$t->set_var('delete','');
 		$t->set_var('lang_delete_entry','&nbsp;');
 	    }
+
 	    $t->parse('list','cat_list',True);
 	}
     }
-	// ---------------------------- end record declaration -----------------------------------------
+	
+// ---------------------------- end record declaration -----------------------------------------
 
     $t->parse('out','cat_list_t',True);
     $t->p('out');

admin/editcategory.php

@@ -11,22 +11,22 @@
   \**************************************************************************/
   /* $Id$ */
 
-	$phpgw_info['flags']['currentapp'] = 'admin';
-	include('../header.inc.php');
-
     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->categories($phpgw_info['user']['account_id'],'phpgw');
+    $c->app_name = 'phpgw';
 
     $hidden_vars = "<input type=\"hidden\" name=\"sort\" value=\"$sort\">\n"
 		. "<input type=\"hidden\" name=\"order\" value=\"$order\">\n"
@@ -39,31 +39,61 @@
     {
 	$errorcount = 0;
 
-		if (!$cat_name) { $error[$errorcount++] = lang('Please enter a name for that category !'); }
+	if (!$cat_name)
+	{
+	    $error[$errorcount++] = lang('Please enter a name for that category !');
+	}
 
 	if (!$error)
 	{
-			if (!$cat_parent) { $exists = $c->exists('mains',$cat_name,$cat_id); }
+	    if (!$cat_parent)
-			else { $exists = $c->exists('subs',$cat_name,$cat_id); }
+	    {
-			if ($exists == True) { $error[$errorcount++] = lang('That category name has been used already !'); }
+		$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 ($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 (! $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 ($errorcount)
-	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->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);
 
@@ -73,27 +103,23 @@
     $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']));
 
     $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');