Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10093] XoopsModules/newbb/branches/alfred/newbb
|
From: <dh...@us...> - 2012-08-23 18:20:28
|
Revision: 10093
http://xoops.svn.sourceforge.net/xoops/?rev=10093&view=rev
Author: dhcst
Date: 2012-08-23 18:20:19 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Updates Alfred/irmtfan
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/about.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_report.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_votedata.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/admin/menu.php
XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block_tag.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/newbbtree.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/rate.php
XoopsModules/newbb/branches/alfred/newbb/class/read.php
XoopsModules/newbb/branches/alfred/newbb/class/readforum.php
XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php
XoopsModules/newbb/branches/alfred/newbb/class/tree.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/class/xoopsformloader.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/form.forum.php
XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.ini.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.user.php
XoopsModules/newbb/branches/alfred/newbb/include/module.php
XoopsModules/newbb/branches/alfred/newbb/include/module.v100.php
XoopsModules/newbb/branches/alfred/newbb/include/module.v220.php
XoopsModules/newbb/branches/alfred/newbb/include/notification.inc.php
XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php
XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php
XoopsModules/newbb/branches/alfred/newbb/index.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/german/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/german/blocks.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/makepdf.php
XoopsModules/newbb/branches/alfred/newbb/notification_update.php
XoopsModules/newbb/branches/alfred/newbb/polls.php
XoopsModules/newbb/branches/alfred/newbb/post.php
XoopsModules/newbb/branches/alfred/newbb/print.php
XoopsModules/newbb/branches/alfred/newbb/ratethread.php
XoopsModules/newbb/branches/alfred/newbb/reply.php
XoopsModules/newbb/branches/alfred/newbb/report.php
XoopsModules/newbb/branches/alfred/newbb/rss.php
XoopsModules/newbb/branches/alfred/newbb/search.php
XoopsModules/newbb/branches/alfred/newbb/seo.php
XoopsModules/newbb/branches/alfred/newbb/sql/mysql.400.sql
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_subforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/style.css
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/viewpost.php
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
XoopsModules/newbb/branches/alfred/newbb/votepolls.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/images/admin_delete.png
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/about.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/about.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/about.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: about.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: about.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_blocks.php,v 1.1.1.1 2005/10/19 15:58:11 phppp Exp $
+// $Id: admin_blocks.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_cat_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_cat_manager.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_digest.php,v 1.1.1.1 2005/10/19 15:58:11 phppp Exp $
+// $Id: admin_digest.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_forum_manager.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_prune.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_forum_prune.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_reorder.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_forum_reorder.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_header.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_header.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_permissions.php,v 1.1.1.1 2005/10/19 15:58:12 phppp Exp $
+// $Id: admin_permissions.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_report.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_report.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_report.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_report.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: admin_report.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
* @since 4.00
- * @version $Id$
+ * @version $Id: admin_synchronization.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
* @since 4.00
- * @version $Id$
+ * @version $Id: admin_type_manager.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_votedata.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_votedata.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_votedata.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_votedata.php,v 1.1.1.1 2005/10/19 15:58:12 phppp Exp $
+// $Id: admin_votedata.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: index.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -151,6 +151,17 @@
$xoopspoll = &$module_handler->getByDirname('umfrage');
if (is_object($xoopspoll)) $isOK = $xoopspoll->getVar('isactive');
}
+
+ $memlimit_iniphp = return_bytes( @ini_get('memory_limit') );
+ $postmaxsize_iniphp = return_bytes( @ini_get('post_max_size') );
+ if ( $postmaxsize_iniphp < $memlimit_iniphp ) {
+ $uploadlimit = sprintf(_AM_NEWBB_MEMLIMITOK,return_bytes( $postmaxsize_iniphp, true ) );
+ $uploadfarbe = 'Green';
+ } else {
+ $uploadlimit = _AM_NEWBB_MEMLIMITTOLARGE;
+ $uploadfarbe = 'Red';
+ }
+
if ($newXoopsModuleGui) {
$indexAdmin->addInfoBox(_AM_NEWBB_PREFERENCES) ;
@@ -159,6 +170,7 @@
$indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" .'NetPBM'.': %s'."</infotext>", array_key_exists('netpbm',$imageLibs) ? _AM_NEWBB_AUTODETECTED.$imageLibs['netpbm'] :_AM_NEWBB_NOTAVAILABLE, 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" ._AM_NEWBB_GDLIB1.' %s'. "</infotext>", array_key_exists('gd1',$imageLibs) ? _AM_NEWBB_AUTODETECTED.$imageLibs['gd1'] :_AM_NEWBB_NOTAVAILABLE, 'Red') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" ._AM_NEWBB_GDLIB2.' %s'. "</infotext>", array_key_exists('gd2',$imageLibs) ? _AM_NEWBB_AUTODETECTED.$imageLibs['gd2'] :_AM_NEWBB_NOTAVAILABLE, 'Green' ) ;
+ $indexAdmin->addInfoBoxLine(_AM_NEWBB_PREFERENCES, "<infotext>" ._AM_NEWBB_UPLOAD.' %s'. "</infotext>", $uploadlimit ,$uploadfarbe ) ;
$indexAdmin->addInfoBox(_AM_NEWBB_BOARDSUMMARY) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_BOARDSUMMARY, "<infolabel>" ._AM_NEWBB_TOTALTOPICS.': %s' . "</infolabel>", get_total_topics(), 'Green') ;
@@ -358,4 +370,21 @@
}
mod_clearCacheFile("config","newbb");
mod_clearCacheFile("permission","newbb");
+
+function return_bytes ($size_str, $b=false)
+{
+ if ($b == false) {
+ switch (substr ($size_str, -1))
+ {
+ case 'M': case 'm': return (int)$size_str * 1048576;
+ case 'K': case 'k': return (int)$size_str * 1024;
+ case 'G': case 'g': return (int)$size_str * 1073741824;
+ default: return $size_str;
+ }
+ } else {
+ $base = log($size_str) / log(1024);
+ $suffix = array("", "KB", "MB", "GB", "TB");
+ return pow(1024, $base - floor($base)) . ' ' . $suffix[floor($base)];
+ }
+}
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/menu.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/menu.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/menu.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: menu.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: menu.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: newbb_block.php,v 1.1.1.2 2005/10/19 16:23:31 phppp Exp $
+// $Id: newbb_block.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -54,7 +54,7 @@
global $xoopsConfig;
global $access_forums;
global $xoopsLogger;
-
+
mod_loadFunctions("time", "newbb");
$myts =& MyTextSanitizer::getInstance();
@@ -95,7 +95,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
$query = 'SELECT'.
@@ -166,8 +166,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
$topic['seo_forum_url'] = seo_urls($seo_forum_url);
@@ -179,11 +179,11 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
$block['seo_top_alltopics'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -203,7 +203,6 @@
{
global $xoopsConfig;
global $access_forums;
-
mod_loadFunctions("time", "newbb");
$myts = MyTextSanitizer::getInstance();
$block = array();
@@ -243,7 +242,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
if (!isset($access_forums)) {
@@ -322,8 +321,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -336,9 +335,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -394,7 +393,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
if (!empty($options[6])) {
@@ -475,8 +474,8 @@
$topic['post_text'] = $post_text;
}
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -490,9 +489,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block_tag.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block_tag.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block_tag.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
* @since 4.00
- * @version $Id$
+ * @version $Id: newbb_block_tag.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb/tag
*/
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -14,7 +14,7 @@
* @package newbb
* @since 4.0
* @author Taiwen Jiang <ph...@us...>
- * @version $Id: forum.php 2169 2008-09-23 13:37:10Z phppp $
+ * @version $Id: forum.php 62 2012-08-17 10:15:26Z alfred $
*/
if (!defined("XOOPS_ROOT_PATH")) {
@@ -804,6 +804,8 @@
}
$_forum_data['forum_lastpost_subject'] = $subject;
}
+ $icon_handler = newbb_getIconHandler();
+ $_forum_data['forum_icon_path']= $icon_handler->getPath("icon");
$_forum_data['forum_lastpost_icon'] = 'lastposticon.png';
endif;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/newbbtree.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/newbbtree.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/newbbtree.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: newbbtree.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: newbbtree.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -91,7 +91,8 @@
if ( !$groups ) return false;
if ( !$allowed_groups = $this->getGroups("{$type}_{$gperm_name}", $id) ) return false;
- return count(array_intersect($allowed_groups, $groups));
+ if ( count(array_intersect($allowed_groups, $groups)) > 0) return true;
+ return false;
}
function &getCategories($perm_name = "access")
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: post.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: post.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -243,7 +243,11 @@
$edit_user = $myts->stripSlashesGPC($postedit['edit_user']);
$edit_msg = (!empty($postedit['edit_msg'])) ? $myts->stripSlashesGPC($postedit['edit_msg']) : '';
if ($edit_msg != "") {
- $post_edit = _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . " "._MD_EDITEDMSG . " " .$edit_msg."<br />";
+ if ( empty($xoopsModuleConfig['do_latestedit']) ) {
+ $post_edit = _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . " "._MD_EDITEDMSG . " " .$edit_msg."<br />";
+ } else {
+ $post_edit .= _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . " "._MD_EDITEDMSG . " " .$edit_msg."<br />";
+ }
}
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/rate.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/rate.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/rate.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: report.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
+// $Id: rate.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/class/read.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/read.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/read.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: moderate.php,v 1.1.1.1 2005/10/19 16:23:33 phppp Exp $
+// $Id: read.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/class/readforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/readforum.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/readforum.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: moderate.php,v 1.1.1.1 2005/10/19 16:23:33 phppp Exp $
+// $Id: readforum.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: moderate.php,v 1.1.1.1 2005/10/19 16:23:33 phppp Exp $
+// $Id: readtopic.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/class/tree.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/tree.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/tree.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: tree.php,v 1.1.1.1 2005/11/10 19:51:09 phppp Exp $
+// $Id: tree.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -172,6 +172,14 @@
$userinfo["link"] = "<a href=\"".XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid") ."\">".$userinfo["name"]."</a>";
$userinfo["avatar"] = $user->getVar('user_avatar');
+
+ // START hacked by irmtfan - easier rank getting
+ $userrank = $user->rank();
+ if (isset($userrank['image']) && $userrank['image']) {
+ $userinfo["rank_image"] = $userrank['image'];
+ $userinfo["rank_title"] = $userrank['title'];
+ }
+ // END hacked by irmtfan - easier rank getting
$userinfo["from"] = $user->getVar('user_from');
@@ -272,35 +280,10 @@
function loadUserRank()
{
- GLOBAL $xoopsDB;
- if (empty($this->users)) return;
- $myts =& MyTextSanitizer::getInstance();
-
- $sql = 'SELECT * FROM ' . $xoopsDB->prefix('ranks');
- $result = $xoopsDB->query($sql);
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $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 . "/ranks/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
- }
- }
-
- foreach (array_keys($this->userlist) as $uid) {
- if ($rank = $this->users[$uid]->getVar("rank")) {
- $this->userlist[$uid]["rank"]["title"] = $ranks[$rank]["rank_title"];
- $this->userlist[$uid]["rank"]["image"] = $ranks[$rank]["rank_image"];
- continue;
- }
- foreach ($ranks as $id => $rank) {
- if ($rank["rank_min"] <= $this->userlist[$uid]["posts"] && $rank["rank_max"] >= $this->userlist[$uid]["posts"]) {
- $this->userlist[$uid]["rank"]["title"] = $rank["rank_title"];
- $this->userlist[$uid]["rank"]["image"] = $rank["rank_image"];
- break;
- }
- }
- }
+ $GLOBALS['xoopsLogger']->addDeprecated("Function 'USER::loadUserRank' in /newbb/class/user.php is deprecated!");
+
+ return true;
}
function getUsers()
@@ -308,7 +291,7 @@
$this->loadUserInfo();
$this->loadUserOnline();
$this->loadUserGroups();
- $this->loadUserRank();
+ //$this->loadUserRank();
$this->loadUserDigest();
return $this->userlist;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/xoopsformloader.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/xoopsformloader.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/class/xoopsformloader.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: xoopsformloader.php,v 1.8.22.1.2.4 2005/07/14 16:13:30 phppp Exp $
+// $Id: xoopsformloader.php 62 2012-08-17 10:15:26Z alfred $
if (!defined('XOOPS_ROOT_PATH')) {
exit();
}
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,6 +1,6 @@
newBB
Changelog 4.3
-07/14/2012
+08/17/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
@@ -19,6 +19,13 @@
15 Fix Added "Create" links for missing directories (mamba)
16 Fix Link to Blank.gif
17 Fix Error Upload File too large
+18 New Config Quickreply-Editor
+19 Fix Create Thumbnails
+20 Fix userrank (irmtfan)
+21 Fix permission approved (irmtfan)
+22 Fix vulnerabilities in seo.php
+23 Add enable/disable all editmessage in posts
+24 Fix hardcoded Path for icon (irmtfan)
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
* @since 4.00
- * @version $Id$
+ * @version $Id: header.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
include_once '../../mainfile.php';
@@ -75,11 +75,30 @@
if (!empty($xoopsModuleConfig['pngforie_enabled'])) {
$newbb_module_header .= '<style type="text/css">img {behavior:url("include/pngbehavior.htc");}</style>';
}
+
+$dirname = $xoopsModule->getVar('dirname');
+$theme_path = $xoopsConfig['theme_set'] . "/modules/" . $dirname;
+$lang_path = "images/language/" . $xoopsConfig['language'];
+$default_path = "modules/" . $dirname . "/templates";
+
+//Themepfad
+if (file_exists( $GLOBALS['xoops']->path( $theme_path . '/style.css'))) {
+ $rel_path = XOOPS_URL . $theme_path . '/style.css';
+//language path
+} elseif (file_exists( $GLOBALS['xoops']->path( $lang_path . '/style.css'))) {
+ $rel_path = XOOPS_URL . $lang_path . '/style.css';
+//default
+} else {
+ $rel_path = XOOPS_URL . $default_path . '/style.css';
+}
+
+$newbb_module_header .= '<link rel="stylesheet" type="text/css" href="' . $rel_path . '" />';
+
$newbb_module_header .= '
- <link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'/templates/style.css" />
<script type="text/javascript">var toggle_cookie="'.$forumCookie['prefix'].'G'.'";</script>
<script src="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'/include/js/newbb_toggle.js" type="text/javascript"></script>
';
+
if ($menumode == 2) {
$newbb_module_header .= '
Added: XoopsModules/newbb/branches/alfred/newbb/images/admin_delete.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/newbb/branches/alfred/newbb/images/admin_delete.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/newbb/branches/alfred/newbb/include/form.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/form.forum.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/form.forum.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -14,7 +14,7 @@
* @package newbb
* @since 4.0
* @author Taiwen Jiang <ph...@us...>
- * @version $Id: form.forum.php 2170 2008-09-23 13:40:23Z phppp $
+ * @version $Id: form.forum.php 62 2012-08-17 10:15:26Z alfred $
*/
if (!defined("XOOPS_ROOT_PATH")) exit();
Modified: XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -14,7 +14,7 @@
* @package newbb
* @since 4.0
* @author Taiwen Jiang <ph...@us...>
- * @version $Id: form.post.php 2170 2008-09-23 13:40:23Z phppp $
+ * @version $Id: form.post.php 62 2012-08-17 10:15:26Z alfred $
*/
if (!defined('XOOPS_ROOT_PATH')) {
@@ -252,6 +252,7 @@
$extensions = trim(str_replace('|',' ',$forum_obj->getVar('attach_ext')));
$extensions = (empty($extensions) || $extensions == "*") ? _ALL : $extensions;
$upload_tray->addElement(new XoopsFormLabel(_MD_ALLOWED_EXTENSIONS . ":", $extensions));
+ $upload_tray->addElement(new XoopsFormLabel("<br />".sprintf(_MD_NEWBB_MAXPIC,$xoopsModuleConfig['max_img_height'],$xoopsModuleConfig['max_img_width'])));
$forum_form->addElement($upload_tray);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: functions.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: functions.image.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -48,36 +48,15 @@
$imginfo = @getimagesize($image);
$img_info = ( count($imginfo)>0 ) ? $imginfo[0]."X".$imginfo[1].' px':"";
-/*
- if ($xoopsModuleConfig['max_img_width'] > 0) {
- if (
- ( $xoopsModuleConfig['max_image_width'] > 0 && $imginfo[0]> $xoopsModuleConfig['max_image_width'] )
- ||
- ( $xoopsModuleConfig['max_image_height'] > 0 && $imginfo[1]> $xoopsModuleConfig['max_image_height'])
- ) {
- if ($imginfo[0]>$xoopsModuleConfig['max_img_width']) {
- $pseudo_width = $xoopsModuleConfig['max_img_width'];
- $pseudo_height = $xoopsModuleConfig['max_img_width']*($imginfo[1]/$imginfo[0]);
- $pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
- }
- if ($xoopsModuleConfig['max_image_height']>0 && $pseudo_height>$xoopsModuleConfig['max_image_height']) {
- $pseudo_height = $xoopsModuleConfig['max_image_height'];
- $pseudo_width = $xoopsModuleConfig['max_image_height']*($imginfo[0]/$imginfo[1]);
- $pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
- }
- } else
- if (!file_exists($thumb_path.'/'.$source) && $imginfo[0]>$xoopsModuleConfig['max_img_width']) {
- newbb_createThumbnail($source, $xoopsModuleConfig['max_img_width']);
- }
- }
-*/
if ( $xoopsModuleConfig['max_image_width'] > 0 && $xoopsModuleConfig['max_image_height'] > 0 ) {
if ( $imginfo[0] > $xoopsModuleConfig['max_image_width'] || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
- if (!file_exists($thumb_path.'/'.$source) && $imginfo[0]>$xoopsModuleConfig['max_img_width']) {
+ //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $xoopsModuleConfig['max_img_width']) {
+ if (!file_exists($thumb_path.'/'.$source) ) {
newbb_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
}
}
+
if ($imginfo[0] > $xoopsModuleConfig['max_image_width'] || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
$pseudo_width = $xoopsModuleConfig['max_image_width'];
$pseudo_height = $xoopsModuleConfig['max_image_width']*($imginfo[1]/$imginfo[0]);
@@ -91,11 +70,11 @@
}
if (file_exists($thumb)) {
- $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="newbb_image">';
+ $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
$attachmentImage .= '<img src="'.$thumb_url.'" alt="'.$source.' '.$img_info.'" />';
$attachmentImage .= '</a>';
} elseif (!empty($pseudo_size)) {
- $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="newbb_image">';
+ $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
$attachmentImage .= '<img src="'.$image_url.'" '.$pseudo_size.' alt="'.$source.' '.$img_info.'" />';
$attachmentImage .= '</a>';
} elseif (file_exists($image)) {
@@ -125,6 +104,7 @@
}
$imginfo = @getimagesize($src_file);
+
if ( NULL == $imginfo ) {
return false;
}
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.ini.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.ini.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.ini.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: functions.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: functions.ini.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.user.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.user.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -14,7 +14,7 @@
* @package newbb
* @since 4.0
* @author Taiwen Jiang <ph...@us...>
- * @version $Id: functions.user.php 2284 2008-10-12 03:45:46Z phppp $
+ * @version $Id: functions.user.php 62 2012-08-17 10:15:26Z alfred $
*/
if (!defined('XOOPS_ROOT_PATH')) { exit(); }
Modified: XoopsModules/newbb/branches/alfred/newbb/include/module.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/module.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/module.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: module.php,v 1.1.1.2 2005/10/19 16:23:50 phppp Exp $
+// $Id: module.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/include/module.v100.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/module.v100.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/module.v100.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: module.php,v 1.1.1.2 2005/10/19 16:23:50 phppp Exp $
+// $Id: module.v100.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/include/module.v220.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/module.v220.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/module.v220.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: module.php,v 1.1.1.2 2005/10/19 16:23:50 phppp Exp $
+// $Id: module.v220.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/include/notification.inc.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/notification.inc.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/notification.inc.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: notification.inc.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: notification.inc.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -80,5 +80,9 @@
//2 => _MD_MENU_HOVER // for "mouse hover to expand"
);
+// view latest edit
+// 1 - all / 0-latest
+$customConfig["do_latestedit"] = 1;
+
return $customConfig;
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: search.inc.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: search.inc.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: newbb.php,v 1.1 2005/04/07 09:23:42 gij Exp $
+// $Id: sitemap.plugin.php 62 2012-08-17 10:15:26Z alfred $
// FILE :: newbb.php
// AUTHOR :: Ryuji AMANO <in...@ry...>
// WEB :: Ryu's Planning <http://ryus.biz/>
Modified: XoopsModules/newbb/branches/alfred/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/index.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/index.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
* @since 4.00
- * @version $Id$
+ * @version $Id: index.php 62 2012-08-17 10:15:26Z alfred $
* @package module::newbb
*/
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: admin.php 62 2012-08-17 10:15:26Z alfred $
if(defined('NEWBB_ADMIN_DEFINED')) return;
else define('NEWBB_ADMIN_DEFINED',true);
@@ -294,4 +294,9 @@
define("_AM_NEWBB_GROUPMOD_ALLFORUMS","All forums");
define("_AM_NEWBB_GROUPMOD_ADDMOD","Moderators have been successfully registered.");
define("_AM_NEWBB_GROUPMOD_ERRMOD","You have an Error!");
+
+// added in V 4.3
+define('_AM_NEWBB_UPLOAD','max. Upload each file:');
+define('_AM_NEWBB_MEMLIMITTOLARGE','Attention! Value \'memory_limit\' to PHP.INI less than \'post_max_size\'');
+define('_AM_NEWBB_MEMLIMITOK','Files can be uploaded with a maximum of %s.');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: blocks.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: blocks.php 62 2012-08-17 10:15:26Z alfred $
// Blocks
if(defined('NEWBB_BLOCKS_DEFINED')) return;
else define('NEWBB_BLOCKS_DEFINED',true);
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: main.php 17 2007-11-18 14:22:36Z LupusC $
+// $Id: main.php 62 2012-08-17 10:15:26Z alfred $
if(defined('MAIN_DEFINED')) return;
define('MAIN_DEFINED',true);
@@ -483,4 +483,6 @@
define('_MD_NEWBB_MAXKB','File is too big (max %s Kb possible).');
define('_MD_NEWBB_UPLOAD_ERRNODEF','undefined Error');
define('_MD_NEWBB_MAXUPLOADFILEINI','The uploaded file exceeds the upload_max_filesize directive in php.ini.');
+define('_MD_NEWBB_MAXPIC','Images at the max. Size %s X %s pixels.');
+define('_MD_NEWBB_SEARCHDISABLED','The search is disabled and can not be used.');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: modinfo.php,v 2.3 2012/02/08 16:20:00 dhcst Exp $
+// $Id: modinfo.php 62 2012-08-17 10:15:26Z alfred $
// Thanks Tom (http://www.wf-projects.com), for correcting the Engligh language package
if (defined('NEWBB_MODINFO_DEFINED')) return;
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/admin.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/admin.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin.php,v 2.3 2005/11/01 12:25:54 phppp Exp $
+// $Id: admin.php 62 2012-08-17 10:15:26Z alfred $
if(defined('NEWBB_ADMIN_DEFINED')) return;
else define('NEWBB_ADMIN_DEFINED',true);
@@ -294,4 +294,9 @@
define("_AM_NEWBB_GROUPMOD_ALLFORUMS","alle Foren");
define("_AM_NEWBB_GROUPMOD_ADDMOD","Moderatoren wurden erfolgreich eingetragen.");
define("_AM_NEWBB_GROUPMOD_ERRMOD","Fehler aufgetreten!");
+
+// added in V 4.3
+define('_AM_NEWBB_UPLOAD','max. Upload je Datei:');
+define('_AM_NEWBB_MEMLIMITTOLARGE','Achtung! Wert \'memory_limit\' in PHP.INI kleiner als \'post_max_size\'');
+define('_AM_NEWBB_MEMLIMITOK','Es können Dateien mit max %s hochgeladen werden.');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/blocks.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/blocks.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/blocks.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: blocks.php,v 2.3 2005/11/01 12:25:54 phppp Exp $
+// $Id: blocks.php 62 2012-08-17 10:15:26Z alfred $
// Blocks
if(defined('NEWBB_BLOCKS_DEFINED')) return;
else define('NEWBB_BLOCKS_DEFINED',true);
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: main.php 17 2007-11-18 14:22:36Z LupusC $
+// $Id: main.php 62 2012-08-17 10:15:26Z alfred $
if(defined('MAIN_DEFINED')) return;
define('MAIN_DEFINED',true);
@@ -488,4 +488,6 @@
define('_MD_NEWBB_MAXKB','Datei ist zu groß (max. %s Kb möglich).');
define('_MD_NEWBB_UPLOAD_ERRNODEF','unbekannter Fehler');
define('_MD_NEWBB_MAXUPLOADFILEINI','Die hochgeladene Datei überschreitet die in der Anweisung upload_max_filesize in php.ini festgelegte Größe.');
+define('_MD_NEWBB_MAXPIC','bei Bildern beträgt die max. Größe %s X %s Pixel.');
+define('_MD_NEWBB_SEARCHDISABLED','Die Suche ist deaktiviert und kann nicht genutzt werden.');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: modinfo.php,v 2.3 2012/02/08 16:20:00 dhcst Exp $
+// $Id: modinfo.php 62 2012-08-17 10:15:26Z alfred $
// Thanks Tom (http://www.wf-projects.com), for correcting the Engligh language package
if (defined('NEWBB_MODINFO_DEFINED')) return;
@@ -16,7 +16,7 @@
// Names of blocks for this module (Not all module has blocks)
define("_MI_NEWBB_BLOCK_TOPIC_POST","Aktuelle Beiträge im Forum");
define("_MI_NEWBB_BLOCK_TOPIC","Zuletzt beantwortete Themen");
-define("_MI_NEWBB_BLOCK_POST","Aktuelle Beiträge");
+define("_MI_NEWBB_BLOCK_POST","Aktuelle Postings im Forum");
define("_MI_NEWBB_BLOCK_AUTHOR","Autoren");
define("_MI_NEWBB_BLOCK_TAG_CLOUD","Tag Wolke");
define("_MI_NEWBB_BLOCK_TAG_TOP","Top Tags");
Modified: XoopsModules/newbb/branches/alfred/newbb/makepdf.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/makepdf.php 2012-08-23 15:48:30 UTC (rev 10092)
+++ XoopsModules/newbb/branches/alfred/newbb/makepdf.php 2012-08-23 18:20:19 UTC (rev 10093)
@@ -1,5 +1,5 @@
<?php
-// $Id: makepdf.php,v 1.1.1.1 2005/10/19 15:58:07 phppp Exp $
+// $Id: makepdf.php 62 2012-08-17 10:15:26Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
Modified: XoopsModules/newbb/branches/alfred/newbb/notification_update.p...
[truncated message content] |
