From 93e5cae6f0088e8a3bd52bc481c05730635fafa2 Mon Sep 17 00:00:00 2001 From: pioder Date: Mon, 1 Jun 2009 18:46:17 +0000 Subject: [PATCH] + Replaced name function from array_push_associative to array_push_assoc + Rewrited posting.php git-svn-id: https://svn.pioder.pl/uf-svn/uF@32 72ec579a-5ced-4fa4-82f3-afba5d98df2f --- eprofile.php | 2 +- forum.php | 4 +- includes/errors.php | 2 +- includes/misc_functions.php | 2 +- includes/pms/pms_folder.php | 2 +- includes/pms/pms_view.php | 2 +- includes/pms/pms_write.php | 2 +- index.php | 2 +- lngs/Polish/main.php | 1 + login.php | 4 +- moderate.php | 2 +- posting.php | 434 +++++++++++++++---------------- register.php | 2 +- search.php | 4 +- skins/subPurple/ntopic_body.tpl | 49 ---- skins/subPurple/posting_body.tpl | 2 +- topic.php | 2 +- user.php | 2 +- users.php | 2 +- warns.php | 4 +- 20 files changed, 228 insertions(+), 298 deletions(-) delete mode 100644 skins/subPurple/ntopic_body.tpl diff --git a/eprofile.php b/eprofile.php index e962d09..48b2130 100644 --- a/eprofile.php +++ b/eprofile.php @@ -270,7 +270,7 @@ $skin = array( 'lavfile'=>$lng['avatar_file'], 'yes'=>$lng['yes'] ); -$skin = array_push_associative($skin,GenerateHeader($lng['leprofile'],'> '.$lng['leprofile'])); +$skin = array_push_assoc($skin,GenerateHeader($lng['leprofile'],'> '.$lng['leprofile'])); if ($msg=='') { $msg = './skins/'.$default_skin.'/blank.tpl'; diff --git a/forum.php b/forum.php index 8ddbe70..e9723ee 100644 --- a/forum.php +++ b/forum.php @@ -48,7 +48,7 @@ $skin = array( 'f_id' => $fid, 'lang'=> $default_lang ); -$skin = array_push_associative($skin,GenerateHeader($lng['showforum'].': '.$forum['name'], '> '.$forum['name'])); +$skin = array_push_assoc($skin,GenerateHeader($lng['showforum'].': '.$forum['name'], '> '.$forum['name'])); //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/forum_body.tpl'); @@ -76,7 +76,7 @@ else { $skin['noposts']='

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

'; } -$skin = array_push_associative($skin, array( +$skin = array_push_assoc($skin, array( 'option_pages' => AddPages(), 'lwith' => $lng['with'], 'lpage' => $lng['page'], diff --git a/includes/errors.php b/includes/errors.php index cc4d561..2b5df85 100644 --- a/includes/errors.php +++ b/includes/errors.php @@ -52,7 +52,7 @@ function message_forum($text, $url, $interval = 1.8) 'queries' => '', 'pa_link' => '', ); - $skin = array_push_associative($skin,GenerateHeader($lng['message_forum'], '> '.$lng['message_forum'])); + $skin = array_push_assoc($skin,GenerateHeader($lng['message_forum'], '> '.$lng['message_forum'])); die( include('./skins/'.ViewSkinName().'/message_body.tpl') ); diff --git a/includes/misc_functions.php b/includes/misc_functions.php index f21ef3f..b2c35ca 100644 --- a/includes/misc_functions.php +++ b/includes/misc_functions.php @@ -465,7 +465,7 @@ function TriggerStats($id, $type) UpdateConfigPosts(); } -function array_push_associative(&$arr) +function array_push_assoc(&$arr) { $ret = ''; $args = func_get_args(); diff --git a/includes/pms/pms_folder.php b/includes/pms/pms_folder.php index 2526ca3..abd4d06 100644 --- a/includes/pms/pms_folder.php +++ b/includes/pms/pms_folder.php @@ -23,7 +23,7 @@ $skin = array( 'lmdate'=>$lng['date'] ); -$skin = array_push_associative($skin,GenerateHeader($lng['lpm'].': '.(($_GET['submode']=='sentbox') ? $lng['sentbox'] : $lng['inbox']), ' > '.$lng['lpm'].' > '.$folder)); +$skin = array_push_assoc($skin,GenerateHeader($lng['lpm'].': '.(($_GET['submode']=='sentbox') ? $lng['sentbox'] : $lng['inbox']), ' > '.$lng['lpm'].' > '.$folder)); //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/msgs_is_body.tpl'); diff --git a/includes/pms/pms_view.php b/includes/pms/pms_view.php index a5ca2a3..cbf1a73 100644 --- a/includes/pms/pms_view.php +++ b/includes/pms/pms_view.php @@ -97,7 +97,7 @@ $skin = array( 'lpinfo'=>$lng['postinfo'] ); -$skin = array_push_associative($skin,GenerateHeader($lng['show_message'].': '.$result['name'], ' > '.$folder.' > +$skin = array_push_assoc($skin,GenerateHeader($lng['show_message'].': '.$result['name'], ' > '.$folder.' > '.$lng['show_message'] .': '.$result['name'])); diff --git a/includes/pms/pms_write.php b/includes/pms/pms_write.php index 617d6fa..1e64007 100644 --- a/includes/pms/pms_write.php +++ b/includes/pms/pms_write.php @@ -56,7 +56,7 @@ $skin = array( 'action'=>$_SERVER['REQUEST_URI'] ); -$skin = array_push_associative($skin, GenerateHeader($lng['lpm'].': '.$lng['write_pm'], '>'.$lng['lpm'].' > '.$lng['write_pm'])); +$skin = array_push_assoc($skin, GenerateHeader($lng['lpm'].': '.$lng['write_pm'], '>'.$lng['lpm'].' > '.$lng['write_pm'])); if ($msg=='') { diff --git a/index.php b/index.php index 1f8c809..de1aa79 100644 --- a/index.php +++ b/index.php @@ -45,7 +45,7 @@ $skin = array( 'lpm_msgs' => ($_SESSION['uid']>0) ? $lng['pm_messages'] : '', 'amsgs' => ($_SESSION['uid']>0) ? User::UserMsgs() : '' ); -$skin = array_push_associative($skin, GenerateHeader($lng['mainpage'], '> '.$lng['mainpage'])); +$skin = array_push_assoc($skin, GenerateHeader($lng['mainpage'], '> '.$lng['mainpage'])); //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/index_body.tpl'); diff --git a/lngs/Polish/main.php b/lngs/Polish/main.php index 8d29e51..92edf84 100644 --- a/lngs/Polish/main.php +++ b/lngs/Polish/main.php @@ -220,6 +220,7 @@ $lng['invalidmode']='Nieprawidłowa opcja pliku'; $lng['no_group']='Grupa nie istnieje!
Powrót do strony głównej grup.'; $lng['message_sent']='Twoja wiadomość została wysłana
Powrót na forum
'; $lng['perror_2']='Nie jesteś autorem tego postu albo moderatorem'; +$lng['perror_3']='Nazwa tematu nie została wypełniona bądź jest krótsza niż 5 znaków!'; $lng['empty password']='Podaj Hasło!'; $lng['empty email']='Podaj Email!'; $lng['warn_is_added']='Ostrzeżenie zostało dodane.
Powrót na forum.'; diff --git a/login.php b/login.php index 28f1996..995bf96 100644 --- a/login.php +++ b/login.php @@ -125,7 +125,7 @@ if (isset($_GET['mode'])) 'llog_in'=> $lng['llog_in'], 'msg' => $msg ); - $skin = array_push_associative($skin, GenerateHeader($lng['llogin'],'> '.$lng['llogin'])); + $skin = array_push_assoc($skin, GenerateHeader($lng['llogin'],'> '.$lng['llogin'])); include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/login_body.tpl'); $skin['pa_link']=''; @@ -166,7 +166,7 @@ if (isset($_GET['mode'])) 'lsave' => $lng['save'], 'pa_link'=>'' ); - $skin = array_push_associative($skin, GenerateHeader($lng['lforgot_pass2'], '> '.$lng['lforgot_pass2'])); + $skin = array_push_assoc($skin, GenerateHeader($lng['lforgot_pass2'], '> '.$lng['lforgot_pass2'])); include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/newpass_body.tpl'); $stop = TimeGeneration(); diff --git a/moderate.php b/moderate.php index 235a9f5..f9d1ca9 100644 --- a/moderate.php +++ b/moderate.php @@ -129,7 +129,7 @@ switch(trim($_GET['action'])) 'L.reset' => $lng['reset'], 'OPTIONS.select_forum' => Forum::AddForums($tid) ); - $skin = array_push_associative($skin, GenerateHeader($lng['move_topic'].': '.Topic::TopicInformation($tid,'name'),'' + $skin = array_push_assoc($skin, GenerateHeader($lng['move_topic'].': '.Topic::TopicInformation($tid,'name'),'' .$lng['move_topic'].': ' .Topic::TopicInformation($tid,'name'))); if ($_SESSION['uid']>0) diff --git a/posting.php b/posting.php index 22ece46..b9e241c 100644 --- a/posting.php +++ b/posting.php @@ -30,32 +30,16 @@ SessDelInvalid(); SessRegister(); SessDeleteOld(); $msg=''; + if ($_SESSION['uid']<1) { message_forum($lng['youarenotlogd'],'login.php?mode=login'); } -/**foreach ($_POST as $name => $value) -{ - if ($forum_config['use_censorlist']) - { - $_POST[$name] = Secure::UseCensorlist($value); - } -} -*/ $start = TimeGeneration(); //add skin variables -$skin = array( -'smiles'=>Post::SmilesShow(), -//labels -'lsmiles'=>$lng['smiles'], -'ltopicname'=>$lng['ltopicname'], -'lsave'=>$lng['save'], -'lreset'=>$lng['reset'], -'lmsg'=>$lng['message'], -'lsticky_topic'=>$lng['sticky_topic'], -'lwritetopic'=>$lng['writetopic'], -); -$skin = array_push_associative($skin, GenerateHeader('','')); +$skin = array(); + +$skin = array_push_assoc($skin, GenerateHeader('','')); $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); if(RANK=='2') @@ -66,267 +50,261 @@ else { $skin['pa_link']=''; } -switch(trim($_GET['mode'])) + +if (isset($_POST['textedit'])) { - /** - * - functions for reply: normal, editing, quoting... - * - **/ - case 'qpost': //quote post + $errors = false; + //check post form + if (($_POST['textedit'] =='' ) or (strlen(trim($_POST['textedit']))<10)) { - $msg =''; - if (isset($_POST['textedit'])) - { - if (($_POST['textedit'] !='' ) and (strlen(trim($_POST['textedit']))>10)) - { - if (isset($_COOKIE['antiflood_time'])) - { - if ($_COOKIE['antiflood_time']>time()) - { - message_forum($lng['antiflood_enabled'],$_SERVER['REQUEST_URI']); - } - } - else - { - setcookie('antiflood_time',(time() + $forum_config['time_antiflood'])); - } - $_POST['textedit'] = Secure::TagsReplace($_POST['textedit']); - $id = Post::NewPost(intval($_GET['t']),$_POST['textedit'], $_SESSION['uid']); - $count = ceil(($id / 15 )); - if ($count >1) - { - $page= '&page='.$count; - } - else - { - $page=''; - } - $stop = TimeGeneration(); - message_forum($lng['post_is_saved'],'topic.php?t='.$_GET['t'].$page.'#'.$id); - } - else - { - $message = $lng['perror_1']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; - } - } - else - { - $_POST['textedit']='[quote]'.stripslashes(Topic::PostInformation($_GET['id'],'text')).'[/quote]'; + $errors = true; + $message = $lng['perror_1']; + } + + if ($_GET['mode'] == 'ntopic') + { + if (($_POST['ntopic']!='') or (strlen(trim($_POST['ntopic']))>5)) + { + $errors = true; + $message = $lng['perror_3']; } - Secure::topic_exists(intval($_GET['t'])); - Secure::TopicLocked(intval($_GET['t'])); - $skin['mainpage'] = $lng['quote']; - $skin['lmainpage'] = '> '.$lng['quote']; - $skin['f_id'] = $_GET['id']; - $skin['action'] = 'posting.php?mode=qpost&id='.$_GET['id'].'&t='.$_GET['t']; - if ($msg=='') - { - $msg='./skins/'.$default_skin.'/blank.tpl'; - } - include('./skins/'.$default_skin.'/overall_header.tpl'); - include('./skins/'.$default_skin.'/posting_body.tpl'); - include('./skins/'.$default_skin.'/overall_footer.tpl'); - break; } - case 'edit': //edit post + + //antiflood lock + if (isset($_COOKIE['antiflood_time'])) { - if ((User::RankAdminMod($_SESSION['uid'])) or ($_SESSION['uid']==Topic::PostInformation($_GET['id'],'u_id'))) + if ($_COOKIE['antiflood_time']>time()) { - $msg =''; - if (isset($_POST['textedit'])) - { - if (($_POST['textedit'] !='' ) and (strlen(trim($_POST['textedit']))>10)) - { - if (isset($_COOKIE['antiflood_time'])) - { - if ($_COOKIE['antiflood_time']>time()) - { - message_forum($lng['antiflood_enabled'],$_SERVER['REQUEST_URI']); - } - } - else - { - setcookie('antiflood_time',(time() + $forum_config['time_antiflood'])); - } - $_POST['textedit'] = Secure::TagsReplace($_POST['textedit']); - Post::EditPost(intval($_GET['id']),$_POST['textedit']); - $count = ceil((Topic::PostInformation(intval($_GET['id']),'tp_id') / 15 )); - if ($count >1) - { - $page= '&page='.$count; - } - else - { - $page=''; - } - $stop = TimeGeneration(); - message_forum($lng['post_is_saved'],'topic.php?t='.Topic::PostInformation(intval($_GET['id']),'t_id').$page.'#p'.$_GET['id']); - } - else + message_forum($lng['antiflood_enabled'],$_SERVER['REQUEST_URI']); + } + } + else + { + setcookie('antiflood_time',(time() + $forum_config['time_antiflood'])); + } + + //prepare post... + if (!$errors) + { + $_POST['textedit'] = Secure::TagsReplace($_POST['textedit']); + if ($_GET['mode']=='ntopic') + { + $_POST['ntopic'] = Secure::UseCensorlist(strip_tags(trim($_POST['ntopic']))); + if (isset($_POST['topic_sticky'])) { - $message = $lng['perror_1']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; - } + $_POST['topic_sticky']='1'; } else { - $_POST['textedit']=stripslashes(Topic::PostInformation($_GET['id'],'text')); + $_POST['topic_sticky']='0'; } } - $skin['mainpage'] = $lng['editpost']; - $skin['lmainpage'] = '> '.$lng['editpost']; - $skin['f_id'] = intval($_GET['id']); - $skin['action'] = 'posting.php?mode=edit&id='.intval($_GET['id']); - if ($msg=='') - { - $msg='./skins/'.$default_skin.'/blank.tpl'; - } - include('./skins/'.$default_skin.'/overall_header.tpl'); - include('./skins/'.$default_skin.'/posting_body.tpl'); - include('./skins/'.$default_skin.'/overall_footer.tpl'); - break; - } - case 'rpost': //reply post - { - $msg =''; - if (isset($_POST['textedit'])) + + //do it! + switch ($_GET['mode']) { - if (($_POST['textedit'] !='' ) and (strlen(trim($_POST['textedit']))>10)) + case 'rpost': { - if (isset($_COOKIE['antiflood'])) - { - if ($_COOKIE['antiflood_time']>time()) - { - message_forum($lng['antiflood_enabled'],$_SERVER['REQUEST_URI']); - } - } - else - { - setcookie('antiflood_time',(time() + $forum_config['time_antiflood'])); - } - $_POST['textedit'] = Secure::TagsReplace($_POST['textedit']); - $id = Post::NewPost(intval($_GET['id']),$_POST['textedit'], $_SESSION['uid']); $count =ceil(($id / 15 )); if ($count >1) { - $page= '&page='.$count; + $page= '&page='.$count; } else { $page=''; } - $stop = TimeGeneration(); - message_forum($lng['post_is_saved'],'topic.php?t='.$_GET['id'].$page.'#p'.$id); + $redirect_url = 'topic.php?t='.$_GET['id'].$page.'#p'.$id; + break; } - else + + case 'qpost': { - $message = $lng['perror_1']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; - } - } - else - { - $_POST['textedit']=''; - } - Secure::topic_exists(intval($_GET['id'])); - Secure::TopicLocked(intval($_GET['id'])); - $skin['mainpage'] = $lng['answer'].': '.Topic::TopicInformation(intval($_GET['id']),'name'); - $skin['lmainpage'] = '> '.$lng['answer'].': '.Topic::TopicInformation(intval($_GET['id']),'name'); - $skin['f_id'] = $_GET['id']; - $skin['action'] = 'posting.php?mode=rpost&id='.$_GET['id']; - if ($msg=='') - { - $msg='./skins/'.$default_skin.'/blank.tpl'; - } - include('./skins/'.$default_skin.'/overall_header.tpl'); - include('./skins/'.$default_skin.'/posting_body.tpl'); - include('./skins/'.$default_skin.'/overall_footer.tpl'); - break; - } - /** - * - Select new TOPIC - * - **/ - case 'ntopic': //new topic - { - $msg =''; - if ((isset($_POST['textedit'])) and (isset($_POST['ntopic']))) - { - if (($_POST['textedit'] !='' ) and ($_POST['ntopic']!='') and (strlen(trim($_POST['textedit']))>10) and (strlen(trim($_POST['ntopic']))>5)) - { - $_POST['textedit'] = Secure::TagsReplace($_POST['textedit']); - if (isset($_COOKIE['antiflood_time'])) + $id = Post::NewPost(intval($_GET['id']),$_POST['textedit'], $_SESSION['uid']); + $count =ceil(($id / 15 )); + if ($count >1) { - if ($_COOKIE['antiflood_time']>time()) - { - message_forum($lng['antiflood_enabled'],$_SERVER['REQUEST_URI']); - } + $page= '&page='.$count; } else { - setcookie('antiflood_time',(time() + $forum_config['time_antiflood'])); + $page=''; } - $_POST['ntopic'] = strip_tags(addslashes($_POST['ntopic'])); - if (isset($_POST['topic_sticky'])) + $redirect_url = 'topic.php?t='.$_GET['id'].$page.'#p'.$id; + + break; + } + + case 'edit': + { + Post::EditPost(intval($_GET['id']),$_POST['textedit']); + $count = ceil((Topic::PostInformation(intval($_GET['id']),'tp_id') / 15 )); + if ($count >1) { - $_POST['topic_sticky']='1'; + $page= '&page='.$count; } else { - $_POST['topic_sticky']='0'; + $page=''; } - $last = Post::NewTopic($_POST['textedit'],$_POST['ntopic'], intval($_GET['f']), $_SESSION['uid'], $_POST['topic_sticky']); - $stop = TimeGeneration(); - message_forum($lng['post_is_saved'],'topic.php?t='.$last); + $redirect_url = 'topic.php?t='.Topic::PostInformation(intval($_GET['id']),'t_id').$page.'#p'.$_GET['id']; + + break; } - else + + case 'ntopic': { - $message = $lng['perror_1']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; + $last = Post::NewTopic($_POST['textedit'],$_POST['ntopic'], intval($_GET['f']), $_SESSION['uid'], $_POST['topic_sticky']); + $redirect_url = 'topic.php?t='.$last; + break; } } - else - { - $_POST['ntopic'] = ''; - $_POST['textedit']=''; + //redirecting to topic page... + $stop = TimeGeneration(); + message_forum($lng['post_is_saved'], $redirect_url); + } + else + { + $msg = './skins/'.$default_skin.'/post_error_body.tpl'; + } +} +else +{ + switch($_GET['mode']) + { + case 'qpost': + { + $_POST['textedit'] = (empty($_POST['textedit'])) ? '[quote]'.stripslashes(Topic::PostInformation($_GET['id'],'text')).'[/quote]' : $_POST['textedit']; + break; } - $sql = "SELECT `lock`, `name`, `f_id` FROM ".FORUMS_TABLE." WHERE `f_id`='".intval($_GET['f'])."'"; - $forum = DataBase::fetch(DataBase::sql_query($sql, GENERAL, 'Could not obtain forum information')); - if($forum['name']=='') + + case 'edit': { - message_forum($lng['no_forum'], 'index.php'); + $_POST['textedit'] = (empty($_POST['textedit'])) ? stripslashes(Topic::PostInformation($_GET['id'],'text')) : $_POST['textedit']; + break; } - if($forum['lock']=='1') + + case 'rpost': { - message_forum($lng['no_posting_forum_locked'],'index.php'); + $_POST['textedit'] = (empty($_POST['textedit'])) ? '' : $_POST['textedit']; + break; } - $skin['mainpage'] = $lng['writetopic']; - $skin['action'] = $_SERVER['REQUEST_URI']; - $skin['lmainpage'] = '> '.$forum['name'].' >'.$lng['writetopic']; - $skin['f_id']=$_GET['f']; - if ($msg=='') + + case 'ntopic': { - $msg='./skins/'.$default_skin.'/blank.tpl'; + $_POST['textedit'] = (empty($_POST['textedit'])) ? '' : $_POST['textedit']; + $_POST['ntopic'] = (empty($_POST['ntopic'])) ? '' : $_POST['ntopic']; + break; } - include('./skins/'.$default_skin.'/overall_header.tpl'); - include('./skins/'.$default_skin.'/posting_body.tpl'); - include('./skins/'.$default_skin.'/overall_footer.tpl'); + } +} + +//generating output page +if ($_GET['mode'] == 'rpost' || $_GET['mode'] == 'qpost') +{ + Secure::topic_exists(intval($_GET['id'])); + Secure::TopicLocked(intval($_GET['id'])); +} + +if ($_GET['mode'] == 'ntopic') +{ + $sql = "SELECT `lock`, `name`, `f_id` FROM ".FORUMS_TABLE." WHERE `f_id`='".intval($_GET['f'])."'"; + $forum = DataBase::fetch(DataBase::sql_query($sql, GENERAL, 'Could not obtain forum information')); + if($forum['name']=='') + { + message_forum($lng['no_forum'], 'index.php'); + } + if($forum['lock']=='1') + { + message_forum($lng['no_posting_forum_locked'],'index.php', 5); + } +} + +if ($_GET['mode']=='edit') +{ + if (Topic::PostInformation(trim(strip_tags($_GET['id'])), 'p_id')== '') + { + message_forum($lng['no_message'], 'index.php'); + } + + if ((!User::RankAdminMod($_SESSION['uid'])) or ($_SESSION['uid']!=Topic::PostInformation($_GET['id'],'u_id'))) + { + message_forum($lng['perror_2'], 'index.php'); + } +} + +switch ($_GET['mode']) +{ + case 'ntopic': + { + $skin = array_push_assoc($skin, array( + 'mainpage' => $lng['writetopic'], + 'lmainpage' => '> '.$forum['name'].' >'.$lng['writetopic'] + )); + break; + } + + case 'edit': + { + $skin = array_push_assoc($skin, array( + 'mainpage' => $lng['editpost'], + 'lmainpage' => '> '.$lng['editpost'] + )); + break; + } + + case 'rpost': + { + $skin = array_push_assoc($skin, array( + 'mainpage' => $lng['answer'].': '.Topic::TopicInformation(intval($_GET['id']),'name'), + 'lmainpage' => '> '.$lng['answer'].': '.Topic::TopicInformation(intval($_GET['id']),'name') + )); break; } + + case 'qpost': + { + $skin = array_push_assoc($skin, array( + 'mainpage' => $lng['quote'], + 'lmainpage' => '> '.$lng['quote'] + )); + break; + } + // if no mode... :D default: { $stop = TimeGeneration(); message_forum($lng['invalidmode'],'index.php'); break; - } + } +} + +$skin = array_push_assoc($skin, array( +'smiles'=>Post::SmilesShow(), +//labels +'lsmiles'=>$lng['smiles'], +'ltopicname'=>$lng['ltopicname'], +'lsave'=>$lng['save'], +'lreset'=>$lng['reset'], +'lmsg'=>$lng['message'], +'lsticky_topic'=>$lng['sticky_topic'], +'lwritetopic'=>$lng['writetopic'], +)); + +if ($msg=='') +{ + $msg='./skins/'.$default_skin.'/blank.tpl'; } + +//do it! +include('./skins/'.$default_skin.'/overall_header.tpl'); +include('./skins/'.$default_skin.'/posting_body.tpl'); +include('./skins/'.$default_skin.'/overall_footer.tpl'); +?> diff --git a/register.php b/register.php index 882c282..0c5105b 100644 --- a/register.php +++ b/register.php @@ -147,7 +147,7 @@ $skin = array( 'pa_link'=>'' ); $_POST['allow_gg']='1'; -$skin = array_push_associative($skin, GenerateHeader($lng['lregister'],'> '.$lng['lregister'])); +$skin = array_push_assoc($skin, GenerateHeader($lng['lregister'],'> '.$lng['lregister'])); if ($msg=='') { $msg = './skins/'.$default_skin.'/blank.tpl'; diff --git a/search.php b/search.php index 2e3b68a..80abd40 100644 --- a/search.php +++ b/search.php @@ -226,7 +226,7 @@ if ((isset($_POST['keywords'])) || ($_GET['content']=='lastposts') || ($_GET['co 'ltopicname'=>$lng['ltopicname'], 'lang'=> $default_lang ); - $skin = array_push_associative($skin,GenerateHeader($window_title,$navigator_title)); + $skin = array_push_assoc($skin,GenerateHeader($window_title,$navigator_title)); include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/forum_body.tpl'); $query = DataBase::sql_query($sql,GENERAL, 'Could not obtain topics information'); @@ -283,7 +283,7 @@ else ); $window_title = $lng['lsearch']; $navigator_title = '> '.$lng['lsearch']; - $skin = array_push_associative($skin,GenerateHeader($window_title,$navigator_title)); + $skin = array_push_assoc($skin,GenerateHeader($window_title,$navigator_title)); include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/search_body.tpl'); } diff --git a/skins/subPurple/ntopic_body.tpl b/skins/subPurple/ntopic_body.tpl deleted file mode 100644 index 224c543..0000000 --- a/skins/subPurple/ntopic_body.tpl +++ /dev/null @@ -1,49 +0,0 @@ - -
- -
- - - - - -
- - - - -
-

:  -

- -
-  - - - - - - - -
Post
- - - - - - - -

 -

:
-
- - 0) { ?> - - -

-   - -
-
diff --git a/skins/subPurple/posting_body.tpl b/skins/subPurple/posting_body.tpl index 4d4058a..0727d99 100644 --- a/skins/subPurple/posting_body.tpl +++ b/skins/subPurple/posting_body.tpl @@ -1,5 +1,5 @@ -
+ diff --git a/topic.php b/topic.php index 80f0792..5cb9efc 100644 --- a/topic.php +++ b/topic.php @@ -47,7 +47,7 @@ $skin = array( onMouseOut="this.src=\'skins/'.$default_skin.'/images/lng_'.$default_lang.'/reply.gif\'" border="0" alt="reply">' ); -$skin = array_push_associative($skin, GenerateHeader($lng['showtopic'].': '.$topic['name'], '> '.$forum['name'].' > '.$topic['name'])); +$skin = array_push_assoc($skin, GenerateHeader($lng['showtopic'].': '.$topic['name'], '> '.$forum['name'].' > '.$topic['name'])); //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); diff --git a/user.php b/user.php index b6fca7e..0f80944 100644 --- a/user.php +++ b/user.php @@ -97,7 +97,7 @@ $skin = array( 'user_email'=>($user_info['allow_email']=='1') ? 'email' : '', ); -$skin = array_push_associative($skin,GenerateHeader($lng['showprofile'].': '.$user_info['nick'], '> '.$lng['showprofile'].': '.$user_info['nick'])); +$skin = array_push_assoc($skin,GenerateHeader($lng['showprofile'].': '.$user_info['nick'], '> '.$lng['showprofile'].': '.$user_info['nick'])); //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/user_body.tpl'); diff --git a/users.php b/users.php index ddad51c..4140ae6 100644 --- a/users.php +++ b/users.php @@ -162,7 +162,7 @@ $skin = array( 'luname'=>$lng['user_name'], 'lgo'=>$lng['lgo'] ); -$skin = array_push_associative($skin, GenerateHeader($lng['lusers'],'> '.$lng['lusers'])); +$skin = array_push_assoc($skin, GenerateHeader($lng['lusers'],'> '.$lng['lusers'])); //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/users_body.tpl'); diff --git a/warns.php b/warns.php index b7757f0..d8f782e 100644 --- a/warns.php +++ b/warns.php @@ -109,7 +109,7 @@ switch(trim($_GET['mode'])) 'lall_warns'=>$lng['all_warns'], 'queries'=>ShowQueries($start, TimeGeneration()) ); - $skin = array_push_associative($skin, GenerateHeader($lng['add_warn'].': '.$nick_name,'> '.$lng['add_warn'].': '.$nick_name)); + $skin = array_push_assoc($skin, GenerateHeader($lng['add_warn'].': '.$nick_name,'> '.$lng['add_warn'].': '.$nick_name)); if(User::UserInformation($_SESSION['uid'],'rank')=='2') { $skin['pa_link']=''.$lng['pa_link'].''; @@ -138,7 +138,7 @@ switch(trim($_GET['mode'])) 'lvalue' => $lng['value'], 'lmotive' => $lng['motive'] ); - $skin = array_push_associative($skin, GenerateHeader($lng['show_warns'].': '.$user['nick'],'> '.$lng['show_warns'].': '.$user['nick'])); + $skin = array_push_assoc($skin, GenerateHeader($lng['show_warns'].': '.$user['nick'],'> '.$lng['show_warns'].': '.$user['nick'])); include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/warns_view_body.tpl'); $sql = "SELECT * FROM `".WARNINGS_TABLE."` WHERE `u_id`='$uid'";