diff --git a/.htaccess b/.htaccess index e35472c..e8a4181 100644 --- a/.htaccess +++ b/.htaccess @@ -13,6 +13,7 @@ RewriteBase / RewriteRule error/(.*)\.html$ index.php?task=error&sub=$1 +RewriteRule ^np/images/(.+)$ /modules/nickpage/images/$1 [L,NC] RewriteRule np/(.*) index.php?task=nickpage&user=$1 RewriteRule ^register/(.*)? register.php?regstring=$1 RewriteRule ^avatar/(.*)? index.php?task=rp&sum=avatar&id=$1 @@ -26,6 +27,6 @@ RewriteRule canon_chars.html index.php?task=rp&sub=canons [QSA,L] RewriteRule logs.html index.php?task=chat&sub=logs [QSA,L] RewriteRule private.html index.php?task=chat&sub=privatelogs [QSA,L] RewriteRule ^guidelines.html$ /text/rules.html [R=301,L] -RewriteRule ^(.*\.html?)$ index.php?task=text&url=$1 [L] +RewriteRule ^/t/(.*\.html?)$ index.php?task=text&url=$1 [L] diff --git a/modules/chat/chat.ajax.php b/modules/chat/chat.ajax.php index 1c499ed..6dfaf48 100644 --- a/modules/chat/chat.ajax.php +++ b/modules/chat/chat.ajax.php @@ -126,13 +126,13 @@ class chat extends ajax_module{ } if($session->userdata['rp_admin']==1){ $js="var menu = [ - { name: \"kick\", action: function (element) { sendMsg(\"/k \"+$(element).attr('id')); } }, - { name: \"jail\", action: function (element) { sendMsg(\"/jail \"+$(element).attr('id')); } }, + { name: \"kick\", action: function (element) { window.socket.send(\"/k \"+$(element).attr('id')); } }, + { name: \"jail\", action: function (element) { window.socket.send(\"/jail \"+$(element).attr('id')); } }, { name: \"gag\", action: function (element) { socket.send(\"/gag \"+$(element).attr('id')); } }, - { name: \"toggle private\", action: function (element) { sendMsg(\"/tpc \"+$(element).attr('id')); } }, - { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } }, - { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(element).attr('id')); } }, - { name: \"catch\", action: function (element) { sendMsg(\"/c \"+$(element).attr('id')); } }, + { name: \"toggle private\", action: function (element) { window.socket.send(\"/tpc \"+$(element).attr('id')); } }, + { name: \"ignore\", action: function (element) { window.socket.send(\"/ig \"+$(element).attr('id')); } }, + { name: \"invite\", action: function (element) { window.socket.send(\"/i \"+$(element).attr('id')); } }, + { name: \"catch\", action: function (element) { window.socket.send(\"/c \"+$(element).attr('id')); } }, { name: \"whisperwindow\", action: function (element) { if ($('#'+$(element).attr('id')+'_whisper').length > 0){ $('#'+$(element).attr('id')+'_whisper').dialog('open'); $('#'+$(element).attr('id')+'_whisper').dialog('moveToTop'); @@ -140,12 +140,12 @@ class chat extends ajax_module{ create_whisper($(element).attr('id'),\"\"); } } }, { name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } }, - { name: \"reports\", action: function (element) { sendMsg(\"/rel \"+$(element).attr('id')); } } + { name: \"reports\", action: function (element) { window.socket.send(\"/rel \"+$(element).attr('id')); } } ];"; }else{ $js="var menu = [ - { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } }, - { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(element).attr('id')); } }, + { name: \"ignore\", action: function (element) { window.socket.send(\"/ig \"+$(element).attr('id')); } }, + { name: \"invite\", action: function (element) { window.socket.send(\"/i \"+$(element).attr('id')); } }, { name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } } ];"; } diff --git a/modules/chat/chat.output.php b/modules/chat/chat.output.php index 5a39f87..3eaa83e 100644 --- a/modules/chat/chat.output.php +++ b/modules/chat/chat.output.php @@ -35,7 +35,7 @@ class chat extends module{ if($db->num_rows($result)<=0){ $core->message('Sorry', 'You have to create a Char to participate.',FALSE,$config['path'].'/index.php'); }*/ - $rooms=array(array('room'=>'Lounge','selected'=>'selected="selected"'),array('room'=>'Flirt','selected'=>'')); + $rooms=array(array('room'=>'Lounge','selected'=>'selected="selected"'),array('room'=>'Flirt','selected'=>''),array('room'=>'Quiz','selected'=>'')); $this->tpl->assign('options',$rooms); if($session->userdata['allow_grimdark']==0){ $this->tpl->assign('usercount',$data['usercount']); diff --git a/modules/chat/templates/default/allroomlist.tpl b/modules/chat/templates/default/allroomlist.tpl index a920c3f..5fcdabb 100644 --- a/modules/chat/templates/default/allroomlist.tpl +++ b/modules/chat/templates/default/allroomlist.tpl @@ -12,7 +12,7 @@ No users. {$key}
{/if} {foreach from=$user.u item=i} - {$i.l}{$i.n} 
+ {$i.l}{$i.n} 
{/foreach} {/foreach} {/if} @@ -22,4 +22,4 @@ No users. {$js} $(".notice").rightClickMenu(menu); -{/if} +{/if} \ No newline at end of file diff --git a/modules/chat/templates/default/chat.tpl b/modules/chat/templates/default/chat.tpl index b9d3a12..f6727bd 100644 --- a/modules/chat/templates/default/chat.tpl +++ b/modules/chat/templates/default/chat.tpl @@ -6,7 +6,7 @@ Raum: -Es {$befinden} {$usercount} User im Chat. +Es {$befinden} {$usercount} User im Chat.




@@ -20,3 +20,4 @@ Raum: - +
+
+
Ding | Hilfe | Smilies | Benachrichtigung: An | Scrolling: An | {$whtext} | {$submit} | Logout
+
+ +
- diff --git a/modules/chat/templates/default/chat_header.tpl b/modules/chat/templates/default/chat_header.tpl index d4fce0a..eb0c5d5 100644 --- a/modules/chat/templates/default/chat_header.tpl +++ b/modules/chat/templates/default/chat_header.tpl @@ -1,74 +1,91 @@ - - - - - - - - - - Funch.at - Die Österreichische Chatcommunity - - - - - - - - - {$meta} - - - - - - - - - - - + - + + + + + + + + + + - - - - + + + + + - - - - - -
- + +
+ + + diff --git a/modules/chatusers/chatusers.plugins.php b/modules/chatusers/chatusers.plugins.php index 4e8c4a1..b46a95a 100644 --- a/modules/chatusers/chatusers.plugins.php +++ b/modules/chatusers/chatusers.plugins.php @@ -11,23 +11,21 @@ class plugins_chatusers{ function chatuser_refresh(){ global $db, $config, $footer; $footer .= ""; } } -?> \ No newline at end of file +?> diff --git a/modules/mybbnews/mybbnews.module.php b/modules/mybbnews/mybbnews.module.php index eb3d053..b9c98e6 100644 --- a/modules/mybbnews/mybbnews.module.php +++ b/modules/mybbnews/mybbnews.module.php @@ -7,7 +7,7 @@ class module_mybbnews extends admin_module{ $info["file"]="mybbnews"; $info["author"]="genuineparts"; $info["version"]="1.0.0"; - $info["url"]="http://www.austriachat.net"; + $info["url"]="http://www.becast.ar"; return $info; } diff --git a/modules/mybbnews/templates/default/news.tpl b/modules/mybbnews/templates/default/news.tpl index 657ca03..5db2c19 100644 --- a/modules/mybbnews/templates/default/news.tpl +++ b/modules/mybbnews/templates/default/news.tpl @@ -1,22 +1,26 @@

News

{foreach from=$news item=n} -
-
-

- {$n.title} -

-
- -
-
-
-

{$n.text}

-
-

{$n.comments} Kommentar(e)

-
-{foreachelse} -{/foreach} +
+
+

{$n.title}

+
+ +
+
+
+

{$n.text}

+
+

+ {$n.comments} Kommentar(e) +

+
+ +{foreachelse} {/foreach} diff --git a/modules/nickpage/images/body_background.gif b/modules/nickpage/images/body_background.gif deleted file mode 100644 index fd088ed..0000000 Binary files a/modules/nickpage/images/body_background.gif and /dev/null differ diff --git a/modules/nickpage/images/f.png b/modules/nickpage/images/f.png index 2c5e112..b0abc5a 100644 Binary files a/modules/nickpage/images/f.png and b/modules/nickpage/images/f.png differ diff --git a/modules/nickpage/images/m.png b/modules/nickpage/images/m.png index 5fe2dd0..0ac3f3e 100644 Binary files a/modules/nickpage/images/m.png and b/modules/nickpage/images/m.png differ diff --git a/modules/nickpage/images/nickpage.jpg b/modules/nickpage/images/nickpage.jpg deleted file mode 100644 index 0855017..0000000 Binary files a/modules/nickpage/images/nickpage.jpg and /dev/null differ diff --git a/modules/nickpage/images/u.png b/modules/nickpage/images/u.png index f609a6c..61db489 100644 Binary files a/modules/nickpage/images/u.png and b/modules/nickpage/images/u.png differ diff --git a/modules/nickpage/nickpage.output.php b/modules/nickpage/nickpage.output.php index e24a2f7..7e0baf6 100644 --- a/modules/nickpage/nickpage.output.php +++ b/modules/nickpage/nickpage.output.php @@ -28,14 +28,18 @@ If (!defined("in_astat")) { die("Dieses Script kann nicht ausserhalb des Frameworks laufen!"); } $session->page_begin("Nickpage", FALSE); +use Smarty\Smarty; class nickpage extends module{ + var $mybb_conf,$session; + function __construct(){ + parent::__construct(); $this->mybb_conf = $this->fetchboardconfig(); } function output(){ - global $module,$tpl,$config,$db,$log,$core,$error, $session; + global $module,$config,$db,$log,$core,$error, $session; $count=20; @@ -49,12 +53,13 @@ class nickpage extends module{ $user['sitetitle']='Nickpage nicht gefunden'; }else{ $parser=new textparser(); - + $loggedin = false; $db->free_result($result); - $user['sitetitle']='Nickpage von '.$user['username']; - - $result=$db->query("SELECT * FROM `" . $this->mybb_conf['prefix'] . "users` WHERE `uid`='".$user['fuid']."' LIMIT 1"); + if($session->userdata['uid']!=0){ + $loggedin = true; + } + $result=$db->query("SELECT * FROM `" . $this->mybb_conf["prefix"] . "users` WHERE `uid`='".$user['fuid']."' LIMIT 1"); $forum=$db->fetch_array($result); $db->free_result($result); @@ -62,7 +67,7 @@ class nickpage extends module{ $chat=$db->fetch_array($result); $db->free_result($result); - $result=$db->query("SELECT count(`id`) as `count` FROM `" . $config['prefix'] . "npguestbook` WHERE `guid`='".$user['uid']."'"); + $result=$db->query("SELECT count(`id`) as `count` FROM `" . $config["prefix"] . "npguestbook` WHERE `guid`='".$user['uid']."'"); $gb_count=$db->fetch_array($result); $gb_pages=ceil($gb_count['count']/$count); $db->free_result($result); @@ -76,8 +81,8 @@ class nickpage extends module{ }else{ $user['age'] = 'unbekannt'; } - - if(!$_GET['page'] || $_GET['page']=="first"){ + $page = 0; + if(!isset($_GET['page']) || $_GET['page']=="first"){ $start=0; }elseif($_GET['page']=="last"){ $page=$gb_pages-1; @@ -118,10 +123,10 @@ class nickpage extends module{ $user['chattime']=$this->intervall($chat['chattime']); $user['reviewnum']=$reviews['count']; switch($chat['rights']){ - case(3): + case(99): $user['chatright']='Chatadmin'; break; - case(2): + case(50): $user['chatright']='Chat-VIP'; break; } @@ -136,6 +141,7 @@ class nickpage extends module{ } //$forum['buddylist']; if($session->userdata['uid']!=""){ + $result=$db->query("SELECT `buddylist` FROM `" . $this->mybb_conf["prefix"] . "users` WHERE `uid`='".$session->userdata['fuid']."' LIMIT 1"); $friends=$db->fetch_array($result); $db->free_result($result); @@ -174,16 +180,17 @@ class nickpage extends module{ $db->free_result($result); } } - $tpl->assign('friends',$friendl); - $tpl->assign('user',$user); - $tpl->assign('forum',$forum); - $tpl->assign('domain',$config['domain']); - $tpl->assign('gb',$gb); - $tpl->assign('pagination',$pagination); - //$content=$this->tpl->fetch('nickpage_content.tpl'); + + $this->tpl->assign('friends',$friendl); + $this->tpl->assign('user',$user); + $this->tpl->assign('forum',$forum); + $this->tpl->assign('loggedin',$loggedin); + $this->tpl->assign('domain',$config['domain']); + $this->tpl->assign('gb',$gb); + $this->tpl->assign('pagination',$pagination); + $content=$this->tpl->fetch('nickpage.tpl'); } - $tpl->assign('user',$user); - $core->make_page($content,TRUE,$config['fullpath'].'/modules/nickpage/templates/default/nickpage.tpl',NULL,NULL); + $core->make_page($content,TRUE,$config['fullpath'].'/modules/nickpage/templates/default/nickpage_content.tpl',NULL,NULL); } function output_edit(){ diff --git a/modules/nickpage/templates/default/nickpage.tpl b/modules/nickpage/templates/default/nickpage.tpl index 4e7b5a0..fe85b03 100644 --- a/modules/nickpage/templates/default/nickpage.tpl +++ b/modules/nickpage/templates/default/nickpage.tpl @@ -13,13 +13,15 @@
-

Über {$user.username}

+

Über {$user.username}

Ist das {$user.username}? - {$user.fid2}

+ {$user.fid2}

Über mich:

+ {if $user.birthdayprivacy != none}

Alter: {$user.age}
+ {/if}

{/if} -
+
{if $gb!=""} +
{$pagination} {foreach from=$gb item=g}
@@ -73,13 +76,22 @@
- +
{else} +

Keine Einträge. Schreib doch einfach einen. ;-)

+
+{/if} +{if $loggedin==true} +

Gästebucheintrag schreiben:

+
+ + + +
{/if} -