Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9601] XoopsModules/newbb/branches/alfred/newbb
|
From: <be...@us...> - 2012-05-30 08:57:34
|
Revision: 9601
http://xoops.svn.sourceforge.net/xoops/?rev=9601&view=rev
Author: beckmi
Date: 2012-05-30 08:57:28 +0000 (Wed, 30 May 2012)
Log Message:
-----------
fixing bugs, replacing Buzz with Gooogle Plus
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/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/language/italian/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/googleplus.png
Removed 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-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -39,7 +39,7 @@
{
if (empty($path)) return false;
if (@is_writable($path)) {
- $path_status = _AM_NEWBB_AVAILABLE;
+ $path_status = '';// directory available;
} elseif (!@is_dir($path)) {
$path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>';
} else {
@@ -168,25 +168,21 @@
$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');
- }
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
- } else {
+
+ 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 {
// loadModuleAdminMenu(0, _MI_NEWBB_ADMENU_INDEX);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -499,11 +499,11 @@
$thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
$thread_action['social_facebook']['target'] = '_blank';
- $thread_action['social_buzz']['image'] = newbb_displayImage('buzz', _MD_SHARE_BUZZ);
- $thread_action['social_buzz']['link'] = "http://www.google.com/buzz/post?url=".$full_link;
- $thread_action['social_buzz']['name'] = _MD_SHARE_BUZZ;
- $thread_action['social_buzz']['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_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-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -77,10 +77,10 @@
return $level;
}
-class newbbUser {
+class User {
var $user = null;
-
- function User()
+
+ function user()
{
}
@@ -213,7 +213,7 @@
if (class_exists("User_language")) {
$handler = new User_language();
} else {
- $handler = new newbbUser();
+ $handler = new User();
}
foreach (array_keys($this->users) as $uid) {
$this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-05-30 08:57:28 UTC (rev 9601)
@@ -15,7 +15,11 @@
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-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -72,7 +72,7 @@
$forumImage['facebook'] =
$forumImage['twitter'] =
$forumImage['linkedin'] =
-$forumImage['buzz'] =
+$forumImage['googleplus'] =
$forumImage['stumbleupon'] =
$forumImage['friendfeed'] =
$forumImage['digg'] =
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -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">Not available</font>');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is 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-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -467,7 +467,7 @@
define("_MD_ADVERTISING_USER","Advertisement");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
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-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -472,7 +472,7 @@
define("_MD_ADVERTISING_USER","Werbung");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -514,7 +514,7 @@
//4.05 - social
define("_MD_SHARE_FACEBOOK", "Facebook");
define("_MD_SHARE_TWITTER", "Twitter");
-define("_MD_SHARE_BUZZ", "Google Buzz");
+define("_MD_SHARE_GOOGLEPLUS", "Google Plus");
define("_MD_SHARE_LINKEDIN", "LinkedIn");
define("_MD_SHARE_STUMBLEUPON", "Stumbleupon");
define("_MD_SHARE_FRIENDFEED", "FriendFeed");
Deleted: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
===================================================================
(Binary files differ)
Added: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/googleplus.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/googleplus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-05-30 08:57:28 UTC (rev 9601)
@@ -20,7 +20,7 @@
<{if $topic_post.poster.uid != 0}>
<div class="comUserRankText"><{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}></div>
<{if $topic_post.poster.avatar != "blank.gif"}>
- <br /><img class="comUserImg" src="<{$xoops_upload_url}>/avatars/<{$topic_post.poster.avatar}>" alt="" />
+ <br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
<{else}>
<br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -44,7 +44,6 @@
}
$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;
@@ -61,7 +60,6 @@
$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);
@@ -115,7 +113,7 @@
$xoopsOption['template_main'] = 'newbb_viewtopic.html';
$postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status);
-//Threadersteller zählt nicht
+//Threadersteller z\xE4hlt nicht
if (!$xoopsUser || ($xoopsUser->getVar('uid') != $topic_obj->getVar('topic_poster')) ) {
$topic_obj->incrementCounter();
}
@@ -199,14 +197,13 @@
$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);
@@ -220,7 +217,6 @@
} else {
$viewtopic_posters =array();
}
-
if ($xoopsModuleConfig['advertising']) {
$i=0;
$rank = xoops_getrank();
@@ -294,7 +290,6 @@
unset($postsArray);
$xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}");
-
$admin_actions = array();
$ad_merge = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
