Menu
▾
▴
xoops-svn
|
From: <dh...@us...> - 2012-07-14 14:14:54
|
Revision: 9875
http://xoops.svn.sourceforge.net/xoops/?rev=9875&view=rev
Author: dhcst
Date: 2012-07-14 14:14:48 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
add index for table bb_posts
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/include/module.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql
Modified: XoopsModules/newbb/branches/alfred/newbb/include/module.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/module.php 2012-07-14 11:52:44 UTC (rev 9874)
+++ XoopsModules/newbb/branches/alfred/newbb/include/module.php 2012-07-14 14:14:48 UTC (rev 9875)
@@ -83,6 +83,10 @@
" CHANGE `poster_ip` `poster_ip` varchar(15) NOT NULL default '0.0.0.0'";
$GLOBALS['xoopsDB']->queryF( $sql );
}
+
+ if ($oldversion < 431) {
+ $GLOBALS['xoopsDB']->queryFromFile(XOOPS_ROOT_PATH."/modules/".$module->getVar("dirname", "n")."/sql/mysql.430.sql");
+ }
if (!empty($newbbConfig["syncOnUpdate"])) {
mod_loadFunctions("recon", "newbb");
Added: XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql (rev 0)
+++ XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql 2012-07-14 14:14:48 UTC (rev 9875)
@@ -0,0 +1,5 @@
+DROP INDEX `approved` ON `bb_posts`;
+
+ALTER TABLE `bb_posts` ADD INDEX `forumid_uid` ( `forum_id` , `uid` );
+ALTER TABLE `bb_posts` ADD INDEX `topicid_uid` ( `topic_id` , `uid` );
+ALTER TABLE `bb_posts` ADD INDEX `forumid_approved_postid` ( `forum_id` , `approved` , `post_id` );
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-14 16:32:58
|
Revision: 9876
http://xoops.svn.sourceforge.net/xoops/?rev=9876&view=rev
Author: dhcst
Date: 2012-07-14 16:32:51 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
fix error in uploads
fix error in update index
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/uploader.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/post.php
XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql
XoopsModules/newbb/branches/alfred/newbb/sql/mysql.sql
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/uploader.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/uploader.php 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/class/uploader.php 2012-07-14 16:32:51 UTC (rev 9876)
@@ -40,11 +40,7 @@
}
}
$_allowedMimeTypes = array();
- if ( file_exists($GLOBALS['xoops']->path('/class/mimetypes.inc.php'))) {
- $extensionToMime = include XOOPS_ROOT_PATH . '/class/mimetypes.inc.php';
- } elseif ( file_exists($GLOBALS['xoops']->path('/include/mimetypes.inc.php'))) {
- $extensionToMime = include XOOPS_ROOT_PATH . '//mimetypes.inc.php';
- }
+ $extensionToMime = include $GLOBALS['xoops']->path('/include/mimetypes.inc.php');
foreach ($allowedMimeTypes as $type) {
if (isset($extensionToMime[$type])) {
$_allowedMimeTypes[] = $extensionToMime[$type];
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-07-14 16:32:51 UTC (rev 9876)
@@ -1,6 +1,6 @@
newBB
Changelog 4.3
-06/16/2012
+07/14/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
@@ -18,6 +18,7 @@
14 Fix Replaced Buzz with Google Plus (mamba)
15 Fix Added "Create" links for missing directories (mamba)
16 Fix Link to Blank.gif
+17 Fix Error Upload File too large
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-07-14 16:32:51 UTC (rev 9876)
@@ -248,7 +248,7 @@
$upload_tray = new XoopsFormElementTray(_MD_ATTACHMENT);
$upload_tray->addElement(new XoopsFormFile('', 'userfile', ($forum_obj->getVar('attach_maxkb') * 1024)));
$upload_tray->addElement(new XoopsFormButton('', 'contents_upload', _MD_UPLOAD, "submit"));
- $upload_tray->addElement(new XoopsFormLabel("<br /><br />" . _MD_MAX_FILESIZE . ":", $forum_obj->getVar('attach_maxkb') . "K; "));
+ $upload_tray->addElement(new XoopsFormLabel("<br /><br />" . _MD_MAX_FILESIZE . ":", $forum_obj->getVar('attach_maxkb') . "Kb; "));
$extensions = trim(str_replace('|',' ',$forum_obj->getVar('attach_ext')));
$extensions = (empty($extensions) || $extensions == "*") ? _ALL : $extensions;
$upload_tray->addElement(new XoopsFormLabel(_MD_ALLOWED_EXTENSIONS . ":", $extensions));
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-07-14 16:32:51 UTC (rev 9876)
@@ -485,4 +485,7 @@
// 4.3
define("_MD_GO", "Los");
define('_MD_NEWBB_SEEUSERDATA','Benutzerinformationen');
+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.');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/post.php 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/post.php 2012-07-14 16:32:51 UTC (rev 9876)
@@ -225,7 +225,7 @@
$attachments_tmp = unserialize(base64_decode($_POST["attachments_tmp"]));
if (isset($_POST["delete_tmp"]) && count($_POST["delete_tmp"])) {
foreach ($_POST["delete_tmp"] as $key) {
- unlink(XOOPS_CACHE_PATH . "/" . $attachments_tmp[$key][0]);
+ unlink(XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['dir_attachments'] . "/" . $attachments_tmp[$key][0]);
unset($attachments_tmp[$key]);
}
}
@@ -237,7 +237,6 @@
}
}
}
-
$error_upload = '';
if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != '' && $topic_handler->getPermission($forum_obj, $topic_status, 'attach') ) {
@@ -248,24 +247,40 @@
$uploader = new newbb_uploader(
$uploaddir,
$forum_obj->getVar('attach_ext'),
- $maxfilesize,$xoopsModuleConfig['max_img_width'],$xoopsModuleConfig['max_img_height']
+ intval($maxfilesize),
+ intval($xoopsModuleConfig['max_img_width']),
+ intval($xoopsModuleConfig['max_img_height'])
);
- $uploader->setCheckMediaTypeByExt();
+ if ( $_FILES['userfile']['error'] > 0 ) {
+ switch ($_FILES['userfile']['error']) {
+ case 1:
+ $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
+ break;
+ case 2:
+ $error_message[] = sprintf(_MD_NEWBB_MAXKB,$forum_obj->getVar('attach_maxkb'));
+ break;
+ default:
+ $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
+ break;
+ }
+ } else {
+ $uploader->setCheckMediaTypeByExt();
- if ( $uploader->fetchMedia( $_POST['xoops_upload_file'][0]) ) {
- $prefix = is_object($xoopsUser) ? strval($xoopsUser->uid()) . '_' : 'newbb_';
- $uploader->setPrefix($prefix);
- if ( !$uploader->upload() ) {
- $error_message[] = $error_upload = $uploader->getErrors();
- } else {
- if ( is_file( $uploader->getSavedDestination() )) {
- $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
- }
- }
- } else {
- $error_message[] = $error_upload = $uploader->getErrors();
- }
+ if ( $uploader->fetchMedia( $_POST['xoops_upload_file'][0]) ) {
+ $prefix = is_object($xoopsUser) ? strval($xoopsUser->uid()) . '_' : 'newbb_';
+ $uploader->setPrefix($prefix);
+ if ( !$uploader->upload() ) {
+ $error_message[] = $error_upload = $uploader->getErrors();
+ } else {
+ if ( is_file( $uploader->getSavedDestination() )) {
+ $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
+ }
+ }
+ } else {
+ $error_message[] = $error_upload = $uploader->getErrors();
+ }
+ }
}
$postid = $post_handler->insert($post_obj);
@@ -402,7 +417,7 @@
$attachments_tmp = unserialize(base64_decode($_POST["attachments_tmp"]));
if (isset($_POST["delete_tmp"]) && count($_POST["delete_tmp"])) {
foreach ($_POST["delete_tmp"] as $key) {
- unlink(XOOPS_CACHE_PATH . $attachments_tmp[$key][0]);
+ unlink($uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['dir_attachments'] . "/" . $attachments_tmp[$key][0]);
unset($attachments_tmp[$key]);
}
}
@@ -410,35 +425,49 @@
$error_upload = '';
if ( isset($_FILES['userfile']['name']) && $_FILES['userfile']['name']!='' ) {
- $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
- $uploaddir = XOOPS_CACHE_PATH;
require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/class/uploader.php';
- $uploader = new newbb_uploader(
+ $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
+ $uploaddir = $uploaddir = XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['dir_attachments'];
+
+ $uploader = new newbb_uploader(
$uploaddir,
$forum_obj->getVar('attach_ext'),
- $maxfilesize,
- $xoopsModuleConfig['max_img_width'],
- $xoopsModuleConfig['max_img_height']
+ intval($maxfilesize),
+ intval($xoopsModuleConfig['max_img_width']),
+ intval($xoopsModuleConfig['max_img_height'])
);
-
- $uploader->setCheckMediaTypeByExt();
- if ( $uploader->fetchMedia( $_POST['xoops_upload_file'][0]) ) {
- $prefix = is_object($xoopsUser) ? strval($xoopsUser->uid()) . '_' : 'newbb_';
- $uploader->setPrefix($prefix);
- if ( !$uploader->upload() ) {
- $error_message[] = $error_upload = $uploader->getErrors();
- } else {
- if ( is_file( $uploader->getSavedDestination() )) {
- $attachments_tmp[strval(time())]=array(
- $uploader->getSavedFileName(),
- $uploader->getMediaName(),
- $uploader->getMediaType()
+ if ( $_FILES['userfile']['error'] > 0 ) {
+ switch ($_FILES['userfile']['error']) {
+ case 1:
+ $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
+ break;
+ case 2:
+ $error_message[] = sprintf(_MD_NEWBB_MAXKB,$forum_obj->getVar('attach_maxkb'));
+ break;
+ default:
+ $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
+ break;
+ }
+ } else {
+ $uploader->setCheckMediaTypeByExt();
+ if ( $uploader->fetchMedia( $_POST['xoops_upload_file'][0]) ) {
+ $prefix = is_object($xoopsUser) ? strval($xoopsUser->uid()) . '_' : 'newbb_';
+ $uploader->setPrefix($prefix);
+ if ( !$uploader->upload() ) {
+ $error_message[] = $error_upload = $uploader->getErrors();
+ } else {
+ if ( is_file( $uploader->getSavedDestination() )) {
+ $attachments_tmp[strval(time())]=array(
+ $uploader->getSavedFileName(),
+ $uploader->getMediaName(),
+ $uploader->getMediaType()
);
- }
- }
- } else {
- $error_message[] = $error_upload = $uploader->getErrors();
- }
+ }
+ }
+ } else {
+ $error_message[] = $error_upload = $uploader->getErrors();
+ }
+ }
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/sql/mysql.430.sql 2012-07-14 16:32:51 UTC (rev 9876)
@@ -1,4 +1,4 @@
-DROP INDEX `approved` ON `bb_posts`;
+ALTER TABLE `bb_posts` DROP INDEX `approved`
ALTER TABLE `bb_posts` ADD INDEX `forumid_uid` ( `forum_id` , `uid` );
ALTER TABLE `bb_posts` ADD INDEX `topicid_uid` ( `topic_id` , `uid` );
Modified: XoopsModules/newbb/branches/alfred/newbb/sql/mysql.sql
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/sql/mysql.sql 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/sql/mysql.sql 2012-07-14 16:32:51 UTC (rev 9876)
@@ -162,8 +162,7 @@
`uid` int(10) unsigned NOT NULL default '0',
`poster_name` varchar(255) NOT NULL default '',
`poster_ip` int(11) NOT NULL default '0',
- `subject` varchar(255) NOT NULL default '',
-
+ `subject` varchar(255) NOT NULL default '',
`icon` varchar(25) NOT NULL default '',
`attachsig` tinyint(1) unsigned NOT NULL default '0',
`approved` smallint(2) NOT NULL default '1',
@@ -171,18 +170,17 @@
`attachment` text,
`require_reply` tinyint(1) unsigned NOT NULL default '0',
- PRIMARY KEY (`post_id`),
- KEY `uid` (`uid`),
- KEY `pid` (`pid`),
- KEY `forum_id` (`forum_id`),
- KEY `topic_id` (`topic_id`),
- KEY `subject` (`subject`(40)),
- KEY `forumid_uid` (`forum_id`,`uid`),
- KEY `topicid_uid` (`topic_id`,`uid`),
- KEY `post_time` (`post_time`),
- KEY `approved` (`approved`),
- KEY `topicid_postid_pid` (`topic_id`,`post_id`,`pid`),
- FULLTEXT KEY `search` (`subject`(64))
+ PRIMARY KEY (`post_id`),
+ KEY `uid` (`uid`),
+ KEY `pid` (`pid`),
+ KEY `forum_id` (`forum_id`),
+ KEY `topic_id` (`topic_id`),
+ KEY `subject` (`subject`(40)),
+ KEY `forumid_uid` (`forum_id`,`uid`),
+ KEY `topicid_uid` (`topic_id`,`uid`),
+ KEY `post_time` (`post_time`),
+ KEY `forumid_approved_postid` (`forum_id`,`approved`,`post_id`),
+ FULLTEXT KEY `search` (`subject`(64))
) ENGINE=MyISAM;
-- --------------------------------------------------------
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-14 16:32:51 UTC (rev 9876)
@@ -54,9 +54,9 @@
if ($order == "") {
if (is_object($xoopsUser) && $xoopsUser->isActive() ) {
- $order = ($xoopsUser->getVar('uorder')==1) ? 'DESC' : 'ASC';
+ $order = ($xoopsUser->getVar('uorder') == 1) ? 'DESC' : 'ASC';
} else {
- $order = ($xoopsConfig['com_order']==1) ? 'DESC' : 'ASC';
+ $order = ($xoopsConfig['com_order'] == 1) ? 'DESC' : 'ASC';
}
}
@@ -86,25 +86,17 @@
$isadmin = newbb_isAdmin($forum_obj);
-if ( !$isadmin && $topic_obj->getVar('approved') < 0 ) {
+if ( ( !$isadmin && $topic_obj->getVar('approved') < 0 ) || (!$forum_handler->getPermission($forum_obj)) || (!$topic_handler->getPermission($forum_obj, $topic_obj->getVar('topic_status'), "view")) ) {
redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=".$forum_id, 2, _MD_NORIGHTTOVIEW);
exit();
}
-if (!$forum_handler->getPermission($forum_obj)) {
- redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php", 2, _MD_NORIGHTTOACCESS);
- exit();
-}
+
/* Only admin has access to admin mode */
if (!$isadmin) {
$status = "";
$mode = 0;
}
-if (!$topic_handler->getPermission($forum_obj, $topic_obj->getVar('topic_status'), "view")) {
- redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum=".$forum_id, 2, _MD_NORIGHTTOVIEW);
- exit();
-}
-
if (!empty($xoopsModuleConfig['enable_karma'])) {
$karma_handler = xoops_getmodulehandler('karma', 'newbb');
$user_karma = $karma_handler->getUserKarma();
@@ -125,7 +117,6 @@
$xoops_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'-'.$forum_obj->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_obj->getVar("forum_id").'" />';
}
-
$xoopsOption['template_main'] = 'newbb_viewtopic.html';
$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH."/header.php";
@@ -264,8 +255,7 @@
$navi = $nav->renderImageNav(4);
} else {
$navi = $nav->renderNav(4);
- }
-
+ }
$xoopsTpl->assign('forum_page_nav', $navi);
} else {
$xoopsTpl->assign('forum_page_nav', '');
@@ -290,15 +280,13 @@
}
}
$xoTheme->addMeta('meta', 'keywords', $kwort);
- $xoTheme->addMeta('meta', 'description', substr(strip_tags($postsArray[$post_id]->getVar('post_text')),0,100));
+ $xoTheme->addMeta('meta', 'description', substr(strip_tags($postsArray[$post_id]->getVar('post_text')),0,120));
}
-
unset($postsArray);
$xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}");
$admin_actions = array();
-
$ad_merge = "";
$ad_move = "";
$ad_delete = "";
@@ -600,7 +588,7 @@
$quickform = ( !empty($xoopsModuleConfig["editor_default"]) ) ? $xoopsModuleConfig["editor_default"] : "textarea";
$editor_configs = array();
$editor_configs [ "name" ] = "message" ;
- $editor_configs [ "value" ] = $message ;
+ //$editor_configs [ "value" ] = $message ;
$editor_configs [ "rows" ] = empty( $xoopsModuleConfig [ "editor_rows" ]) ? 10 : $xoopsModuleConfig [ "editor_rows" ];
$editor_configs [ "cols" ] = empty( $xoopsModuleConfig [ "editor_cols" ]) ? 30 : $xoopsModuleConfig [ "editor_cols" ];
$editor_configs [ "width" ] = empty( $xoopsModuleConfig [ "editor_width" ]) ? "100%" : $xoopsModuleConfig [ "editor_width" ];
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-07-14 14:14:48 UTC (rev 9875)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-07-14 16:32:51 UTC (rev 9876)
@@ -27,14 +27,14 @@
$modversion['status_version'] = "4.2";
//about
-$modversion['release_date'] = '2012/07/04';
+$modversion['release_date'] = '2012/07/14';
$modversion["module_website_url"] = "http://www.simple-xoops.de/";
$modversion["module_website_name"] = "SIMPLE-XOOPS";
-$modversion["module_status"] = "RC 1";
+$modversion["module_status"] = "RC 2";
$modversion['min_php'] = "5.2";
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = "1.1";
-$modversion['min_db'] = array('mysql'=>'5.0', 'mysqli'=>'5.0');
+$modversion['min_db'] = array('mysql'=>'5.1', 'mysqli'=>'5.1');
$modversion['system_menu'] = 1;
$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-15 09:13:22
|
Revision: 9880
http://xoops.svn.sourceforge.net/xoops/?rev=9880&view=rev
Author: dhcst
Date: 2012-07-15 09:13:16 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
fix error in type-manager
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php
XoopsModules/newbb/branches/alfred/newbb/class/type.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php 2012-07-14 23:46:12 UTC (rev 9879)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php 2012-07-15 09:13:16 UTC (rev 9880)
@@ -53,9 +53,7 @@
continue;
} else {
foreach (array("type_name", "type_color", "type_description") as $var) {
- if ($type_obj->getVar($var) != @$_POST[$var][$key]) {
- $type_obj->setVar($var, @$_POST[$var][$key]);
- }
+ $type_obj->setVar($var, @$_POST[$var][$key]);
}
$type_handler->insert($type_obj);
unset($type_obj);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/type.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/type.php 2012-07-14 23:46:12 UTC (rev 9879)
+++ XoopsModules/newbb/branches/alfred/newbb/class/type.php 2012-07-15 09:13:16 UTC (rev 9880)
@@ -14,10 +14,6 @@
exit();
}
-defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
-newbb_load_object();
-
-
/**
* Type
*
@@ -27,11 +23,17 @@
*
* {@link ArtObject}
**/
-class NewbbType extends ArtObject
+class NewbbType extends XoopsObject
{
- function NewbbType()
+
+ function NewbbType()
{
- $this->ArtObject("bb_type");
+ $this->__construct();
+ }
+
+ function __construct()
+ {
+ //$this->ArtObject("bb_type");
$this->initVar('type_id', XOBJ_DTYPE_INT);
$this->initVar('type_name', XOBJ_DTYPE_TXTBOX, "");
$this->initVar('type_color', XOBJ_DTYPE_SOURCE, "");
@@ -51,11 +53,16 @@
* {@link ArtObjectHandler}
*
*/
-class NewbbTypeHandler extends ArtObjectHandler
+class NewbbTypeHandler extends XoopsPersistableObjectHandler
{
- function NewbbTypeHandler(&$db) {
- $this->ArtObjectHandler($db, 'bb_type', 'NewbbType', 'type_id', 'type_name');
+ function NewbbTypeHandler(&$db)
+ {
+ parent::__construct($db, "bb_categories", 'Category', 'cat_id', 'cat_title');
}
+
+ function __construct(&$db) {
+ parent::__construct($db, 'bb_type', 'NewbbType', 'type_id', 'type_name');
+ }
/**
* Get types linked to a forum
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-15 09:28:23
|
Revision: 9881
http://xoops.svn.sourceforge.net/xoops/?rev=9881&view=rev
Author: dhcst
Date: 2012-07-15 09:28:17 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
fix Quickreply Editor Einstellungen
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-07-15 09:13:16 UTC (rev 9880)
+++ XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-07-15 09:28:17 UTC (rev 9881)
@@ -43,6 +43,9 @@
// Set the default editor
$customConfig["editor_default"] = "dhtmltextarea";
+// Set the default editor for quick reply
+$customConfig["editor_quick_default"] = "textarea";
+
// default value for editor rows, coloumns
$customConfig["editor_rows"] = 15;
$customConfig["editor_cols"] = 40;
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-15 09:13:16 UTC (rev 9880)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-15 09:28:17 UTC (rev 9881)
@@ -55,7 +55,7 @@
<{/if}>
</div>
<{if $topic_post.poster.level}>
- <div class="comUserStat" align="left"><{$topic_post.poster.level}></div>
+ <div class="comUserStat"><{$topic_post.poster.level}></div>
<{/if}>
<{if $topic_post.poster.status}>
<div class="comUserStatus"><{$topic_post.poster.status}></div>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-15 09:13:16 UTC (rev 9880)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-15 09:28:17 UTC (rev 9881)
@@ -585,7 +585,8 @@
$forum_form->addElement( $captcha );
}
- $quickform = ( !empty($xoopsModuleConfig["editor_default"]) ) ? $xoopsModuleConfig["editor_default"] : "textarea";
+ //$quickform = ( !empty($xoopsModuleConfig["editor_default"]) ) ? $xoopsModuleConfig["editor_default"] : "textarea";
+ $quickform = ( !empty($xoopsModuleConfig["editor_quick_default"]) ) ? $xoopsModuleConfig["editor_quick_default"] : "textarea";
$editor_configs = array();
$editor_configs [ "name" ] = "message" ;
//$editor_configs [ "value" ] = $message ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <dh...@us...> - 2012-08-23 18:22:59
|
Revision: 10094
http://xoops.svn.sourceforge.net/xoops/?rev=10094&view=rev
Author: dhcst
Date: 2012-08-23 18:22:48 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Fix permission create new forum
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-08-23 18:20:19 UTC (rev 10093)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-08-23 18:22:48 UTC (rev 10094)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_permissions.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_permissions.php 69 2012-08-21 19:33:07Z alfred $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -139,13 +139,6 @@
}
}
-xoops_cp_header();
-echo "<fieldset>";
-if ($newXoopsModuleGui) echo $indexAdmin->addNavigation('admin_permissions.php');
-//if (!$newXoopsModuleGui) loadModuleAdminMenu(3);
-// else echo $indexAdmin->addNavigation('admin_permissions.php');
-echo "<fieldset>";
-if (!$newXoopsModuleGui) echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$action = isset($_REQUEST['action']) ? strtolower($_REQUEST['action']) : "";
$module_id = $xoopsModule->getVar('mid');
$newbbperm_handler =& xoops_getmodulehandler('permission', 'newbb');
@@ -153,6 +146,9 @@
switch($action) {
case "template":
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_permissions.php');
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$opform = new XoopsSimpleForm(_AM_NEWBB_PERM_ACTION, 'actionform', 'admin_permissions.php', "get");
$op_select = new XoopsFormSelect("", 'action');
$op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -204,6 +200,7 @@
$ret .= '</td></tr>';
$ret .= '</table></form>';
echo $ret;
+ xoops_cp_footer();
break;
case "template_save":
@@ -219,8 +216,11 @@
$perm_template = $newbbperm_handler->getTemplate();
if ($perm_template === null) {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE);
+ exit();
}
-
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_permissions.php');
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$opform = new XoopsSimpleForm(_AM_NEWBB_PERM_ACTION, 'actionform', 'admin_permissions.php', "get");
$op_select = new XoopsFormSelect("", 'action');
$op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -254,6 +254,7 @@
$tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
$fmform->addElement($tray);
$fmform->display();
+ xoops_cp_footer();
break;
case "apply_save":
@@ -262,11 +263,14 @@
if ($forum < 1) continue;
$newbbperm_handler->applyTemplate($forum, $module_id);
}
+ mod_clearCacheFile("permission","newbb");
redirect_header("admin_permissions.php", 2, _AM_NEWBB_PERM_TEMPLATE_APPLIED);
break;
default:
-
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('admin_permissions.php');
+ echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . "</legend>";
$opform = new XoopsSimpleForm(_AM_NEWBB_PERM_ACTION, 'actionform', 'admin_permissions.php', "get");
$op_select = new XoopsFormSelect("", 'action');
$op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -333,11 +337,9 @@
// Since we can not control the permission update, a trick is used here
$permission_handler =& xoops_getmodulehandler("permission", "newbb");
$permission_handler->createPermData();
-
+ mod_clearCacheFile("permission","newbb");
+ xoops_cp_footer();
break;
}
-mod_clearCacheFile("forum","newbb");
-mod_clearCacheFile("permission","newbb");
-echo "</fieldset></fieldset>";
-xoops_cp_footer();
+
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-08-23 18:20:19 UTC (rev 10093)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-08-23 18:22:48 UTC (rev 10094)
@@ -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: viewforum.php 62 2012-08-17 10:15:26Z alfred $
+ * @version $Id$
* @package module::newbb
*/
@@ -21,7 +21,7 @@
/*
* Build the page query
*/
-$query_vars = array("forum", "type", "status", "mode", "sort", "order", "start", "since");
+$query_vars = array("forum", "type", "status", "sort", "order", "start", "since");
$query_array = array();
foreach ($query_vars as $var) {
if (!empty($_GET[$var])) $query_array[$var] = "{$var}={$_GET[$var]}";
@@ -44,10 +44,8 @@
$forum_id = intval($_GET['forum']);
$type = @intval($_GET['type']);
$status = (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted", "digest", "unreplied", "unread")))? $_GET['status'] : "";
-$mode = (!empty($status) && in_array($status, array("active", "pending", "deleted")))? 2 : (!empty($_GET['mode']) ? intval($_GET['mode']) : 0);
$forum_handler = xoops_getmodulehandler('forum', 'newbb');
-
$forum_obj = $forum_handler->get($forum_id);
if (!$forum_obj) {
@@ -55,7 +53,7 @@
exit();
}
-if (!$forum_handler->getPermission($forum_obj) || !$forum_handler->getPermission($forum_obj,'view')) {
+if (!$forum_handler->getPermission($forum_obj)) {
redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php", 2, _NOPERM);
exit();
}
@@ -83,11 +81,12 @@
/* Only admin has access to admin mode */
if (!$isadmin) {
$status = (!empty($status) && in_array($status, array("active", "pending", "deleted"))) ? "" : $status;
- $mode = 0;
}
-$xoopsTpl->assign('mode', $mode);
$xoopsTpl->assign('status', $status);
+if ( $isadmin ) {
+ $xoopsTpl->assign('forum_index_cpanel',array("link" => "admin/index.php", "name" => _MD_ADMINCP));
+}
if ($xoopsModuleConfig['wol_enabled']) {
$online_handler =& xoops_getmodulehandler('online', 'newbb');
@@ -189,16 +188,16 @@
$xoopsTpl->assign_by_ref('topics', $allTopics);
$xoopsTpl->assign('sticky', $sticky);
-$xoopsTpl->assign('rating_enable', $xoopsModuleConfig['rating_enabled']);
-$xoopsTpl->assign('img_newposts', newbb_displayImage('topic_new',_MD_NEWPOSTS));
-$xoopsTpl->assign('img_hotnewposts', newbb_displayImage('topic_hot_new',_MD_MORETHAN));
-$xoopsTpl->assign('img_folder', newbb_displayImage('topic',_MD_NONEWPOSTS));
-$xoopsTpl->assign('img_hotfolder', newbb_displayImage('topic_hot',_MD_MORETHAN2));
-$xoopsTpl->assign('img_locked', newbb_displayImage('topic_locked',_MD_TOPICLOCKED));
+$xoopsTpl->assign('rating_enable', $xoopsModuleConfig['rating_enabled']);
+$xoopsTpl->assign('img_newposts', newbb_displayImage('topic_new',_MD_NEWPOSTS));
+$xoopsTpl->assign('img_hotnewposts',newbb_displayImage('topic_hot_new',_MD_MORETHAN));
+$xoopsTpl->assign('img_folder', newbb_displayImage('topic',_MD_NONEWPOSTS));
+$xoopsTpl->assign('img_hotfolder', newbb_displayImage('topic_hot',_MD_MORETHAN2));
+$xoopsTpl->assign('img_locked', newbb_displayImage('topic_locked',_MD_TOPICLOCKED));
-$xoopsTpl->assign('img_sticky', newbb_displayImage('topic_sticky',_MD_TOPICSTICKY));
-$xoopsTpl->assign('img_digest', newbb_displayImage('topic_digest',_MD_TOPICDIGEST));
-$xoopsTpl->assign('img_poll', newbb_displayImage('poll',_MD_TOPICHASPOLL));
+$xoopsTpl->assign('img_sticky', newbb_displayImage('topic_sticky',_MD_TOPICSTICKY));
+$xoopsTpl->assign('img_digest', newbb_displayImage('topic_digest',_MD_TOPICDIGEST));
+$xoopsTpl->assign('img_poll', newbb_displayImage('poll',_MD_TOPICHASPOLL));
$xoopsTpl->assign('mark_read', XOOPS_URL."/modules/newbb/viewforum.php?mark=1&{$page_query}");
$xoopsTpl->assign('mark_unread', XOOPS_URL."/modules/newbb/viewforum.php?mark=2&{$page_query}");
@@ -266,7 +265,6 @@
$page_query_nav = implode("&", array_values($query_nav));
unset($query_nav);
$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", $page_query_nav);
- //if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
elseif ($xoopsModuleConfig['pagenav_display'] == 'bild')
@@ -284,8 +282,6 @@
mod_loadFunctions("forum", "newbb");
$xoopsTpl->assign('forum_jumpbox', newbb_make_jumpbox($forum_id));
}
-$xoopsTpl->assign('menumode',$menumode);
-$xoopsTpl->assign('menumode_other',$menumode_other);
if ($xoopsModuleConfig['show_permissiontable']) {
$perm_handler = xoops_getmodulehandler('permission', 'newbb');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-08-25 15:50:55
|
Revision: 10104
http://xoops.svn.sourceforge.net/xoops/?rev=10104&view=rev
Author: dhcst
Date: 2012-08-25 15:50:49 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
Update set usertimzone and check pollmodules
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/polls.php
XoopsModules/newbb/branches/alfred/newbb/votepolls.php
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-08-25 13:24:45 UTC (rev 10103)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-08-25 15:50:49 UTC (rev 10104)
@@ -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: header.php 62 2012-08-17 10:15:26Z alfred $
+ * @version $Id$
* @package module::newbb
*/
include_once '../../mainfile.php';
@@ -61,15 +61,6 @@
require_once XOOPS_ROOT_PATH."/class/module.textsanitizer.php";
$myts = MyTextSanitizer::getInstance();
-$menumode = 0;
-$menumode_other = array();
-$menu_url = htmlSpecialChars(preg_replace("/&menumode=[^&]/", "", $_SERVER[ 'REQUEST_URI' ]));
-$menu_url .= ( false === strpos($menu_url, "?") ) ? "?menumode=" : "&menumode=";
-foreach ($xoopsModuleConfig["valid_menumodes"] as $key => $val) {
- if ($key != $menumode) $menumode_other[] = array("title"=>$val, "link"=>$menu_url.$key);
-}
-
-
$newbb_module_header = '';
$newbb_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar("name").'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', "n").'/rss.php" />';
if (!empty($xoopsModuleConfig['pngforie_enabled'])) {
@@ -77,9 +68,9 @@
}
$dirname = $xoopsModule->getVar('dirname');
-$theme_path = $xoopsConfig['theme_set'] . "/modules/" . $dirname;
-$lang_path = "images/language/" . $xoopsConfig['language'];
-$default_path = "modules/" . $dirname . "/templates";
+$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'))) {
@@ -96,40 +87,14 @@
$newbb_module_header .= '
<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>
+ <script src="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'/include/newbb_toggle.js" type="text/javascript"></script>
';
-
-if ($menumode == 2) {
- $newbb_module_header .= '
- <link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'templates/newbb_menu_hover.css" />
- <style type="text/css">body {behavior:url("include/newbb.htc");}</style>
- ';
-}
-
-if ($menumode == 1) {
- $newbb_module_header .= '
- <link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname").'templates/newbb_menu_click.css" />
- <script src="include/js/newbb_menu_click.js" type="text/javascript"></script>
- ';
-}
-
$xoops_module_header = $newbb_module_header; // for cache hack
if (!empty($xoopsModuleConfig["welcome_forum"]) && is_object($xoopsUser) && !$xoopsUser->getVar('posts')) {
mod_loadFunctions("welcome", "newbb");
}
-$pollmodules = NULL;
-//$module_handler = &xoops_gethandler('module');
-$xoopspoll = &$module_handler->getByDirname('xoopspoll');
-if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
- $pollmodules = 'xoopspoll';
-} else {
- //Umfrage
- $xoopspoll = &$module_handler->getByDirname('umfrage');
- if (is_object($xoopspoll) && $xoopspoll->getVar('isactive'))
- $pollmodules = 'umfrage';
-}
$xoopsLogger->stopTime('newBB_Header');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/polls.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/polls.php 2012-08-25 13:24:45 UTC (rev 10103)
+++ XoopsModules/newbb/branches/alfred/newbb/polls.php 2012-08-25 15:50:49 UTC (rev 10104)
@@ -14,7 +14,7 @@
* @package newbb
* @since 4.0
* @author Taiwen Jiang <ph...@us...>
- * @version $Id: polls.php 62 2012-08-17 10:15:26Z alfred $
+ * @version $Id: polls.php 2175 2008-09-23 14:07:03Z phppp $
*/
@@ -24,6 +24,17 @@
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . "/class/xoopsblock.php";
+$pollmodules = NULL;
+$xoopspoll = &$module_handler->getByDirname('xoopspoll');
+if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
+ $pollmodules = 'xoopspoll';
+} else {
+ //Umfrage
+ $xoopspoll = &$module_handler->getByDirname('umfrage');
+ if (is_object($xoopspoll) && $xoopspoll->getVar('isactive'))
+ $pollmodules = 'umfrage';
+}
+
if ( $pollmodules == 'xoopspoll')
{
include XOOPS_ROOT_PATH . "/modules/xoopspoll/include/constants.php";
@@ -46,13 +57,12 @@
exit();
}
-$op = "add";
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
-if (isset($_GET['poll_id'])) $poll_id = intval($_GET['poll_id']);
-if (isset($_POST['poll_id'])) $poll_id = intval($_POST['poll_id']);
-if (isset($_GET['topic_id'])) $topic_id = intval($_GET['topic_id']);
-if (isset($_POST['topic_id'])) $topic_id = intval($_POST['topic_id']);
+if (isset($_REQUEST['op'])) ? $_REQUEST['op'] : "add";
+if ( !in_array( $op,array('add','save','edit','update','addmor','savemore','delete','delete_ok','restart','restart_ok','log')) ) $op = "add";
+if (isset($_GET['poll_id'])) $poll_id = intval($_GET['poll_id']);
+if (isset($_POST['poll_id'])) $poll_id = intval($_POST['poll_id']);
+if (isset($_GET['topic_id'])) $topic_id = intval($_GET['topic_id']);
+if (isset($_POST['topic_id'])) $topic_id = intval($_POST['topic_id']);
if (!isset($module_handler)) $module_handler =& xoops_gethandler('module');
$xoopspoll =& $module_handler->getByDirname($pollmodules);
@@ -95,6 +105,7 @@
}
if (!$perm) {
redirect_header("viewtopic.php?topic_id=" . $topic_id, 2, _NOPERM);
+ exit();
}
if ( $op == "add" ) {
@@ -179,7 +190,9 @@
$poll->setVar("description", @$_POST['description']);
if ( !empty($_POST['end_time']) ) {
$timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null;
- $poll->setVar("end_time", userTimeToServerTime(strtotime($_POST['end_time']), $timezone));
+ //$poll->setVar("end_time", userTimeToServerTime(strtotime($_POST['end_time']), $timezone));
+ //Hack by irmtfan
+ $poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($_POST['end_time']) : strtotime($_POST['end_time']), $timezone));
} else {
// if expiration date is not set, set it to 10 days from now
$poll->setVar("end_time", time() + (86400 * 10));
@@ -322,7 +335,9 @@
$end_time = (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
if ( !empty($end_time) ) {
$timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null;
- $poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+ //$poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+ //Hack by Irmtfan
+ $poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
}
$poll->setVar("display", 0);
$poll->setVar("weight", intval(@$_POST['weight']));
@@ -526,7 +541,9 @@
$end_time = (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
if ( !empty($end_time) ) {
$timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null;
- $poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+ //$poll->setVar("end_time", userTimeToServerTime(strtotime($end_time), $timezone));
+ //Hack by irmtfan
+ $poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
} else {
$poll->setVar("end_time", time() + (86400 * 10));
}
Modified: XoopsModules/newbb/branches/alfred/newbb/votepolls.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/votepolls.php 2012-08-25 13:24:45 UTC (rev 10103)
+++ XoopsModules/newbb/branches/alfred/newbb/votepolls.php 2012-08-25 15:50:49 UTC (rev 10104)
@@ -1,5 +1,5 @@
<?php
-// $Id: votepolls.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: votepolls.php,v 1.3 2005/10/19 17:20:28 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -41,6 +41,18 @@
include_once XOOPS_ROOT_PATH."/modules/umfrage/class/umfragerenderer.php";
}
+$pollmodules = NULL;
+//$module_handler = &xoops_gethandler('module');
+$xoopspoll = &$module_handler->getByDirname('xoopspoll');
+if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
+ $pollmodules = 'xoopspoll';
+} else {
+ //Umfrage
+ $xoopspoll = &$module_handler->getByDirname('umfrage');
+ if (is_object($xoopspoll) && $xoopspoll->getVar('isactive'))
+ $pollmodules = 'umfrage';
+}
+
if ( !empty($_POST['poll_id']) ) {
$poll_id = intval($_POST['poll_id']);
} elseif (!empty($_GET['poll_id'])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2013-03-26 17:53:31
|
Revision: 10228
http://xoops.svn.sourceforge.net/xoops/?rev=10228&view=rev
Author: dhcst
Date: 2013-03-26 17:53:17 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
Update to 4.4 Alpha1 see changelog.txt
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/category.php
XoopsModules/newbb/branches/alfred/newbb/class/digest.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/icon.php
XoopsModules/newbb/branches/alfred/newbb/class/karma.php
XoopsModules/newbb/branches/alfred/newbb/class/moderate.php
XoopsModules/newbb/branches/alfred/newbb/class/newbbtree.php
XoopsModules/newbb/branches/alfred/newbb/class/online.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.render.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.user.php
XoopsModules/newbb/branches/alfred/newbb/include/images.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/moderate.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/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.sql
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_online.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_subforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.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/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/class/voteuser.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.clean.php
XoopsModules/newbb/branches/alfred/newbb/include/newbb_toggle.js
XoopsModules/newbb/branches/alfred/newbb/sql/mysql.440.sql
XoopsModules/newbb/branches/alfred/newbb/templates/language/
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/anonym.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/admin_delete.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/admin_edit.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/admin_merge.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/admin_move.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/attachment.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/blank.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/blank.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/buzz.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/delicious.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/digg.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/document.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/down.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/facebook.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/forum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/forum_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/friendfeed.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/googleplus.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/linkedin.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/minus.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/more.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/new_forum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/next.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/pdf.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/plus.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/poll.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/post.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/previous.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/printer.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/rate1.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/rate2.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/rate3.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/rate4.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/rate5.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/reddit.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/rss.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/spacer-a.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/statistik.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/stumbleupon.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/subforum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/technorati.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_digest.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_hot.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_hot_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_locked.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_my.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/topic_sticky.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/twitter.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/up.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/whosonline.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/icon/wong.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/lastposticon.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/more.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/new_forum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/new_subforum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/offline.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/online.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_bann.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_delete.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_edit.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_pdf.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_quote.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_reply.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_report.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/p_thanks.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/t_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/t_poll.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/t_qr.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/default/t_reply.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/english/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/anonym.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/admin_delete.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/admin_edit.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/admin_merge.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/admin_move.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/attachment.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/blank.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/blank.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/buzz.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/delicious.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/digg.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/document.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/down.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/facebook.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/forum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/forum_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/friendfeed.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/googleplus.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/linkedin.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/minus.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/more.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/new_forum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/next.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/pdf.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/plus.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/poll.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/post.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/previous.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/printer.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/rate1.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/rate2.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/rate3.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/rate4.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/rate5.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/reddit.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/rss.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/spacer-a.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/statistik.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/stumbleupon.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/subforum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/technorati.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_digest.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_hot.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_hot_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_locked.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_my.gif
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/topic_sticky.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/twitter.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/up.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/whosonline.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/icon/wong.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/lastposticon.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/more.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/new_forum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/new_subforum.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/offline.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/online.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_bann.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_delete.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_edit.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_quote.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_reply.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_report.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_thanks.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/p_up.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/t_new.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/t_poll.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/t_qr.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/default/t_reply.png
XoopsModules/newbb/branches/alfred/newbb/templates/language/german/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/language/index.html
XoopsModules/newbb/branches/alfred/newbb/templates/mime/
XoopsModules/newbb/branches/alfred/newbb/templates/mime/ace.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/avi.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/bmp.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/doc.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/exe.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/flash.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/gif.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/html.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/jpeg.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/jpg.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/mid.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/mov.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/mp3.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/mpg.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/netscape.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/pdf.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/png.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/ppt.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/rar.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/txt.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/unknown.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/wav.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/xls.gif
XoopsModules/newbb/branches/alfred/newbb/templates/mime/zip.gif
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/blue.gif
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/green.gif
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/img_backing.gif
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/img_left.gif
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/img_right.gif
XoopsModules/newbb/branches/alfred/newbb/templates/rpg/orange.gif
XoopsModules/newbb/branches/alfred/newbb/voteuser.php
Removed Paths:
-------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_groupmod.php
XoopsModules/newbb/branches/alfred/newbb/include/js/
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/about.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/about.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/about.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: about.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: about.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -32,140 +32,11 @@
include( "admin_header.php" );
xoops_cp_header();
-if ($newXoopsModuleGui) {
- $module_info =& $module_handler->get($xoopsModule->getVar("mid"));
- $aboutAdmin = new ModuleAdmin();
- echo $aboutAdmin->addNavigation('about.php');
- echo $aboutAdmin->renderabout('PBQZ7D6LT6UBC', true);
-} else {
+$module_info =& $module_handler->get($xoopsModule->getVar("mid"));
+$aboutAdmin = new ModuleAdmin();
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderabout('PBQZ7D6LT6UBC', true);
- $module_handler =& xoops_gethandler('module');
- $versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
-
- //loadModuleAdminMenu(13, _AM_NEWBB_ABOUT . " " . $versioninfo->getInfo('name'));
-
- echo "<fieldset>";
- // Left headings...
- echo "<img src='" . XOOPS_URL . "/modules/".$xoopsModule->dirname()."/" . $versioninfo->getInfo('image') . "' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px;' /></a>";
- echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " version " . $versioninfo->getInfo('version') . " (" . $versioninfo->getInfo('status_version') . ")</div>";
-
- if ( $versioninfo->getInfo('author_realname') != '') {
- $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")";
- } else {
- $author_name = $versioninfo->getInfo('author');
- }
-
- echo "<div style = 'line-height: 16px; font-weight: bold; display: block;'>" . _AM_NEWBB_BY . " " .$author_name;
- echo "</div>";
- echo "<div style = 'line-height: 16px; display: block;'>" . $versioninfo->getInfo('license') . "</div><br /><br /></>\n";
-
- // Author Information
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><strong>" . _AM_NEWBB_AUTHOR_INFO . "</strong></td>";
- echo "</tr>";
-
- If ( $versioninfo->getInfo('$author_name') != '' ) {
- echo "<tr>";
- echo "<td class='head' width='150px' align='left'>" ._AM_NEWBB_AUTHOR_NAME . "</td>";
- echo "<td class='even' align='left'>" . $author_name . "</td>";
- echo "</tr>";
- }
- If ( $versioninfo->getInfo('author_website_url') != '' ) {
- echo "<tr>";
- echo "<td class='head' width='150px' align='left'>" . _AM_NEWBB_AUTHOR_WEBSITE . "</td>";
- echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('author_website_url') . "' target='_blank'>" . $versioninfo->getInfo('author_website_name') . "</a></td>";
- echo "</tr>";
- }
- If ( $versioninfo->getInfo('author_email') != '' ) {
- echo "<tr>";
- echo "<td class='head' width='150px' align='left'>" . _AM_NEWBB_AUTHOR_EMAIL . "</td>";
- echo "<td class='even' align='left'><a href='mailto:" . $versioninfo->getInfo('author_email') . "'>" . $versioninfo->getInfo('author_email') . "</a></td>";
- echo "</tr>";
- }
- If ( $versioninfo->getInfo('credits') != '' ) {
- echo "<tr>";
- echo "<td class='head' width='150px' align='left'>" . _AM_NEWBB_AUTHOR_CREDITS . "</td>";
- echo "<td class='even' align='left'>" . $versioninfo->getInfo('credits') . "</td>";
- echo "</tr>";
- }
-
- echo "</table>";
- echo "<br />\n";
-
- // Module Developpment information
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr>";
- echo "<td colspan='2' class='bg3' align='left'><strong>" . _AM_NEWBB_MODULE_INFO . "</strong></td>";
- echo "</tr>";
-
- If ( $versioninfo->getInfo('status') != '' ) {
- echo "<tr>";
- echo "<td class='head' width='200' align='left'>" . _AM_NEWBB_MODULE_STATUS . "</td>";
- echo "<td class='even' align='left'>" . $versioninfo->getInfo('status') . "</td>";
- echo "</tr>";
- }
-
- If ( $versioninfo->getInfo('demo_site_url') != '' ) {
- echo "<tr>";
- echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_DEMO . "</td>";
- echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('demo_site_url') . "' target='blank'>" . $versioninfo->getInfo('demo_site_name') . "</a></td>";
- echo "</tr>";
- }
-
- If ( $versioninfo->getInfo('support_site_url') != '' ) {
- echo "<tr>";
- echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_SUPPORT . "</td>";
- echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('support_site_url') . "' target='blank'>" . $versioninfo->getInfo('support_site_name') . "</a></td>";
- echo "</tr>";
- }
-
- If ( $versioninfo->getInfo('submit_bug') != '' ) {
- echo "<tr>";
- echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_BUG . "</td>";
- echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_bug') . "' target='blank'>" . "Submit a Bug in newBB Bug Tracker" . "</a></td>";
- echo "</tr>";
- }
- If ( $versioninfo->getInfo('submit_feature') != '' ) {
- echo "<tr>";
- echo "<td class='head' align='left'>" . _AM_NEWBB_MODULE_FEATURE . "</td>";
- echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_feature') . "' target='_blank'>" . "Request a feature in the newBB Feature Tracker" . "</a></td>";
- echo "</tr>";
- }
-
- echo "</table>";
-
- // Warning
- If ( $versioninfo->getInfo('warning') != '' ) {
- echo "<br />\n";
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr>";
- echo "<td class='bg3' align='left'><strong>" . _AM_NEWBB_MODULE_DISCLAIMER . "</strong></td>";
- echo "</tr>";
-
- echo "<tr>";
- echo "<td class='even' align='left'>" . $versioninfo->getInfo('warning') . "</td>";
- echo "</tr>";
- echo "</table>";
- }
-
- // Author's note
- If ( $versioninfo->getInfo('author_word') != '' ) {
- echo "<br />\n";
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr>";
- echo "<td class='bg3' align='left'><strong>" . _AM_NEWBB_AUTHOR_WORD . "</strong></td>";
- echo "</tr>";
-
- $extra = (defined('_AM_NEWBB_AUTHOR_WORD_EXTRA'))?_AM_NEWBB_AUTHOR_WORD_EXTRA:'';
- echo "<tr>";
- echo "<td class='even' align='left'>" . $versioninfo->getInfo('author_word') . "</td>";
- echo "</tr>";
- echo "</table>";
- }
- echo "</fieldset>";
-}
-
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_blocks.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,38 +0,0 @@
-<?php
-// $Id: admin_blocks.php 62 2012-08-17 10:15:26Z alfred $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// 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 //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu) //
-// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
-// Project: The XOOPS Project //
-// ------------------------------------------------------------------------- //
-// ------------------------------------------------------------------------- //
-// myblocksadmin.php //
-// - XOOPS block admin for each modules - //
-// GIJOE <http://www.peak.ne.jp/> //
-// ------------------------------------------------------------------------- //
-include("admin_header.php");
-header("Location: ".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&selmod=".$xoopsModule->getVar("mid"));
-?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_cat_manager.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_cat_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -31,7 +31,7 @@
include('admin_header.php');
mod_loadFunctions("render", "newbb");
xoops_cp_header();
-echo "<fieldset>";
+
$op = !empty($_GET['op'])? $_GET['op'] : (!empty($_POST['op'])?$_POST['op']:"");
$cat_id = intval( !empty($_GET['cat_id']) ? $_GET['cat_id'] : @$_POST['cat_id'] );
@@ -112,13 +112,8 @@
switch ($op) {
case "mod":
$category_obj = ( $cat_id > 0) ? $category_handler->get($cat_id) : $category_handler->create();
- if (!$newXoopsModuleGui) {
- //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $category_obj->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . "</legend>";
- } else {
- echo $indexAdmin->addNavigation('admin_cat_manager.php') ;
- }
- echo"<br />";
+ echo $indexAdmin->addNavigation('admin_cat_manager.php') ;
+ echo"<br />";
editCategory($category_obj);
break;
@@ -164,32 +159,16 @@
default:
if (!$categories = $category_handler->getByPermission("all")) {
- if (!$newXoopsModuleGui) {
- //loadModuleAdminMenu(1, _AM_NEWBB_CREATENEWCATEGORY);
- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_CREATENEWCATEGORY . "</legend>";
- } else {
- $indexAdmin->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
- echo $indexAdmin->renderButton();
- }
- echo "<fieldset>";
+ $indexAdmin->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+ echo $indexAdmin->renderButton();
echo "<br />";
newCategory();
- echo "</fieldset>";
- break;
+ break;
}
- if (!$newXoopsModuleGui) {
- //loadModuleAdminMenu(1, _AM_NEWBB_CATADMIN);
- echo "<fieldset>";
- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_CATADMIN . "</legend>";
- echo"<br />";
- echo "<a style='border: 1px solid #5E5D63; color: #000000; font-family: verdana, tahoma, arial, helvetica, sans-serif; font-size: 1em; padding: 4px 8px; text-align:center;' href='admin_cat_manager.php?op=mod'>" . _AM_NEWBB_CREATENEWCATEGORY . "</a><br /><br />";
- } else {
- echo $indexAdmin->addNavigation('admin_cat_manager.php') ;
- echo "<fieldset>";
- $indexAdmin->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
- echo $indexAdmin->renderButton();
- }
+ echo $indexAdmin->addNavigation('admin_cat_manager.php') ;
+ $indexAdmin->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+ echo $indexAdmin->renderButton();
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
echo "<td class='bg3'>" . _AM_NEWBB_CATEGORY1 . "</td>";
@@ -213,6 +192,5 @@
break;
}
mod_clearCacheFile("permission_category","newbb");
-echo "</fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_digest.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_digest.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_digest.php,v 1.1.1.1 2005/10/19 15:58:11 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -36,7 +36,6 @@
$item = !empty($_GET['op'])? $_GET['item'] : (!empty($_POST['item'])?$_POST['item']:"process");
$start = (isset($_GET['start']))?$_GET['start']:0;
-//$report_handler =& xoops_getmodulehandler('report', 'newbb');
xoops_cp_header();
switch($op) {
@@ -51,11 +50,8 @@
default:
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/xoopsformloader.php";
- echo "<fieldset>";
$limit = 5;
- if ($newXoopsModuleGui) echo $indexAdmin->addNavigation('admin_digest.php') ;
- //if (!$newXoopsModuleGui) loadModuleAdminMenu(7,_AM_NEWBB_DIGESTADMIN);
- // else echo $indexAdmin->addNavigation('admin_digest.php') ;
+ echo $indexAdmin->addNavigation('admin_digest.php');
echo '<form action="'.xoops_getenv('PHP_SELF').'" method="post">';
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
@@ -78,14 +74,10 @@
echo $hidden->render();
$hidden = new XoopsFormHidden('item', $item);
echo $hidden->render()."</form>";
-
echo "</table>";
$nav = new XoopsPageNav($digest_handler->getDigestCount(), $limit, $start, "start");
echo $nav->renderNav(4);
-
- echo "</fieldset>";
-
break;
}
xoops_cp_footer();
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_manager.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_forum_manager.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -43,8 +43,6 @@
$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
switch ($op) {
case 'moveforum':
- //if (!$newXoopsModuleGui) loadModuleAdminMenu(2, "");
-
if (!empty($_POST['dest_forum'])) {
$dest = $_POST['dest_forum'];
if ($dest > 0) {
@@ -62,14 +60,14 @@
$forum_handler->insert($forum_obj);
if ($forum_handler->insert($forum_obj)) {
if ( $cid != $forum_obj->getVar("cat_id") && $subforums = newbb_getSubForum($forum_id) ) {
- $forums = array_map("intval", array_values($subforums));
+ $forums = array_map("intval", array_values($subforums));
$forum_handler->updateAll("cat_id", $cid, new Criteria("forum_id", "(".implode(", ", $forums).")", "IN") );
- }
+ }
- mod_clearCacheFile("forum", "newbb");
- redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
+ mod_clearCacheFile("forum", "newbb");
+ redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
} else {
- redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
+ redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
}
exit();
} else {
@@ -91,8 +89,6 @@
break;
case 'mergeforum':
- //if (!$newXoopsModuleGui) loadModuleAdminMenu(2, "");
-
if (!empty($_POST['dest_forum'])) {
$forum_dest =& $forum_handler->get($_POST['dest_forum']);
@@ -117,7 +113,6 @@
$forum_handler->delete($forum_obj);
- //mod_clearCacheFile("forum", "newbb");
$forum_handler->synchronization($forum_dest);
unset($forum_dest);
mod_clearCacheFile("forum", "newbb");
@@ -201,7 +196,6 @@
case "mod":
$forum_obj =& $forum_handler->get($forum_id);
- //if (!$newXoopsModuleGui) loadModuleAdminMenu(2, _AM_NEWBB_EDITTHISFORUM . $forum_obj->getVar('forum_name'));
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITTHISFORUM . "</legend>";
include XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/form.forum.php";
@@ -224,7 +218,6 @@
break;
case "addforum":
- //if (!$newXoopsModuleGui) loadModuleAdminMenu(2, _AM_NEWBB_CREATENEWFORUM);
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_CREATENEWFORUM . "</legend>";
echo "<br />";
$parent_forum = @intval($_GET['forum']);
@@ -243,13 +236,7 @@
default:
- if (!$newXoopsModuleGui) {
- //loadModuleAdminMenu(2, _AM_NEWBB_FORUM_MANAGER);
- $echo = "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_FORUM_MANAGER . "</legend>";
- } else {
- $echo = $indexAdmin->addNavigation('admin_forum_manager.php') ;
- $echo .= "<fieldset>";
- }
+ $echo = $indexAdmin->addNavigation('admin_forum_manager.php') ;
$echo .= "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
$echo .= "<tr align='center'>";
$echo .= "<td class='bg3' colspan='2'>" . _AM_NEWBB_NAME . "</td>";
@@ -263,7 +250,7 @@
$category_handler =& xoops_getmodulehandler('category', 'newbb');
$criteria_category = new CriteriaCompo(new criteria('1', 1));
$criteria_category->setSort('cat_order');
- $categories = $category_handler->getList($criteria_category);
+ $categories = $category_handler->getList($criteria_category);
$forums = $forum_handler->getTree(array_keys($categories), 0, "all");
foreach (array_keys($categories) as $c) {
$category = $categories[$c];
@@ -272,7 +259,7 @@
$cat_edit_link = "<a href=\"admin_cat_manager.php?op=mod&cat_id=" . $cat_id. "\">".newbb_displayImage('admin_edit', _EDIT)."</a>";
$cat_del_link = "<a href=\"admin_cat_manager.php?op=del&cat_id=" . $cat_id . "\">".newbb_displayImage('admin_delete', _DELETE)."</a>";
$forum_add_link = "<a href=\"admin_forum_manager.php?op=addforum&cat_id=" . $cat_id . "\">".newbb_displayImage('new_forum')."</a>";
- $echo .= "<tr class='even' align='left'>";
+ $echo .= "<tr class='even' align='left'>";
$echo .= "<td width='100%' colspan='2'><strong>" . $cat_link . "</strong></td>";
$echo .= "<td align='center'>" . $cat_edit_link . "</td>";
$echo .= "<td align='center'>" . $cat_del_link . "</td>";
@@ -283,7 +270,7 @@
if (!isset($forums[$c])) continue;
$i = 0;
foreach (array_keys($forums[$c]) as $f) {
- $forum = $forums[$c][$f];
+ $forum = $forums[$c][$f];
$f_link = $forum["prefix"]."<a href=\"" . XOOPS_URL.'/modules/'.$xoopsModule->getVar("dirname", "n") . "/viewforum.php?forum=" . $f . "\">" . $forum["forum_name"] . "</a>";
$f_edit_link = "<a href=\"admin_forum_manager.php?op=mod&forum=" . $f . "\">".newbb_displayImage('admin_edit',_AM_NEWBB_EDIT)."</a>";
$f_del_link = "<a href=\"admin_forum_manager.php?op=del&forum=" . $f . "\">".newbb_displayImage('admin_delete',_AM_NEWBB_DELETE)."</a>";
@@ -291,7 +278,7 @@
$f_move_link = "<a href=\"admin_forum_manager.php?op=moveforum&forum=" . $f . "\">".newbb_displayImage('admin_move',_AM_NEWBB_MOVE)."</a>";
$f_merge_link = "<a href=\"admin_forum_manager.php?op=mergeforum&forum=" . $f . "\">".newbb_displayImage('admin_merge',_AM_NEWBB_MERGE)."</a>";
- $class = ((++$i)%2)?"odd":"even";
+ $class = ((++$i)%2)?"odd":"even";
$echo .= "<tr class='".$class."' align='left'><td></td>";
$echo .= "<td><strong>" . $f_link . "</strong></td>";
$echo .= "<td align='center'>" . $f_edit_link . "</td>";
@@ -306,7 +293,6 @@
echo $echo;
echo "</table>";
- echo "</fieldset>";
break;
}
xoops_cp_footer();
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_prune.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_prune.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_forum_prune.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -28,11 +28,9 @@
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/xoopsformloader.php";
xoops_cp_header();
-echo "<fieldset>";
-if ($newXoopsModuleGui) echo $indexAdmin->addNavigation('admin_forum_prune.php') ;
-//if (!$newXoopsModuleGui) loadModuleAdminMenu(5, _AM_NEWBB_PRUNE_TITLE);
-// else echo $indexAdmin->addNavigation('admin_forum_prune.php') ;
+echo $indexAdmin->addNavigation('admin_forum_prune.php') ;
+
echo "<table width='100%' border='0' cellspacing='1' class='outer'>"
. "<tr><td class='odd'>";
@@ -205,7 +203,7 @@
}
echo"</td></tr></table>";
-echo "</fieldset>";
+
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_reorder.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_forum_reorder.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_forum_reorder.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -58,13 +58,8 @@
$cat = array();
xoops_cp_header();
- echo "<fieldset>";
- if (!$newXoopsModuleGui) {
- //loadModuleAdminMenu(4, _AM_NEWBB_SETFORUMORDER);
- echo "<fieldset>";
- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_SETFORUMORDER . "</legend>";
- } else echo $indexAdmin->addNavigation('admin_forum_reorder.php') ;
+ echo $indexAdmin->addNavigation('admin_forum_reorder.php') ;
echo"<table width='100%' border='0' cellspacing='1' class='outer'>"
. "<tr><td class='odd'>";
@@ -112,8 +107,6 @@
echo "</table>";
echo "</form>";
echo"</td></tr></table>";
- echo "</fieldset>";
- if (!$newXoopsModuleGui) echo "</fieldset>";
}
xoops_cp_footer();
Deleted: XoopsModules/newbb/branches/alfred/newbb/admin/admin_groupmod.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_groupmod.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_groupmod.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,99 +0,0 @@
-<?php
-// $Id: admin_groupmod.php,v 4.0 2010/01/06 16:43:32 dhcst$
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// 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 //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: Dirk Herrmann (AKA alfred) //
-// URL: http://www.mymyxoops.org/, http://simple-xoops.de/ //
-// Project: The XOOPS Project //
-// ------------------------------------------------------------------------- //
-include('admin_header.php');
-xoops_cp_header();
-echo "<fieldset>";
-include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/xoopsformloader.php";
-if (!$newXoopsModuleGui) {
- //loadModuleAdminMenu(10,_AM_NEWBB_GROUPMOD_TITLE);
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_GROUPMOD_TITLE . "</legend>";
-} else echo $indexAdmin->addNavigation('admin_groupmod.php');
-$member_handler =& xoops_gethandler('member');
-$forum_handler = &xoops_getmodulehandler('forum', 'newbb');
-if (!empty($_POST['submit'])) {
- $fgroups = !empty($_POST['group']) ? $_POST['group'] : '';
- $fforum = intval($_POST['forenid']);
- $fuser = array();
- if ($fforum!=0) {
- if ($fgroups != '') {
- foreach ($fgroups as $k) {
- $gg = & $member_handler->getUsersByGroup($k, false);
- foreach ($gg as $f) {
- if (!in_array($f,$fuser)) $fuser[]=$f;
- }
- }
- }
- if ($fforum == -1) { // alle Foren
- $sql = "UPDATE ".$xoopsDB->prefix('bb_forums')." SET forum_moderator='".serialize($fuser)."'";
- } else {
- $sql = "UPDATE ".$xoopsDB->prefix('bb_forums')." SET forum_moderator='".serialize($fuser)."' WHERE forum_id =".$fforum;
- }
- if (is_array($fuser) && $xoopsDB->queryF($sql)) {
- $mess = _AM_NEWBB_GROUPMOD_ADDMOD;
- } else {
- $mess = _AM_NEWBB_GROUPMOD_ERRMOD."<br /><small>( ".$sql . " )</small>";
- }
- echo '<div class="confirmMsg">'.$mess.'</div><br /><br />';
- }
-}
-
-echo _AM_NEWBB_GROUPMOD_TITLEDESC;
-echo"<br /><br /><table width='100%' border='0' cellspacing='1' class='outer'>"
- . "<tr><td class='odd'>";
-echo "<form name='reorder' method='post'>";
- $category_handler = &xoops_getmodulehandler('category', 'newbb');
- $criteria_category = new CriteriaCompo(new criteria('1', 1));
- $criteria_category->setSort('cat_order');
- $categories = $category_handler->getAll($criteria_category, array("cat_id", "cat_order", "cat_title"));
- $forums = $forum_handler->getTree(array_keys($categories), 0, 'all', " ");
- echo '<select name="forenid">';
- echo '<option value="-1">-- '._AM_NEWBB_GROUPMOD_ALLFORUMS.' --</option>';
- foreach (array_keys($categories) as $c) {
- if (!isset($forums[$c])) continue;
- $i = 0;
- foreach ($forums[$c] as $key => $forum) {
- echo '<option value="'.$forum['forum_id'].'"> '.$categories[$c]->getVar("cat_title")."::".$forum['forum_name'].'</option>';
- }
- }
- echo '</select>';
- echo "</td><tr><tr><td class='even'>";
- $groups =& $member_handler->getGroups();
- foreach ($groups as $value) {
- echo '<input type="checkbox" name="group[]" value="'.$value->getVar('groupid').'" /> '. $value->getVar('name')."<br />";
- }
- echo "</td><tr><tr><td class='odd'>";
-
- echo '<input type="submit" value="'._SUBMIT.'" name="submit" />';
- echo "</td></tr></table>";
-echo "</form></fieldset>";
-echo "</fieldset>";
-xoops_cp_footer();
-?>
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_header.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_header.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -37,14 +37,12 @@
xoops_loadLanguage('main','newbb');
xoops_loadLanguage('modinfo','newbb');
-$newXoopsModuleGui = false;
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
- $pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
- $pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
- $newXoopsModuleGui = true;
- $indexAdmin = new ModuleAdmin();
-}
+
+require_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$indexAdmin = new ModuleAdmin();
+
$myts = &MyTextSanitizer::getInstance();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_permissions.php 69 2012-08-21 19:33:07Z alfred $
+// $Id: admin_permissions.php,v 1.1.1.1 2005/10/19 15:58:12 phppp Exp $
// ------------------------------------------------------------------------ //
// 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 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_report.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin_report.php 62 2012-08-17 10:15:26Z alfred $
+// $Id: admin_report.php,v 1.3 2005/10/19 17:20:32 phppp Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -39,7 +39,7 @@
$report_handler =& xoops_getmodulehandler('report', 'newbb');
xoops_cp_header();
-echo "<fieldset>";
+
switch ($op) {
case "save":
$report_ids = $_POST['report_id'];
@@ -85,12 +85,8 @@
}
$limit = 10;
- if ($newXoopsModuleGui) echo $indexAdmin->addNavigation('admin_report.php') ;
- //if (!$newXoopsModuleGui) loadModuleAdminMenu(6,_AM_NEWBB_REPORTADMIN);
- // else echo $indexAdmin->addNavigation('admin_report.php') ;
-
+ echo $indexAdmin->addNavigation('admin_report.php') ;
echo "<br /><a style='border: 1px solid #5E5D63; color: #000000; font-family: verdana, tahoma, arial, helvetica, sans-serif; font-size: 1em; padding: 4px 8px; text-align:center;' href=\"admin_report.php?item=$item_other\">".$title_other."</a><br /><br />";
-
echo '<form action="'.xoops_getenv('PHP_SELF').'" method="post">';
echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
echo "<tr align='center'>";
@@ -140,14 +136,11 @@
echo $hidden->render();
$hidden = new XoopsFormHidden('item', $item);
echo $hidden->render()."</form>";
-
echo "</table>";
$nav = new XoopsPageNav($report_handler->getCount(new Criteria("report_result", $process_result)), $limit, $start, "start", "item=".$item);
echo $nav->renderNav(4);
- echo "</fieldset>";
-
break;
}
xoops_cp_footer();
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_synchronization.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -6,18 +6,16 @@
* @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: admin_synchronization.php 62 2012-08-17 10:15:26Z alfred $
+ * @version $Id$
* @package module::newbb
*/
include 'admin_header.php';
xoops_cp_header();
-$form = '<fieldset>';
+$form = '';
-if ($newXoopsModuleGui) $form .= $indexAdmin->addNavigation('admin_synchronization.php');
-//if (!$newXoopsModuleGui) loadModuleAdminMenu(12, _AM_NEWBB_SYNCFORUM);
-// else $form .= $indexAdmin->addNavigation('admin_synchronization.php');
+$form .= $indexAdmin->addNavigation('admin_synchronization.php');
//if (!empty($_GET['type'])) {
$start = intval( @$_GET['start'] );
@@ -270,8 +268,6 @@
$form .= '</div>';
$form .= '</form>';
-$form .= "</fieldset>";
-
echo $form;
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php 2013-03-12 14:41:53 UTC (rev 10227)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_type_manager.php 2013-03-26 17:53:17 UTC (rev 10228)
@@ -7,19 +7,16 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <php_pp@hotma...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X