From 9c75d445b07103a91aa86117207baa3e7ec8acbd Mon Sep 17 00:00:00 2001 From: pioder Date: Tue, 28 Jul 2009 13:38:31 +0000 Subject: [PATCH] + 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 --- admin/admin_forums.php | 1 - admin/admin_script.php | 10 ++-- admin/admin_users.php | 13 ++--- admin/index.php | 5 +- config.php | 2 +- eprofile.php | 10 ++-- forum.php | 2 +- includes/admin/class_main.php | 86 +++++------------------------ includes/constants.php | 1 - includes/misc_functions.php | 77 +++++--------------------- search.php | 2 +- skins/subPurple/images/favicon.ico | Bin 1342 -> 0 bytes topic.php | 2 +- users.php | 2 +- 14 files changed, 50 insertions(+), 163 deletions(-) delete mode 100644 skins/subPurple/images/favicon.ico diff --git a/admin/admin_forums.php b/admin/admin_forums.php index d894824..03917a5 100644 --- a/admin/admin_forums.php +++ b/admin/admin_forums.php @@ -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'); diff --git a/admin/admin_script.php b/admin/admin_script.php index c1e0f36..250c815 100644 --- a/admin/admin_script.php +++ b/admin/admin_script.php @@ -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'], diff --git a/admin/admin_users.php b/admin/admin_users.php index dbc6ece..e1994bd 100644 --- a/admin/admin_users.php +++ b/admin/admin_users.php @@ -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 diff --git a/admin/index.php b/admin/index.php index e3e358e..ebab086 100644 --- a/admin/index.php +++ b/admin/index.php @@ -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 ' - - + + µForum ACP diff --git a/config.php b/config.php index bef62b5..74ed476 100644 --- a/config.php +++ b/config.php @@ -13,6 +13,6 @@ define('DB_USER','root'); define('DB_PASS',''); define('DB_NAME','uf'); define('DB_PREFIX','uf_'); -define('VERSION','9.6.25'); +define('VERSION','1.0.4'); define('UF_INSTALLED',true); ?> diff --git a/eprofile.php b/eprofile.php index 6a8ee83..3046384 100644 --- a/eprofile.php +++ b/eprofile.php @@ -231,18 +231,18 @@ $skin = array( 'lovpr'=>$lng['general_settings'], 'L.select_value'=>$lng['select_value'], 'L.limit_users'=>$lng['limit_users'], -'OPTIONS.limit_users'=>AddPages2($userdata['limit_users']), +'OPTIONS.limit_users'=>ListPages($userdata['limit_users']), 'L.posts_in_topic'=>$lng['limit_posts'], -'OPTIONS.limit_tpid'=>AddPages2($userdata['limit_tpid']), +'OPTIONS.limit_tpid'=>ListPages($userdata['limit_tpid']), 'L.topics_in_forum'=>$lng['limit_topics'], -'OPTIONS.limit_ftid'=>AddPages2($userdata['limit_ftid']), +'OPTIONS.limit_ftid'=>ListPages($userdata['limit_ftid']), 'lupr'=>$lng['profile_settings'], 'lspr'=>$lng['signature_settings'], 'ldefault_lang'=>$lng['default_lang'], -'default_lang'=>AddLangs(), +'default_lang'=>ListDir('lngs', $default_lang), 'l2default_lang'=>$lng['select_lang'], 'ldefault_skin'=>$lng['default_skin'], -'default_skin'=>AddSkins(), +'default_skin'=>ListDir('skins', $default_skin), 'l2default_skin'=>$lng['select_skin'], 'lapr'=>$lng['avatar_settings'], 'lsubmit'=>$lng['save'], diff --git a/forum.php b/forum.php index fc261c1..fa0bd1b 100644 --- a/forum.php +++ b/forum.php @@ -77,7 +77,7 @@ else $skin['noposts']='

'.$lng['nopost'].'!

'; } $skin = array_push_assoc($skin, array( -'option_pages' => AddPages(), +'option_pages' => ListPages($page, $count), 'lwith' => $lng['with'], 'lpage' => $lng['page'], 'lpages' => $count, diff --git a/includes/admin/class_main.php b/includes/admin/class_main.php index d92cbe9..cc246a9 100644 --- a/includes/admin/class_main.php +++ b/includes/admin/class_main.php @@ -12,51 +12,11 @@ if ( !defined('IN_uF') ) die('Hacking attempt'); } class Admin_Over -{ - function AddPages() - { - global $count; - global $page; - $content = ''; - for ($i=1;$i<=$count;$i++) - { - if ($i==$page) - { - $content .= ''; - } - else - { - $content .= ''; - } - } - return $content; - unset($content); - } - function AddSkins() - { - global $forum_config; - global $default_skin; - $all=''; - $query = DataBase::sql_query("SELECT `name`, `s_id` FROM `".SKINS_TABLE."`",GENERAL,'Could not obtain skins information'); - while($t = DataBase::fetch($query)) - { - - if ($t['name']==$default_skin) - { - $all .= ''; - } - else - { - $all .= ''; - } - } - return $all; - unset($t, $all); - } - function AddPages2($page)//for edit profile, not used in limit! +{ + function ListPages($page, $count = 50)//for edit profile, not used in limit! { $content = ''; - for ($i=1;$i<=50;$i++) + for ($i=1;$i<=$count;$i++) { if ($i==$page) { @@ -70,20 +30,17 @@ class Admin_Over return $content; unset($content); } - function AddLangs() + + function ListDir($dir, $selection) { - global $forum_config; - global $default_lang; $result=''; - $cat=opendir('./../lngs'); - $notempty = false; - while ($file = readdir($cat)) - { - if($file != '..' && $file !='.' && $file !='') + $rep=opendir('./../'.$dir); + while ($file = readdir($rep)) + { + if($file != '..' && $file !='.' && $file !='' && $file[0] != '.') { - if (is_dir('./../lngs/'.$file)){ - $notempty = true; - if ($file==$default_lang) + if (is_dir('./../'.$dir.'/'.$file)){ + if ($file==$selection) { $result .=''; } @@ -95,26 +52,9 @@ class Admin_Over } } return $result; - unset($cat, $notempty, $file, $result); - } - function ViewSkinName() - { - global $forum_config; - if ($_SESSION['uid']>0) - { - $result = User::UserInformation($_SESSION['uid'],'skin'); - $sql = "SELECT * FROM `".SKINS_TABLE."` WHERE `s_id`='$result'"; - $result = DataBase::fetch(DataBase::sql_query($sql,CRITICAL,'Could not obtain skin information.')); - return $result['name']; - } - else - { - $result = $forum_config['defaultskin']; - $sql = "SELECT * FROM `".SKINS_TABLE."` WHERE `s_id`='$result'"; - $result = DataBase::fetch(DataBase::sql_query($sql,CRITICAL,'Could not obtain skin information.')); - return $result['name']; - } + unset($rep, $file, $result); } + function DefaultLang() { global $forum_config; diff --git a/includes/constants.php b/includes/constants.php index 4150ce1..c7b33a0 100644 --- a/includes/constants.php +++ b/includes/constants.php @@ -32,7 +32,6 @@ define('PM_SENTBOX_TABLE',DB_PREFIX.'msg_sentbox'); define('POSTS_TABLE',DB_PREFIX.'posts'); define('SESSIONS_TABLE',DB_PREFIX.'sessions'); define('SHOUTBOX_TABLE',DB_PREFIX.'shoutbox'); -define('SKINS_TABLE',DB_PREFIX.'skins'); define('SMILES_TABLE',DB_PREFIX.'smiles'); define('USERS_TABLE',DB_PREFIX.'users'); define('USERS_GROUP_TABLE',DB_PREFIX.'users_group'); diff --git a/includes/misc_functions.php b/includes/misc_functions.php index 4f30e32..6060cfb 100644 --- a/includes/misc_functions.php +++ b/includes/misc_functions.php @@ -91,7 +91,8 @@ function UserAgent($agent) $system = (strpos($agent_tst, 'kateos')) ? 'linux_kateos' : $system; $system = (strpos($agent_tst, 'bsd')) ? 'linux_freebsd' : $system; } - if ( $system == '') + + if ( $system == '') { $system = (strpos($agent_tst, 'mac')) ? 'macos' : $system; $system = (strpos($agent_tst, 'aix')) ? 'aix' : $system; @@ -157,83 +158,35 @@ function GenerateTime($request_time) return $date; } - -function AddPages() + +function ListPages($page, $count = 50)//for edit profile, not used in limit! { - global $count; - global $page; $content = ''; for ($i=1;$i<=$count;$i++) { if ($i==$page) - { - $content .= ''; - } - else { - $content .= ''; - } - } - return $content; - unset($content); -} - -function AddPages2($page)//for edit profile, not used in limit! -{ - $content = ''; - for ($i=1;$i<=50;$i++) - { - if ($i==$page) - { - $content .= ''; + $content .= ''; } else { $content .= ''; } } - return $content; unset($content); } - -function AddSkins() -{ - global $forum_config; - global $default_skin; - $all=''; - $query = DataBase::sql_query("SELECT `name`, `s_id` FROM `".SKINS_TABLE."`",GENERAL,'Could not obtain skins information'); - while($t = DataBase::fetch($query)) - { - - if ($t['name']==$default_skin) - { - $all .= ''; - } - else - { - $all .= ''; - } - } - - return $all; - unset($t, $all); -} - -function AddLangs() + +function ListDir($dir, $selection) { - global $forum_config; - global $default_lang; $result=''; - $rep=opendir('./lngs'); - $browseruMoinsUnRepertoire = false; + $rep=opendir('./'.$dir); while ($file = readdir($rep)) - { - if($file != '..' && $file !='.' && $file !='') + { + if($file != '..' && $file !='.' && $file !='' && $file[0] != '.') { - if (is_dir('./lngs/'.$file)){ - $browseruMoinsUnRepertoire = true; - if ($file==$default_lang) + if (is_dir('./'.$dir.'/'.$file)){ + if ($file==$selection) { $result .=''; } @@ -245,7 +198,7 @@ function AddLangs() } } return $result; - unset($rep, $browseruMoinsUnRepertoire, $file, $result); + unset($rep, $file, $result); } function TimeGeneration() @@ -338,10 +291,8 @@ function ViewSkinName() { $result = $forum_config['defaultskin']; } - $sql = "SELECT * FROM `".SKINS_TABLE."` WHERE `s_id`='$result'"; - $result = DataBase::fetch(DataBase::sql_query($sql,CRITICAL,'Could not obtain skin information.')); - return $result['name']; + return $result; } function GenerateLastPost($id, $type) diff --git a/search.php b/search.php index 80abd40..7dd3d25 100644 --- a/search.php +++ b/search.php @@ -257,7 +257,7 @@ if ((isset($_POST['keywords'])) || ($_GET['content']=='lastposts') || ($_GET['co echo '

'.$lng['nopost'].'!

'; } $skin = array( - 'option_pages' => AddPages(), + 'option_pages' => ListPages($page, $count), 'lwith' => $lng['with'], 'lpage' => $lng['page'], 'lpages' => $count, diff --git a/skins/subPurple/images/favicon.ico b/skins/subPurple/images/favicon.ico deleted file mode 100644 index 0772662d730a1b8b104a724cf3ed6a9a0847fe3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1342 zcmb`H%W~675QfEqH=rmUfd#L9DArJHfOEJMq)13&iX3bRwq@OA$?}YB>pGedpX`K6 zkzz;NlB}NjyZ`=s+Lm>P&%JvV_XpO)yOwp|vaE+(xc1M%e{GNMSk`b|TYt;6*6a1! z_x(K2Z!Pxbw(Eum$TC?9A^adnlB8|h8;gJZX^bh0Vmh13T-J46RuvI~Ac&%kH;rp$K&a2Mt1V1X}Vgi!Z5ULn+;TSJIHRgn@lFI zxi*{4a&NBhEu2Lh$E5fT%bw|U8ik=0Vm6yi#^c3evE6Q)reO)`q?BaGek0Ew$Uu*< z2t{=;bR1`dou4mk8#t`WvLpg5e!<}nkk@SA7q&?utGb0+*LCD2DRF375QfVn-4&$} z^1z&=tP*pTWv=UzSIRu!K(!?-aPF;AWz))C?L_Ix=t~&I_^FyMpd@5ab3V6ur8Oi4 zo^RUD7zMV|MWfR~JF-3gJXv@_+bXb-Oj0V1;7k_?0#E#%Hp{F@bG2;@Ur`xvV=glF z{>ywa_sd3+7?KAmVD5X~cC%4R(ZWU>QJZf;{UcG{)_A#|3Voh*um2CuE`zjCrRqsU z$?!-2Fp7wyx{ek$x|dCFOMT`wr;)nI%xKvih24uw@$NGFmg%_Y$%5?Mqd2B;Xb=ai z(xy^PFDJTVqSXXtNHFI))PTx{o%mV(=5xt5{DL$9f@kCw~Y>^y724K zQhgHoU08ldn-42#(I_ranS(jh$r z1XrGO9}djWkHPP_evoAAN(cL)q&jxZ>8@=vtw?t@di&`^K#Z`cab@dut4%$etSf^m aOK>K`O(X2Va2{9;J94_52BOe`)~$ diff --git a/topic.php b/topic.php index 5cb9efc..eb5c7ad 100644 --- a/topic.php +++ b/topic.php @@ -129,7 +129,7 @@ $skin = array( alt="stick">', 'lmod' => $lng['lmod'], 'c_delete_topic'=>$lng['c_delete_topic'], -'option_pages'=>AddPages(), +'option_pages'=>ListPages($page, $count), 'lwith'=>$lng['with'], 'lpage'=>$lng['page'], 'lpages'=>$count diff --git a/users.php b/users.php index 4140ae6..3544dc2 100644 --- a/users.php +++ b/users.php @@ -202,7 +202,7 @@ while($result = DataBase::fetch($query)) include('./skins/'.$default_skin.'/users_item_add_body.tpl'); } $skin = array( -'option_pages'=>AddPages(), +'option_pages'=>ListPages($page, $count), 'lwith'=>$lng['with'], 'lpage'=>$lng['page'], 'lpages'=>$count