+ Deleted skins table - obtaining skin information from skins/ catalog

+ Renamed AddPages to ListPages and rewrited function.
+ Removed AddPages2, AddLangs, Admin_Over::ViewSkinName()
+ Created ListDir() function

git-svn-id: https://svn.pioder.pl/uf-svn/uF@34 72ec579a-5ced-4fa4-82f3-afba5d98df2f
This commit is contained in:
pioder
2009-07-28 13:38:31 +00:00
parent 92e90cd55f
commit 9c75d445b0
14 changed files with 50 additions and 163 deletions

View File

@@ -25,7 +25,6 @@ include('./../lngs/'.Admin_Over::DefaultLang().'/admin.php');
SessDelInvalid();
SessRegister();
SessDeleteOld();
//$default_skin = Admin_Over::ViewSkinName();
if (User::UserInformation($_SESSION['uid'],'rank')!=2)
{
admin_message_forum($lng['yournotadmin'],'../index.php');

View File

@@ -334,10 +334,10 @@ $skin = array(
'forum_disabled'=>$forum_config['disable_forum'],
'L.default_skin'=>$lng['default_skin'],
'L2.default_skin'=>$lng['select_skin'],
'OPTIONS.default_skin'=>AddSkins(),
'OPTIONS.default_skin'=>ListDir('skins', $forum_config['default_skin']),
'L.default_lang'=>$lng['default_lang'],
'L2.default_lang'=>$lng['select_lang'],
'OPTIONS.default_lang'=>AddLangs(),
'OPTIONS.default_lang'=>ListDir('lngs', $forum_config['default_lang']),
'L.meta_keywords'=>$lng['meta_keywords'],
'meta_keywords'=>$forum_config['meta_keywords'],
'L.meta_description'=>$lng['meta_description'],
@@ -361,12 +361,12 @@ $skin = array(
'OPTION.allow_upload_avatars'=>($forum_config['allow_upload_avatars']) ? 'checked="checked"' : '',
'L.select_value'=>$lng['select_value'],
'L.limit_users'=>$lng['limit_users'],
'OPTIONS.limit_users'=>AddPages2($forum_config['limit_users']),
'OPTIONS.limit_users'=>ListPages($forum_config['limit_users']),
'L.posts_in_topic'=>$lng['limit_posts'],
'L.scriptoptions'=>$lng['scriptconfig'],
'OPTIONS.limit_tpid'=>AddPages2($forum_config['limit_tpid']),
'OPTIONS.limit_tpid'=>ListPages($forum_config['limit_tpid']),
'L.topics_in_forum'=>$lng['limit_topics'],
'OPTIONS.limit_ftid'=>AddPages2($forum_config['limit_ftid']),
'OPTIONS.limit_ftid'=>ListPages($forum_config['limit_ftid']),
'L.admin_mod'=>$lng['admin_mod_preferences'],
'L.shoutbox'=>$lng['shoutbox_preferences'],
'L.allow_shoutbox'=>$lng['allow_shoutbox'],

View File

@@ -201,7 +201,6 @@ switch($_GET['mode'])
{
admin_message_forum($lng['no_user'],'admin_users.php?mode=view');
}
$default_skin = Admin_Over::ViewSkinName();
//add skin variables
$skin = array(
//labels profile
@@ -221,11 +220,11 @@ switch($_GET['mode'])
'lovpr'=>$lng['general_settings'],
'L.select_value'=>$lng['select_value'],
'L.limit_users'=>$lng['limit_users'],
'OPTIONS.limit_users'=>Admin_Over::AddPages2($userinfo['limit_users']),
'OPTIONS.limit_users'=>Admin_Over::ListPages($userinfo['limit_users']),
'L.posts_in_topic'=>$lng['limit_posts'],
'OPTIONS.limit_tpid'=>Admin_Over::AddPages2($userinfo['limit_tpid']),
'OPTIONS.limit_tpid'=>Admin_Over::ListPages($userinfo['limit_tpid']),
'L.topics_in_forum'=>$lng['limit_topics'],
'OPTIONS.limit_ftid'=>Admin_Over::AddPages2($userinfo['limit_ftid']),
'OPTIONS.limit_ftid'=>Admin_Over::ListPages($userinfo['limit_ftid']),
'lupr'=>$lng['profile_settings'],
'lspr'=>$lng['signature_settings'],
'ladmpr'=>$lng['admin_settings'],
@@ -234,10 +233,10 @@ switch($_GET['mode'])
'lposts'=>$lng['posts'],
'posts'=>$userinfo['posts'],
'ldefault_lang'=>$lng['default_lang'],
'default_lang'=>Admin_Over::AddLangs(),
'default_lang'=>Admin_Over::ListDir('lngs', $userinfo['default_lang']),
'l2default_lang'=>$lng['select_lang'],
'ldefault_skin'=>$lng['default_skin2'],
'default_skin'=>Admin_Over::AddSkins(),
'default_skin'=>Admin_Over::ListDir('skins', $userinfo['default_skin']),
'l2default_skin'=>$lng['select_skin'],
'lapr'=>$lng['avatar_settings'],
'lsubmit'=>$lng['save'],
@@ -442,7 +441,7 @@ switch($_GET['mode'])
include('./template/user_item_add_body.tpl');
}
$skin = array(
'option_pages'=>Admin_Over::AddPages(),
'option_pages'=>Admin_Over::ListPages($page, $count),
'lwith'=>$lng['with'],
'lpage'=>$lng['page'],
'lpages'=>$count

View File

@@ -21,7 +21,6 @@ include('./../common.php');
include('./../includes/admin/class_main.php');
include('./../includes/classes/class_forum.php');
include('./../lngs/'.Admin_Over::DefaultLang().'/admin.php');
$default_skin = Admin_Over::ViewSkinName();
SessDelInvalid();
SessRegister();
SessDeleteOld();
@@ -33,8 +32,8 @@ echo '
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="shortcut icon" href="../skins/'.$default_skin.'/images/favicon.ico">
<link rel="favicon" href="../skins/'.$default_skin.'/images/favicon.ico">
<link rel="shortcut icon" href="../images/favicon.ico">
<link rel="favicon" href="../images/favicon.ico">
<title>&micro;Forum ACP</title>
<frameset rows="90,*" border="2" framespacing="0" frameborder="yes">
<frame src="header.php" name="nav" marginheight="3" scrolling="no">