From 13e01d7b93a9f4acf44766ca474956e349e99621 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Sun, 7 Sep 2003 16:52:51 +0000
Subject: [PATCH] Extension var update

git-svn-id: file:///svn/phpbb/trunk@4480 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/admin_attachments.php |   2 +-
 phpBB/adm/admin_ban.php         |   2 +-
 phpBB/adm/admin_bbcodes.php     |   4 +---
 phpBB/adm/admin_board.php       |   2 +-
 phpBB/adm/admin_database.php    |   2 +-
 phpBB/adm/admin_disallow.php    |   2 +-
 phpBB/adm/admin_email.php       |   2 +-
 phpBB/adm/admin_icons.php       |   2 +-
 phpBB/adm/admin_permissions.php |   2 +-
 phpBB/adm/admin_phpinfo.php     |   2 +-
 phpBB/adm/admin_prune.php       |   2 +-
 phpBB/adm/admin_prune_users.php |   2 +-
 phpBB/adm/admin_ranks.php       |   2 +-
 phpBB/adm/admin_search.php      |   2 +-
 phpBB/adm/admin_styles.php      |   5 ++++-
 phpBB/adm/admin_viewlogs.php    |   2 +-
 phpBB/adm/admin_words.php       |   2 +-
 phpBB/adm/images/cellpic1.gif   | Bin 246 -> 369 bytes
 phpBB/adm/index.php             |   4 +---
 19 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php
index 01e5ef59e5..7f4ca15563 100644
--- a/phpBB/adm/admin_attachments.php
+++ b/phpBB/adm/admin_attachments.php
@@ -22,7 +22,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 if (!$auth->acl_get('a_attach'))
diff --git a/phpBB/adm/admin_ban.php b/phpBB/adm/admin_ban.php
index 72dafc4553..356c3e9eea 100644
--- a/phpBB/adm/admin_ban.php
+++ b/phpBB/adm/admin_ban.php
@@ -37,7 +37,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Load default header
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have ban permissions?
diff --git a/phpBB/adm/admin_bbcodes.php b/phpBB/adm/admin_bbcodes.php
index e8c2550644..0ecf9b5ee7 100644
--- a/phpBB/adm/admin_bbcodes.php
+++ b/phpBB/adm/admin_bbcodes.php
@@ -18,9 +18,7 @@ if (!empty($setmodules))
 		return;
 	}
 
-	$filename = basename(__FILE__);
-	$module['POST']['BBCODES'] = $filename . $SID;
-
+	$module['POST']['BBCODES'] = basename(__FILE__) . $SID;
 	return;
 }
 
diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index 0960262414..a67e6a16e1 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -37,7 +37,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Load default header
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Get mode
diff --git a/phpBB/adm/admin_database.php b/phpBB/adm/admin_database.php
index b47f820b69..8c73927951 100644
--- a/phpBB/adm/admin_database.php
+++ b/phpBB/adm/admin_database.php
@@ -28,7 +28,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Load default header
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 include($phpbb_root_path . 'functions_compress.'.$phpEx);
 
diff --git a/phpBB/adm/admin_disallow.php b/phpBB/adm/admin_disallow.php
index 7b8e9e6ca3..c6c1fcfa18 100644
--- a/phpBB/adm/admin_disallow.php
+++ b/phpBB/adm/admin_disallow.php
@@ -34,7 +34,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_user.'.$phpEx);
 
diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php
index 64cd4ab942..bcbfc53440 100644
--- a/phpBB/adm/admin_email.php
+++ b/phpBB/adm/admin_email.php
@@ -29,7 +29,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Check permissions
diff --git a/phpBB/adm/admin_icons.php b/phpBB/adm/admin_icons.php
index bf041701e9..b81c4ccd57 100644
--- a/phpBB/adm/admin_icons.php
+++ b/phpBB/adm/admin_icons.php
@@ -36,7 +36,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have general permissions?
diff --git a/phpBB/adm/admin_permissions.php b/phpBB/adm/admin_permissions.php
index 92581923df..9bc6c65a6d 100644
--- a/phpBB/adm/admin_permissions.php
+++ b/phpBB/adm/admin_permissions.php
@@ -35,7 +35,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 
diff --git a/phpBB/adm/admin_phpinfo.php b/phpBB/adm/admin_phpinfo.php
index d4583a8631..afedce729c 100644
--- a/phpBB/adm/admin_phpinfo.php
+++ b/phpBB/adm/admin_phpinfo.php
@@ -28,7 +28,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Load default header
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 
diff --git a/phpBB/adm/admin_prune.php b/phpBB/adm/admin_prune.php
index 0c19d6a7d9..2663cad24a 100644
--- a/phpBB/adm/admin_prune.php
+++ b/phpBB/adm/admin_prune.php
@@ -34,7 +34,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have permission?
diff --git a/phpBB/adm/admin_prune_users.php b/phpBB/adm/admin_prune_users.php
index 4c045c7bea..a623ac5476 100644
--- a/phpBB/adm/admin_prune_users.php
+++ b/phpBB/adm/admin_prune_users.php
@@ -34,7 +34,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have forum admin permissions?
diff --git a/phpBB/adm/admin_ranks.php b/phpBB/adm/admin_ranks.php
index 7869ec1600..3eba8532a3 100644
--- a/phpBB/adm/admin_ranks.php
+++ b/phpBB/adm/admin_ranks.php
@@ -33,7 +33,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Let's set the root dir for phpBB
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have permission?
diff --git a/phpBB/adm/admin_search.php b/phpBB/adm/admin_search.php
index 0d565c3517..6d5999575c 100644
--- a/phpBB/adm/admin_search.php
+++ b/phpBB/adm/admin_search.php
@@ -34,7 +34,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 include($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
 
diff --git a/phpBB/adm/admin_styles.php b/phpBB/adm/admin_styles.php
index 4fd02e5171..8f5e233328 100644
--- a/phpBB/adm/admin_styles.php
+++ b/phpBB/adm/admin_styles.php
@@ -18,6 +18,9 @@
 // Previews of templates, imagesets, themes ... unified
 // Security review
 
+// BUGS
+// Editing template -> store in DB -> some kind of failure
+
 if (!empty($setmodules))
 {
 	if (!$auth->acl_get('a_styles'))
@@ -37,7 +40,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have styles admin permissions?
diff --git a/phpBB/adm/admin_viewlogs.php b/phpBB/adm/admin_viewlogs.php
index 97adfb852d..a441026860 100644
--- a/phpBB/adm/admin_viewlogs.php
+++ b/phpBB/adm/admin_viewlogs.php
@@ -37,7 +37,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have styles admin permissions?
diff --git a/phpBB/adm/admin_words.php b/phpBB/adm/admin_words.php
index fae053b47f..e2f629290d 100644
--- a/phpBB/adm/admin_words.php
+++ b/phpBB/adm/admin_words.php
@@ -33,7 +33,7 @@ if (!empty($setmodules))
 define('IN_PHPBB', 1);
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have forum admin permissions?
diff --git a/phpBB/adm/images/cellpic1.gif b/phpBB/adm/images/cellpic1.gif
index 715b8d4aa8b8752fc3e2ff6deb214cd424ad413f..35932cc07b7f98a298f5354320323d077118f12a 100644
GIT binary patch
literal 369
zcmV-%0gnDhNk%w1VH5xy0K@<Q+1}&U+~LsI+}GXV#Lm^!+TY63*wWeF%+%V*(bvw@
z+R4(`(AeC@&eq!B<k8sO%hTD&(b&e%)x*rx&(_=1+TX;?)X&!3&eht-(AL7s)5Xr!
z)!X3P;N{2A*TKrtA^8LV00000EC2ui02BZm000H<U?+}bSq2=3rfce|EFvSAqRjGr
z%NVx(1mI5?+ysN4q;kn@IyKH{QUk48r&y|0%k63=U$Axp7K=3&0(oL#tJ`U~rF|q6
zhsJx6An8jQeu09186Fvjh#rQCiii;jkdX-s3zHF#n2-ww5C)r@o(7={5T6DJ5UCKT
zsH&^1tUU@CG&MCmJ+(a-6ulI@zr4b|7s3w=0s_d%%E=GR&&dZ52i4Qm*x1w71qBt|
z;0N9n-{chs-!JOx>H+TW@bT{h0R#5;`1$z&{Qds_{~Q2tK(L@ef&&u*5aD1%!43^0
PN_3#8qQ#3CLjV9f&xgLM

literal 246
zcmV<S015v`Nk%w1VF>^k0K@<Q%+%Y?*4)X`*x=>q*xuvX;N;ZX;NRrv-QwoR(bv(~
z-pJ6_$kN!-+1|&{*Vf$O+27>X-s92O-PPRT(AVA9-QwQk=gZUC)7szD+Th&b<=o-s
z-sI=b*4x|R=FQdHA^8LV00000EC2ui00{sY000GZ;Npy=vz$pXE@|r~j3CeHd|k6}
z@B9S-zTfZiDFTYfPT<oiHa~#?B^sSlu2%_G!If~ojj&jZDQ7U}Ovb=&w;z+Z9A2s0
w?SwoblIKJIe*}O9goTA08Xg{qiW&%ykdPJ}7L}Eh2LqX!2b}|-pr9cDJIlt3)Bpeg

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index f9dfd15713..5f1673269d 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -11,12 +11,10 @@
 // 
 // -------------------------------------------------------------
 
-
 define('IN_PHPBB', 1);
-
 // Include files
 $phpbb_root_path = '../';
-require($phpbb_root_path . 'extension.inc');
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
 require('pagestart.' . $phpEx);
 
 // Do we have any admin permissions at all?