Make owner appendix optional for categories

admin/inc/class.uicategories.inc.php

@@ -231,12 +231,15 @@
 
 				if ($this->appname && $cat['app_name'] == 'phpgw')
 				{
-					$appendix = '<' . lang('Global') . '>';
+					$appendix = ' ♦';
 				}
 				elseif ($cat['owner'] != $accountId)
+				{
+					if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
 					{
 						$appendix = ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
 					}
+				}
 				else
 				{
 					$appendix = '';

etemplate/inc/class.select_widget.inc.php

@@ -194,9 +194,12 @@
 							$s .= ' ♦';
 						}
 						elseif ($cat['owner'] != $accountId)
+						{
+							if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
 							{
 								$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
 							}
+						}
 						elseif ($cat['access'] == 'private')
 						{
 							$s .= ' ♥';

etemplate/inc/class.tree_widget.inc.php

@@ -94,9 +94,12 @@ class tree_widget
 						$s .= ' ♦';
 					}
 					elseif ($cat['owner'] != $accountId)
+					{
+						if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
 						{
 							$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
 						}
+					}
 					elseif ($cat['access'] == 'private') {
 						$s .= ' ♥';
 					}

infolog/inc/class.infolog_hooks.inc.php

@@ -342,9 +342,12 @@ class infolog_hooks
 				$s .= ' ♦';
 			}
 			elseif ($cat['owner'] != $accountId)
+			{
+				if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
 				{
 					$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
 				}
+			}
 			elseif ($cat['access'] == 'private')
 			{
 				$s .= ' ♥';

phpgwapi/inc/class.categories.inc.php

@@ -404,9 +404,12 @@ class categories
 						$s .= ' ♦';
 					}
 					elseif ($cat['owner'] != $this->account_id)
+					{
+						if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
 						{
 							$s .= ' <' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '>';
 						}
+					}
 					elseif ($cat['access'] == 'private')
 					{
 						$s .= ' ♥';

preferences/inc/class.uicategories.inc.php

@@ -216,22 +216,22 @@
 				$GLOBALS['egw']->template->set_var('color',$gray < 128 ? 'style="color: white;"' : '');
 
 				$accountId = $GLOBALS['egw_info']['user']['account_id'];
+				$appendix = '';
 
+				if ($GLOBALS['egw_info']['user']['preferences']['common']['show_category_owner'])
+				{
 					if ($cat['app_name'] == 'phpgw')
 					{
-					$appendix = '&lt;' . lang('Global') . '&gt;';
+						$appendix = ' &#9830;';
 					}
 					elseif ($cat['owner'] == '-1')
 					{
-					$appendix = '&lt;' . lang('Global') . '&nbsp;' . $GLOBALS['egw_info']['apps'][$cats_app]['title'] . '&gt;';
+						$appendix = ' &#9830;&nbsp;' . $GLOBALS['egw_info']['apps'][$cats_app]['title'];
 					}
 					elseif ($cat['owner'] != $accountId)
 					{
 						$appendix = ' &lt;' . $GLOBALS['egw']->accounts->id2name($cat['owner'], 'account_fullname') . '&gt;';
 					}
-				else
-				{
-					$appendix = '';
 				}
 
 				$level = $cat['level'];

preferences/inc/hook_settings.inc.php

@@ -316,6 +316,18 @@
 			'xmlrpc' => True,
 			'admin'  => false,
 		),
+		'show_category_owner' => array(
+			'type'		=>	'select',
+			'label'		=>	'Show the category owner with the category name.',
+			'name'		=>	'show_category_owner',
+			'values'    =>  array(
+				'1'		=>  lang('Yes'),
+				'0'     =>	lang('No'),
+			),
+			'help'		=>	'The owner is attached to distinguish between categories with the same name.  You can turn this off and will get the names only.',
+			'xmlrpc'	=>	True,
+			'admin'		=>	False
+		),
 	);
 	// disable thumbnails, if no size configured by admin
 	if (!$GLOBALS['egw_info']['server']['link_list_thumbnail']) unset($GLOBALS['settings']['link_list_thumbnail']);

rpc.php

@@ -17,6 +17,7 @@ require_once 'Horde/RPC.php';
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
 		'currentapp'			=> 'login',
+		'login'				=> True,
 		'noheader'			=> True,
 		'nonavbar'			=> True,
 		'disable_Template_class'	=> True