Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9650] XoopsModules/newbb/branches/alfred/newbb
|
From: <dh...@us...> - 2012-06-15 21:21:52
|
Revision: 9650
http://xoops.svn.sourceforge.net/xoops/?rev=9650&view=rev
Author: dhcst
Date: 2012-06-15 21:21:45 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
Update
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/index.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -39,7 +39,7 @@
{
if (empty($path)) return false;
if (@is_writable($path)) {
- $path_status = '';// directory available;
+ $path_status = _AM_NEWBB_AVAILABLE;
} elseif (!@is_dir($path)) {
$path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>';
} else {
@@ -168,21 +168,25 @@
$indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ;
+/*
+ $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": ";
+ $path_status1 = newbb_admin_getPathStatus($attach_path);
+
+ $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": ";
+ $path_status2 = newbb_admin_getPathStatus($thumb_path);
+
+ $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', '');
+ $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', '');
+*/
+ foreach (array_keys( $folder) as $i) {
+ $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+ $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
+ }
-
- foreach (array_keys($folder) as $i) {
- if (!(newbb_admin_getPathStatus($folder[$i])) == '') {
- $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder');
- } else {
- $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
- }
- $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
- }
-
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
- } else {
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+ } else {
// loadModuleAdminMenu(0, _MI_NEWBB_ADMENU_INDEX);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -497,13 +497,8 @@
$thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK);
$thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link;
$thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
- $thread_action['social_facebook']['target'] = '_blank';
-
- $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS);
- $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link;
- $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS;
- $thread_action['social_gplus']['target'] = '_blank';
-
+ $thread_action['social_facebook']['target'] = '_blank';
+
$thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
$thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
$thread_action['social_linkedin']['name'] = _MD_SHARE_LINKEDIN;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -77,10 +77,10 @@
return $level;
}
-class User {
+class newbbUser {
var $user = null;
-
- function user()
+
+ function User()
{
}
@@ -213,7 +213,7 @@
if (class_exists("User_language")) {
$handler = new User_language();
} else {
- $handler = new User();
+ $handler = new newbbUser();
}
foreach (array_keys($this->users) as $uid) {
$this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
@@ -283,7 +283,7 @@
$ranks[$myrow['rank_id']] = $myrow;
$ranks[$myrow['rank_id']]["rank_title"] = $myts->htmlspecialchars($ranks[$myrow['rank_id']]["rank_title"]);
if (!empty($ranks[$myrow['rank_id']]['rank_image'])) {
- $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
+ $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/ranks/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 21:21:45 UTC (rev 9650)
@@ -15,11 +15,7 @@
11 New cache for Seo
12 New Social-Links in Threads
13 New advertising for topics
-14 Fix Replaced Buzz with Google Plus (mamba)
-15 Fix Added "Create" links for missing directories (mamba)
-16 Fix Link to Blank.gif
-
newBB
Changelog 4.2
02/08/2012
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -72,7 +72,7 @@
$forumImage['facebook'] =
$forumImage['twitter'] =
$forumImage['linkedin'] =
-$forumImage['googleplus'] =
+$forumImage['buzz'] =
$forumImage['stumbleupon'] =
$forumImage['friendfeed'] =
$forumImage['digg'] =
Modified: XoopsModules/newbb/branches/alfred/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/index.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/index.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -53,7 +53,7 @@
/* rss feed */
if (!empty($xoopsModuleConfig['rss_enable'])) {
$xoops_module_header .= '
- <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
+ <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
';
}
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -53,7 +53,7 @@
define('_AM_NEWBB_GDLIB2','GD2 library:');
define('_AM_NEWBB_AUTODETECTED','Autodetected: ');
define('_AM_NEWBB_AVAILABLE','Available');
-define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>');
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -467,7 +467,7 @@
define("_MD_ADVERTISING_USER","Advertisement");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
+define('_MD_SHARE_BUZZ', "Google Buzz");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -472,7 +472,7 @@
define("_MD_ADVERTISING_USER","Werbung");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
+define('_MD_SHARE_BUZZ', "Google Buzz");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Added: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 21:21:45 UTC (rev 9650)
@@ -27,8 +27,8 @@
</div>
<div style="clear:both;"></div>
</div>
+ <br style="clear: both;" />
<{/if}>
-<br style="clear: both;" />
<div class="dropdown">
<{includeq file="db:newbb_index_menu.html"}>
</div>
@@ -64,11 +64,11 @@
<{if $category.forums}>
<tr class="head" align="center">
<td width="5%"> </td>
- <{if $subforum_display == "expand"}>
- <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
- <{else}>
- <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
- <{/if}>
+ <{if $subforum_display == "expand"}>
+ <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
+ <{else}>
+ <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
+ <{/if}>
<td width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></td>
<td width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></td>
<td width="40%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td>
@@ -269,11 +269,12 @@
</div>
<{/foreach}>
<!-- end forum categories -->
-<div>
+</div>
<div style="float: left; text-align: left;">
<{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br />
<{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br />
</div>
+<br style="clear:both;"/>
<div style="float: right; text-align: right;">
<form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search">
<input name="term" id="term" type="text" size="20" />
@@ -300,7 +301,8 @@
<span style="padding: 2px;"><{$online.statistik}></span>
<strong><{$smarty.const._MD_NEWBB_STATS}></strong>
</div>
- <div class="forum_stats odd" style="padding: 5px; line-height: 150%;">
+ <div style="clear:both;"></div>
+ <div class="forum_stats odd" style="padding: 3px; line-height: 150%;">
<div class="forum_stats_left odd">
<{$currenttime}><br />
<{$smarty.const._MD_TOTALTOPICSC}>
@@ -325,9 +327,9 @@
</div>
</div>
</div>
+ <br style="clear:both;"/>
<{/if}>
-<br style="clear:both;"/>
<{if $online}>
<{includeq file="db:newbb_online.html"}>
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -44,6 +44,7 @@
}
$page_query = htmlspecialchars(implode("&", array_values($query_array)));
unset($query_array);
+
$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
$forum_id = !empty($_GET['forum']) ? intval($_GET['forum']) : 0;
@@ -60,6 +61,7 @@
$order = ($xoopsConfig['com_order']==1) ? 'DESC' : 'ASC';
}
}
+
if ( !$topic_id && !$post_id ) {
$redirect = empty($forum_id) ? XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php" : XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum={$forum_id}";
redirect_header($redirect, 2, _MD_ERRORTOPIC);
@@ -113,7 +115,7 @@
$xoopsOption['template_main'] = 'newbb_viewtopic.html';
$postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status);
-//Threadersteller z\xE4hlt nicht
+//Threadersteller zählt nicht
if (!$xoopsUser || ($xoopsUser->getVar('uid') != $topic_obj->getVar('topic_poster')) ) {
$topic_obj->incrementCounter();
}
@@ -197,13 +199,14 @@
$viewtopic_users = array();
if (count($userid_array) > 0) {
- require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
+ require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
$user_handler = new NewbbUserHandler($xoopsModuleConfig['groupbar_enabled'], $xoopsModuleConfig['wol_enabled']);
$user_handler->users = $users;
$user_handler->online = $online;
$viewtopic_users = $user_handler->getUsers();
}
unset($users);
+
if ($xoopsModuleConfig['allow_require_reply'] && $require_reply) {
if (!empty($xoopsModuleConfig['cache_enabled'])) {
$viewtopic_posters = newbb_getsession("t".$topic_id, true);
@@ -217,7 +220,8 @@
} else {
$viewtopic_posters =array();
}
-if ($xoopsModuleConfig['advertising']) {
+
+if ($xoopsModuleConfig['show_advertising']) {
$i=0;
$rank = xoops_getrank();
$image =
@@ -241,7 +245,7 @@
);
}
foreach ($postsArray as $eachpost) {
- if ($xoopsModuleConfig['advertising']) {
+ if ($xoopsModuleConfig['show_advertising']) {
if ($i == 2) $xoopsTpl->append('topic_posts', $post_werbung);
$i++;
}
@@ -290,6 +294,7 @@
unset($postsArray);
$xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}");
+
$admin_actions = array();
$ad_merge = "";
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -508,6 +508,7 @@
_MI_NEWBB_INFOBOX_SHOW => 2 )
);
+
$modversion['config'][] = array(
'name' => 'show_sociallinks',
'title' => '_MI_SHOW_SOCIALLINKS',
@@ -515,16 +516,15 @@
'formtype' => 'yesno',
'valuetype' => 'int',
'default' => 1);
-
+
$modversion['config'][] = array(
- 'name' => 'advertising',
+ 'name' => 'show_advertising',
'title' => '_MI_ADVERTISING',
'description' => '_MI_ADVERTISING_DESC',
'formtype' => 'yesno',
'valuetype' => 'int',
- 'default' => 0);
+ 'default' => 0);
-
$modversion['config'][] = array(
'name' => 'show_jump',
'title' => '_MI_SHOW_JUMPBOX',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
