diff --git a/admin/admin_script.php b/admin/admin_script.php index 7da8154..c1e0f36 100644 --- a/admin/admin_script.php +++ b/admin/admin_script.php @@ -289,6 +289,14 @@ if (isset($_POST['forum_path'])) /* shoutbox_max_msgs */ $name[] = 'shoutbox_max'; $value[] = (!is_numeric($_POST['shoutbox_limit'])) ? '50' : $_POST['shoutbox_limit']; + + /* pm inbox max */ + $name[] = 'pm_inbox_max'; + $value[] = (!is_numeric($_POST['pm_inbox_max'])) ? '10' : $_POST['pm_inbox_max']; + + /* pm sentbox max */ + $name[] = 'pm_sentbox_max'; + $value[] = (!is_numeric($_POST['pm_sentbox_max'])) ? '10' : $_POST['pm_sentbox_max']; $count_o = count($name); for($i=0;$i<$count_o;$i++) @@ -368,6 +376,15 @@ $skin = array( 'L.shoutbox_limit'=>$lng['shoutbox_max_view'], 'OPTION.shoutbox_limit'=>$forum_config['shoutbox_max'], + +/* pm sentbox max */ +'L.pm_sentbox_max'=>$lng['pm_sentbox_max'], +'OPTION.pm_sentbox_max'=>$forum_config['pm_sentbox_max'], + +/* pm inbox max */ +'L.pm_inbox_max'=>$lng['pm_inbox_max'], +'OPTION.pm_inbox_max'=>$forum_config['pm_inbox_max'], + /* color mod */ 'L.color_mod'=>$lng['color_mod'], 'OPTION.color_mod' => $forum_config['color_mod'], diff --git a/admin/header.php b/admin/header.php index 6a2c1a9..09632a9 100644 --- a/admin/header.php +++ b/admin/header.php @@ -27,7 +27,7 @@ if (User::UserInformation($_SESSION['uid'],'rank')!=2) admin_message_forum($lng['yournotadmin'],'../index.php'); } $skin = array( - 'uf_pa'=>$lng['uf_pa_nav'], + 'uf_pa'=>$lng['uf_pa'], 'index'=>$lng['index'], 'gotoforum'=>$lng['go_to_forum'], 'scriptstat'=>$lng['scriptstat'], diff --git a/admin/index.php b/admin/index.php index 3b07626..e3e358e 100644 --- a/admin/index.php +++ b/admin/index.php @@ -29,13 +29,13 @@ if (User::UserInformation($_SESSION['uid'],'rank')!=2) { admin_message_forum($lng['yournotadmin'],'../index.php'); } -/*echo ' +echo ' -DSF Administration +µForum ACP @@ -45,8 +45,8 @@ if (User::UserInformation($_SESSION['uid'],'rank')!=2) Sorry, you browser doesn\'t support frames. -';*/ -echo ' +'; +/*echo ' @@ -62,5 +62,5 @@ echo ' Sorry, you browser doesn\'t support frames. -'; +';*/ ?> diff --git a/admin/template/admin_script.tpl b/admin/template/admin_script.tpl index 538afd5..8ca376e 100644 --- a/admin/template/admin_script.tpl +++ b/admin/template/admin_script.tpl @@ -153,7 +153,7 @@ - + :   @@ -162,6 +162,24 @@ + + + + :   + + + + + + + + + :   + + + + +   diff --git a/admin/template/images/Thumbs.db b/admin/template/images/Thumbs.db deleted file mode 100644 index b72e01e..0000000 Binary files a/admin/template/images/Thumbs.db and /dev/null differ diff --git a/admin/template/images/lng_Polish/Thumbs.db b/admin/template/images/lng_Polish/Thumbs.db deleted file mode 100644 index b886c58..0000000 Binary files a/admin/template/images/lng_Polish/Thumbs.db and /dev/null differ diff --git a/admin/template/images/wyzz/Thumbs.db b/admin/template/images/wyzz/Thumbs.db deleted file mode 100644 index 046bdd8..0000000 Binary files a/admin/template/images/wyzz/Thumbs.db and /dev/null differ diff --git a/admin/template/overall_header.tpl b/admin/template/overall_header.tpl index 8409656..eff30f0 100644 --- a/admin/template/overall_header.tpl +++ b/admin/template/overall_header.tpl @@ -3,61 +3,33 @@ -DSF Administration +µF Administration
-
-
+
+
-
+
- - - - - - - - - - - - - - - - - - - -
- =><= -
- -
- -
- + »« • + • + • + • + • + • + +
- -
- -
- -
- -
- -
- -
- -
- + • + • + • + • + +
diff --git a/admin/template/skin.css b/admin/template/skin.css index f2e11ab..eb3a549 100644 --- a/admin/template/skin.css +++ b/admin/template/skin.css @@ -17,6 +17,7 @@ a:hover background-color: #C6D1FB; text-align: center; background-image: url('images/td_beam.jpg'); + text-decoration: none; } /* body class */ diff --git a/config.php b/config.php index 6ab0c56..bef62b5 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.5.31'); +define('VERSION','9.6.25'); define('UF_INSTALLED',true); ?> diff --git a/eprofile.php b/eprofile.php index 48b2130..6a8ee83 100644 --- a/eprofile.php +++ b/eprofile.php @@ -278,14 +278,6 @@ if ($msg=='') //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); include('./skins/'.$default_skin.'/eprofile_body.tpl'); -if(RANK=='2') -{ - $skin['pa_link']=''.$lng['pa_link'].''; -} -else -{ - $skin['pa_link']=''; -} $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); include('./skins/'.$default_skin.'/overall_footer.tpl'); diff --git a/forum.php b/forum.php index e9723ee..fc261c1 100644 --- a/forum.php +++ b/forum.php @@ -90,21 +90,6 @@ $skin = array_push_assoc($skin, array( onMouseOut="this.src=\'skins/'.$default_skin.'/images/lng_'.$default_lang.'/topic.gif\'" border="0" alt="reply">' )); include('./skins/'.$default_skin.'/forum_end_body.tpl'); -if ($_SESSION['uid']>0) -{ - if(RANK=='2') - { - $skin['pa_link']=''.$lng['pa_link'].''; - } - else - { - $skin['pa_link']=''; - } -} -else -{ - $skin['pa_link']=''; -} $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); include('./skins/'.$default_skin.'/overall_footer.tpl'); diff --git a/groups.php b/groups.php index ad0c810..0fc3d29 100644 --- a/groups.php +++ b/groups.php @@ -131,21 +131,6 @@ if(isset($_GET['mode'])) { echo '

'.$lng['no_elements'].'!

'; } - if ($_SESSION['uid']>0) - { - if(RANK=='2') - { - $skin['pa_link']=''.$lng['pa_link'].''; - } - else - { - $skin['pa_link']=''; - } - } - else - { - $skin['pa_link']=''; - } echo ''; $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); @@ -198,21 +183,6 @@ else echo '

'.$lng['no_groups'].'!

'; } - if ($_SESSION['uid']>0) - { - if(RANK=='2') - { - $skin['pa_link']=''.$lng['pa_link'].''; - } - else - { - $skin['pa_link']=''; - } - } - else - { - $skin['pa_link']=''; - } $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); include('./skins/'.$default_skin.'/overall_footer.tpl'); diff --git a/includes/admin/class_main.php b/includes/admin/class_main.php index 6411686..d92cbe9 100644 --- a/includes/admin/class_main.php +++ b/includes/admin/class_main.php @@ -153,8 +153,7 @@ class Admin_Over DSF Administration - -
'.$lng['uf_pa'].'
'; + '; } } ?> diff --git a/includes/classes/class_pms.php b/includes/classes/class_pms.php index b79b7f8..0ce7712 100644 --- a/includes/classes/class_pms.php +++ b/includes/classes/class_pms.php @@ -13,6 +13,22 @@ if ( !defined('IN_uF') ) } class Pms { + function PMCnt($uid = -1) + { + $uid = ($uid==-1) ? $_SESSION['uid'] : $uid; + //private messages in inbox + $sql = "SELECT COUNT(*) AS `cnt` FROM `".PM_INBOX_TABLE."` WHERE `u_id`='".$uid."'"; + $result = DataBase::sql_query($sql, GENERAL, 'Could not obtain count of pms in inbox'); + $row = DataBase::fetch($result); + + //private messages in sentbox + $sql = "SELECT COUNT(*) AS `cnt` FROM `".PM_SENTBOX_TABLE."` WHERE `u_id`='".$uid."'"; + $result = DataBase::sql_query($sql, GENERAL, 'Could not obtain count of pms in sentbox'); + $row2 = DataBase::fetch($result); + + return array($row['cnt'], $row2['cnt']); + } + function UserName($uid) { global $user; diff --git a/includes/misc_functions.php b/includes/misc_functions.php index b2c35ca..4f30e32 100644 --- a/includes/misc_functions.php +++ b/includes/misc_functions.php @@ -33,21 +33,22 @@ function GenerateHeader($title, $navigator) global $lng; global $forum_config; $skin = array( - 'forumname' => $forum_config['forumname'], - 'forumdesc' => $forum_config['forumdesc'], - 'users' => $lng['lusers'], - 'pm' => $lng['lpm'], - 'register' => $lng['lregister'], - 'search' => $lng['lsearch'], - 'eprofile' => $lng['leprofile'], - 'groups' => $lng['lgroups'], + 'L.forumname' => $forum_config['forumname'], + 'L.forumdesc' => $forum_config['forumdesc'], + 'L.users' => $lng['lusers'], + 'L.pm' => $lng['lpm'], + 'L.register' => $lng['lregister'], + 'L.search' => $lng['lsearch'], + 'L.eprofile' => $lng['leprofile'], + 'L.groups' => $lng['lgroups'], 'keywords' => $forum_config['meta_keywords'], 'description' => $forum_config['meta_description'], 'mainpage' => $title, - 'lmainpage' => $navigator, - 'lactual_time'=>$lng['lactualtime'], + 'L.mainpage' => $navigator, + 'L.actual_time'=>$lng['lactualtime'], 'modelogin' => ($_SESSION['uid']>0) ? 'logout' : 'login', - 'llogin' => ($_SESSION['uid']>0) ? $lng['lunlogin'] : $lng['llogin'] + 'L.login' => ($_SESSION['uid']>0) ? $lng['lunlogin'] : $lng['llogin'], + 'L.pa_link' => $lng['pa_link'] ); return $skin; diff --git a/includes/pms/pms_folder.php b/includes/pms/pms_folder.php index abd4d06..5c0d8d1 100644 --- a/includes/pms/pms_folder.php +++ b/includes/pms/pms_folder.php @@ -3,6 +3,7 @@ // //private messsages cache - v1.0 Alpha 2 // +$cnt = Pms::PMCnt(); // 0 - inbox; 1 - sentbox $sql = "SELECT `u_id`,`nick`,`rank` FROM `".USERS_TABLE."`"; $query = DataBase::sql_query($sql,GENERAL,'Could not obtain forums information'); $user['count']= DataBase::num_rows($query); @@ -20,13 +21,17 @@ $skin = array( 'lang'=>DefaultLang(), 'lname'=>$lng['message_name'], 'lauthor'=>$lng['user'], -'lmdate'=>$lng['date'] +'lmdate'=>$lng['date'], +'lmessages_in_box'=>$lng['messages_in_box'], +'msg_count'=>($_GET['submode']=='inbox') ? $cnt[0] : $cnt[1], +'msg_max'=>($_GET['submode']=='inbox') ? $forum_config['pm_inbox_max'] : $forum_config['pm_sentbox_max'], +'msg_per'=>($_GET['submode']=='inbox') ? round(($cnt[0]/$forum_config['pm_inbox_max'])*100,1) : round(($cnt[1]/$forum_config['pm_sentbox_max'])*100,1) ); $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'); +include('./skins/'.$default_skin.'/pms_folder_body.tpl'); $uid = $_SESSION['uid']; if (!isset($_GET['submode'])) @@ -72,12 +77,12 @@ else 'mode'=> ($_GET['submode']=='inbox') ? 'user' : 'author' ); - include('./skins/'.$default_skin.'/msgs_is_item_body.tpl'); + include('./skins/'.$default_skin.'/pms_folder_item_body.tpl'); } $skin['nomsgs'] = ''; } //do it! -include('./skins/'.$default_skin.'/msgs_is_end_body.tpl'); +include('./skins/'.$default_skin.'/pms_folder_end_body.tpl'); if(RANK=='2') { $skin['pa_link']=''.$lng['pa_link'].''; diff --git a/includes/pms/pms_write.php b/includes/pms/pms_write.php index 1e64007..21c6633 100644 --- a/includes/pms/pms_write.php +++ b/includes/pms/pms_write.php @@ -11,10 +11,31 @@ if ((isset($_POST['textedit'])) and (isset($_POST['nmsg'])) and (isset($_POST['u $result = DataBase::fetch(DataBase::sql_query($sql, CRITICAL,'Could not obtain user information.')); if ($result['u_id']!='') { - $_POST['textedit'] = Secure::TagsReplace($_POST['textedit']); - $_POST['nmsg'] = strip_tags($_POST['nmsg']); - Pms::SendMessage($_POST['textedit'],$_POST['nmsg'], $_POST['username']); - message_forum($lng['post_is_saved'],'pms.php'); + $cntu = Pms::PMCnt($result['u_id']); + if ($cntu[0] < $forum_config['pm_inbox_max']) + { + //antiflood lock + 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['nmsg'] = strip_tags($_POST['nmsg']); + Pms::SendMessage($_POST['textedit'],$_POST['nmsg'], $_POST['username']); + message_forum($lng['post_is_saved'],'pms.php'); + } + } + else + { + $message = $lng['pm_inbox_full']; + $msg = './skins/'.$default_skin.'/post_error_body.tpl'; + } } else { @@ -42,6 +63,7 @@ else $_POST['nmsg']=''; $_POST['textedit']=''; } +$cnt = Pms::PMCnt(); //add skin variables $skin = array( 'smiles'=>Post::SmilesShow(), @@ -53,7 +75,8 @@ $skin = array( 'lsave'=>$lng['save'], 'lreset'=>$lng['reset'], 'lwritemsg'=>$lng['write_pm'], -'action'=>$_SERVER['REQUEST_URI'] +'action'=>$_SERVER['REQUEST_URI'], +'lsentbox_full'=>($cnt[1]==$forum_config['pm_sentbox_max']) ? $lng['pm_sentbox_full'] : '' ); $skin = array_push_assoc($skin, GenerateHeader($lng['lpm'].': '.$lng['write_pm'], '>'.$lng['lpm'].' > '.$lng['write_pm'])); @@ -65,7 +88,7 @@ if ($msg=='') //do it! include('./skins/'.$default_skin.'/overall_header.tpl'); -include('./skins/'.$default_skin.'/msgs_new_body.tpl'); +include('./skins/'.$default_skin.'/pms_new_body.tpl'); if(RANK=='2') { diff --git a/index.php b/index.php index de1aa79..2fba2d6 100644 --- a/index.php +++ b/index.php @@ -122,21 +122,6 @@ else } } -if ($_SESSION['uid']>0) -{ - if(RANK=='2') - { - $skin['pa_link']=''.$lng['pa_link'].''; - } - else - { - $skin['pa_link']=''; - } -} -else -{ - $skin['pa_link']=''; -} $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); include('./skins/'.$default_skin.'/overall_footer.tpl'); diff --git a/install1/uf_tables.sql b/install1/uf_tables.sql index 407e867..01774f9 100644 --- a/install1/uf_tables.sql +++ b/install1/uf_tables.sql @@ -104,7 +104,9 @@ INSERT INTO `uf_config` VALUES ('sig_len', '300'); INSERT INTO `uf_config` VALUES ('time_antiflood', '30'); INSERT INTO `uf_config` VALUES ('tables_width', '900'); INSERT INTO `uf_config` VALUES ('newpasswd_len', '6'); - +INSERT INTO `uf_config` VALUES ('posts', '1'); +INSERT INTO `uf_config` VALUES ('pm_inbox_max', '10'); +INSERT INTO `uf_config` VALUES ('pm_sentbox_max', '10'); #---------------------------------------------------- @@ -118,6 +120,8 @@ CREATE TABLE `uf_forums` ( `moderate` int(11) NOT NULL default '0', `name` varchar(30) NOT NULL default '', `desc` text NOT NULL, + `posts` mediumint(8) NOT NULL, + `lastpost` varchar(255) NOT NULL, `c_id` int(8) NOT NULL default '0', `sort` mediumint(8) NOT NULL default '0', PRIMARY KEY (`f_id`) @@ -126,7 +130,7 @@ CREATE TABLE `uf_forums` ( #- #- Table structure for `uf_forums` #- -INSERT INTO `uf_forums` VALUES (1, 0, 0, 'Testowe Forum', 'Pierwsze testowe forum skryptu Dynamic Script Forum.', 1, 1); +INSERT INTO `uf_forums` VALUES (1, 0, 0, 'Testowe Forum', 'Pierwsze testowe forum skryptu Dynamic Script Forum.', 1, '1:1:1:1181666444:2:Admin', 1, 1); #---------------------------------------------------- @@ -311,6 +315,8 @@ CREATE TABLE `uf_topics` ( `name` varchar(100) NOT NULL default '', `author` mediumint(8) NOT NULL default '0', `lastpost_time` int(1) NOT NULL, + `posts` mediumint(8) NOT NULL, + `lastpost` varchar(255) NOT NULL, PRIMARY KEY (`t_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -318,7 +324,7 @@ CREATE TABLE `uf_topics` ( #- Table structure for `uf_topics` #- -INSERT INTO `uf_topics` VALUES (1, 1, 0, 0, 'Witamy na forum uf', 1,0); +INSERT INTO `uf_topics` VALUES (1, 1, 0, 0, 'Witamy na forum uf', 1, 0, 2, '1:1:0:2:Admin'); #---------------------------------------------------- diff --git a/lngs/Polish/admin.php b/lngs/Polish/admin.php index 6c4d2ca..1ffa3cc 100644 --- a/lngs/Polish/admin.php +++ b/lngs/Polish/admin.php @@ -145,6 +145,8 @@ $lng['shoutbox_time_clear']='Maksymalny czas (w sek.) wiadomoÅ›ci'; $lng['shoutbox_max_view']='Maksymalna ilość pokazywanych wiadomoÅ›ci'; $lng['allow_shoutbox']='WÅ‚Ä…cz ShoutBox'; //|| other---------------------- +$lng['pm_inbox_max']='Makasymalna ilość odebranych PW przechowywanych w skrzynce'; +$lng['pm_sentbox_max']='Maksymalna ilość wysÅ‚anych PW przechowywanych w skrzynce'; $lng['sig_len']='DÅ‚ugość podpisu'; $lng['color_mod']='Kolor Moderatora'; $lng['color_admin']='Kolor Administratora'; diff --git a/lngs/Polish/main.php b/lngs/Polish/main.php index 92edf84..d2a0785 100644 --- a/lngs/Polish/main.php +++ b/lngs/Polish/main.php @@ -77,9 +77,6 @@ $lng['default_skin']='DomyÅ›lny styl'; $lng['lurank']='Poziom'; $lng['showprofile']='Pokaż Profil'; $lng['avatar']='Avatar'; -$lng['luregister']='Zarejestrowany'; -$lng['lulastvisit']='Ostatnia wizyta'; -$lng['luinterests']='Zainteresowania'; $lng['user_name']='Nazwa użytkownika'; $lng['profile_settings']='Ustawienia profilu'; $lng['general_settings']='Ustawienia ogólne'; @@ -100,10 +97,20 @@ $lng['lastpost']='Ostatni post'; $lng['contact']='Kontakt'; $lng['lurank2']='Ranga'; $lng['lmod']='Moderacja'; -$lng['addusrtogrp']='Dodaj użytkownika(nick)'; -$lng['delusrforgrp']='UsuÅ„ z grupy(nick)'; + $lng['empty_password']='HasÅ‚o jest puste!'; +$lng['empty_nick']='Nie podano nicku!'; $lng['key_not_valid']='NieprawidÅ‚owy wynik dodawania!'; + +// +//on groups... -------------------------------------------------------- +// +$lng['addusrtogrp']='Dodaj użytkownika(nick)'; +$lng['delusrforgrp']='UsuÅ„ z grupy(nick)'; +$lng['luregister']='Zarejestrowany'; +$lng['lulastvisit']='Ostatnia wizyta'; +$lng['luinterests']='Zainteresowania'; + // //moderate... ------------------------------------------------------- // @@ -113,6 +120,8 @@ $lng['admin_mod_administration']='Pole Admina/Mod\'a'; // //other...------------------------------------------------------------ // + +$lng['messages_in_box']='WiadomoÅ›ci w folderze'; $lng['admins']='Administratorzy'; $lng['admins_desc']='Globalni administratorzy tego forum'; $lng['mods']='Moderatorzy'; @@ -139,7 +148,7 @@ $lng['no.']='nr'; $lng['desc']='RosnÄ…co'; $lng['script_generated']='Skrypt zostaÅ‚ wykonany w '; $lng['no']='Nie'; -$lng['pa_link']='Administruj forum'; +$lng['pa_link']='Administracja'; $lng['select_forum']='Wybierz forum'; $lng['empty']='Brak'; $lng['sticky']='Przyklejony: '; @@ -147,6 +156,8 @@ $lng['visible_of_post']='Kliknij tutaj, aby zatwierdzić post'; $lng['post_moderated']='Ten post nie zostaÅ‚ jeszcze zatwierdzony u moderatora'; $lng['moderated_post_text']='Treść nie zatwierdzonego postu'; $lng['post'] = 'Post'; +$lng['pm_sentbox_full']='Twoja skrzynka elementów wysÅ‚anych jest peÅ‚na - wiadomość nie zostanie zapisana.'; +$lng['pm_inbox_full']='Wiadomość nie zostanie dostarczona do adresata, gdyż jego skrzynka jest peÅ‚na. Przepraszamy.'; // //on private messages.....-------------------------------------------- // diff --git a/login.php b/login.php index 995bf96..1d3b9b9 100644 --- a/login.php +++ b/login.php @@ -93,7 +93,6 @@ if (isset($_GET['mode'])) $sql = "UPDATE `".USERS_TABLE."` SET lastvisit='".time()."' WHERE u_id='$user_id'";//update lastvisit for user DataBase::sql_query($sql,GENERAL,'Could not update user lastvisit');//run query $msg = $lng['youareloggedas'].': '.$nick.'';// messaage "login as.." - $skin['pa_link']=''; $stop = TimeGeneration();//generate generation's time message_forum($msg, 'index.php');//message and require to index.php } @@ -128,7 +127,6 @@ if (isset($_GET['mode'])) $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']=''; $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); include('./skins/'.$default_skin.'/overall_footer.tpl'); diff --git a/moderate.php b/moderate.php index f9d1ca9..100ba67 100644 --- a/moderate.php +++ b/moderate.php @@ -132,21 +132,6 @@ switch(trim($_GET['action'])) $skin = array_push_assoc($skin, GenerateHeader($lng['move_topic'].': '.Topic::TopicInformation($tid,'name'),'' .$lng['move_topic'].': ' .Topic::TopicInformation($tid,'name'))); - if ($_SESSION['uid']>0) - { - if(RANK=='2') - { - $skin['pa_link']=''.$lng['pa_link'].''; - } - else - { - $skin['pa_link']=''; - } - } - else - { - $skin['pa_link']=''; - } $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); //do it! diff --git a/posting.php b/posting.php index b9e241c..5e4abbd 100644 --- a/posting.php +++ b/posting.php @@ -42,14 +42,6 @@ $skin = array(); $skin = array_push_assoc($skin, GenerateHeader('','')); $stop = TimeGeneration(); $skin['queries'] = ShowQueries($start, $stop); -if(RANK=='2') -{ - $skin['pa_link']=''.$lng['pa_link'].''; -} -else -{ - $skin['pa_link']=''; -} if (isset($_POST['textedit'])) { diff --git a/register.php b/register.php index 0c5105b..d3c66e3 100644 --- a/register.php +++ b/register.php @@ -45,70 +45,83 @@ foreach ($_POST as $name => $value) $_POST[$name] = Secure::UseCensorlist($value); } } +$errors = false; + if (isset($_POST['email'])) { -if ( ereg ("^.+@.+\..+$", $_POST['email'])) -{ $nick = $_POST['nick']; - if ($nick!='') + if (!ereg ("^.+@.+\..+$", $_POST['email'])) { - $sql = "SELECT * FROM `".USERS_TABLE."` WHERE `nick`='$nick'"; + $errors = true; + $message = $lng['invalid_email']; + } + + if (trim($_POST['nick'])=='') + { + $errors = true; + $message = $lng['empty_nick']; + } + + if ($_POST['password']=='') + { + $errors = true; + $message = $lng['empty_password']; + } + + if ($_POST['confirmpassword']=='') + { + $errors = true; + $message = $lng['empty_password']; + } + + if ($_POST['valid_match']!=$_POST['valid_key']) + { + $errors = true; + $message = $lng['key_not_valid']; + } + + if ($_POST['password']!=$_POST['confirmpassword']) + { + $errors = true; + $message=$lng['incorrect_password2']; + } + + if (!$errors) + { + $nick = addslashes(strip_tags($_POST['nick'])); + $sql = "SELECT `nick` FROM `".USERS_TABLE."` WHERE `nick`='$nick'"; $query = DataBase::sql_query($sql,GENERAL,'Could not obtain user information.'); $result = DataBase::fetch($query); - $result = $result['nick']; - if ($result!=$nick) + + if ($nick == $result['nick']) { - if ($_POST['password']!='') - { - if ($_POST['password']==$_POST['confirmpassword']) - { - if ($_POST['valid_match']==$_POST['valid_key']) - { - $_POST['nick']= addslashes(strip_tags($_POST['nick'])); - $original_pass = $_POST['password']; - $_POST['password']=md5($_POST['password']); - User::CreateProfile($_POST['nick'],$_POST['password'], $_POST['email'],0,1,0,1,'','',''); - $stop = TimeGeneration(); - if ($forum_config['allow_send_email']) - { - SendRegisterEmail(); - } - message_forum($lng['account_created'],'index.php'); - } - else - { - $message = $lng['key_not_valid']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; - } - } - else - { - $message=$lng['incorrect_password2']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; - } - } - else - { - $message=$lng['empty_password']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; - } - } - else + $errors = true; + $message = $lng['user_is_exist']; + } + } + + + if (!$errors) + { + $_POST['nick']= addslashes(strip_tags($_POST['nick'])); + $original_pass = addslashes($_POST['password']); + $_POST['password']=md5($_POST['password']); + + User::CreateProfile($_POST['nick'],$_POST['password'], $_POST['email'],0,1,0,1,'','',''); + + $stop = TimeGeneration(); + + if ($forum_config['allow_send_email']) { - $message=$lng['user_is_exist']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; + SendRegisterEmail(); } + + message_forum($lng['account_created'],'index.php'); } else { - $message=$lng['empty_email']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; + $msg = './skins/'.$default_skin.'/post_error_body.tpl'; } -} -else -{ - $message=$lng['invalid_email']; - $msg = './skins/'.$default_skin.'/post_error_body.tpl'; -} + } else { diff --git a/skins/subPurple/overall_footer.tpl b/skins/subPurple/overall_footer.tpl index a9e7314..e9bb784 100644 --- a/skins/subPurple/overall_footer.tpl +++ b/skins/subPurple/overall_footer.tpl @@ -8,7 +8,6 @@   -

diff --git a/skins/subPurple/overall_header.tpl b/skins/subPurple/overall_header.tpl index 699b2a2..900c3dd 100644 --- a/skins/subPurple/overall_header.tpl +++ b/skins/subPurple/overall_header.tpl @@ -6,7 +6,7 @@ -<? echo $skin['forumname']; ?> • <? echo $skin['mainpage']; ?> +<? echo $skin['L.forumname']; ?> • <? echo $skin['mainpage']; ?> + diff --git a/warns.php b/warns.php index d8f782e..2bf828a 100644 --- a/warns.php +++ b/warns.php @@ -177,14 +177,6 @@ switch(trim($_GET['mode'])) { $skin['no_elements']='

'.$lng['no_elements'].'!

'; } - if($user_rank=='2') - { - $skin['pa_link']=''.$lng['pa_link'].''; - } - else - { - $skin['pa_link']=''; - } include('./skins/'.$default_skin.'/warns_view_end_body.tpl'); include('./skins/'.$default_skin.'/overall_footer.tpl'); break;