Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10073] XoopsModules/newbb/branches/irmtfan/newbb
|
From: <ir...@us...> - 2012-08-15 07:36:43
|
Revision: 10073
http://xoops.svn.sourceforge.net/xoops/?rev=10073&view=rev
Author: irmtfan
Date: 2012-08-15 07:36:34 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
double slash in rpg url, language revise, tcpdf added, print hardcodes removed
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt
XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
XoopsModules/newbb/branches/irmtfan/newbb/docs/readme.txt
XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/main.php
XoopsModules/newbb/branches/irmtfan/newbb/language/persian/modinfo.php
XoopsModules/newbb/branches/irmtfan/newbb/makepdf.php
XoopsModules/newbb/branches/irmtfan/newbb/print.php
Added Paths:
-----------
XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt 2012-08-15 07:36:34 UTC (rev 10073)
@@ -1,58 +1,87 @@
-Changelog from rev.9883
-date: 2012-08-06
-================================================
-1- hardcode fix: using header php command instead of redirect_header XOOPS function (deka87/irmtfan)
-in newbb/search.php
-(Also hardcoded in latest core in xoops2.5.5/htdocs/search.php)
-
-2- hardcode fix: icon_path smarty variable was hardcoded in viewtopic and viewpost and is not defined in class/forum.php (irmtfan)
-in newbb/viewtopic.php, newbb/viewpost.php, newbb/class/forum.php
-
-3- hardcode icons and some hardcodes has been solved in templates:
-in newbb/templates/newbb_thread.html, newbb/templates/newbb_index.html, newbb/templates/newbb_viewforum_subforum.html
-
-4- add readme.txt
-in docs/readme.txt
-
-date: 2012-08-04
-================================================
-1- bug fixed: error in newbb/polls.php when the strtotime is not defined in XoopsLocal class (irmtfan)
-solution: replace XoopsLocal::strtotime($end_time) by method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time)
-in newbb/polls.php
-2- more hardcodes in newbb/templates has been removed
-
-date: 2012-08-01
-================================================
-1- localization: input date localized (for other date systems like hegira) by replacing strtotime by XoopsLocal::strtotime
-in newbb/polls.php
-
-2- customization&localization: newbb style.css is fully localized and customized and is not hard-coded anymore.
-in newbb/header.php
-file changes:
--- deleted newbb/templates/style.css
--- added newbb/templates/images/language/english/style.css
--- added newbb/templates/images/language/persian/style.css
-priorities:
-if exist in themes/YOUR_THEME/modules/newbb/images/language/YOUR_LANG/style.css take it
-else if exist in themes/default/modules/newbb/images/language/YOUR_LANG/style.css take it
-else if exist in modules/newbb/templates/images/language/YOUR_LANG/style.css take it
-else if exist in modules/newbb/templates/images/language/english/style.css take it
-else if exist in modules/newbb/templates/style.css take it (for backward compatibility)
-
-3- many hardcodes in newbb/templates and style.css has been removed
-
-date: 2012-07-30
-================================================
-1- bug fix: edit not displayed when the reason is not filled (irmtfan)
-2- bug fix: only the last edit is recorded. (irmtfan/alfred)
-in newbb/class/post.php
-3- bug fix: 'noapprove' permission incorrectly recorded in database. (irmtfan)
-in newbb/class/permission.php
-4- bug fix: load user ranks has been hardcoded. it works in old/upgraded websites but not works in new installed websites. a new getting rank introduced. (black_beard/irmtfan)
-in newbb/class/user.php, newbb/templates/newbb_thread.html
-5- minor bug fix: mysql 5.1 was incorrectly needed (irmtfan)
-in newbb/xoops_version.php
-6- hardcode: some style.css color hardcodes has been removed. (irmtfan)
-in newbb/templates/style.css
-7- feature added: text links instead of buttons. (deka87/irmtfan)
+Changelog from rev.9883
+
+date: 2012-08-15
+================================================
+1- minor fix: double slash fixed in rpg url
+in newbb/class/user.php
+
+2- hardcode removed in rpg image alignment - align="left -> class="icon_left"
+in newbb/class/user.php
+
+3- some english/persian language definitions has been revised. All extra spaces/newlines have been removed.
+All changed to end method windows(CR+LF).See docs/lang_diff.txt for detail.
+in newbb/language/english/*.php, newbb/language/persian/*.php
+
+4- add lang_diff.txt
+in newbb/docs/lang_diff.txt
+
+5- expand readme.txt add guides to get a backup from old images before update, introduce Image customization and some FAQ
+in newbb/docs/readme.txt
+
+6- makepdf.php from black_beard - add RTL - remove unneeded TCPDF config language requirements - add multi-lang EMLH by GIJ and Xlanguage by phppp DJ.
+Add Forum Index - cat - forum - sub forum - topic names to the pdf header.
+in newbb/makepdf.php
+
+7- add local stylesheet (xoops_header) in print.php
+in newbb/print.php
+
+date: 2012-08-06
+================================================
+1- hardcode fix: using header php command instead of redirect_header XOOPS function (deka87/irmtfan)
+in newbb/search.php
+(Also hardcoded in latest core in xoops2.5.5/htdocs/search.php)
+
+2- hardcode fix: icon_path smarty variable was hardcoded in viewtopic and viewpost and is not defined in class/forum.php (irmtfan)
+in newbb/viewtopic.php, newbb/viewpost.php, newbb/class/forum.php
+
+3- hardcode icons and some hardcodes has been solved in templates:
+in newbb/templates/newbb_thread.html, newbb/templates/newbb_index.html, newbb/templates/newbb_viewforum_subforum.html
+
+4- add readme.txt for install and upgrade
+in docs/readme.txt
+
+5- a poll class misses in english style.css
+in newbb/templates/images/language/english/style.css
+
+date: 2012-08-04
+================================================
+1- bug fixed: error in newbb/polls.php when the strtotime is not defined in XoopsLocal class (irmtfan)
+solution: replace XoopsLocal::strtotime($end_time) by method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time)
+in newbb/polls.php
+2- more hardcodes in newbb/templates has been removed
+
+date: 2012-08-01
+================================================
+1- localization: input date localized (for other date systems like hegira) by replacing strtotime by XoopsLocal::strtotime
+in newbb/polls.php
+
+2- customization&localization: newbb style.css is fully localized and customized and is not hard-coded anymore.
+in newbb/header.php
+file changes:
+-- deleted newbb/templates/style.css
+-- added newbb/templates/images/language/english/style.css
+-- added newbb/templates/images/language/persian/style.css
+priorities:
+if exist in themes/YOUR_THEME/modules/newbb/images/language/YOUR_LANG/style.css take it
+else if exist in themes/default/modules/newbb/images/language/YOUR_LANG/style.css take it
+else if exist in modules/newbb/templates/images/language/YOUR_LANG/style.css take it
+else if exist in modules/newbb/templates/images/language/english/style.css take it
+else if exist in modules/newbb/templates/style.css take it (for backward compatibility)
+
+3- many hardcodes in newbb/templates and style.css has been removed
+
+date: 2012-07-30
+================================================
+1- bug fix: edit not displayed when the reason is not filled (irmtfan)
+2- bug fix: only the last edit is recorded. (irmtfan/alfred)
+in newbb/class/post.php
+3- bug fix: 'noapprove' permission incorrectly recorded in database. (irmtfan)
+in newbb/class/permission.php
+4- bug fix: load user ranks has been hardcoded. it works in old/upgraded websites but not works in new installed websites. a new getting rank introduced. (black_beard/irmtfan)
+in newbb/class/user.php, newbb/templates/newbb_thread.html
+5- minor bug fix: mysql 5.1 was incorrectly needed (irmtfan)
+in newbb/xoops_version.php
+6- hardcode: some style.css color hardcodes has been removed. (irmtfan)
+in newbb/templates/style.css
+7- feature added: text links instead of buttons. (deka87/irmtfan)
in newbb/class/icon.php , newbb/include/functions.render.php , newbb/include/plugin.php
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/user.php 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/user.php 2012-08-15 07:36:34 UTC (rev 10073)
@@ -1,298 +1,300 @@
-<?php
-/**
- * CBB 4.0, or newbb, the forum module for XOOPS project
- *
- * @copyright The XOOPS Project http://xoops.sf.net
- * @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 $
- * @package module::newbb
- */
-
-if (!defined("XOOPS_ROOT_PATH")) {
- exit();
-}
-
-defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
-
-function newbb_calculateLevel($RPG, $RPGDIFF)
-{
-
- //$RPG = $user->getVar('posts');
- //$RPGDIFF = $user->getVar('user_regdate');
-
- $today = time();
- $diff = $today - $RPGDIFF;
- $exp = round($diff / 86400,0);
- if ($exp <= 0) { $exp = 1; }
- $ppd= round($RPG / $exp, 0);
- $level = pow (log10 ($RPG), 3);
- $ep = floor (100 * ($level - floor ($level)));
- $showlevel = floor ($level + 1);
- $hpmulti =round ($ppd / 6, 1);
- if ($hpmulti > 1.5) { $hpmulti = 1.5; }
- if ($hpmulti < 1) { $hpmulti = 1; }
- $maxhp = $level * 25 * $hpmulti;
- $hp= $ppd / 5;
- if ($hp >= 1) {
- $hp= $maxhp;
- } else {
- $hp= floor ($hp * $maxhp);
- }
- $hp= floor ($hp);
- $maxhp= floor ($maxhp);
- if ($maxhp <= 0) {
- $zhp = 1;
- } else {
- $zhp = $maxhp;
- }
- $hpf= floor (100 * ($hp / $zhp)) - 1;
- $maxmp= ($exp * $level) / 5;
- $mp= $RPG / 3;
- if ($mp >= $maxmp) { $mp = $maxmp; }
- $maxmp = floor ($maxmp);
- $mp = floor ($mp);
- if ($maxmp <= 0) {
- $zmp = 1;
- } else {
- $zmp = $maxmp;
- }
- $mpf= floor (100 * ($mp / $zmp)) - 1;
- if ( $hpf >= 98 ) { $hpf = $hpf - 2; }
- if ( $ep >= 98 ) { $ep = $ep - 2; }
- if ( $mpf >= 98 ) { $mpf = $mpf - 2; }
-
- $level = array();
- $level['level'] = $showlevel ;
- $level['exp'] = $ep;
- $level['exp_width'] = $ep.'%';
- $level['hp'] = $hp;
- $level['hp_max'] = $maxhp;
- $level['hp_width'] = $hpf.'%';
- $level['mp'] = $mp;
- $level['mp_max'] = $maxmp;
- $level['mp_width'] = $mpf.'%';
-
- return $level;
-}
-
-class newbbUser {
- var $user = null;
-
- function User()
- {
- }
-
- function getUserbar()
- {
- global $xoopsModuleConfig, $xoopsUser, $isadmin;
-
- $userbar = array();
- if (empty($xoopsModuleConfig['userbar_enabled'])) return $userbar;
-
- $user = $this->user;
- $userbar["profile"] = array("link" => XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid"), "name" => _PROFILE);
-
- if (is_object($xoopsUser)) {
- $userbar["pm"] = array("link" => "javascript:void openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $user->getVar("uid") . "', 'pmlite', 450, 380);", "name" => _MD_PM);
- }
- if ($user->getVar('user_viewemail') || $isadmin) {
- $userbar["email"] = array("link" => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');", "name" => _MD_EMAIL);
- }
- if ($url = $user->getVar('url')) {
- $userbar["url"] = array("link" => "javascript:void window.open('" . $url . "', 'new');", "name" => _MD_WWW);
- }
- if ($icq = $user->getVar('user_icq')) {
- $userbar["icq"] = array("link" => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq."', 'new');", "name" => _MD_ICQ);
- }
- if ($aim = $user->getVar('user_aim')) {
- $userbar["aim"]= array("link" => "javascript:void window.open('aim:goim?screenname=" . $aim . "&message=Hi+" . $aim . "+Are+you+there?" . "', 'new');", "name" => _MD_AIM);
- }
- if ($yim = $user->getVar('user_yim')) {
- $userbar["yim"] = array("link" => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . "&.src=pg" . "', 'new');", "name" => _MD_YIM);
- }
- if ($msn = $user->getVar('user_msnm')) {
- $userbar["msnm"] = array("link" => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');", "name" => _MD_MSNM);
- }
-
- return $userbar;
- }
-
- function getLevel()
- {
- global $xoopsModuleConfig, $forumUrl;
-
- $level = newbb_calculateLevel($this->user->getVar("posts"), $this->user->getVar("user_regdate"));
- $info='';
- if ($xoopsModuleConfig['user_level'] == 2) {
- static $rpg_images;
- if (!isset($rpg_images)) {
- $icon_handler = newbb_getIconHandler();
- $rpg_path = $icon_handler->getPath("rpg");
- foreach (array("img_left", "img_backing", "img_right", "blue", "green", "orange") as $img) {
- $rpg_images[$img] = XOOPS_URL . '/' . $rpg_path . '/'.$img.'.gif';
- }
- }
- $table = "<table class='userlevel'><tr><td class='end'><img src='" . $rpg_images['img_left'] . "' alt='' /></td><td class='center' background='" . $rpg_images['img_backing'] . "'><img src='%s' width='%d' alt='' align='left' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
-
- $info = _MD_LEVEL . " " . $level['level'] . "<br />" . _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />".
- sprintf($table, $rpg_images["orange"], $level['hp_width']);
- $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'] . "<br />".
- sprintf($table, $rpg_images["green"], $level['mp_width']);
- $info .= _MD_EXP . " " . $level['exp'] . "<br />".
- sprintf($table, $rpg_images["blue"], $level['exp_width']);
- } else {
- $info = _MD_LEVEL . " " . $level['level'] . "; ". _MD_EXP . " " . $level['exp'] . "<br />";
- $info .= _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />";
- $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'];
- }
- return $info;
- }
-
- function getInfo(&$user)
- {
- global $xoopsModuleConfig, $myts;
- static $name_anonymous;
-
- if ( !(is_object($user)) || !($user->isActive()) ) {
- if (!isset($name_anonymous)) {
- $name_anonymous = $myts->HtmlSpecialChars($GLOBALS["xoopsConfig"]['anonymous']);
- }
- return array("name" => $name_anonymous, "link" => $name_anonymous);
- }
-
- $this->user = $user;
-
- $userinfo["uid"] = $user->getVar("uid");
-
- $name = empty($xoopsModuleConfig['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
- $userinfo["name"] = $name ? $name : $user->getVar('uname');
-
- $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');
-
- mod_loadFunctions("time", "newbb");
- $userinfo["regdate"] = newbb_formatTimestamp($user->getVar('user_regdate'), 'reg');
-
- $userinfo["posts"] = $user->getVar('posts');
-
- if (!empty($xoopsModuleConfig['user_level'])) {
- $userinfo["level"] = $this->getLevel();
- }
-
- if (!empty($xoopsModuleConfig['userbar_enabled'])) {
- $userinfo["userbar"] = $this->getUserbar();
- }
-
- $userinfo["signature"] = $user->getVar('user_sig');
- return $userinfo;
- }
-}
-
-class NewbbUserHandler
-{
- var $enableGroup;
- var $enableOnline;
- var $userlist = array();
- var $users = array();
- //var $online = array();
-
- function NewbbUserHandler($enableGroup = true, $enableOnline = true)
- {
- $this->enableGroup = $enableGroup;
- $this->enableOnline = $enableOnline;
- }
-
- function loadUserInfo()
- {
- @include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS["xoopsModule"]->getVar("dirname", "n")."/language/".$GLOBALS["xoopsConfig"]["language"]."/user.php";
- if (class_exists("User_language")) {
- $handler = new User_language();
- } else {
- $handler = new newbbUser();
- }
- foreach (array_keys($this->users) as $uid) {
- $this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
- }
- }
-
- function loadUserOnline()
- {
- if (empty($this->users) || !$this->enableOnline) return;
- mod_loadFunctions("render", "newbb");
- $image_online = newbb_displayImage('online', _MD_ONLINE);
- $image_offline = newbb_displayImage('offline',_MD_OFFLINE);
-
- $online_handler =& xoops_getmodulehandler('online', 'newbb');
- $onlines = $online_handler->checkStatus(array_keys($this->users));
-
- foreach (array_keys($this->users) as $uid) {
- $this->userlist[$uid]["status"] = empty($onlines[$uid]) ? $image_offline : $image_online;
- }
- }
-
- function loadUserGroups()
- {
- GLOBAL $xoopsDB;
-
- if (empty($this->users) || !$this->enableGroup) return;
-
- $groups = array();
- $member_handler =& xoops_gethandler('member');
- $groups_obj = $member_handler->getGroups();
- $count = count($groups_obj);
- for ($i = 0; $i < $count; $i++) {
- $groups[$groups_obj[$i]->getVar('groupid')] = $groups_obj[$i]->getVar('name');
- }
- unset($groups_obj);
-
- $sql = 'SELECT groupid, uid FROM ' . $xoopsDB->prefix('groups_users_link') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
- $result = $xoopsDB->query($sql);
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $this->userlist[$myrow['uid']]["groups"][] = $groups[$myrow['groupid']];
- }
- }
-
- function loadUserDigest()
- {
- GLOBAL $xoopsDB;
-
- if (empty($this->users)) return;
-
- $sql = 'SELECT user_digests, uid FROM ' . $xoopsDB->prefix('bb_user_stats') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
- $result = $xoopsDB->query($sql);
- while ($myrow = $xoopsDB->fetchArray($result)) {
- $this->userlist[$myrow['uid']]["digests"] = intval( $myrow['user_digests'] );
- }
- }
-// START irmtfan remove function
-// function loadUserRank()
-// {
-// return true;
-// }
-// END irmtfan remove function
-
- function getUsers()
- {
- $this->loadUserInfo();
- $this->loadUserOnline();
- $this->loadUserGroups();
- // irmtfan removed $this->loadUserRank();
- $this->loadUserDigest();
-
- return $this->userlist;
- }
-}
-
+<?php
+/**
+ * CBB 4.0, or newbb, the forum module for XOOPS project
+ *
+ * @copyright The XOOPS Project http://xoops.sf.net
+ * @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 $
+ * @package module::newbb
+ */
+
+if (!defined("XOOPS_ROOT_PATH")) {
+ exit();
+}
+
+defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
+
+function newbb_calculateLevel($RPG, $RPGDIFF)
+{
+
+ //$RPG = $user->getVar('posts');
+ //$RPGDIFF = $user->getVar('user_regdate');
+
+ $today = time();
+ $diff = $today - $RPGDIFF;
+ $exp = round($diff / 86400,0);
+ if ($exp <= 0) { $exp = 1; }
+ $ppd= round($RPG / $exp, 0);
+ $level = pow (log10 ($RPG), 3);
+ $ep = floor (100 * ($level - floor ($level)));
+ $showlevel = floor ($level + 1);
+ $hpmulti =round ($ppd / 6, 1);
+ if ($hpmulti > 1.5) { $hpmulti = 1.5; }
+ if ($hpmulti < 1) { $hpmulti = 1; }
+ $maxhp = $level * 25 * $hpmulti;
+ $hp= $ppd / 5;
+ if ($hp >= 1) {
+ $hp= $maxhp;
+ } else {
+ $hp= floor ($hp * $maxhp);
+ }
+ $hp= floor ($hp);
+ $maxhp= floor ($maxhp);
+ if ($maxhp <= 0) {
+ $zhp = 1;
+ } else {
+ $zhp = $maxhp;
+ }
+ $hpf= floor (100 * ($hp / $zhp)) - 1;
+ $maxmp= ($exp * $level) / 5;
+ $mp= $RPG / 3;
+ if ($mp >= $maxmp) { $mp = $maxmp; }
+ $maxmp = floor ($maxmp);
+ $mp = floor ($mp);
+ if ($maxmp <= 0) {
+ $zmp = 1;
+ } else {
+ $zmp = $maxmp;
+ }
+ $mpf= floor (100 * ($mp / $zmp)) - 1;
+ if ( $hpf >= 98 ) { $hpf = $hpf - 2; }
+ if ( $ep >= 98 ) { $ep = $ep - 2; }
+ if ( $mpf >= 98 ) { $mpf = $mpf - 2; }
+
+ $level = array();
+ $level['level'] = $showlevel ;
+ $level['exp'] = $ep;
+ $level['exp_width'] = $ep.'%';
+ $level['hp'] = $hp;
+ $level['hp_max'] = $maxhp;
+ $level['hp_width'] = $hpf.'%';
+ $level['mp'] = $mp;
+ $level['mp_max'] = $maxmp;
+ $level['mp_width'] = $mpf.'%';
+
+ return $level;
+}
+
+class newbbUser {
+ var $user = null;
+
+ function User()
+ {
+ }
+
+ function getUserbar()
+ {
+ global $xoopsModuleConfig, $xoopsUser, $isadmin;
+
+ $userbar = array();
+ if (empty($xoopsModuleConfig['userbar_enabled'])) return $userbar;
+
+ $user = $this->user;
+ $userbar["profile"] = array("link" => XOOPS_URL . "/userinfo.php?uid=" . $user->getVar("uid"), "name" => _PROFILE);
+
+ if (is_object($xoopsUser)) {
+ $userbar["pm"] = array("link" => "javascript:void openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $user->getVar("uid") . "', 'pmlite', 450, 380);", "name" => _MD_PM);
+ }
+ if ($user->getVar('user_viewemail') || $isadmin) {
+ $userbar["email"] = array("link" => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');", "name" => _MD_EMAIL);
+ }
+ if ($url = $user->getVar('url')) {
+ $userbar["url"] = array("link" => "javascript:void window.open('" . $url . "', 'new');", "name" => _MD_WWW);
+ }
+ if ($icq = $user->getVar('user_icq')) {
+ $userbar["icq"] = array("link" => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq."', 'new');", "name" => _MD_ICQ);
+ }
+ if ($aim = $user->getVar('user_aim')) {
+ $userbar["aim"]= array("link" => "javascript:void window.open('aim:goim?screenname=" . $aim . "&message=Hi+" . $aim . "+Are+you+there?" . "', 'new');", "name" => _MD_AIM);
+ }
+ if ($yim = $user->getVar('user_yim')) {
+ $userbar["yim"] = array("link" => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . "&.src=pg" . "', 'new');", "name" => _MD_YIM);
+ }
+ if ($msn = $user->getVar('user_msnm')) {
+ $userbar["msnm"] = array("link" => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');", "name" => _MD_MSNM);
+ }
+
+ return $userbar;
+ }
+
+ function getLevel()
+ {
+ global $xoopsModuleConfig, $forumUrl;
+
+ $level = newbb_calculateLevel($this->user->getVar("posts"), $this->user->getVar("user_regdate"));
+ $info='';
+ if ($xoopsModuleConfig['user_level'] == 2) {
+ static $rpg_images;
+ if (!isset($rpg_images)) {
+ $icon_handler = newbb_getIconHandler();
+ $rpg_path = $icon_handler->getPath("rpg");
+ foreach (array("img_left", "img_backing", "img_right", "blue", "green", "orange") as $img) {
+// irmtfan fix: double "/" removed
+ $rpg_images[$img] = XOOPS_URL . $rpg_path . '/'.$img.'.gif';
+ }
+ }
+// irmtfan hardcore removed align="left"
+ $table = "<table class='userlevel'><tr><td class='end'><img src='" . $rpg_images['img_left'] . "' alt='' /></td><td class='center' background='" . $rpg_images['img_backing'] . "'><img src='%s' width='%d' alt='' class='icon_left' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
+
+ $info = _MD_LEVEL . " " . $level['level'] . "<br />" . _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />".
+ sprintf($table, $rpg_images["orange"], $level['hp_width']);
+ $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'] . "<br />".
+ sprintf($table, $rpg_images["green"], $level['mp_width']);
+ $info .= _MD_EXP . " " . $level['exp'] . "<br />".
+ sprintf($table, $rpg_images["blue"], $level['exp_width']);
+ } else {
+ $info = _MD_LEVEL . " " . $level['level'] . "; ". _MD_EXP . " " . $level['exp'] . "<br />";
+ $info .= _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />";
+ $info .= _MD_MP . " " . $level['mp'] . " / " . $level['mp_max'];
+ }
+ return $info;
+ }
+
+ function getInfo(&$user)
+ {
+ global $xoopsModuleConfig, $myts;
+ static $name_anonymous;
+
+ if ( !(is_object($user)) || !($user->isActive()) ) {
+ if (!isset($name_anonymous)) {
+ $name_anonymous = $myts->HtmlSpecialChars($GLOBALS["xoopsConfig"]['anonymous']);
+ }
+ return array("name" => $name_anonymous, "link" => $name_anonymous);
+ }
+
+ $this->user = $user;
+
+ $userinfo["uid"] = $user->getVar("uid");
+
+ $name = empty($xoopsModuleConfig['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
+ $userinfo["name"] = $name ? $name : $user->getVar('uname');
+
+ $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');
+
+ mod_loadFunctions("time", "newbb");
+ $userinfo["regdate"] = newbb_formatTimestamp($user->getVar('user_regdate'), 'reg');
+
+ $userinfo["posts"] = $user->getVar('posts');
+
+ if (!empty($xoopsModuleConfig['user_level'])) {
+ $userinfo["level"] = $this->getLevel();
+ }
+
+ if (!empty($xoopsModuleConfig['userbar_enabled'])) {
+ $userinfo["userbar"] = $this->getUserbar();
+ }
+
+ $userinfo["signature"] = $user->getVar('user_sig');
+ return $userinfo;
+ }
+}
+
+class NewbbUserHandler
+{
+ var $enableGroup;
+ var $enableOnline;
+ var $userlist = array();
+ var $users = array();
+ //var $online = array();
+
+ function NewbbUserHandler($enableGroup = true, $enableOnline = true)
+ {
+ $this->enableGroup = $enableGroup;
+ $this->enableOnline = $enableOnline;
+ }
+
+ function loadUserInfo()
+ {
+ @include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS["xoopsModule"]->getVar("dirname", "n")."/language/".$GLOBALS["xoopsConfig"]["language"]."/user.php";
+ if (class_exists("User_language")) {
+ $handler = new User_language();
+ } else {
+ $handler = new newbbUser();
+ }
+ foreach (array_keys($this->users) as $uid) {
+ $this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
+ }
+ }
+
+ function loadUserOnline()
+ {
+ if (empty($this->users) || !$this->enableOnline) return;
+ mod_loadFunctions("render", "newbb");
+ $image_online = newbb_displayImage('online', _MD_ONLINE);
+ $image_offline = newbb_displayImage('offline',_MD_OFFLINE);
+
+ $online_handler =& xoops_getmodulehandler('online', 'newbb');
+ $onlines = $online_handler->checkStatus(array_keys($this->users));
+
+ foreach (array_keys($this->users) as $uid) {
+ $this->userlist[$uid]["status"] = empty($onlines[$uid]) ? $image_offline : $image_online;
+ }
+ }
+
+ function loadUserGroups()
+ {
+ GLOBAL $xoopsDB;
+
+ if (empty($this->users) || !$this->enableGroup) return;
+
+ $groups = array();
+ $member_handler =& xoops_gethandler('member');
+ $groups_obj = $member_handler->getGroups();
+ $count = count($groups_obj);
+ for ($i = 0; $i < $count; $i++) {
+ $groups[$groups_obj[$i]->getVar('groupid')] = $groups_obj[$i]->getVar('name');
+ }
+ unset($groups_obj);
+
+ $sql = 'SELECT groupid, uid FROM ' . $xoopsDB->prefix('groups_users_link') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
+ $result = $xoopsDB->query($sql);
+ while ($myrow = $xoopsDB->fetchArray($result)) {
+ $this->userlist[$myrow['uid']]["groups"][] = $groups[$myrow['groupid']];
+ }
+ }
+
+ function loadUserDigest()
+ {
+ GLOBAL $xoopsDB;
+
+ if (empty($this->users)) return;
+
+ $sql = 'SELECT user_digests, uid FROM ' . $xoopsDB->prefix('bb_user_stats') . " WHERE uid IN( " . implode(", ", array_keys($this->users)) . ")";
+ $result = $xoopsDB->query($sql);
+ while ($myrow = $xoopsDB->fetchArray($result)) {
+ $this->userlist[$myrow['uid']]["digests"] = intval( $myrow['user_digests'] );
+ }
+ }
+// START irmtfan remove function
+// function loadUserRank()
+// {
+// return true;
+// }
+// END irmtfan remove function
+
+ function getUsers()
+ {
+ $this->loadUserInfo();
+ $this->loadUserOnline();
+ $this->loadUserGroups();
+ // irmtfan removed $this->loadUserRank();
+ $this->loadUserDigest();
+
+ return $this->userlist;
+ }
+}
+
?>
\ No newline at end of file
Added: XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt (rev 0)
+++ XoopsModules/newbb/branches/irmtfan/newbb/docs/lang_diff.txt 2012-08-15 07:36:34 UTC (rev 10073)
@@ -0,0 +1,28 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+Version 4.3 rev.9992
+----------------
+admin.php
+----------
+remove:
+define("_AM_NEWBB_ALLOWSIGNATURES","Allow Signatures:");
+
+revise:
+define("_AM_NEWBB_CAN_SIGNATURE","Can use and disable/enable signature. Default is set in profile module.");
+define("_AM_NEWBB_CAN_HTML","Can use and disable/enable HTML");
+define('_AM_NEWBB_AUTHOR_WORD_EXTRA',"Extra words by module Author");
+
+modinfo.php
+----------
+revise:
+define("_MI_USERMODERATE_DESC","Forum moderator can suspend a specific user for a specific time period in the forum");
+define("_MI_SUBFORUM_DISPLAY_DESC","Choose one of the methods to display subforums");
+define("_MI_STATISTIK_ENABLE_DESC","The stats will be shown in your forum at the bottom of each forum/topic");
+
+main.php
+---------
+revise:
+define("_MD_EDITEDMSG","Reason:");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/docs/readme.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/docs/readme.txt 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/docs/readme.txt 2012-08-15 07:36:34 UTC (rev 10073)
@@ -1,10 +1,13 @@
-newbb 4.3 install and upgrade guide
-requirements: XOOPS 2.5.x php 5.2 mysql 5.0
+Newbb 4.3 guide
+Requirements:
+=========================
+XOOPS 2.5.x php 5.2 mysql 5.0
+
To Install
=========================
1- close your website. (recommended) be sure you be logged in.
-2- upload the newbb to /modules/newbb ( upload the compressed file and decompressed via Cpanel is the best way to insure all files are correctly uploaded)
+2- upload the newbb to /modules/newbb (upload the compressed file and decompressed via Cpanel is the best way to insure all files are correctly uploaded)
3- go to your admin -> system -> modules -> install
4- change the default settings to your desired in the module preferences and newbb/include/plugin.php
5- dont forget to open your website again.
@@ -13,11 +16,58 @@
==========================
1- close your website. (highly recommended) be sure you be logged in.
2- get a backup from your old newbb database.(all XOOPSPREFIX_bb_* tables)
-3- IF EXIST get a backup from your old newbb/include/plugin.php
-4- delete your old newbb folder located in modules (or rename it to newbb_old)
-5- IF EXIST delete old newbb folder (templates) in htdocs/themes/default/modules/newbb AND htdocs/themes/YOUR_THEME/modules/newbb (or rename it to newbb_old)
-6- upload the newbb to htdocs/modules/newbb ( upload the compressed file and decompressed via Cpanel is the best way to insure all files are correctly upload)
-7- go to your admin -> system -> modules -> newbb -> upgrade (wait until you see the report page)
-8- go to system -> maintenance -> clear all caches
-9- change the default settings to your desired in the module preferences and newbb/include/plugin.php and IF EXIST based on your old back-upped plugin.php
-10 - dont forget to open your website again.
\ No newline at end of file
+3- get a backup from your old newbb/images directory to save your custom old images. Also get a backup from any changes you done in files.
+4- IF EXIST get a backup from your old newbb/include/plugin.php
+5- delete your old newbb folder located in modules (or rename it to newbb_old)
+6- IF EXIST delete old newbb folder (templates) in htdocs/themes/default/modules/newbb AND htdocs/themes/YOUR_THEME/modules/newbb (or rename it to newbb_old)
+7- upload the newbb to htdocs/modules/newbb (upload the compressed file and decompressed via Cpanel is the best way to insure all files are correctly uploaded)
+8- go to your admin -> system -> modules -> newbb -> upgrade (important: wait until you see the report page)
+9- go to system -> maintenance -> clear all caches
+10- change the default settings to your desired in the module preferences and newbb/include/plugin.php and IF EXIST based on your old back-upped plugin.php. Set the permissions in newbb -> admin -> permission for all groups one by one. pay attention that webmasters group has all accesses regardless of permissions. using a non webmaster test account is recommended to test the permissions for each group.
+11 - dont forget to open your website again.
+
+Image set Full customization
+==========================
+In newbb 4.3 you can customize all images (like reply, edit, ... buttons and icons) for all themes or each theme one by one without touching the modules/newbb files.
+The priority for reading images are as below:
+ * IF EXISTS XOOPS_ROOT/themes/YOUR_THEME/modules/newbb/images/, TAKE IT;
+ * ELSEIF EXISTS XOOPS_ROOT/themes/default/modules/newbb/images/, TAKE IT;
+ * ELSE TAKE XOOPS_ROOT/modules/newbb/templates/images/
+The above means, if you want to customize images for all of your themes you should not touch the modules/newbb/templates/images/ folder.
+Just upload the image set in XOOPS_ROOT/themes/default/modules/newbb/images and all of your themes will read it from default theme.
+Then if you want to customize it for another specific theme you can upload the new image set in XOOPS_ROOT/themes/YOUR_THEME/modules/newbb/images
+And you can follow the above for the other themes.
+
+FAQ:
+==========================
+1- How do I set options like HTML and signature behind reply editor box?
+
+for signature:
+- In newbb the webmaster can set the permission so that different groups had the ability to use and disable/enable their signatures in different forums behind their posts. In other words, if the user set the attachsig option to No in its profile, the signature is disabled (unchecked) by default and can be enabled in specific posts, otherwise it is enabled (checked) and can be disabled.
+- the default is defined in Profile module by webmaster for new registered users. in profile -> admin -> fields -> attachsig -> default -> Yes/No(default)
+- registered users can change the above default in their profiles (if they have permission): in edit profile -> Always attach my signature -> Yes/No
+
+
+for html:
+- you can set the permission to allow different groups to use html in different forums.
+- the default for allowed groups in allowed forums is hardcoded to enable (check box has always a tick) and user can disable it in each post.
+
+for smilies, xoopscode and br:
+- the default is hardcoded to enable (check box has always a tick) and user can disable it in each post.
+
+2- attachments are only showed to registered users. where can i change it to show for guests?
+in newbb -> admin -> preferences -> Display attachments only for registered users -> yes(default)/no
+
+3- where can I change the image buttons to text links?
+Open newbb/include/plugin.php
+change this line:
+$customConfig["display_text_links"] = false;
+to this:
+$customConfig["display_text_links"] = true;
+
+4- where can I change the reply and quick reply default editors to tinymce?
+In newbb/include/plugin.php
+
+5- Why i have not a JQuery redirect in some submits in newbb module like reply and new topic?
+Please find and remove any newline/space before <?php or after ?> in your whole xoops php files.
+Also find and remove any BOM in language utf-8 files in your whole xoops.
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/english/admin.php 2012-08-15 07:36:34 UTC (rev 10073)
@@ -97,7 +97,7 @@
define("_AM_NEWBB_ALLOWHTML","Allow HTML:");
define("_AM_NEWBB_YES","Yes");
define("_AM_NEWBB_NO","No");
-define("_AM_NEWBB_ALLOWSIGNATURES","Allow Signatures:");
+// irmtfan remove define("_AM_NEWBB_ALLOWSIGNATURES","Allow Signatures:");
define("_AM_NEWBB_HOTTOPICTHRESHOLD","Hot Topic Threshold:");
//define("_AM_NEWBB_POSTPERPAGE","Posts per Page:<span style='font-size: xx-small; font-weight: normal; display: block;'>(This is the number of posts<br /> per topic that will be<br /> displayed per page.)</span>");
//define("_AM_NEWBB_TOPICPERFORUM","Topics per Forum:<span style='font-size: xx-small; font-weight: normal; display: block;'>(This is the number of topics<br /> per forum that will be<br /> displayed per page.)</span>");
@@ -173,8 +173,8 @@
define("_AM_NEWBB_CAN_ATTACH","Can use attachment");
define("_AM_NEWBB_CAN_NOAPPROVE","Can post directly");
define("_AM_NEWBB_CAN_TYPE","Can use topic type");
-define("_AM_NEWBB_CAN_HTML","Can use HTML syntax");
-define("_AM_NEWBB_CAN_SIGNATURE","Can use signature");
+define("_AM_NEWBB_CAN_HTML","Can use and disable/enable HTML in posts");//irmtfan revised
+define("_AM_NEWBB_CAN_SIGNATURE","Can disable/enable signature in posts.Default is set in profile module.");//irmtfan revised
define("_AM_NEWBB_ACTION","Action");
define("_AM_NEWBB_PERM_TEMPLATE","Set default permission template");
define("_AM_NEWBB_PERM_TEMPLATE_DESC","Edit the following permission template so that it can be applied to a forum or a couple of forums");
@@ -187,30 +187,30 @@
define("_AM_NEWBB_PERM_SETBYGROUP","Set permissions directly by group");
// admin_forum_prune.php
-define("_AM_NEWBB_PRUNE_RESULTS_TITLE","Prune Results");
-define("_AM_NEWBB_PRUNE_RESULTS_TOPICS","Pruned Topics");
-define("_AM_NEWBB_PRUNE_RESULTS_POSTS","Pruned Posts");
-define("_AM_NEWBB_PRUNE_RESULTS_FORUMS","Pruned Forums");
-define("_AM_NEWBB_PRUNE_STORE","Store posts in this forum instead of deleting them");
-define("_AM_NEWBB_PRUNE_ARCHIVE","Save a copy of posts to Archive");
-define("_AM_NEWBB_PRUNE_FORUMSELERROR","You forgot to select forum(s) to prune");
-define("_AM_NEWBB_PRUNE_DAYS","Remove topics without replies in:");
-define("_AM_NEWBB_PRUNE_FORUMS","Forums to be pruned");
-define("_AM_NEWBB_PRUNE_STICKY","Keep Sticky topics");
-define("_AM_NEWBB_PRUNE_DIGEST","Keep Digest topics");
-define("_AM_NEWBB_PRUNE_LOCK","Keep Locked topics");
-define("_AM_NEWBB_PRUNE_HOT","Keep topics with more than this number of replies");
-define("_AM_NEWBB_PRUNE_SUBMIT","Ok");
-define("_AM_NEWBB_PRUNE_RESET","Reset");
-define("_AM_NEWBB_PRUNE_YES","Yes");
-define("_AM_NEWBB_PRUNE_NO","No");
-define("_AM_NEWBB_PRUNE_WEEK","A Week");
-define("_AM_NEWBB_PRUNE_2WEEKS","Two Weeks");
-define("_AM_NEWBB_PRUNE_MONTH","A Month");
-define("_AM_NEWBB_PRUNE_2MONTH","Two Months");
-define("_AM_NEWBB_PRUNE_4MONTH","Four Months");
-define("_AM_NEWBB_PRUNE_YEAR","A Year");
-define("_AM_NEWBB_PRUNE_2YEARS","2 Years");
+define ("_AM_NEWBB_PRUNE_RESULTS_TITLE","Prune Results");
+define ("_AM_NEWBB_PRUNE_RESULTS_TOPICS","Pruned Topics");
+define ("_AM_NEWBB_PRUNE_RESULTS_POSTS","Pruned Posts");
+define ("_AM_NEWBB_PRUNE_RESULTS_FORUMS","Pruned Forums");
+define ("_AM_NEWBB_PRUNE_STORE","Store posts in this forum instead of deleting them");
+define ("_AM_NEWBB_PRUNE_ARCHIVE","Save a copy of posts to Archive");
+define ("_AM_NEWBB_PRUNE_FORUMSELERROR","You forgot to select forum(s) to prune");
+define ("_AM_NEWBB_PRUNE_DAYS","Remove topics without replies in:");
+define ("_AM_NEWBB_PRUNE_FORUMS","Forums to be pruned");
+define ("_AM_NEWBB_PRUNE_STICKY","Keep Sticky topics");
+define ("_AM_NEWBB_PRUNE_DIGEST","Keep Digest topics");
+define ("_AM_NEWBB_PRUNE_LOCK","Keep Locked topics");
+define ("_AM_NEWBB_PRUNE_HOT","Keep topics with more than this number of replies");
+define ("_AM_NEWBB_PRUNE_SUBMIT","Ok");
+define ("_AM_NEWBB_PRUNE_RESET","Reset");
+define ("_AM_NEWBB_PRUNE_YES","Yes");
+define ("_AM_NEWBB_PRUNE_NO","No");
+define ("_AM_NEWBB_PRUNE_WEEK","A Week");
+define ("_AM_NEWBB_PRUNE_2WEEKS","Two Weeks");
+define ("_AM_NEWBB_PRUNE_MONTH","A Month");
+define ("_AM_NEWBB_PRUNE_2MONTH","Two Months");
+define ("_AM_NEWBB_PRUNE_4MONTH","Four Months");
+define ("_AM_NEWBB_PRUNE_YEAR","A Year");
+define ("_AM_NEWBB_PRUNE_2YEARS","2 Years");
// About.php constants
define('_AM_NEWBB_AUTHOR_INFO',"Author Information");
@@ -227,8 +227,7 @@
define('_AM_NEWBB_MODULE_DISCLAIMER',"Disclaimer");
define('_AM_NEWBB_AUTHOR_WORD',"The Author's Word");
define('_AM_NEWBB_BY','By');
-define('_AM_NEWBB_AUTHOR_WORD_EXTRA',"
-");
+define('_AM_NEWBB_AUTHOR_WORD_EXTRA',"Extra words by module Author");
// admin_report.php
define("_AM_NEWBB_REPORTADMIN","Reported posts manager");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/english/main.php 2012-08-15 07:36:34 UTC (rev 10073)
@@ -34,7 +34,7 @@
define('_MD_NEWPOSTS','New posts');
define('_MD_NONEWPOSTS','No new posts');
define('_MD_PRIVATEFORUM','Inactive Forum');
-define('_MD_BY','by'); // Posted by
+define('_MD_BY','by');// Posted by
define('_MD_TOSTART','To start viewing messages, select the forum that you want to visit from the list below.');
define('_MD_TOTALTOPICSC','Total Topics: ');
define('_MD_TOTALPOSTSC','Total Posts: ');
@@ -236,8 +236,8 @@
define('_MD_TIMEISUPDEL','You\'ve reached the time limit for deleting your post.');
//reply.php
-define('_MD_ON','on'); //Posted on
-define('_MD_USERWROTE','%s wrote:'); // %s is username
+define('_MD_ON','on');//Posted on
+define('_MD_USERWROTE','%s wrote:');// %s is username
define('_MD_RE','Re');
//post.php
@@ -247,7 +247,7 @@
define('_MD_THANKSSUBMIT','Thanks for your submission!');
define('_MD_REPLYPOSTED','A reply to your topic has been posted.');
define('_MD_HELLO','Hello %s,');
-define('_MD_URRECEIVING','You are receiving this email because a message you posted on %s forums has been replied to.'); // %s is your site name
+define('_MD_URRECEIVING','You are receiving this email because a message you posted on %s forums has been replied to.');// %s is your site name
define('_MD_CLICKBELOW','Click on the link below to view the thread:');
define('_MD_WAITFORAPPROVAL','Thank you. Your post will be approved before publication.');
define('_MD_POSTING_LIMITED','Why not take a break and come back in %d sec');
@@ -344,7 +344,7 @@
define("_MD_CANTVOTEOWN","You cannot vote on the topic you submitted.<br />All votes are logged and reviewed.");
define("_MD_VOTEONCE","Please do not vote for the same topic more than once.");
define("_MD_VOTEAPPRE","Your vote is appreciated.");
-define("_MD_THANKYOU","Thank you for taking the time to vote here at %s"); // %s is your site name
+define("_MD_THANKYOU","Thank you for taking the time to vote here at %s");// %s is your site name
define("_MD_VOTES","Votes");
define("_MD_NOVOTERATE","You did not rate this Topic");
@@ -431,7 +431,7 @@
define("_MD_NEWBB_SEENOTGUEST","<font color=\"red\"><b>Link only for registered users</b></font>");
define("_MD_NEWBB_REPORTSUBJECT","A contribution has been reported");
define("_MD_NEWBB_GOTOLASTPOST","Go to last post");
-define("_MD_EDITEDMSG","Reason (optional):");
+define("_MD_EDITEDMSG","Reason:");
define("_MD_DELEDEDMSG","Reason for deleting<br /><small>(If a reason is provided, the user will receive a message)</small>:");
define("_MD_DELEDEDMSG_SUBJECT","Deletion of your article");
define("_MD_DELEDEDMSG_BODY","Hello %s,
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/english/modinfo.php 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/english/modinfo.php 2012-08-15 07:36:34 UTC (rev 10073)
@@ -50,7 +50,7 @@
define("_MI_PATH_MAGICK","Path for ImageMagick");
define("_MI_PATH_MAGICK_DESC","Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");
define("_MI_SUBFORUM_DISPLAY","Display Mode of subforums on index page");
-define("_MI_SUBFORUM_DISPLAY_DESC","");
+define("_MI_SUBFORUM_DISPLAY_DESC","Choose one of the methods to display subforums");
define("_MI_SUBFORUM_EXPAND","Expand");
define("_MI_SUBFORUM_COLLAPSE","Collapse");
define("_MI_SUBFORUM_HIDDEN","Hidden");
@@ -103,7 +103,7 @@
define("_MI_VIEWMODE_DESC","To override the General Settings of viewmode within threads, set to NONE in order to switch feature off");
define("_MI_COMPACT","Compact");
define("_MI_MENUMODE","Default Menu Mode");
-define("_MI_MENUMODE_DESC","'SELECT' - select options, 'HOVER' - may slow down IE, 'CLICK' - requires JAVASCRIPT");
+define("_MI_MENUMODE_DESC","'SELECT' - select options,'HOVER' - may slow down IE,'CLICK' - requires JAVASCRIPT");
define("_MI_REPORTMOD_ENABLE","Report a Post");
define("_MI_REPORTMOD_ENABLE_DESC","User can report posts to Moderator(s), for any reason, which enables Moderator(s) to take action");
define("_MI_SHOW_JUMPBOX","Show Jumpbox");
@@ -171,45 +171,45 @@
define("_MI_PERMCHECK_ONDISPLAY","Check permission");
define("_MI_PERMCHECK_ONDISPLAY_DESC","Check permission for edit on display page");
define("_MI_USERMODERATE","Enable user moderation");
-define("_MI_USERMODERATE_DESC","");
+define("_MI_USERMODERATE_DESC","Forum moderator can suspend a specific user for a specific time period in the forum");
// RMV-NOTIFY
// Notification event descriptions and mail templates
-define('_MI_NEWBB_THREAD_NOTIFY','Thread');
-define('_MI_NEWBB_THREAD_NOTIFYDSC','Notification options that apply to the current thread.');
-define('_MI_NEWBB_FORUM_NOTIFY','Forum');
-define('_MI_NEWBB_FORUM_NOTIFYDSC','Notification options that apply to the current forum.');
-define('_MI_NEWBB_GLOBAL_NOTIFY','Global');
-define('_MI_NEWBB_GLOBAL_NOTIFYDSC','Global forum notification options.');
-define('_MI_NEWBB_THREAD_NEWPOST_NOTIFY','New Post');
-define('_MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP','Notify me of new posts in the current thread.');
-define('_MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC','Receive notification when a new message is posted in the current thread.');
-define('_MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post in thread');
-define('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFY','New Thread');
-define('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP','Notify me of new topics in the current forum.');
-define('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC','Receive notification when a new thread is started in the current forum.');
-define('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New thread in forum');
-define('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY','New Forum');
-define('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP','Notify me when a new forum is created.');
-define('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC','Receive notification when a new forum is created.');
-define('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New forum');
-define('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFY','New Post');
-define('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP','Notify me of any new posts.');
-define('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC','Receive notification when any new message is posted.');
-define('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post');
-define('_MI_NEWBB_FORUM_NEWPOST_NOTIFY','New Post');
-define('_MI_NEWBB_FORUM_NEWPOST_NOTIFYCAP','Notify me of any new posts in the current forum.');
-define('_MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC','Receive notification when any new message is posted in the current forum.');
-define('_MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post in forum');
-define('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY','New Post (Full Text)');
-define('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP','Notify me of any new posts (include full text in message).');
-define('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC','Receive full text notification when any new message is posted.');
-define('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post (full text)');
-define('_MI_NEWBB_GLOBAL_DIGEST_NOTIFY','Digest');
-define('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYCAP','Notify me of post digest.');
-define('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYDSC','Receive digest notification.');
-define('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : post digest');
+define ('_MI_NEWBB_THREAD_NOTIFY','Thread');
+define ('_MI_NEWBB_THREAD_NOTIFYDSC','Notification options that apply to the current thread.');
+define ('_MI_NEWBB_FORUM_NOTIFY','Forum');
+define ('_MI_NEWBB_FORUM_NOTIFYDSC','Notification options that apply to the current forum.');
+define ('_MI_NEWBB_GLOBAL_NOTIFY','Global');
+define ('_MI_NEWBB_GLOBAL_NOTIFYDSC','Global forum notification options.');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFY','New Post');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP','Notify me of new posts in the current thread.');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC','Receive notification when a new message is posted in the current thread.');
+define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post in thread');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFY','New Thread');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP','Notify me of new topics in the current forum.');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC','Receive notification when a new thread is started in the current forum.');
+define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New thread in forum');
+define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY','New Forum');
+define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP','Notify me when a new forum is created.');
+define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC','Receive notification when a new forum is created.');
+define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New forum');
+define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFY','New Post');
+define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP','Notify me of any new posts.');
+define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC','Receive notification when any new message is posted.');
+define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post');
+define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFY','New Post');
+define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYCAP','Notify me of any new posts in the current forum.');
+define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC','Receive notification when any new message is posted in the current forum.');
+define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post in forum');
+define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY','New Post (Full Text)');
+define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP','Notify me of any new posts (include full text in message).');
+define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC','Receive full text notification when any new message is posted.');
+define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : New post (full text)');
+define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFY','Digest');
+define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYCAP','Notify me of post digest.');
+define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYDSC','Receive digest notification.');
+define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYSBJ','[{X_SITENAME}] {X_MODULE} auto-notify : post digest');
// FOR installation
define("_MI_NEWBB_INSTALL_CAT_TITLE","Category Test");
@@ -226,16 +226,16 @@
define("_MI_NEWBB_ADMENU_GROUPMOD","Group moderate");
define("_MI_SUBJECT_PREFIX","Add a prefix to the topic subject");
define("_MI_SUBJECT_PREFIX_DESC","Sets a prefix, such as [SOLVED] at the beginning of the subject. For more options please use one ',' as the separator. NONE is no prefix.");
-define("_MI_SUBJECT_PREFIX_DEFAULT", '<font color="#00CC00"> [solved] </ font> <font color="#00CC00"> [done] </ font> <font color="#FF0000"> [request] </ font> , <font color="#FF0000"> [bug report] </ font> <font color="#FF0000"> [unsolved] </ font>');
+define("_MI_SUBJECT_PREFIX_DEFAULT",'<font color="#00CC00"> [solved] </ font> <font color="#00CC00"> [done] </ font> <font color="#FF0000"> [request] </ font> , <font color="#FF0000"> [bug report] </ font> <font color="#FF0000"> [unsolved] </ font>');
define("_MI_SUBJECT_PREFIX_LEVEL","Permissions for use of prefixes");
define("_MI_SUBJECT_PREFIX_LEVEL_DESC","The group (s) select the prefixes to use it.");
-define("_MI_SPL_DISABLE", 'disabled');
-define("_MI_SPL_ANYONE", 'each');
-define("_MI_SPL_MEMBER", 'Members');
-define("_MI_SPL_MODERATOR", 'Moderators');
-define("_MI_SPL_ADMIN", 'Administrators');
+define("_MI_SPL_DISABLE",'disabled');
+define("_MI_SPL_ANYONE",'each');
+define("_MI_SPL_MEMBER",'Members');
+define("_MI_SPL_MODERATOR",'Moderators');
+define("_MI_SPL_ADMIN",'Administrators');
define("_MI_STATISTIK_ENABLE","enable Stats");
-define("_MI_STATISTIK_ENABLE_DESC","");
+define("_MI_STATISTIK_ENABLE_DESC","The stats will be shown in your forum at the bottom of each forum/topic");
//4.05
define('_MI_SHOW_INFOBOX','Show Infobox');
Modified: XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php 2012-08-15 06:10:19 UTC (rev 10072)
+++ XoopsModules/newbb/branches/irmtfan/newbb/language/persian/admin.php 2012-08-15 07:36:34 UTC (rev 10073)
@@ -1,297 +1,296 @@
-<?php
-// $Id: admin.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
-
-if(defined('NEWBB_ADMIN_DEFINED')) return;
-else define('NEWBB_ADMIN_DEFINED',true);
-
-//%%%%%% File Name index.php %%%%%
-define("_AM_NEWBB_FORUMCONF","تنظیمات انجمن");
-define("_AM_NEWBB_ADDAFORUM","اضافه کردن یکانجمن");
-define("_AM_NEWBB_SYNCFORUM","همگام سازی انجمن");
-define("_AM_NEWBB_REORDERFORUM","مرتب سازی دوباره");
-define("_AM_NEWBB_FORUM_MANAGER","انجمنها");
-define("_AM_NEWBB_PRUNE_TITLE","هرس کردن");
-define("_AM_NEWBB_CATADMIN","شاخهها");
-define("_AM_NEWBB_GENERALSET","تنظیمات ماژول");
-define("_AM_NEWBB_MODULEADMIN","مدیریت ماژول:");
-define("_AM_NEWBB_HELP","کمک");
-define("_AM_NEWBB_ABOUT","درباره");
-define("_AM_NEWBB_BOARDSUMMARY","آمار Board");
-define("_AM_NEWBB_PENDING_POSTS_FOR_AUTH","تایید پستهای معلق");
-define("_AM_NEWBB_POSTID","ID پست");
-define("_AM_NEWBB_POSTDATE","تاریخ پست");
-define("_AM_NEWBB_POSTER","فرستنده");
-define("_AM_NEWBB_TOPICS","تاپیکها");
-define("_AM_NEWBB_SHORTSUMMARY","خلاصهی Board");
-define("_AM_NEWBB_TOTALPOSTS","مجموع پستها");
-define("_AM_NEWBB_TOTALTOPICS","مجموع تاپیکها");
-define("_AM_NEWBB_TOTALVIEWS","مجموع دیده شدهها");
-define("_AM_NEWBB_BLOCKS","بلاکها");
-define("_AM_NEWBB_SUBJECT","عنوان");
-define("_AM_NEWBB_APPROVE","تایید پست");
-define("_AM_NEWBB_APPROVETEXT","محتوای این پست");
-define("_AM_NEWBB_POSTAPPROVED","این پست تایید شد");
-define("_AM_NEWBB_POSTNOTAPPROVED","پست تایید نشد");
-define("_AM_NEWBB_POSTSAVED","پست ذخیره شد");
-define("_AM_NEWBB_POSTNOTSAVED","پست ذخیره نشد");
-define("_AM_NEWBB_TOPICAPPROVED","تاپیک تایید شد");
-define("_AM_NEWBB_TOPICNOTAPPROVED","تاپیکتایید نشد");
-define("_AM_NEWBB_TOPICID","ID تاپیک");
-define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH","تایید نکردن تاپیکهای ارسال شده");
-define('_AM_NEWBB_DEL_ONE','فقط این پیام را پاککن');
-define('_AM_NEWBB_POSTSDELETED','پیام انتخاب شده حذف شد');
-define('_AM_NEWBB_NOAPPROVEPOST','در حال حاضر هیچ پست منتظر برای تایید موجود نیست.');
-define('_AM_NEWBB_SUBJECTC','عنوان:');
-define('_AM_NEWBB_MESSAGEICON','شکلکپیام:');
-define('_AM_NEWBB_MESSAGEC','پیام:');
-define('_AM_NEWBB_CANCELPOST','لغو کردن ارسال');
-define('_AM_NEWBB_GOTOMOD','برو به ماژول');
-define('_AM_NEWBB_PREFERENCES','تنظیمات ماژول');
-define('_AM_NEWBB_POLLMODULE','ماژول Xoops poll');
-define('_AM_NEWBB_POLL_OK','آماده برای استفاده');
-define('_AM_NEWBB_GDLIB1','GD1 library:');
-define('_AM_NEWBB_GDLIB2','GD2 library:');
-define('_AM_NEWBB_AUTODETECTED','شناسایی خودکار: ');
-define('_AM_NEWBB_AVAILABLE','آمادهاست');
-define('_AM_NEWBB_NOTAVAILABLE','<font color="red">آماده نیست</font>');
-define('_AM_NEWBB_NOTWRITABLE','<font color="red">قابل دسترسی نیست</font>');
-define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK');
-define('_AM_NEWBB_IMAGEMAGICK_NOTSET','تنظیمنشده');
-define('_AM_NEWBB_ATTACHPATH','مسیر برای قرار دادن ضمائم');
-define('_AM_NEWBB_THUMBPATH','مسیر برای قرار دادن تصاویر تمبری');
-//define('_AM_NEWBB_RSSPATH','مسیر برای RSS feed');
-define('_AM_NEWBB_REPORT','پیامهای گزارش داده شده');
-define('_AM_NEWBB_REPORT_PENDING','گزارشهای معلق');
-define('_AM_NEWBB_REPORT_PROCESSED','گزارشهای پردازش شده');
-define('_AM_NEWBB_CREATETHEDIR','بساز');
-define('_AM_NEWBB_SETMPERM','گذاشتن دسترسی ها');
-define('_AM_NEWBB_DIRCREATED','شاخه ساخته شد');
-define('_AM_NEWBB_DIRNOTCREATED','شاخه شاخته نشد');
-define('_AM_NEWBB_PERMSET','دسترسی تنظیم شد');
-define('_AM_NEWBB_PERMNOTSET','دسترسی تنظیم نشد');
-define('_AM_NEWBB_DIGEST','آگهای رسانی خلاصه ها');
-define('_AM_NEWBB_DIGEST_PAST','<font color="red"> %d دقیقه پیش گذاشته شده است</font>');
-define('_AM_NEWBB_DIGEST_NEXT',' %d دقیقه دیگر فرستاده می شود');
-define('_AM_NEWBB_DIGEST_ARCHIVE','خلاصه در آرشیو قرار گرفت');
-define('_AM_NEWBB_DIGEST_SENT','خلاصه در حال فرستاده شدن');
-define('_AM_NEWBB_DIGEST_FAILED','خلاصه فرستاده نشد');
-
-// admin_forum_manager.php
-define("_AM_NEWBB_NAME","نام");
-define("_AM_NEWBB_CREATEFORUM","ایجاد انجمن");
-define("_AM_NEWBB_EDIT","ویرایش");
-define("_AM_NEWBB_CLEAR","پاک کردن گزینه ها");
-define("_AM_NEWBB_DELETE","حذف");
-define("_AM_NEWBB_ADD","اضافهکردن");
-define("_AM_NEWBB_MOVE","انتقال");
-define("_AM_NEWBB_ORDER","ردیفکردن");
-define("_AM_NEWBB_TWDAFAP","این قسمت انجمن و تمام پیامهای زده شده در آن را حذف خواهد کرد.<br><br>هشدار: آیا مطمئنید که این انجمن را میخواهید پاککنید؟");
-define("_AM_NEWBB_FORUMREMOVED","انجمن پاکشد.");
-define("_AM_NEWBB_CREATENEWFORUM","ایجاد یکانجمن جدید");
-define("_AM_NEWBB_EDITTHISFORUM","ویرایش انجمن:");
-define("_AM_NEWBB_SET_FORUMORDER","تنظیم محل...
[truncated message content] |
