From 26f9fb5cd0d53a158e550d6442b29ec32de787f7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 10 May 2013 16:38:18 +0000
Subject: [PATCH] remove old pre 1.8 preferences.php

---
 preferences/preferences.php                 | 139 --------------------
 resources/inc/class.resources_hooks.inc.php |   2 +-
 2 files changed, 1 insertion(+), 140 deletions(-)
 delete mode 100755 preferences/preferences.php

diff --git a/preferences/preferences.php b/preferences/preferences.php
deleted file mode 100755
index d446fd65ea..0000000000
--- a/preferences/preferences.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare - Preferences                                                 *
-	* http://www.egroupware.org                                                *
-	* Written by RalfBecker@outdoor-training.de to emulate the old preferences *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
-
-	/* $Id$ */
-
-	$GLOBALS['egw_info']['flags'] = array(
-		'noheader'                => True,
-		'noappheader'             => True,
-		'nonavbar'                => True,
-		'currentapp'              => 'preferences',
-		'enable_nextmatchs_class' => True,
-	);
-	include('../header.inc.php');
-
-	function create_section($title)
-	{
-		$GLOBALS['settings'][] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'title'  => $title,
-			'type'   => 'section'
-		);
-	}
-
-	function create_subsection($title)
-	{
-		$GLOBALS['settings'][] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'title'  => $title,
-			'type'   => 'subsection'
-		);
-	}
-
-	function create_input_box($label,$name,$help='',$default='',$size='',$maxsize='',$type='',$run_lang=True)
-	{
-		$GLOBALS['settings'][$name] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'type'   => 'input'
-		);
-		foreach(array('label','name','help','default','size','maxsize','type','run_lang','rows','cols','values','subst_help') as $var)
-		{
-			if(isset($$var))
-			{
-				$GLOBALS['settings'][$name][$var] = $$var;
-			}
-		}
-	}
-
-	function create_password_box($label,$name,$help='',$size='',$maxsize='',$run_lang=True)
-	{
-		$GLOBALS['settings'][$name] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'type'   => 'password'
-		);
-		foreach(array('label','name','help','default','size','maxsize','type','run_lang','rows','cols','values','subst_help') as $var)
-		{
-			if(isset($$var))
-			{
-				$GLOBALS['settings'][$name][$var] = $$var;
-			}
-		}
-	}
-
-	function create_text_area($label,$name,$rows,$cols,$help='',$default='',$run_lang=True)
-	{
-		$GLOBALS['settings'][$name] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'type'   => 'text'
-		);
-		foreach(array('label','name','help','default','size','maxsize','type','run_lang','rows','cols','values','subst_help') as $var)
-		{
-			if(isset($$var))
-			{
-				$GLOBALS['settings'][$name][$var] = $$var;
-			}
-		}
-	}
-
-	function create_select_box($label,$name,$values,$help='',$default='',$run_lang=True)
-	{
-		$GLOBALS['settings'][$name] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'type'   => 'select'
-		);
-		foreach(array('label','name','help','default','size','maxsize','type','run_lang','rows','cols','values','subst_help') as $var)
-		{
-			if(isset($$var))
-			{
-				$GLOBALS['settings'][$name][$var] = $$var;
-			}
-		}
-	}
-
-	function create_check_box($label,$name,$help='',$default='',$run_lang=True)
-	{
-		$GLOBALS['settings'][$name] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'type'   => 'check'
-		);
-		foreach(array('label','name','help','default','size','maxsize','type','run_lang','rows','cols','values','subst_help') as $var)
-		{
-			if(isset($$var))
-			{
-				$GLOBALS['settings'][$name][$var] = $$var;
-			}
-		}
-	}
-
-	function create_notify($label,$name,$rows,$cols,$help='',$default='',$values='',$subst_help=True,$run_lang=True)
-	{
-		$GLOBALS['settings'][$name] = array(
-			'admin'  => False,	// admin is controlled by the old-format hook_settings file itself
-			'xmlrpc' => True,	// make everything availible via xmlrpc
-			'type'   => 'notify'
-		);
-		foreach(array('label','name','help','default','size','maxsize','type','run_lang','rows','cols','values','subst_help') as $var)
-		{
-			if(isset($$var))
-			{
-				$GLOBALS['settings'][$name][$var] = $$var;
-			}
-		}
-	}
-	ExecMethod('preferences.uisettings.index');
diff --git a/resources/inc/class.resources_hooks.inc.php b/resources/inc/class.resources_hooks.inc.php
index e1590f5b42..f67add374a 100644
--- a/resources/inc/class.resources_hooks.inc.php
+++ b/resources/inc/class.resources_hooks.inc.php
@@ -44,7 +44,7 @@ class resources_hooks
 			&& $GLOBALS['egw_info']['user']['apps']['importexport'])	// Only one preference right now, need this to prevent errors
 		{
 			$file = array(
-				'Preferences'     => egw::link('/preferences/preferences.php','appname='.$appname),
+				'Preferences'     => egw::link('/index.php','menuaction=preferences.uisettings.index&appname='.$appname),
 			// Categories control access, not regular ACL system
 			//	'Grant Access'    => egw::link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
 			//	'Edit Categories' => egw::link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True')