[Tikiwiki-cvs] tiki tiki-admin_dsn.php, 1.15, 1.15.2.1 tiki-admin_external_wikis.php, 1.15, 1.15.2.1 tiki-admin_hotwords.php, 1.21.2.1, 1.21.2.2 tiki-admin_modules.php, 1.52, 1.52.2.1 tiki-forum_import.php, 1.1.2.4, 1.1.2.5

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23573

Modified Files:
      Tag: BRANCH-1-10
	tiki-admin_dsn.php tiki-admin_external_wikis.php 
	tiki-admin_hotwords.php tiki-admin_modules.php 
	tiki-forum_import.php 
Log Message:
get rid of check_admin

Index: tiki-admin_dsn.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_dsn.php,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- tiki-admin_dsn.php	12 Oct 2007 07:55:23 -0000	1.15
+++ tiki-admin_dsn.php	25 Nov 2007 21:42:34 -0000	1.15.2.1
@@ -11,7 +11,11 @@
 
 include_once ('lib/admin/adminlib.php');
 
-$access->check_admin($user, tra("Admin: DSN"));
+if ($tiki_p_admin != 'y') {
+	$smarty->assign('msg', tra('You do not have permission to use this feature'));
+	$smarty->display('error.tpl');
+	die;
+}
 
 if (!isset($_REQUEST["dsnId"])) {
 	$_REQUEST["dsnId"] = 0;

Index: tiki-admin_external_wikis.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_external_wikis.php,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- tiki-admin_external_wikis.php	12 Oct 2007 07:55:23 -0000	1.15
+++ tiki-admin_external_wikis.php	25 Nov 2007 21:42:34 -0000	1.15.2.1
@@ -11,8 +11,11 @@
 
 include_once ('lib/admin/adminlib.php');
 
-$access->check_admin($user, tra("Admin: External Wikis"));
-
+if ($tiki_p_admin != 'y') {
+	$smarty->assign('msg', tra('You do not have permission to use this feature'));
+	$smarty->display('error.tpl');
+	die;
+}
 
 if (!isset($_REQUEST["extwikiId"])) {
 	$_REQUEST["extwikiId"] = 0;

Index: tiki-admin_hotwords.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_hotwords.php,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -d -r1.21.2.1 -r1.21.2.2
--- tiki-admin_hotwords.php	25 Nov 2007 21:35:24 -0000	1.21.2.1
+++ tiki-admin_hotwords.php	25 Nov 2007 21:42:35 -0000	1.21.2.2
@@ -16,7 +16,11 @@
 	$smarty->display('error.tpl');
 	die;
 }
-$access->check_admin($user, tra("Admin: Hotwords"));
+if ($tiki_p_admin != 'y') {
+	$smarty->assign('msg', tra('You do not have permission to use this feature'));
+	$smarty->display('error.tpl');
+	die;
+}
 
 
 // Process the form to add a user here

Index: tiki-admin_modules.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_modules.php,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -u -d -r1.52 -r1.52.2.1
--- tiki-admin_modules.php	3 Aug 2007 20:08:19 -0000	1.52
+++ tiki-admin_modules.php	25 Nov 2007 21:42:35 -0000	1.52.2.1
@@ -42,8 +42,11 @@
 }
 
 // PERMISSIONS: NEEDS p_admin
-$access->check_admin($user, tra("Admin: Modules"));
-
+if ($tiki_p_admin != 'y') {
+	$smarty->assign('msg', tra('You do not have permission to use this feature'));
+	$smarty->display('error.tpl');
+	die;
+}
 
 // Values for the user_module edit/create form
 $smarty->assign('um_name', '');

Index: tiki-forum_import.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/Attic/tiki-forum_import.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- tiki-forum_import.php	25 Nov 2007 21:35:24 -0000	1.1.2.4
+++ tiki-forum_import.php	25 Nov 2007 21:42:35 -0000	1.1.2.5
@@ -46,12 +46,16 @@
 // Initialization
 require_once ('tiki-setup.php');
 
-if ($feature_forums != 'y') {
+if ($prefs['feature_forums'] != 'y') {
 	$smarty->assign('msg', tra('This feature is disabled').': feature_forums');
 	$smarty->display('error.tpl');
 	die;
 }
-$access->check_admin($user, tra("Import Forums"));
+if ($tiki_p_admin != 'y') {
+	$smarty->assign('msg', tra('You do not have permission to use this feature'));
+	$smarty->display('error.tpl');
+	die;
+}	
 
 include_once ('lib/importerlib.php');
 $import = new Importer($dbTiki);