Menu
▾
▴
xoops-cvs2 — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
| 2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
| 2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
| 2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
| 2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
| 2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
| 2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
| 2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
| 2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
| 2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
(5) |
|
2
(20) |
3
(5) |
4
(5) |
5
|
6
|
7
(1) |
8
(3) |
|
9
(1) |
10
(5) |
11
(1) |
12
(5) |
13
(7) |
14
|
15
(5) |
|
16
(5) |
17
(9) |
18
(3) |
19
(9) |
20
|
21
(4) |
22
(3) |
|
23
(6) |
24
(5) |
25
(1) |
26
(3) |
27
(12) |
28
(14) |
29
(5) |
|
30
(4) |
31
(7) |
|
|
|
|
|
|
From: <tr...@us...> - 2009-08-31 23:02:47
|
Revision: 3541
http://xoops.svn.sourceforge.net/xoops/?rev=3541&view=rev
Author: trabis
Date: 2009-08-31 23:02:37 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Code formating for xoops standards
Modified Paths:
--------------
XoopsCore/trunk/htdocs/include/checklogin.php
XoopsCore/trunk/htdocs/include/comment_delete.php
XoopsCore/trunk/htdocs/include/comment_edit.php
XoopsCore/trunk/htdocs/include/comment_form.php
XoopsCore/trunk/htdocs/include/comment_new.php
XoopsCore/trunk/htdocs/include/comment_post.php
XoopsCore/trunk/htdocs/include/comment_reply.php
XoopsCore/trunk/htdocs/include/comment_view.php
XoopsCore/trunk/htdocs/include/commentform.inc.php
XoopsCore/trunk/htdocs/include/cp_functions.php
XoopsCore/trunk/htdocs/include/cp_header.php
XoopsCore/trunk/htdocs/include/findusers.php
XoopsCore/trunk/htdocs/include/formdhtmltextarea_preview.php
XoopsCore/trunk/htdocs/include/functions.php
XoopsCore/trunk/htdocs/include/notification_functions.php
XoopsCore/trunk/htdocs/include/notification_select.php
XoopsCore/trunk/htdocs/include/notification_update.php
XoopsCore/trunk/htdocs/include/registerform.php
XoopsCore/trunk/htdocs/include/searchform.php
XoopsCore/trunk/htdocs/include/site-closed.php
XoopsCore/trunk/htdocs/include/xoopscodes.php
XoopsCore/trunk/htdocs/include/xoopslocal.php
Modified: XoopsCore/trunk/htdocs/include/checklogin.php
===================================================================
--- XoopsCore/trunk/htdocs/include/checklogin.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/checklogin.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -74,8 +74,8 @@
}
// Set cookie for rememberme
- if ( !empty($xoopsConfig['usercookie']) ) {
- if ( !empty($_POST["rememberme"]) ) {
+ if (!empty($xoopsConfig['usercookie'])) {
+ if (!empty($_POST["rememberme"])) {
setcookie($xoopsConfig['usercookie'], $_SESSION['xoopsUserId'] . '-' . md5($user->getVar('pass') . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX), time() + 31536000, '/', XOOPS_COOKIE_DOMAIN, 0);
} else {
setcookie($xoopsConfig['usercookie'], 0, -1, '/', XOOPS_COOKIE_DOMAIN, 0);
@@ -83,25 +83,25 @@
}
if (!empty($_POST['xoops_redirect']) && !strpos($_POST['xoops_redirect'], 'register')) {
- $_POST['xoops_redirect'] = trim( $_POST['xoops_redirect'] );
+ $_POST['xoops_redirect'] = trim($_POST['xoops_redirect']);
$parsed = parse_url(XOOPS_URL);
$url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
- if ( isset( $parsed['host'] ) ) {
+ if (isset( $parsed['host'])) {
$url .= $parsed['host'];
- if ( isset( $parsed['port'] ) ) {
+ if (isset( $parsed['port'])) {
$url .= ':' . $parsed['port'];
}
} else {
$url .= $_SERVER['HTTP_HOST'];
}
- if ( @$parsed['path'] ) {
- if ( strncmp( $parsed['path'], $_POST['xoops_redirect'], strlen( $parsed['path'] ) ) ) {
+ if (@$parsed['path']) {
+ if (strncmp($parsed['path'], $_POST['xoops_redirect'], strlen( $parsed['path']))) {
$url .= $parsed['path'];
}
}
$url .= $_POST['xoops_redirect'];
} else {
- $url = XOOPS_URL.'/index.php';
+ $url = XOOPS_URL . '/index.php';
}
// RMV-NOTIFY
@@ -110,8 +110,8 @@
$notification_handler->doLoginMaintenance($user->getVar('uid'));
redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname')), false);
-} elseif (empty($_POST['xoops_redirect'])) {
- redirect_header(XOOPS_URL.'/user.php', 5, $xoopsAuth->getHtmlErrors());
+} else if (empty($_POST['xoops_redirect'])) {
+ redirect_header(XOOPS_URL . '/user.php', 5, $xoopsAuth->getHtmlErrors());
} else {
redirect_header(XOOPS_URL . '/user.php?xoops_redirect=' . urlencode(trim($_POST['xoops_redirect'])), 5, $xoopsAuth->getHtmlErrors(), false);
}
Modified: XoopsCore/trunk/htdocs/include/comment_delete.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_delete.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_delete.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -21,14 +21,14 @@
* @author John Neill <cat...@xo...>
* @version $Id$
*/
-if (! defined('XOOPS_ROOT_PATH') || ! is_object($xoopsModule)) {
+if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
die('Restricted access');
}
include_once $GLOBALS['xoops']->path('include/comment_constants.php');
$op = 'delete';
-if (! empty($_POST)) {
+if (!empty($_POST)) {
extract($_POST);
$com_mode = isset($com_mode) ? htmlspecialchars(trim($com_mode), ENT_QUOTES) : 'flat';
$com_order = isset($com_order) ? intval($com_order) : XOOPS_COMMENT_OLD1ST;
@@ -41,10 +41,10 @@
}
if ('system' == $xoopsModule->getVar('dirname')) {
- $comment_handler = & xoops_gethandler('comment');
- $comment = & $comment_handler->get($com_id);
- $module_handler = & xoops_gethandler('module');
- $module = & $module_handler->get($comment->getVar('com_modid'));
+ $comment_handler =& xoops_gethandler('comment');
+ $comment =& $comment_handler->get($com_id);
+ $module_handler =& xoops_gethandler('module');
+ $module =& $module_handler->get($comment->getVar('com_modid'));
$comment_config = $module->getInfo('comments');
$com_modid = $module->getVar('mid');
$redirect_page = XOOPS_URL . '/modules/system/admin.php?fct=comments&com_modid=' . $com_modid . '&com_itemid';
@@ -59,15 +59,15 @@
$redirect_page = $comment_config['pageName'] . '?';
$comment_confirm_extra = array();
if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
- foreach($comment_config['extraParams'] as $extra_param) {
+ foreach ($comment_config['extraParams'] as $extra_param) {
if (isset(${$extra_param})) {
$redirect_page .= $extra_param . '=' . ${$extra_param} . '&';
-
+
// for the confirmation page
$comment_confirm_extra[$extra_param] = ${$extra_param};
} elseif (isset($_GET[$extra_param])) {
$redirect_page .= $extra_param . '=' . $_GET[$extra_param] . '&';
-
+
// for the confirmation page
$comment_confirm_extra[$extra_param] = $_GET[$extra_param];
}
@@ -78,12 +78,12 @@
}
$accesserror = false;
-if (! is_object($xoopsUser)) {
+if (!is_object($xoopsUser)) {
$accesserror = true;
} else {
- if (! $xoopsUser->isAdmin($com_modid)) {
- $sysperm_handler = & xoops_gethandler('groupperm');
- if (! $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) {
+ if (!$xoopsUser->isAdmin($com_modid)) {
+ $sysperm_handler =& xoops_gethandler('groupperm');
+ if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) {
$accesserror = true;
}
}
@@ -102,26 +102,26 @@
xoops_loadLanguage('comment');
switch ($op) {
case 'delete_one':
- $comment_handler = xoops_gethandler('comment');
- $comment = & $comment_handler->get($com_id);
- if (! $comment_handler->delete($comment)) {
+ $comment_handler =& xoops_gethandler('comment');
+ $comment =& $comment_handler->get($com_id);
+ if (!$comment_handler->delete($comment)) {
include_once $GLOBALS['xoops']->path('header.php');
xoops_error(_CM_COMDELETENG . ' (ID: ' . $comment->getVar('com_id') . ')');
include_once $GLOBALS['xoops']->path('footer');
exit();
}
-
+
$com_itemid = $comment->getVar('com_itemid');
// execute updateStat callback function if set
if (isset($comment_config['callback']['update']) && trim($comment_config['callback']['update']) != '') {
$skip = false;
- if (! function_exists($comment_config['callback']['update'])) {
+ if (!function_exists($comment_config['callback']['update'])) {
if (isset($comment_config['callbackFile'])) {
$callbackfile = trim($comment_config['callbackFile']);
- if ($callbackfile != '' && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
- include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+ if ($callbackfile != '' && file_exists($file = $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
+ include_once $file;
}
- if (! function_exists($comment_config['callback']['update'])) {
+ if (!function_exists($comment_config['callback']['update'])) {
$skip = true;
}
} else {
@@ -136,31 +136,31 @@
$comment_config['callback']['update']($com_itemid, $comment_count);
}
}
-
+
// update user posts if its not an anonymous post
if ($comment->getVar('com_uid') != 0) {
- $member_handler = & xoops_gethandler('member');
- $com_poster = & $member_handler->getUser($comment->getVar('com_uid'));
+ $member_handler =& xoops_gethandler('member');
+ $com_poster =& $member_handler->getUser($comment->getVar('com_uid'));
if (is_object($com_poster)) {
$member_handler->updateUserByField($com_poster, 'posts', $com_poster->getVar('posts') - 1);
}
}
-
+
// get all comments posted later within the same thread
- $thread_comments = & $comment_handler->getThread($comment->getVar('com_rootid'), $com_id);
+ $thread_comments =& $comment_handler->getThread($comment->getVar('com_rootid'), $com_id);
include_once $GLOBALS['xoops']->path('class/tree.php');
$xot = new XoopsObjectTree($thread_comments, 'com_id', 'com_pid', 'com_rootid');
- $child_comments = & $xot->getFirstChild($com_id);
+ $child_comments =& $xot->getFirstChild($com_id);
// now set new parent ID for direct child comments
$new_pid = $comment->getVar('com_pid');
$errs = array();
- foreach(array_keys($child_comments) as $i) {
+ foreach (array_keys($child_comments) as $i) {
$child_comments[$i]->setVar('com_pid', $new_pid);
// if the deleted comment is a root comment, need to change root id to own id
if (false != $comment->isRoot()) {
$new_rootid = $child_comments[$i]->getVar('com_id');
$child_comments[$i]->setVar('com_rootid', $child_comments[$i]->getVar('com_id'));
- if (! $comment_handler->insert($child_comments[$i])) {
+ if (!$comment_handler->insert($child_comments[$i])) {
$errs[] = 'Could not change comment parent ID from <strong>' . $com_id . '</strong> to <strong>' . $new_pid . '</strong>. (ID: ' . $new_rootid . ')';
} else {
// need to change root id for all its child comments as well
@@ -168,13 +168,13 @@
$cc_count = count($c_child_comments);
foreach(array_keys($c_child_comments) as $j) {
$c_child_comments[$j]->setVar('com_rootid', $new_rootid);
- if (! $comment_handler->insert($c_child_comments[$j])) {
+ if (!$comment_handler->insert($c_child_comments[$j])) {
$errs[] = 'Could not change comment root ID from <strong>' . $com_id . '</strong> to <strong>' . $new_rootid . '</strong>.';
}
}
}
} else {
- if (! $comment_handler->insert($child_comments[$i])) {
+ if (!$comment_handler->insert($child_comments[$i])) {
$errs[] = 'Could not change comment parent ID from <strong>' . $com_id . '</strong> to <strong>' . $new_pid . '</strong>.';
}
}
@@ -187,26 +187,26 @@
}
redirect_header($redirect_page . '=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode, 1, _CM_COMDELETED);
break;
-
+
case 'delete_all':
$comment_handler = xoops_gethandler('comment');
- $comment = & $comment_handler->get($com_id);
+ $comment =& $comment_handler->get($com_id);
$com_rootid = $comment->getVar('com_rootid');
-
+
// get all comments posted later within the same thread
- $thread_comments = & $comment_handler->getThread($com_rootid, $com_id);
-
+ $thread_comments =& $comment_handler->getThread($com_rootid, $com_id);
+
// construct a comment tree
include_once $GLOBALS['xoops']->path('class/tree.php');
$xot = new XoopsObjectTree($thread_comments, 'com_id', 'com_pid', 'com_rootid');
- $child_comments = & $xot->getAllChild($com_id);
+ $child_comments =& $xot->getAllChild($com_id);
// add itself here
$child_comments[$com_id] = & $comment;
$msgs = array();
$deleted_num = array();
- $member_handler = & xoops_gethandler('member');
+ $member_handler =& xoops_gethandler('member');
foreach(array_keys($child_comments) as $i) {
- if (! $comment_handler->delete($child_comments[$i])) {
+ if (!$comment_handler->delete($child_comments[$i])) {
$msgs[] = _CM_COMDELETENG . ' (ID: ' . $child_comments[$i]->getVar('com_id') . ')';
} else {
$msgs[] = _CM_COMDELETED . ' (ID: ' . $child_comments[$i]->getVar('com_id') . ')';
@@ -217,32 +217,32 @@
}
}
}
- foreach($deleted_num as $user_id => $post_num) {
+ foreach ($deleted_num as $user_id => $post_num) {
// update user posts
$com_poster = $member_handler->getUser($user_id);
if (is_object($com_poster)) {
$member_handler->updateUserByField($com_poster, 'posts', $com_poster->getVar('posts') - $post_num);
}
}
-
+
$com_itemid = $comment->getVar('com_itemid');
// execute updateStat callback function if set
if (isset($comment_config['callback']['update']) && trim($comment_config['callback']['update']) != '') {
$skip = false;
- if (! function_exists($comment_config['callback']['update'])) {
+ if (!function_exists($comment_config['callback']['update'])) {
if (isset($comment_config['callbackFile'])) {
$callbackfile = trim($comment_config['callbackFile']);
- if ($callbackfile != '' && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
- include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+ if ($callbackfile != '' && file_exists($file = $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
+ include_once $file;
}
- if (! function_exists($comment_config['callback']['update'])) {
+ if (!function_exists($comment_config['callback']['update'])) {
$skip = true;
}
} else {
$skip = true;
}
}
- if (! $skip) {
+ if (!$skip) {
$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
$criteria->add(new Criteria('com_itemid', $com_itemid));
$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
@@ -255,18 +255,18 @@
echo '<br /><a href="' . $redirect_page . '=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '">' . _BACK . '</a>';
include_once $GLOBALS['xoops']->path('footer.php');
break;
-
+
case 'delete':
default:
include_once $GLOBALS['xoops']->path('header.php');
$comment_confirm = array(
- 'com_id' => $com_id ,
- 'com_mode' => $com_mode ,
- 'com_order' => $com_order ,
+ 'com_id' => $com_id ,
+ 'com_mode' => $com_mode ,
+ 'com_order' => $com_order ,
'op' => array(
- _CM_DELETEONE => 'delete_one' ,
+ _CM_DELETEONE => 'delete_one' ,
_CM_DELETEALL => 'delete_all'));
- if (! empty($comment_confirm_extra) && is_array($comment_confirm_extra)) {
+ if (!empty($comment_confirm_extra) && is_array($comment_confirm_extra)) {
$comment_confirm = $comment_confirm + $comment_confirm_extra;
}
xoops_confirm($comment_confirm, 'comment_delete.php', _CM_DELETESELECT);
Modified: XoopsCore/trunk/htdocs/include/comment_edit.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_edit.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_edit.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -21,7 +21,7 @@
* @author John Neill <cat...@xo...>
* @version $Id$
*/
-if (! defined('XOOPS_ROOT_PATH') || ! is_object($xoopsModule)) {
+if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
die('Restricted access');
}
@@ -44,7 +44,7 @@
}
}
-if (! isset($_GET['com_order'])) {
+if (!isset($_GET['com_order'])) {
if (is_object($xoopsUser)) {
$com_order = $xoopsUser->getVar('uorder');
} else {
@@ -56,7 +56,7 @@
/**
*/
-$comment_handler = &xoops_gethandler('comment');
+$comment_handler =& xoops_gethandler('comment');
$comment = &$comment_handler->get($com_id);
$dohtml = $comment->getVar('dohtml');
$dosmiley = $comment->getVar('dosmiley');
Modified: XoopsCore/trunk/htdocs/include/comment_form.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_form.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_form.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -21,7 +21,7 @@
* @author John Neill <cat...@xo...>
* @version $Id$
*/
-if (! defined('XOOPS_ROOT_PATH') || ! is_object($xoopsModule)) {
+if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
die('Restricted access');
}
@@ -51,7 +51,7 @@
$cform->addElement(new XoopsFormText(_CM_TITLE, 'com_title', 50, 255, $com_title), true);
$icons_radio = new XoopsFormRadio(_MESSAGEICON, 'com_icon', $com_icon);
$subject_icons = XoopsLists::getSubjectsList();
-foreach($subject_icons as $iconfile) {
+foreach ($subject_icons as $iconfile) {
$icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
}
$cform->addElement($icons_radio);
@@ -68,8 +68,8 @@
}
if (false != $xoopsUser->isAdmin($com_modid)) {
// show status change box when editing (comment id is not empty)
- if (! empty($com_id)) {
- include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+ if (!empty($com_id)) {
+ include_once $GLOBALS['xoops']->path('include/comment_constants.php');
$status_select = new XoopsFormSelect(_CM_STATUS, 'com_status', $com_status);
$status_select->addOptionArray(array(
XOOPS_COMMENT_PENDING => _CM_PENDING ,
@@ -93,7 +93,7 @@
$br_checkbox->addOption(1, _CM_DOAUTOWRAP);
$option_tray->addElement($br_checkbox);
$cform->addElement($option_tray);
-if (! $xoopsUser) {
+if (!$xoopsUser) {
$cform->addElement(new XoopsFormCaptcha());
}
$cform->addElement(new XoopsFormHidden('com_pid', intval($com_pid)));
@@ -107,8 +107,8 @@
if ('system' != $xoopsModule->getVar('dirname')) {
$comment_config = $xoopsModule->getInfo('comments');
if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
- $myts = & MyTextSanitizer::getInstance();
- foreach($comment_config['extraParams'] as $extra_param) {
+ $myts =& MyTextSanitizer::getInstance();
+ foreach ($comment_config['extraParams'] as $extra_param) {
// This routine is included from forms accessed via both GET and POST
if (isset($_POST[$extra_param])) {
$hidden_value = $myts->stripSlashesGPC($_POST[$extra_param]);
Modified: XoopsCore/trunk/htdocs/include/comment_new.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_new.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_new.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -36,11 +36,14 @@
include_once $GLOBALS['xoops']->path('header.php');
if (isset($com_replytitle)) {
if (isset($com_replytext)) {
- themecenterposts($com_replytitle, $com_replytext);
+ echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
+ <tr><td class="head">' . $com_replytitle . '</td></tr>
+ <tr><td><br />' . $com_replytext . '<br /></td></tr>
+ </table>';
}
- $myts = & MyTextSanitizer::getInstance();
+ $myts =& MyTextSanitizer::getInstance();
$com_title = $myts->htmlSpecialChars($com_replytitle);
- if (! preg_match("/^(Re|" . _CM_RE . "):/i", $com_title)) {
+ if (!preg_match("/^(Re|" . _CM_RE . "):/i", $com_title)) {
$com_title = _CM_RE . ": " . xoops_substr($com_title, 0, 56);
}
} else {
@@ -54,7 +57,7 @@
$com_mode = $xoopsConfig['com_mode'];
}
}
- if (! isset($_GET['com_order'])) {
+ if (!isset($_GET['com_order'])) {
if (is_object($xoopsUser)) {
$com_order = $xoopsUser->getVar('uorder');
} else {
@@ -73,7 +76,7 @@
$com_pid = 0;
$com_rootid = 0;
$com_text = '';
-
+
include_once $GLOBALS['xoops']->path('include/comment_form.php');
include_once $GLOBALS['xoops']->path('footer.php');
}
Modified: XoopsCore/trunk/htdocs/include/comment_post.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_post.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_post.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -32,10 +32,10 @@
if (empty($com_id)) {
exit();
}
- $comment_handler = & xoops_gethandler('comment');
- $comment = & $comment_handler->get($com_id);
- $module_handler = & xoops_gethandler('module');
- $module = & $module_handler->get($comment->getVar('com_modid'));
+ $comment_handler =& xoops_gethandler('comment');
+ $comment =& $comment_handler->get($com_id);
+ $module_handler =& xoops_gethandler('module');
+ $module =& $module_handler->get($comment->getVar('com_modid'));
$comment_config = $module->getInfo('comments');
$com_modid = $module->getVar('mid');
$redirect_page = XOOPS_URL . '/modules/system/admin.php?fct=comments&com_modid=' . $com_modid . '&com_itemid';
@@ -62,10 +62,10 @@
}
$op = '';
-if (! empty($_POST)) {
+if (!empty($_POST)) {
if (isset($_POST['com_dopost'])) {
$op = 'post';
- } elseif (isset($_POST['com_dopreview'])) {
+ } else if (isset($_POST['com_dopreview'])) {
$op = 'preview';
}
if (isset($_POST['com_dodelete'])) {
@@ -76,7 +76,7 @@
$op = '';
}
}
- if ($op == 'post' && ! is_object($xoopsUser)) {
+ if ($op == 'post' && !is_object($xoopsUser)) {
xoops_load("captcha");
$xoopsCaptcha = XoopsCaptcha::getInstance();
if (! $xoopsCaptcha->verify()) {
@@ -84,7 +84,7 @@
$op = 'preview';
}
}
-
+
$com_mode = isset($_POST['com_mode']) ? htmlspecialchars(trim($_POST['com_mode']), ENT_QUOTES) : 'flat';
$com_order = isset($_POST['com_order']) ? intval($_POST['com_order']) : XOOPS_COMMENT_OLD1ST;
$com_itemid = isset($_POST['com_itemid']) ? intval($_POST['com_itemid']) : 0;
@@ -105,16 +105,16 @@
case "delete":
include_once $GLOBALS['xoops']->path('include/comment_delete.php');
break;
-
+
case "preview":
- $myts = & MyTextSanitizer::getInstance();
+ $myts =& MyTextSanitizer::getInstance();
$doimage = 1;
$com_title = $myts->htmlSpecialChars($myts->stripSlashesGPC($_POST['com_title']));
if ($dohtml != 0) {
if (is_object($xoopsUser)) {
- if (! $xoopsUser->isAdmin($com_modid)) {
+ if (!$xoopsUser->isAdmin($com_modid)) {
$sysperm_handler = & xoops_gethandler('groupperm');
- if (! $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) {
+ if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) {
$dohtml = 0;
}
}
@@ -122,41 +122,47 @@
$dohtml = 0;
}
}
- $p_comment = & $myts->previewTarea($_POST['com_text'], $dohtml, $dosmiley, $doxcode, $doimage, $dobr);
+ $p_comment =& $myts->previewTarea($_POST['com_text'], $dohtml, $dosmiley, $doxcode, $doimage, $dobr);
$noname = isset($noname) ? intval($noname) : 0;
$com_text = $myts->htmlSpecialChars($myts->stripSlashesGPC($_POST['com_text']));
if ($xoopsModule->getVar('dirname') != 'system') {
include_once $GLOBALS['xoops']->path('header.php');
- if (! empty($captcha_message)) {
+ if (!empty($captcha_message)) {
xoops_error($captcha_message);
}
- themecenterposts($com_title, $p_comment);
+ echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
+ <tr><td class="head">' . $com_title . '</td></tr>
+ <tr><td><br />' . $p_comment . '<br /></td></tr>
+ </table>';
include_once $GLOBALS['xoops']->path('include/comment_form.php');
include_once $GLOBALS['xoops']->path('footer.php');
} else {
xoops_cp_header();
- themecenterposts($com_title, $p_comment);
+ echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
+ <tr><td class="head">' . $com_title . '</td></tr>
+ <tr><td><br />' . $p_comment . '<br /></td></tr>
+ </table>';
include_once $GLOBALS['xoops']->path('include/comment_form.php');
xoops_cp_footer();
}
break;
-
+
case "post":
$doimage = 1;
- $comment_handler = & xoops_gethandler('comment');
+ $comment_handler =& xoops_gethandler('comment');
$add_userpost = false;
$call_approvefunc = false;
$call_updatefunc = false;
// RMV-NOTIFY - this can be set to 'comment' or 'comment_submit'
$notify_event = false;
- if (! empty($com_id)) {
- $comment = & $comment_handler->get($com_id);
+ if (!empty($com_id)) {
+ $comment =& $comment_handler->get($com_id);
$accesserror = false;
-
+
if (is_object($xoopsUser)) {
$sysperm_handler = & xoops_gethandler('groupperm');
if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) {
- if (! empty($com_status) && $com_status != XOOPS_COMMENT_PENDING) {
+ if (!empty($com_status) && $com_status != XOOPS_COMMENT_PENDING) {
$old_com_status = $comment->getVar('com_status');
$comment->setVar('com_status', $com_status);
// if changing status from pending state, increment user post
@@ -168,11 +174,11 @@
// RMV-NOTIFY
$notify_event = 'comment';
}
- } elseif (XOOPS_COMMENT_HIDDEN == $old_com_status && XOOPS_COMMENT_ACTIVE == $com_status) {
+ } else if (XOOPS_COMMENT_HIDDEN == $old_com_status && XOOPS_COMMENT_ACTIVE == $com_status) {
$call_updatefunc = true;
// Comments can not be directly posted hidden,
// no need to send notification here
- } elseif (XOOPS_COMMENT_ACTIVE == $old_com_status && XOOPS_COMMENT_HIDDEN == $com_status) {
+ } else if (XOOPS_COMMENT_ACTIVE == $old_com_status && XOOPS_COMMENT_HIDDEN == $com_status) {
$call_updatefunc = true;
}
}
@@ -198,7 +204,7 @@
$comment->setVar('com_rootid', $com_rootid);
$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
if (is_object($xoopsUser)) {
- $sysperm_handler = & xoops_gethandler('groupperm');
+ $sysperm_handler =& xoops_gethandler('groupperm');
if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups())) {
$comment->setVar('com_status', XOOPS_COMMENT_ACTIVE);
$add_userpost = true;
@@ -225,7 +231,7 @@
break;
}
}
- if (! empty($xoopsModuleConfig['com_anonpost']) && ! empty($noname)) {
+ if (!empty($xoopsModuleConfig['com_anonpost']) && ! empty($noname)) {
$uid = 0;
} else {
$uid = $xoopsUser->getVar('uid');
@@ -279,79 +285,79 @@
// set own id as root id if this is a top comment
if ($com_rootid == 0) {
$com_rootid = $newcid;
- if (! $comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
+ if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
$comment_handler->delete($comment);
- include XOOPS_ROOT_PATH . '/header.php';
+ include $GLOBALS['xoops']->path('header.php');
xoops_error();
- include XOOPS_ROOT_PATH . '/footer.php';
+ include $GLOBALS['xoops']->path('footer.php');
}
}
// call custom approve function if any
if (false != $call_approvefunc && isset($comment_config['callback']['approve']) && trim($comment_config['callback']['approve']) != '') {
$skip = false;
- if (! function_exists($comment_config['callback']['approve'])) {
+ if (!function_exists($comment_config['callback']['approve'])) {
if (isset($comment_config['callbackFile'])) {
$callbackfile = trim($comment_config['callbackFile']);
if ($callbackfile != '' && file_exists($GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
include_once $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile);
}
- if (! function_exists($comment_config['callback']['approve'])) {
+ if (!function_exists($comment_config['callback']['approve'])) {
$skip = true;
}
} else {
$skip = true;
}
}
- if (! $skip) {
+ if (!$skip) {
$comment_config['callback']['approve']($comment);
}
}
-
+
// call custom update function if any
if (false != $call_updatefunc && isset($comment_config['callback']['update']) && trim($comment_config['callback']['update']) != '') {
$skip = false;
- if (! function_exists($comment_config['callback']['update'])) {
+ if (!function_exists($comment_config['callback']['update'])) {
if (isset($comment_config['callbackFile'])) {
$callbackfile = trim($comment_config['callbackFile']);
if ($callbackfile != '' && file_exists($GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile))) {
include_once $GLOBALS['xoops']->path('modules/' . $moddir . '/' . $callbackfile);
}
- if (! function_exists($comment_config['callback']['update'])) {
+ if (!function_exists($comment_config['callback']['update'])) {
$skip = true;
}
} else {
$skip = true;
}
}
- if (! $skip) {
+ if (!$skip) {
$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
$criteria->add(new Criteria('com_itemid', $com_itemid));
$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
$comment_count = $comment_handler->getCount($criteria);
$func = $comment_config['callback']['update'];
call_user_func_array($func, array(
- $com_itemid ,
- $comment_count ,
+ $com_itemid ,
+ $comment_count ,
$comment->getVar('com_id')));
}
}
-
+
// increment user post if needed
$uid = $comment->getVar('com_uid');
if ($uid > 0 && false != $add_userpost) {
- $member_handler = & xoops_gethandler('member');
- $poster = & $member_handler->getUser($uid);
+ $member_handler =& xoops_gethandler('member');
+ $poster =& $member_handler->getUser($uid);
if (is_object($poster)) {
$member_handler->updateUserByField($poster, 'posts', $poster->getVar('posts') + 1);
}
}
-
+
// RMV-NOTIFY
// trigger notification event if necessary
if ($notify_event) {
$not_modid = $com_modid;
include_once $GLOBALS['xoops']->path('include/notification_functions.php');
- $not_catinfo = & notificationCommentCategoryInfo($not_modid);
+ $not_catinfo =& notificationCommentCategoryInfo($not_modid);
$not_category = $not_catinfo['name'];
$not_itemid = $com_itemid;
$not_event = $notify_event;
@@ -360,13 +366,13 @@
// module).
$comment_tags = array();
if ('system' == $xoopsModule->getVar('dirname')) {
- $module_handler = & xoops_gethandler('module');
- $not_module = & $module_handler->get($not_modid);
+ $module_handler =& xoops_gethandler('module');
+ $not_module =& $module_handler->get($not_modid);
} else {
- $not_module = & $xoopsModule;
+ $not_module =& $xoopsModule;
}
- if (! isset($comment_url)) {
- $com_config = & $not_module->getInfo('comments');
+ if (!isset($comment_url)) {
+ $com_config =& $not_module->getInfo('comments');
$comment_url = $com_config['pageName'] . '?';
if (isset($com_config['extraParams']) && is_array($com_config['extraParams'])) {
$extra_params = '';
@@ -378,10 +384,10 @@
$comment_url .= $com_config['itemName'];
}
$comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
- $notification_handler = & xoops_gethandler('notification');
+ $notification_handler =& xoops_gethandler('notification');
$notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
}
- if (! isset($comment_post_results)) {
+ if (!isset($comment_post_results)) {
// if the comment is active, redirect to posted comment
if ($comment->getVar('com_status') == XOOPS_COMMENT_ACTIVE) {
redirect_header($redirect_page . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid, 1, _CM_THANKSPOST);
@@ -391,7 +397,7 @@
}
}
} else {
- if (! isset($purge_comment_post_results)) {
+ if (!isset($purge_comment_post_results)) {
include_once $GLOBALS['xoops']->path('header.php');
xoops_error($comment->getHtmlErrors());
include_once $GLOBALS['xoops']->path('footer');
Modified: XoopsCore/trunk/htdocs/include/comment_reply.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_reply.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_reply.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -40,7 +40,7 @@
$com_mode = $xoopsConfig['com_mode'];
}
}
-if (! isset($_GET['com_order'])) {
+if (!isset($_GET['com_order'])) {
if (is_object($xoopsUser)) {
$com_order = $xoopsUser->getVar('uorder');
} else {
@@ -49,12 +49,12 @@
} else {
$com_order = intval($_GET['com_order']);
}
-$comment_handler = & xoops_gethandler('comment');
-$comment = & $comment_handler->get($com_id);
+$comment_handler =& xoops_gethandler('comment');
+$comment =& $comment_handler->get($com_id);
$r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid'));
$r_text = _CM_POSTER . ': <strong>' . $r_name . '</strong> ' . _CM_POSTED . ': <strong>' . formatTimestamp($comment->getVar('com_created')) . '</strong><br /><br />' . $comment->getVar('com_text');
$com_title = $comment->getVar('com_title', 'E');
-if (! preg_match("/^(Re|" . _CM_RE . "):/i", $com_title)) {
+if (!preg_match("/^(Re|" . _CM_RE . "):/i", $com_title)) {
$com_title = _CM_RE . ": " . xoops_substr($com_title, 0, 56);
}
$com_pid = $com_id;
@@ -70,7 +70,10 @@
$com_itemid = $comment->getVar('com_itemid');
include_once $GLOBALS['xoops']->path('header.php');
-themecenterposts($comment->getVar('com_title'), $r_text);
+echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
+ <tr><td class="head">' . $comment->getVar('com_title') . '</td></tr>
+ <tr><td><br />' . $r_text . '<br /></td></tr>
+ </table>';
include_once $GLOBALS['xoops']->path('include/comment_form.php');
include_once $GLOBALS['xoops']->path('footer.php');
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/include/comment_view.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_view.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/comment_view.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -21,7 +21,7 @@
* @author John Neill <cat...@xo...>
* @version $Id$
*/
-if (! defined('XOOPS_ROOT_PATH') || ! is_object($xoopsModule)) {
+if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
die('Restricted access');
}
@@ -29,12 +29,12 @@
include_once $GLOBALS['xoops']->path('modules/system/constants.php');
if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
- $gperm_handler = & xoops_gethandler('groupperm');
+ $gperm_handler =& xoops_gethandler('groupperm');
$groups = ($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
$xoopsTpl->assign('xoops_iscommentadmin', $gperm_handler->checkRight('system_admin', XOOPS_SYSTEM_COMMENT, $groups));
-
+
xoops_loadLanguage('comment');
-
+
$comment_config = $xoopsModule->getInfo('comments');
$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
if ($com_itemid > 0) {
@@ -46,7 +46,7 @@
$com_mode = empty($com_mode) ? $xoopsConfig['com_mode'] : $com_mode;
}
$xoopsTpl->assign('comment_mode', $com_mode);
- if (! isset($_GET['com_order'])) {
+ if (!isset($_GET['com_order'])) {
if (is_object($xoopsUser)) {
$com_order = $xoopsUser->getVar('uorder');
} else {
@@ -57,12 +57,12 @@
}
if ($com_order != XOOPS_COMMENT_OLD1ST) {
$xoopsTpl->assign(array(
- 'comment_order' => XOOPS_COMMENT_NEW1ST ,
+ 'comment_order' => XOOPS_COMMENT_NEW1ST ,
'order_other' => XOOPS_COMMENT_OLD1ST));
$com_dborder = 'DESC';
} else {
$xoopsTpl->assign(array(
- 'comment_order' => XOOPS_COMMENT_OLD1ST ,
+ 'comment_order' => XOOPS_COMMENT_OLD1ST ,
'order_other' => XOOPS_COMMENT_NEW1ST));
$com_dborder = 'ASC';
}
@@ -72,14 +72,14 @@
} else {
$admin_view = false;
}
-
+
$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
$com_rootid = isset($_GET['com_rootid']) ? intval($_GET['com_rootid']) : 0;
$comment_handler = & xoops_gethandler('comment');
if ($com_mode == 'flat') {
$comments = $comment_handler->getByItemId($xoopsModule->getVar('mid'), $com_itemid, $com_dborder);
include_once $GLOBALS['xoops']->path('class/commentrenderer.php');
- $renderer = & XoopsCommentRenderer::instance($xoopsTpl);
+ $renderer =& XoopsCommentRenderer::instance($xoopsTpl);
$renderer->setComments($comments);
$renderer->renderFlatView($admin_view);
} elseif ($com_mode == 'thread') {
@@ -87,13 +87,13 @@
$comment_url = $comment_config['pageName'] . '?';
if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
$extra_params = '';
- foreach($comment_config['extraParams'] as $extra_param) {
+ foreach ($comment_config['extraParams'] as $extra_param) {
// This page is included in the module hosting page -- param could be from anywhere
if (isset(${$extra_param})) {
$extra_params .= $extra_param . '=' . ${$extra_param} . '&';
- } elseif (isset($_POST[$extra_param])) {
+ } else if (isset($_POST[$extra_param])) {
$extra_params .= $extra_param . '=' . $_POST[$extra_param] . '&';
- } elseif (isset($_GET[$extra_param])) {
+ } else if (isset($_GET[$extra_param])) {
$extra_params .= $extra_param . '=' . $_GET[$extra_param] . '&';
} else {
$extra_params .= $extra_param . '=&';
@@ -103,7 +103,7 @@
$comment_url .= $extra_params;
}
$xoopsTpl->assign('comment_url', $comment_url . $comment_config['itemName'] . '=' . $com_itemid . '&com_mode=thread&com_order=' . $com_order);
- if (! empty($com_id) && ! empty($com_rootid) && ($com_id != $com_rootid)) {
+ if (!empty($com_id) && !empty($com_rootid) && ($com_id != $com_rootid)) {
// Show specific thread tree
$comments = $comment_handler->getThread($com_rootid, $com_id);
if (false != $comments) {
@@ -121,7 +121,7 @@
$comments = $comment_handler->getThread($top_comments[$i]->getVar('com_rootid'), $top_comments[$i]->getVar('com_id'));
if (false != $comments) {
include_once $GLOBALS['xoops']->path('class/commentrenderer.php');
- $renderer = & XoopsCommentRenderer::instance($xoopsTpl);
+ $renderer =& XoopsCommentRenderer::instance($xoopsTpl);
$renderer->setComments($comments);
$renderer->renderThreadView($top_comments[$i]->getVar('com_id'), $admin_view);
}
@@ -137,13 +137,13 @@
for($i = 0; $i < $c_count; $i ++) {
$comments = $comment_handler->getThread($top_comments[$i]->getVar('com_rootid'), $top_comments[$i]->getVar('com_id'));
include_once $GLOBALS['xoops']->path('class/commentrenderer.php');
- $renderer = & XoopsCommentRenderer::instance($xoopsTpl);
+ $renderer =& XoopsCommentRenderer::instance($xoopsTpl);
$renderer->setComments($comments);
$renderer->renderNestView($top_comments[$i]->getVar('com_id'), $admin_view);
}
}
}
-
+
// assign comment nav bar
$navbar = '
<form method="get" action="' . $comment_config['pageName'] . '">
@@ -173,19 +173,19 @@
$navbar .= '>' . _NEWESTFIRST . '</option></select><input type="hidden" name="' . $comment_config['itemName'] . '" value="' . $com_itemid . '" /> <input type="submit" value="' . _CM_REFRESH . '" class="formButton" />';
if (! empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
$postcomment_link = 'comment_new.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode;
-
+
$xoopsTpl->assign('anon_canpost', true);
}
$link_extra = '';
if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
- foreach($comment_config['extraParams'] as $extra_param) {
+ foreach ($comment_config['extraParams'] as $extra_param) {
if (isset(${$extra_param})) {
$link_extra .= '&' . $extra_param . '=' . ${$extra_param};
$hidden_value = htmlspecialchars(${$extra_param}, ENT_QUOTES);
$extra_param_val = ${$extra_param};
- } elseif (isset($_POST[$extra_param])) {
+ } else if (isset($_POST[$extra_param])) {
$extra_param_val = $_POST[$extra_param];
- } elseif (isset($_GET[$extra_param])) {
+ } else if (isset($_GET[$extra_param])) {
$extra_param_val = $_GET[$extra_param];
}
if (isset($extra_param_val)) {
@@ -204,24 +204,24 @@
</table>
</form>';
$xoopsTpl->assign(array(
- 'commentsnav' => $navbar ,
- 'editcomment_link' => 'comment_edit.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra ,
- 'deletecomment_link' => 'comment_delete.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra ,
+ 'commentsnav' => $navbar ,
+ 'editcomment_link' => 'comment_edit.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra ,
+ 'deletecomment_link' => 'comment_delete.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra ,
'replycomment_link' => 'comment_reply.php?com_itemid=' . $com_itemid . '&com_order=' . $com_order . '&com_mode=' . $com_mode . '' . $link_extra));
-
+
// assign some lang variables
$xoopsTpl->assign(array(
- 'lang_from' => _CM_FROM ,
- 'lang_joined' => _CM_JOINED ,
- 'lang_posts' => _CM_POSTS ,
- 'lang_poster' => _CM_POSTER ,
- 'lang_thread' => _CM_THREAD ,
- 'lang_edit' => _EDIT ,
- 'lang_delete' => _DELETE ,
- 'lang_reply' => _REPLY ,
- 'lang_subject' => _CM_REPLIES ,
- 'lang_posted' => _CM_POSTED ,
- 'lang_updated' => _CM_UPDATED ,
+ 'lang_from' => _CM_FROM ,
+ 'lang_joined' => _CM_JOINED ,
+ 'lang_posts' => _CM_POSTS ,
+ 'lang_poster' => _CM_POSTER ,
+ 'lang_thread' => _CM_THREAD ,
+ 'lang_edit' => _EDIT ,
+ 'lang_delete' => _DELETE ,
+ 'lang_reply' => _REPLY ,
+ 'lang_subject' => _CM_REPLIES ,
+ 'lang_posted' => _CM_POSTED ,
+ 'lang_updated' => _CM_UPDATED ,
'lang_notice' => _CM_NOTICE));
}
}
Modified: XoopsCore/trunk/htdocs/include/commentform.inc.php
===================================================================
--- XoopsCore/trunk/htdocs/include/commentform.inc.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/commentform.inc.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,58 +1,55 @@
<?php
-// $Id$
-// ------------------------------------------------------------------------ //
-// 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 //
-// ------------------------------------------------------------------------ //
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
-include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
-include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+/*
+ 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.
+*/
+
+/**
+ * Xoops Comments Reply
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package kernel
+ * @subpackage Xoops Comments Class
+ * @since 2.0.0
+ * @author Kazumi Ono <on...@xo...>
+ * @version $Id$
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+include $GLOBALS['xoops']->path('class/xoopsformloader.php');
+
$cform = new XoopsThemeForm(_CM_POSTCOMMENT, "commentform", "postcomment.php", "post", true);
-if (!preg_match("/^re:/i", $subject)) {
- $subject = "Re: ".xoops_substr($subject,0,56);
+if (!preg_match("/^(Re|" . _CM_RE . "):/i", $subject)) {
+ $subject = _CM_RE . ": " . xoops_substr($subject, 0, 56);
}
+
$cform->addElement(new XoopsFormText(_CM_TITLE, 'subject', 50, 255, $subject), true);
$icons_radio = new XoopsFormRadio(_MESSAGEICON, 'icon', $icon);
$subject_icons = XoopsLists::getSubjectsList();
foreach ($subject_icons as $iconfile) {
- $icons_radio->addOption($iconfile, '<img src="'.XOOPS_URL.'/images/subject/'.$iconfile.'" alt="" />');
+ $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
}
$cform->addElement($icons_radio);
$cform->addElement(new XoopsFormDhtmlTextArea(_CM_MESSAGE, 'message', $message, 10, 50), true);
$option_tray = new XoopsFormElementTray(_OPTIONS,'<br />');
if ($xoopsUser) {
- if ($xoopsConfig['anonpost'] == 1) {
- $noname_checkbox = new XoopsFormCheckBox('', 'noname', $noname);
- $noname_checkbox->addOption(1, _POSTANON);
- $option_tray->addElement($noname_checkbox);
- }
- if ($xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
- $nohtml_checkbox = new XoopsFormCheckBox('', 'nohtml', $nohtml);
- $nohtml_checkbox->addOption(1, _DISABLEHTML);
- $option_tray->addElement($nohtml_checkbox);
- }
+ if ($xoopsConfig['anonpost'] == 1) {
+ $noname_checkbox = new XoopsFormCheckBox('', 'noname', $noname);
+ $noname_checkbox->addOption(1, _POSTANON);
+ $option_tray->addElement($noname_checkbox);
+ }
+ if ($xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+ $nohtml_checkbox = new XoopsFormCheckBox('', 'nohtml', $nohtml);
+ $nohtml_checkbox->addOption(1, _DISABLEHTML);
+ $option_tray->addElement($nohtml_checkbox);
+ }
}
$smiley_checkbox = new XoopsFormCheckBox('', 'nosmiley', $nosmiley);
$smiley_checkbox->addOption(1, _DISABLESMILEY);
Modified: XoopsCore/trunk/htdocs/include/cp_functions.php
===================================================================
--- XoopsCore/trunk/htdocs/include/cp_functions.php 2009-08-31 17:55:01 UTC (rev 3540)
+++ XoopsCore/trunk/htdocs/include/cp_functions.php 2009-08-31 23:02:37 UTC (rev 3541)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package kernel
- * @subpackage Xoop CP Functions
+ * @subpackage Xoops CP Functions
* @since 2.0.0
* @version $Id$
*/
@@ -28,7 +28,7 @@
function xoops_cp_header()
{
xoops_load('cpanel', 'system');
- $cpanel = & XoopsSystemCpanel::getInstance();
+ $cpane...
[truncated message content] |
|
From: <vo...@us...> - 2009-08-31 17:55:13
|
Revision: 3540
http://xoops.svn.sourceforge.net/xoops/?rev=3540&view=rev
Author: voltan1
Date: 2009-08-31 17:55:01 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
icons not loaded
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_indexcp.html
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_indexcp.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_indexcp.html 2009-08-31 16:20:01 UTC (rev 3539)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_indexcp.html 2009-08-31 17:55:01 UTC (rev 3540)
@@ -1,4 +1,4 @@
-<div class="CPbigTitle" style="background-image: url(<{$xoops_imageurl}>modules/system/class/gui/oxygen/images/cp.png); "><{$lang_cp}></div><br />
+<div class="CPbigTitle" style="background-image: url(<{$xoops_url}>/modules/system/class/gui/oxygen/images/cp.png); "><{$lang_cp}></div><br />
<!-- start slideshow -->
<div class="systemicons">
<div class="cpicon" >
@@ -22,7 +22,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="70%" class="CPindexOptions">
- <div class="CPbigTitle" style="background-image: url(<{$xoops_imageurl}>modules/system/class/gui/oxygen/images/modules.png)"><{$lang_insmodules}></div><br />
+ <div class="CPbigTitle" style="background-image: url(<{$xoops_url}>/modules/system/class/gui/oxygen/images/modules.png)"><{$lang_insmodules}></div><br />
<div class="cpiconmodules">
<{foreach item=mod from=$modules}>
<a class="tooltip" href="<{$mod.link}>" title="<{$mod.title}>">
@@ -34,7 +34,7 @@
</td>
<td width="1%"> </td>
<td width="29%" class="CPindexOptions">
- <div class="CPbigTitle" style="background-image: url(<{$xoops_imageurl}>modules/system/class/gui/oxygen/images/brightside.png)"><{$lang_overview}></div><br />
+ <div class="CPbigTitle" style="background-image: url(<{$xoops_url}>/modules/system/class/gui/oxygen/images/brightside.png)"><{$lang_overview}></div><br />
<!-- strst accordion menu -->
<div id="firstpane" class="menu_list">
<!-- menu 1 -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Bi...@us...> - 2009-08-31 16:20:10
|
Revision: 3539
http://xoops.svn.sourceforge.net/xoops/?rev=3539&view=rev
Author: BitC3R0
Date: 2009-08-31 16:20:01 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Changed from iThemes to xThemes
Newbb templates almost ready
Modified Paths:
--------------
XoopsThemes/wox/trunk/config/config_me.php
XoopsThemes/wox/trunk/config/theme.php
XoopsThemes/wox/trunk/css/content.css
XoopsThemes/wox/trunk/css/forums.css
XoopsThemes/wox/trunk/css/general.css
XoopsThemes/wox/trunk/css/home.css
XoopsThemes/wox/trunk/css/news.css
XoopsThemes/wox/trunk/js/carousel_behavior.js
XoopsThemes/wox/trunk/js/effects.js
XoopsThemes/wox/trunk/js/forums.js
XoopsThemes/wox/trunk/modules/newbb/newbb_index.html
XoopsThemes/wox/trunk/modules/newbb/newbb_item.html
XoopsThemes/wox/trunk/modules/newbb/newbb_thread.html
XoopsThemes/wox/trunk/modules/newbb/newbb_viewforum.html
XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html
XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_thread.html
XoopsThemes/wox/trunk/modules/news/news_article.html
XoopsThemes/wox/trunk/modules/news/news_index.html
XoopsThemes/wox/trunk/modules/news/news_item.html
XoopsThemes/wox/trunk/modules/system/system_comment.html
XoopsThemes/wox/trunk/modules/system/system_comments_flat.html
XoopsThemes/wox/trunk/modules/system/system_comments_nest.html
XoopsThemes/wox/trunk/modules/system/system_comments_thread.html
XoopsThemes/wox/trunk/theme.html
XoopsThemes/wox/trunk/tpls/cbb_menu.html
XoopsThemes/wox/trunk/tpls/content.html
XoopsThemes/wox/trunk/tpls/content_header.html
XoopsThemes/wox/trunk/tpls/home.html
XoopsThemes/wox/trunk/tpls/home_header.html
XoopsThemes/wox/trunk/tpls/news_menu.html
Modified: XoopsThemes/wox/trunk/config/config_me.php
===================================================================
--- XoopsThemes/wox/trunk/config/config_me.php 2009-08-31 14:16:34 UTC (rev 3538)
+++ XoopsThemes/wox/trunk/config/config_me.php 2009-08-31 16:20:01 UTC (rev 3539)
@@ -1,83 +1,83 @@
-<?php
-// LOad category list
-$db = Database::getInstance();
-$sql = "SELECT * FROM ".$db->prefix("topics")." ORDER BY topic_pid,topic_title";
-$result = $db->query($sql);
-$categories = array();
-while($row = $db->fetchArray($result)){
- $categories[] = $row;
-}
-?>
-<div class="it_config_tabs">
- <ul>
- <li id="li-e-home">Homepage</li>
- <li id="li-e-avatars">Avatars</li>
- </ul>
-</div>
-
-<div class="it_config_container" id="e-home">
- <div class="field_item">
- <div class="caption">
- <label for="announcement">Announcement:</label>
- <span class="descriptions">You can specify an announcemente to show at the home page of site.</span>
- </div>
- <div class="content">
- <textarea name="xtconf_announcement" id="announcement" style="width: 98%; height: 70px;"><?php echo $announcement; ?></textarea>
- </div>
- </div>
- <div class="field_item">
- <div class="caption">
- <label for="limit_news">Recent News Number:</label>
- <span class="descriptions">The items number limit for recent news.</span>
- </div>
- <div class="content">
- <input type="text" name="xtconf_limit_news" id="limit_news" size="10" value="<?php echo $limit_news; ?>" />
- </div>
- </div>
- <div class="field_item">
- <div class="caption">
- <label for="length">News Text Length:</label>
- <span class="descriptions">Specify the max length for text.</span>
- </div>
- <div class="content">
- <input type="text" name="xtconf_length" id="length" size="10" value="<?php echo $length; ?>" />
- </div>
- </div>
- <div class="field_item">
- <div class="caption">
- <label for="news-category">News Category:</label>
- <span class="descriptions">Select the category that you wish to show at homepage</span>
- </div>
- <div class="content">
- <select name="xtconf_news_category" id="news-category">
- <?php foreach($categories as $row): ?>
- <option value="<?php echo $row['topic_id']; ?>"<?php echo $featured==$row['topic_id'] ? ' selected="selected"' : ''; ?>><?php echo $row['topic_title']; ?></option>
- <?php endforeach; ?>
- </select>
- </div>
- </div>
-</div>
-
-<div class="it_config_container" id="e-avatars">
- <div class="field_item">
- <div class="caption">
- <label>Avatars for Comments:</label>
- <span class="descriptions">Select method to show avatars in comments.</span>
- </div>
- <div class="content">
- <label><input type="radio" name="xtconf_avatar_comments" id="avatar-comments" value="0"<?php echo $avatar_comments==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
- <label><input type="radio" name="xtconf_avatar_comments" id="avatar-comments" value="1"<?php echo $avatar_comments==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
- </div>
- </div>
-
- <div class="field_item">
- <div class="caption">
- <label>Avatars for Forums:</label>
- <span class="descriptions">Select method to show avatars in forum posts.</span>
- </div>
- <div class="content">
- <label><input type="radio" name="xtconf_avatar_forum" id="avatar-forum" value="0"<?php echo $avatar_forum==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
- <label><input type="radio" name="xtconf_avatar_forum" id="avatar-forum" value="1"<?php echo $avatar_forum==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
- </div>
- </div>
+<?php
+// LOad category list
+$db = Database::getInstance();
+$sql = "SELECT * FROM ".$db->prefix("topics")." ORDER BY topic_pid,topic_title";
+$result = $db->query($sql);
+$categories = array();
+while($row = $db->fetchArray($result)){
+ $categories[] = $row;
+}
+?>
+<div class="it_config_tabs">
+ <ul>
+ <li id="li-e-home">Homepage</li>
+ <li id="li-e-avatars">Avatars</li>
+ </ul>
+</div>
+
+<div class="it_config_container" id="e-home">
+ <div class="field_item">
+ <div class="caption">
+ <label for="announcement">Announcement:</label>
+ <span class="descriptions">You can specify an announcemente to show at the home page of site.</span>
+ </div>
+ <div class="content">
+ <textarea name="xtconf_announcement" id="announcement" style="width: 98%; height: 70px;"><?php echo $announcement; ?></textarea>
+ </div>
+ </div>
+ <div class="field_item">
+ <div class="caption">
+ <label for="limit_news">Recent News Number:</label>
+ <span class="descriptions">The items number limit for recent news.</span>
+ </div>
+ <div class="content">
+ <input type="text" name="xtconf_limit_news" id="limit_news" size="10" value="<?php echo $limit_news; ?>" />
+ </div>
+ </div>
+ <div class="field_item">
+ <div class="caption">
+ <label for="length">News Text Length:</label>
+ <span class="descriptions">Specify the max length for text.</span>
+ </div>
+ <div class="content">
+ <input type="text" name="xtconf_length" id="length" size="10" value="<?php echo $length; ?>" />
+ </div>
+ </div>
+ <div class="field_item">
+ <div class="caption">
+ <label for="news-category">News Category:</label>
+ <span class="descriptions">Select the category that you wish to show at homepage</span>
+ </div>
+ <div class="content">
+ <select name="xtconf_news_category" id="news-category">
+ <?php foreach($categories as $row): ?>
+ <option value="<?php echo $row['topic_id']; ?>"<?php echo $featured==$row['topic_id'] ? ' selected="selected"' : ''; ?>><?php echo $row['topic_title']; ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+ </div>
+</div>
+
+<div class="it_config_container" id="e-avatars">
+ <div class="field_item">
+ <div class="caption">
+ <label>Avatars for Comments:</label>
+ <span class="descriptions">Select method to show avatars in comments.</span>
+ </div>
+ <div class="content">
+ <label><input type="radio" name="xtconf_avatar_comments" id="avatar-comments" value="0"<?php echo $avatar_comments==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
+ <label><input type="radio" name="xtconf_avatar_comments" id="avatar-comments" value="1"<?php echo $avatar_comments==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
+ </div>
+ </div>
+
+ <div class="field_item">
+ <div class="caption">
+ <label>Avatars for Forums:</label>
+ <span class="descriptions">Select method to show avatars in forum posts.</span>
+ </div>
+ <div class="content">
+ <label><input type="radio" name="xtconf_avatar_forum" id="avatar-forum" value="0"<?php echo $avatar_forum==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
+ <label><input type="radio" name="xtconf_avatar_forum" id="avatar-forum" value="1"<?php echo $avatar_forum==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
+ </div>
+ </div>
</div>
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/config/theme.php
===================================================================
--- XoopsThemes/wox/trunk/config/theme.php 2009-08-31 14:16:34 UTC (rev 3538)
+++ XoopsThemes/wox/trunk/config/theme.php 2009-08-31 16:20:01 UTC (rev 3539)
@@ -1,261 +1,261 @@
-<?php
-// $Id$
-// --------------------------------------------------------------
-// WOX Theme
-// Theme for XOOPS official site
-// Author: Eduardo Cortés <i.b...@gm...>
-// License: http://creativecommons.org/licenses/by-nc-sa/2.5/mx/
-// --------------------------------------------------------------
-
-class XThemeWox extends XThemesTheme
-{
- public function __construct(){
- $this->set_config();
- }
-
- public function get_info(){
- return array(
- 'name' => 'WOX Theme',
- 'description' => 'Theme created for official XOOPS site.',
- 'version' => '1.0',
- 'author' => 'Eduardo Cortés',
- 'email' => 'i.b...@gm...',
- 'url' => 'http://redmexico.com.mx',
- 'screenshot' => 'images/shot.jpg'
- );
- }
-
- public function get_config($current){
- extract($current);
-
- include 'config_me.php';
-
- }
-
- public function get_recent_news(&$smarty, $params){
- global $xoopsTpl, $topic_frontpage;
-
- global $xoopsModule;
- $xoopsModule = new XoopsModule();
-
- $myts = MyTextSanitizer::getInstance();
- include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php';
- include_once XOOPS_ROOT_PATH.'/modules/news/class/class.sfiles.php';
- include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newstopic.php';
- include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
- include_once XOOPS_ROOT_PATH.'/class/tree.php';
- $sfiles = new sFiles();
-
- $xt = new NewsTopic();
- $sarray = NewsStory::getAllPublished($params['limit'], 0, false, null, 0, true, 'published', $topic_frontpage);
-
- $scount = count($sarray);
- //$xoopsTpl->assign('story_count', $scount);
- $featured = array();
- if($scount>0){
-
- $storieslist=array();
- foreach ($sarray as $storyid => $thisstory) {
- $storieslist[]=$thisstory->storyid();
- }
- $filesperstory = $sfiles->getCountbyStories($storieslist);
- foreach ($sarray as $storyid => $thisstory) {
- $filescount = array_key_exists($thisstory->storyid(),$filesperstory) ? $filesperstory[$thisstory->storyid()] : 0;
- $story = $thisstory->prepare2show($filescount);
- // The line below can be used to display a Permanent Link image
- // $story['title'] .= " <a href='".XOOPS_URL."/modules/news/article.php?storyid=".$sarray[$i]->storyid()."'><img src='".XOOPS_URL."/modules/news/images/x.gif' alt='Permanent Link' /></a>";
- $story['news_title'] = $story['title'];
- $story['title'] = $thisstory->textlink().' : '.$story['title'];
- $story['topic_title'] = $thisstory->textlink();
- $story['topic_color'] = '#'.$myts->displayTarea($thisstory->topic_color);
- $odata = $this->decode_images($story['text'], $params['length']);
- $story['image'] = $odata['big'];
- $story['text'] = $odata['text'];
- $featured[] = $story;
- }
- }
- $xoopsTpl->assign('recent_news', $featured);
- unset($featured);
- }
-
- private function decode_images($text, $size){
- // Get the big image
-
- $matches = array();
- $big = '';
- $small = '';
- $patterns[] = "/\[thumb](.*)\[\/thumb\]/sU";
-
- preg_match($patterns[0], $text, $matches);
-
- if (!empty($matches)){
- $big = $matches[1];
- }
-
- if (is_numeric($size) && $size<=0){
- $text = '';
- } elseif (is_numeric($size) && $size>0) {
- $text = strip_tags($text);
- $patterns[] = "/\[imgsmall](.*)\[\/imgsmall\]/sU";
- $patterns[] = "/\[imgbig](.*)\[\/imgbig\]/sU";
- $text = preg_replace($patterns, '', $text);
- $text = substr($text, 0, $size);
- } elseif ($size=='all'){
- $patterns[] = "/\[imgsmall](.*)\[\/imgsmall\]/sU";
- $patterns[] = "/\[imgbig](.*)\[\/imgbig\]/sU";
- $text = preg_replace($patterns, '', $text);
- }
- return array('big'=>$big, 'small'=>$small, 'text'=>$text);
- }
-
- public function get_comments(&$smarty, $params){
-
- include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
- $comment_handler =& xoops_gethandler('comment');
- $criteria = new CriteriaCompo(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
- $criteria->setLimit(intval($params['limit']));
- $criteria->setSort('com_created');
- $criteria->setOrder('DESC');
-
- // Check modules permissions
- global $xoopsUser;
- $moduleperm_handler =& xoops_gethandler('groupperm');
- $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
- $criteria1 = new CriteriaCompo(new Criteria('gperm_name','module_read','='));
- $criteria1->add(new Criteria('gperm_groupid', '('.implode(',', $gperm_groupid).')', 'IN'));
- $perms = $moduleperm_handler->getObjects($criteria1, true);
- $modIds = array();
- foreach($perms as $item) {
- $modIds[] = $item->getVar('gperm_itemid');
- }
- if(count($modIds) > 0 ) {
- $modIds = array_unique($modIds);
- $criteria->add(new Criteria('com_modid', '('.implode(',', $modIds).')', 'IN'));
- }
- // Check modules permissions
-
- $comments = $comment_handler->getObjects($criteria, true);
- $member_handler =& xoops_gethandler('member');
- $module_handler =& xoops_gethandler('module');
- $modules = $module_handler->getObjects(new Criteria('hascomments', 1), true);
- $comment_config = array();
- foreach (array_keys($comments) as $i) {
- $mid = $comments[$i]->getVar('com_modid');
- $com['module'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/">'.$modules[$mid]->getVar('name').'</a>';
- if (!isset($comment_config[$mid])) {
- $comment_config[$mid] = $modules[$mid]->getInfo('comments');
- }
- $com['id'] = $i;
- $com['title'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/'.$comment_config[$mid]['pageName'].'?'.$comment_config[$mid]['itemName'].'='.$comments[$i]->getVar('com_itemid').'&com_id='.$i.'&com_rootid='.$comments[$i]->getVar('com_rootid').'&'.htmlspecialchars($comments[$i]->getVar('com_exparams')).'#comment'.$i.'">'.$comments[$i]->getVar('com_title').'</a>';
- $com['icon'] = htmlspecialchars( $comments[$i]->getVar('com_icon'), ENT_QUOTES );
- $com['icon'] = ($com['icon'] != '') ? $com['icon'] : 'icon1.gif';
- $com['time'] = formatTimestamp($comments[$i]->getVar('com_created'),'m');
- if ($comments[$i]->getVar('com_uid') > 0) {
- $poster = $member_handler->getUser($comments[$i]->getVar('com_uid'));
- if (is_object($poster)) {
- $com['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$comments[$i]->getVar('com_uid').'">'.$poster->getVar('uname').'</a>';
- } else {
- $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
- }
- } else {
- $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
- }
- $smarty->append('wox_comments', $com);
- unset($com);
- }
-
- }
-
- // Format News
- public function format_news(&$smarty, $params){
-
- $data = $smarty->get_template_vars('columns');
- $data = $data[0];
- $c = 0;
- foreach ($data as $post){
- $ret = $this->decode_images($post['text'], 'all');
- $post['text'] = $ret['text'];
- $post['image'] = $ret['big'];
-
- // Get comments number
- $comments = strip_tags($post['morelink']);
- $pos = stripos($comments, 'comments');
- $comments = substr($comments, 0, $pos - 1);
- $pos = strrpos($comments, '|');
- $comments = substr($comments, $pos+1);
- $post['comments'] = intval($comments);
-
- $smarty->append('wox_posts', $post);
- $c++;
- }
-
- }
-
- public function clean_post(&$smarty, $params){
- $post = $params['post'];
- $ret = $this->decode_images($post['text'], 'all');
- $post['text'] = $ret['text'];
- $post['image'] = $ret['big'];
-
- $smarty->assign('story', $post);
-
- }
-
- public function comments_options(&$smarty, $params){
- global $xoopsModule, $xoopsUser;
-
- $xoopsTpl =& $smarty;
- $com_order = isset($_REQUEST['com_order']) ? intval($_REQUEST['com_order']) : 0;
- $comment_config = $xoopsModule->getInfo('comments');
- $com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
-
- $navbar = ' <form method="get" action="'.$comment_config['pageName'].'">
- <table width="95%" class="outer" cellspacing="1">
- <tr>
- <td class="even" align="center">
- <input type="hidden" name="com_mode" value="flat" /><select name="com_order"><option value="'.XOOPS_COMMENT_OLD1ST.'"';
- if ($com_order == XOOPS_COMMENT_OLD1ST) {
- $navbar .= ' selected="selected"';
- }
- $navbar .= '>'. _OLDESTFIRST .'</option><option value="'.XOOPS_COMMENT_NEW1ST.'"';
- if ($com_order == XOOPS_COMMENT_NEW1ST) {
- $navbar .= ' selected="selected"';
- }
- unset($postcomment_link);
- $navbar .= '>'. _NEWESTFIRST .'</option></select><input type="hidden" name="'.$comment_config['itemName'].'" value="'.$com_itemid.'" /> <input type="submit" value="'. _CM_REFRESH .'" class="formButton" />';
- if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
- $postcomment_link = 'comment_new.php?com_itemid='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode;
-
- $xoopsTpl->assign('anon_canpost', true);
- }
- $link_extra = '';
- if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
- foreach ($comment_config['extraParams'] as $extra_param) {
- if (isset(${$extra_param})) {
- $link_extra .= '&'.$extra_param.'='.${$extra_param};
- $hidden_value = htmlspecialchars(${$extra_param}, ENT_QUOTES);
- $extra_param_val = ${$extra_param};
- } elseif (isset($_POST[$extra_param])) {
- $extra_param_val = $_POST[$extra_param];
- } elseif (isset($_GET[$extra_param])) {
- $extra_param_val = $_GET[$extra_param];
- }
- if (isset($extra_param_val)) {
- $link_extra .= '&'.$extra_param.'='.$extra_param_val;
- $hidden_value = htmlspecialchars($extra_param_val, ENT_QUOTES);
- $navbar .= '<input type="hidden" name="'.$extra_param.'" value="'.$hidden_value.'" />';
- }
- }
- }
- if (isset($postcomment_link)) {
- $navbar .= ' <input type="button" class="formButton" value="'._CM_POSTCOMMENT.'" />';
- }
- $navbar .= '
- </td>
- </tr>
- </table>
- </form>';
- echo $navbar; return;
- }
-
+<?php
+// $Id$
+// --------------------------------------------------------------
+// WOX Theme
+// Theme for XOOPS official site
+// Author: Eduardo Cortés <i.b...@gm...>
+// License: http://creativecommons.org/licenses/by-nc-sa/2.5/mx/
+// --------------------------------------------------------------
+
+class XThemeWox extends XThemesTheme
+{
+ public function __construct(){
+ $this->set_config();
+ }
+
+ public function get_info(){
+ return array(
+ 'name' => 'WOX Theme',
+ 'description' => 'Theme created for official XOOPS site.',
+ 'version' => '1.0',
+ 'author' => 'Eduardo Cortés',
+ 'email' => 'i.b...@gm...',
+ 'url' => 'http://redmexico.com.mx',
+ 'screenshot' => 'images/shot.jpg'
+ );
+ }
+
+ public function get_config($current){
+ extract($current);
+
+ include 'config_me.php';
+
+ }
+
+ public function get_recent_news(&$smarty, $params){
+ global $xoopsTpl, $topic_frontpage;
+
+ global $xoopsModule;
+ $xoopsModule = new XoopsModule();
+
+ $myts = MyTextSanitizer::getInstance();
+ include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php';
+ include_once XOOPS_ROOT_PATH.'/modules/news/class/class.sfiles.php';
+ include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newstopic.php';
+ include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
+ include_once XOOPS_ROOT_PATH.'/class/tree.php';
+ $sfiles = new sFiles();
+
+ $xt = new NewsTopic();
+ $sarray = NewsStory::getAllPublished($params['limit'], 0, false, null, 0, true, 'published', $topic_frontpage);
+
+ $scount = count($sarray);
+ //$xoopsTpl->assign('story_count', $scount);
+ $featured = array();
+ if($scount>0){
+
+ $storieslist=array();
+ foreach ($sarray as $storyid => $thisstory) {
+ $storieslist[]=$thisstory->storyid();
+ }
+ $filesperstory = $sfiles->getCountbyStories($storieslist);
+ foreach ($sarray as $storyid => $thisstory) {
+ $filescount = array_key_exists($thisstory->storyid(),$filesperstory) ? $filesperstory[$thisstory->storyid()] : 0;
+ $story = $thisstory->prepare2show($filescount);
+ // The line below can be used to display a Permanent Link image
+ // $story['title'] .= " <a href='".XOOPS_URL."/modules/news/article.php?storyid=".$sarray[$i]->storyid()."'><img src='".XOOPS_URL."/modules/news/images/x.gif' alt='Permanent Link' /></a>";
+ $story['news_title'] = $story['title'];
+ $story['title'] = $thisstory->textlink().' : '.$story['title'];
+ $story['topic_title'] = $thisstory->textlink();
+ $story['topic_color'] = '#'.$myts->displayTarea($thisstory->topic_color);
+ $odata = $this->decode_images($story['text'], $params['length']);
+ $story['image'] = $odata['big'];
+ $story['text'] = $odata['text'];
+ $featured[] = $story;
+ }
+ }
+ $xoopsTpl->assign('recent_news', $featured);
+ unset($featured);
+ }
+
+ private function decode_images($text, $size){
+ // Get the big image
+
+ $matches = array();
+ $big = '';
+ $small = '';
+ $patterns[] = "/\[thumb](.*)\[\/thumb\]/sU";
+
+ preg_match($patterns[0], $text, $matches);
+
+ if (!empty($matches)){
+ $big = $matches[1];
+ }
+
+ if (is_numeric($size) && $size<=0){
+ $text = '';
+ } elseif (is_numeric($size) && $size>0) {
+ $text = strip_tags($text);
+ $patterns[] = "/\[imgsmall](.*)\[\/imgsmall\]/sU";
+ $patterns[] = "/\[imgbig](.*)\[\/imgbig\]/sU";
+ $text = preg_replace($patterns, '', $text);
+ $text = substr($text, 0, $size);
+ } elseif ($size=='all'){
+ $patterns[] = "/\[imgsmall](.*)\[\/imgsmall\]/sU";
+ $patterns[] = "/\[imgbig](.*)\[\/imgbig\]/sU";
+ $text = preg_replace($patterns, '', $text);
+ }
+ return array('big'=>$big, 'small'=>$small, 'text'=>$text);
+ }
+
+ public function get_comments(&$smarty, $params){
+
+ include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+ $comment_handler =& xoops_gethandler('comment');
+ $criteria = new CriteriaCompo(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+ $criteria->setLimit(intval($params['limit']));
+ $criteria->setSort('com_created');
+ $criteria->setOrder('DESC');
+
+ // Check modules permissions
+ global $xoopsUser;
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ $gperm_groupid = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
+ $criteria1 = new CriteriaCompo(new Criteria('gperm_name','module_read','='));
+ $criteria1->add(new Criteria('gperm_groupid', '('.implode(',', $gperm_groupid).')', 'IN'));
+ $perms = $moduleperm_handler->getObjects($criteria1, true);
+ $modIds = array();
+ foreach($perms as $item) {
+ $modIds[] = $item->getVar('gperm_itemid');
+ }
+ if(count($modIds) > 0 ) {
+ $modIds = array_unique($modIds);
+ $criteria->add(new Criteria('com_modid', '('.implode(',', $modIds).')', 'IN'));
+ }
+ // Check modules permissions
+
+ $comments = $comment_handler->getObjects($criteria, true);
+ $member_handler =& xoops_gethandler('member');
+ $module_handler =& xoops_gethandler('module');
+ $modules = $module_handler->getObjects(new Criteria('hascomments', 1), true);
+ $comment_config = array();
+ foreach (array_keys($comments) as $i) {
+ $mid = $comments[$i]->getVar('com_modid');
+ $com['module'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/">'.$modules[$mid]->getVar('name').'</a>';
+ if (!isset($comment_config[$mid])) {
+ $comment_config[$mid] = $modules[$mid]->getInfo('comments');
+ }
+ $com['id'] = $i;
+ $com['title'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/'.$comment_config[$mid]['pageName'].'?'.$comment_config[$mid]['itemName'].'='.$comments[$i]->getVar('com_itemid').'&com_id='.$i.'&com_rootid='.$comments[$i]->getVar('com_rootid').'&'.htmlspecialchars($comments[$i]->getVar('com_exparams')).'#comment'.$i.'">'.$comments[$i]->getVar('com_title').'</a>';
+ $com['icon'] = htmlspecialchars( $comments[$i]->getVar('com_icon'), ENT_QUOTES );
+ $com['icon'] = ($com['icon'] != '') ? $com['icon'] : 'icon1.gif';
+ $com['time'] = formatTimestamp($comments[$i]->getVar('com_created'),'m');
+ if ($comments[$i]->getVar('com_uid') > 0) {
+ $poster = $member_handler->getUser($comments[$i]->getVar('com_uid'));
+ if (is_object($poster)) {
+ $com['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$comments[$i]->getVar('com_uid').'">'.$poster->getVar('uname').'</a>';
+ } else {
+ $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
+ }
+ } else {
+ $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
+ }
+ $smarty->append('wox_comments', $com);
+ unset($com);
+ }
+
+ }
+
+ // Format News
+ public function format_news(&$smarty, $params){
+
+ $data = $smarty->get_template_vars('columns');
+ $data = $data[0];
+ $c = 0;
+ foreach ($data as $post){
+ $ret = $this->decode_images($post['text'], 'all');
+ $post['text'] = $ret['text'];
+ $post['image'] = $ret['big'];
+
+ // Get comments number
+ $comments = strip_tags($post['morelink']);
+ $pos = stripos($comments, 'comments');
+ $comments = substr($comments, 0, $pos - 1);
+ $pos = strrpos($comments, '|');
+ $comments = substr($comments, $pos+1);
+ $post['comments'] = intval($comments);
+
+ $smarty->append('wox_posts', $post);
+ $c++;
+ }
+
+ }
+
+ public function clean_post(&$smarty, $params){
+ $post = $params['post'];
+ $ret = $this->decode_images($post['text'], 'all');
+ $post['text'] = $ret['text'];
+ $post['image'] = $ret['big'];
+
+ $smarty->assign('story', $post);
+
+ }
+
+ public function comments_options(&$smarty, $params){
+ global $xoopsModule, $xoopsUser;
+
+ $xoopsTpl =& $smarty;
+ $com_order = isset($_REQUEST['com_order']) ? intval($_REQUEST['com_order']) : 0;
+ $comment_config = $xoopsModule->getInfo('comments');
+ $com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
+
+ $navbar = ' <form method="get" action="'.$comment_config['pageName'].'">
+ <table width="95%" class="outer" cellspacing="1">
+ <tr>
+ <td class="even" align="center">
+ <input type="hidden" name="com_mode" value="flat" /><select name="com_order"><option value="'.XOOPS_COMMENT_OLD1ST.'"';
+ if ($com_order == XOOPS_COMMENT_OLD1ST) {
+ $navbar .= ' selected="selected"';
+ }
+ $navbar .= '>'. _OLDESTFIRST .'</option><option value="'.XOOPS_COMMENT_NEW1ST.'"';
+ if ($com_order == XOOPS_COMMENT_NEW1ST) {
+ $navbar .= ' selected="selected"';
+ }
+ unset($postcomment_link);
+ $navbar .= '>'. _NEWESTFIRST .'</option></select><input type="hidden" name="'.$comment_config['itemName'].'" value="'.$com_itemid.'" /> <input type="submit" value="'. _CM_REFRESH .'" class="formButton" />';
+ if (!empty($xoopsModuleConfig['com_anonpost']) || is_object($xoopsUser)) {
+ $postcomment_link = 'comment_new.php?com_itemid='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode;
+
+ $xoopsTpl->assign('anon_canpost', true);
+ }
+ $link_extra = '';
+ if (isset($comment_config['extraParams']) && is_array($comment_config['extraParams'])) {
+ foreach ($comment_config['extraParams'] as $extra_param) {
+ if (isset(${$extra_param})) {
+ $link_extra .= '&'.$extra_param.'='.${$extra_param};
+ $hidden_value = htmlspecialchars(${$extra_param}, ENT_QUOTES);
+ $extra_param_val = ${$extra_param};
+ } elseif (isset($_POST[$extra_param])) {
+ $extra_param_val = $_POST[$extra_param];
+ } elseif (isset($_GET[$extra_param])) {
+ $extra_param_val = $_GET[$extra_param];
+ }
+ if (isset($extra_param_val)) {
+ $link_extra .= '&'.$extra_param.'='.$extra_param_val;
+ $hidden_value = htmlspecialchars($extra_param_val, ENT_QUOTES);
+ $navbar .= '<input type="hidden" name="'.$extra_param.'" value="'.$hidden_value.'" />';
+ }
+ }
+ }
+ if (isset($postcomment_link)) {
+ $navbar .= ' <input type="button" class="formButton" value="'._CM_POSTCOMMENT.'" />';
+ }
+ $navbar .= '
+ </td>
+ </tr>
+ </table>
+ </form>';
+ echo $navbar; return;
+ }
+
}
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/css/content.css
===================================================================
--- XoopsThemes/wox/trunk/css/content.css 2009-08-31 14:16:34 UTC (rev 3538)
+++ XoopsThemes/wox/trunk/css/content.css 2009-08-31 16:20:01 UTC (rev 3539)
@@ -1,290 +1,290 @@
-body{
- font-family: Verdana, Geneva, sans-serif;
- font-size: 0.75em;
- color: #666;
- margin: 0;
-}
-div#xtHeader{
- height: 106px;
- width: 950px;
- margin: 0 auto;
-}
-div#xtContainer{
- width: 970px;
- margin: 0 auto;
- overflow: hidden;
-}
-
-div#general-container{
- background: url(../images/bgwhite.png) repeat-y top;
- overflow: hidden;
-}
-div#general-sub-container{
- background: url(../images/bggeneral.png) no-repeat center -1px;
- overflow: hidden;
- padding: 5px 0 0 0;
-}
-div#general-real-container{
- width: 910px;
- padding: 10px 20px;
- margin: 0 auto;
- background: #FFF;
- overflow: hidden;
-}
-
-/* XOOPS Standar */
-#mainmenu a{
- display: block;
- padding: 2px 0 2px 14px;
- color: #313131;
- font-size: 1.2em;
- background: url(../images/bullet.png) no-repeat left;
-}
-#mainmenu a.menuSub{
- font-size: 1em;
- background: none;
- padding-left: 18px;
- color: #C00;
-}
-#usermenu a{
- display: block;
- padding: 2px 0 2px 14px;
- font-size: 1.1em;
- background: url(../images/bullet2.png) no-repeat left;
-}
-div.xt-banner{
- padding: 0 0 16px 0;
- text-align: center;
-}
-.hide{
- display: none;
-}
-
-div#logo-bar{
- overflow: hidden;
- height: 70px;
- width: 970px;
- margin: 0 auto;
- margin-top: 5px;
-}
-div#logo-bar a.logo{
- background: url(../images/logo.png) no-repeat;
- width: 202px;
- height: 56px;
- display: block;
- float: left;
-}
-div#logo-bar a.logo span{
- display: none;
-}
-div#logo-bar ul{
- list-style: none;
- margin: 0;
- padding: 0;
-}
-div#logo-bar ul li{
- list-style: none;
- float: right;
- padding: 4px 10px;
- border: 1px solid #CCC;
- border-left: 1px solid #CCC;
- border-right: 1px solid #FFF;
- border-bottom: 0;
- background: #ebebeb url(../images/bg_inav.png) repeat-x top;
- font-size: 0.9em;
- margin-top: 47px;
-}
-div#logo-bar ul li:first-child{
- -moz-border-radius: 0 7px 0 0;
- -khtml-border-radius-topright: 7px;
- -webkit-border-top-right-radius: 7px;
- border-radius: 0 7px 0 0;
- border-right: 1px solid #CCC;
-}
-div#logo-bar ul li:last-child{
- -moz-border-radius: 7px 0 0 0;
- -khtml-border-radius-topleft: 7px;
- -webkit-border-top-left-radius: 7px;
- border-radius: 7px 0 0 0;
- border-left: 1px solid #CCC;
-}
-
-/** Buttons **/
-div#wox-buttons-container{
- background: #3F3F3F;
- height: 50px;
-}
-div#wox-buttons-container div{
- width: 970px;
- margin: 0 auto;
-}
-div#wox-buttons-container a{
- color: #FFF;
- font-weight: bold;
- display: block;
- float: left;
- height: 41px;
- margin: 5px 10px 0 0;
- padding: 4px 6px 0 6px;
- background-repeat: no-repeat;
- background-position: 4px top;
- overflow: hidden;
- background: url(../images/bgtabs.png) repeat-x left -65px;
- -moz-border-radius: 7px 7px 0 0;
- -khtml-border-radius-topright: 7px;
- -khtml-border-radius-topleft: 7px;
- -webkit-border-top-right-radius: 7px;
- -webkit-border-top-left-radius: 7px;
- border-radius: 7px 7px 0 0;
-}
-div#wox-buttons-container a:hover{
- background-position: bottom;
- text-decoration: none;
-}
-div#wox-buttons-container a.selected{
- background: url(../images/bgseltab.png) repeat-x left top;
- color: #000;
-}
-div#wox-buttons-container a img{
- float: left;
- margin-right: 5px;
-}
-div#wox-buttons-container a span{
- display: block;
- float: right;
- margin-top: 8px;
-}
-div#wox-buttons-container a.get{
- display: block;
- float: right;
- padding: 0;
- height: 50px;
- margin: 0;
- background: none;
-}
-
-div#wox-submenu-container{
- min-height: 10px;
- background: #D6DEE4;
- overflow: hidden;
- border-bottom: 1px solid #8CA2B3;
- font-size: 0.9em;
-}
-div#wox-submenu-container div{
- width: 970px;
- margin: 0 auto;
-}
-div#wox-submenu-container a{
- display: block;
- padding: 10px 10px;
- float: left;
- color: #394A57;
- border-right: 1px solid #8CA2B3;
- border-left: 1px solid #EDF0F3;
-}
-div#wox-submenu-container a:hover{
- background: #B4C2CD;
- color: #000;
- text-decoration: none;
- border-left: 1px solid #B4C2CD;
-}
-div#wox-submenu-container a:first-child{
- border-left: 0;
-}
-div#wox-submenu-container a:last-child{
- border-right: 0;
-}
-
-/** Contents **/
-div#wox-contents{
- overflow: hidden;
- width: 970px;
- margin: 10px auto 0 auto;
-}
-div#wox-rightblocks{
- width: 300px;
- float: right;
- background: #ebebeb;
- -moz-border-radius: 5px;
- -khtml-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
- padding: 10px;
-}
-div#xoops-contents{
- float: left;
- width: 635px;
- overflow: hidden;
-}
-div#wox-footer{
- background: #D6DEE4;
- padding: 20px 0;
- border-top: 1px solid #8CA2B3;
- margin-top: 20px;
-}
-div#wox-footer div.container{
- overflow: hidden;
- width: 970px;
- margin: 0 auto;
- color: #333;
-}
-div#wox-footer div.fcolumns{
- width: 295px;
- margin-right: 20px;
- float: left;
- padding: 0 15px 0 0
-}
-div#wox-footer div.fcolumns:last-child{
- margin-right: 0;
- width: 310px;
- padding: 0;
-}
-div#wox-footer h3.block_title{
- font-family: georgia, times, serif;
- color: #0A5781;
- font-size: 1.7em;
- margin: 0 0 15px 0;
- font-weight: normal;
-}
-div#wox-footer div.com_item{
- font-size: 0.9em;
- padding: 0px 0 10px 0;
- margin-bottom: 10px;
- border-bottom: 1px dotted #A3B5C2;
-}
-div#wox-footer div.com_item strong a{
- font-size: 1.1em;
- color: #000;
-}
-
-/** Pages Navigation **/
-div.pages_nav{
- overflow: hidden;
- margin-bottom: 15px;
- padding: 5px 0;
-}
-div.pages_nav u{
- text-decoration: none;
- font-weight: bold;
-}
-div.pages_nav a, div.pages_nav strong{
- display: block;
- padding: 2px 6px;
- float: left;
- font-size: 1.1em;
- background: #D6DEE4;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- margin-right: 1px;
-}
-div.pages_nav strong{
- background: #ebebeb;
- color: #333;
-}
-div.pages_nav a:hover{
- background: #3f3f3f;
- color: #FFF;
- text-decoration: none;
+body{
+ font-family: Verdana, Geneva, sans-serif;
+ font-size: 0.75em;
+ color: #666;
+ margin: 0;
+}
+div#xtHeader{
+ height: 106px;
+ width: 950px;
+ margin: 0 auto;
+}
+div#xtContainer{
+ width: 970px;
+ margin: 0 auto;
+ overflow: hidden;
+}
+
+div#general-container{
+ background: url(../images/bgwhite.png) repeat-y top;
+ overflow: hidden;
+}
+div#general-sub-container{
+ background: url(../images/bggeneral.png) no-repeat center -1px;
+ overflow: hidden;
+ padding: 5px 0 0 0;
+}
+div#general-real-container{
+ width: 910px;
+ padding: 10px 20px;
+ margin: 0 auto;
+ background: #FFF;
+ overflow: hidden;
+}
+
+/* XOOPS Standar */
+#mainmenu a{
+ display: block;
+ padding: 2px 0 2px 14px;
+ color: #313131;
+ font-size: 1.2em;
+ background: url(../images/bullet.png) no-repeat left;
+}
+#mainmenu a.menuSub{
+ font-size: 1em;
+ background: none;
+ padding-left: 18px;
+ color: #C00;
+}
+#usermenu a{
+ display: block;
+ padding: 2px 0 2px 14px;
+ font-size: 1.1em;
+ background: url(../images/bullet2.png) no-repeat left;
+}
+div.xt-banner{
+ padding: 0 0 16px 0;
+ text-align: center;
+}
+.hide{
+ display: none;
+}
+
+div#logo-bar{
+ overflow: hidden;
+ height: 70px;
+ width: 970px;
+ margin: 0 auto;
+ margin-top: 5px;
+}
+div#logo-bar a.logo{
+ background: url(../images/logo.png) no-repeat;
+ width: 202px;
+ height: 56px;
+ display: block;
+ float: left;
+}
+div#logo-bar a.logo span{
+ display: none;
+}
+div#logo-bar ul{
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+div#logo-bar ul li{
+ list-style: none;
+ float: right;
+ padding: 4px 10px;
+ border: 1px solid #CCC;
+ border-left: 1px solid #CCC;
+ border-right: 1px solid #FFF;
+ border-bottom: 0;
+ background: #ebebeb url(../images/bg_inav.png) repeat-x top;
+ font-size: 0.9em;
+ margin-top: 47px;
+}
+div#logo-bar ul li:first-child{
+ -moz-border-radius: 0 7px 0 0;
+ -khtml-border-radius-topright: 7px;
+ -webkit-border-top-right-radius: 7px;
+ border-radius: 0 7px 0 0;
+ border-right: 1px solid #CCC;
+}
+div#logo-bar ul li:last-child{
+ -moz-border-radius: 7px 0 0 0;
+ -khtml-border-radius-topleft: 7px;
+ -webkit-border-top-left-radius: 7px;
+ border-radius: 7px 0 0 0;
+ border-left: 1px solid #CCC;
+}
+
+/** Buttons **/
+div#wox-buttons-container{
+ background: #3F3F3F;
+ height: 50px;
+}
+div#wox-buttons-container div{
+ width: 970px;
+ margin: 0 auto;
+}
+div#wox-buttons-container a{
+ color: #FFF;
+ font-weight: bold;
+ display: block;
+ float: left;
+ height: 41px;
+ margin: 5px 10px 0 0;
+ padding: 4px 6px 0 6px;
+ background-repeat: no-repeat;
+ background-position: 4px top;
+ overflow: hidden;
+ background: url(../images/bgtabs.png) repeat-x left -65px;
+ -moz-border-radius: 7px 7px 0 0;
+ -khtml-border-radius-topright: 7px;
+ -khtml-border-radius-topleft: 7px;
+ -webkit-border-top-right-radius: 7px;
+ -webkit-border-top-left-radius: 7px;
+ border-radius: 7px 7px 0 0;
+}
+div#wox-buttons-container a:hover{
+ background-position: bottom;
+ text-decoration: none;
+}
+div#wox-buttons-container a.selected{
+ background: url(../images/bgseltab.png) repeat-x left top;
+ color: #000;
+}
+div#wox-buttons-container a img{
+ float: left;
+ margin-right: 5px;
+}
+div#wox-buttons-container a span{
+ display: block;
+ float: right;
+ margin-top: 8px;
+}
+div#wox-buttons-container a.get{
+ display: block;
+ float: right;
+ padding: 0;
+ height: 50px;
+ margin: 0;
+ background: none;
+}
+
+div#wox-submenu-container{
+ min-height: 10px;
+ background: #D6DEE4;
+ overflow: hidden;
+ border-bottom: 1px solid #8CA2B3;
+ font-size: 0.9em;
+}
+div#wox-submenu-container div{
+ width: 970px;
+ margin: 0 auto;
+}
+div#wox-submenu-container a{
+ display: block;
+ padding: 10px 10px;
+ float: left;
+ color: #394A57;
+ border-right: 1px solid #8CA2B3;
+ border-left: 1px solid #EDF0F3;
+}
+div#wox-submenu-container a:hover{
+ background: #B4C2CD;
+ color: #000;
+ text-decoration: none;
+ border-left: 1px solid #B4C2CD;
+}
+div#wox-submenu-container a:first-child{
+ border-left: 0;
+}
+div#wox-submenu-container a:last-child{
+ border-right: 0;
+}
+
+/** Contents **/
+div#wox-contents{
+ overflow: hidden;
+ width: 970px;
+ margin: 10px auto 0 auto;
+}
+div#wox-rightblocks{
+ width: 300px;
+ float: right;
+ background: #ebebeb;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+ padding: 10px;
+}
+div#xoops-contents{
+ float: left;
+ width: 635px;
+ overflow: hidden;
+}
+div#wox-footer{
+ background: #D6DEE4;
+ padding: 20px 0;
+ border-top: 1px solid #8CA2B3;
+ margin-top: 20px;
+}
+div#wox-footer div.container{
+ overflow: hidden;
+ width: 970px;
+ margin: 0 auto;
+ color: #333;
+}
+div#wox-footer div.fcolumns{
+ width: 295px;
+ margin-right: 20px;
+ float: left;
+ padding: 0 15px 0 0
+}
+div#wox-footer div.fcolumns:last-child{
+ margin-right: 0;
+ width: 310px;
+ padding: 0;
+}
+div#wox-footer h3.block_title{
+ font-family: georgia, times, serif;
+ color: #0A5781;
+ font-size: 1.7em;
+ margin: 0 0 15px 0;
+ font-weight: normal;
+}
+div#wox-footer div.com_item{
+ font-size: 0.9em;
+ padding: 0px 0 10px 0;
+ margin-bottom: 10px;
+ border-bottom: 1px dotted #A3B5C2;
+}
+div#wox-footer div.com_item strong a{
+ font-size: 1.1em;
+ color: #000;
+}
+
+/** Pages Navigation **/
+div.pages_nav{
+ overflow: hidden;
+ margin-bottom: 15px;
+ padding: 5px 0;
+}
+div.pages_nav u{
+ text-decoration: none;
+ font-weight: bold;
+}
+div.pages_nav a, div.pages_nav strong{
+ display: block;
+ padding: 2px 6px;
+ float: left;
+ font-size: 1.1em;
+ background: #D6DEE4;
+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ margin-right: 1px;
+}
+div.pages_nav strong{
+ background: #ebebeb;
+ color: #333;
+}
+div.pages_nav a:hover{
+ background: #3f3f3f;
+ color: #FFF;
+ text-decoration: none;
}
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/css/forums.css
===================================================================
--- XoopsThemes/wox/trunk/css/forums.css 2009-08-31 14:16:34 UTC (rev 3538)
+++ XoopsThemes/wox/trunk/css/forums.css 2009-08-31 16:20:01 UTC (rev 3539)
@@ -1,232 +1,232 @@
-h1.title{
- font-family: georgia, times, serif;
- font-size: 2.2em;
- font-weight: normal;
- color: #333;
- margin: 0 0 3px 0;
- border-bottom: 2px solid #D6DEE4;
- padding: 0 0 5px 0;
-}
-h2.category_title{
- margin: 0 0 10px 0;
- color: #14655C;
- font-size: 1.3em;
- font-weight: bold;
-}
-h1.title a{ color: #3f3f3f; }
-h1.title span{
- display: block;
- float: right;
- font-size: 0.5em;
- font-family: arial, helvetica, sans-serif;
- padding: 14px 0 0 0;
- color: #666;
-}
-span.wox_start{
- display: block;
- margin-bottom: 10px;
- color: #3f3f3f;
- padding: 3px 0 0 3px;
-}
-div.wox_cbb_options{
- padding: 4px 0;
-}
-div.wox_cbb_options select{
- background: #D6DEE4;
- border: 1px solid #9BAEBD;
- -moz-border-radius: 5px;
- -khtml-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-div.wox_category_item{
- margin-top: 20px;
-}
-
-/** OUTER **/
-.cbb_forums th{
- background: #D6DEE4;
- color: #333;
- font-family: arial, helvetica, sans-serif;
-}
-.cbb_forums th:first-child{
- -moz-border-radius: 5px 0 0 0;
- -khtml-border-radius-topleft: 5px;
- -webkit-border-top-left-radius: 5px;
- border-radius: 5px 0 0 0;
-}
-.cbb_forums th:last-child{
- -moz-border-radius: 0 5px 0 0;
- -khtml-border-radius-topright: 5px;
- -webkit-border-top-right-radius: 5px;
- border-radius: 0 5px 0 0;
-}
-.cbb_forums tr td{
- padding: 8px 5px;
- border-bottom: 1px solid #D6DEE4;
-}
-.cbb_forums tbody tr:first-child td{
- border-top: 2px solid #D6DEE4;
-}
-.cbb_forums span.forum_desc{
- display: block;
- font-size: 0.9em;
- line-height: 140%;
-}
-hr{
- border: 0;
- height: 2px;
- background: #D6DEE4;
- margin-bottom: 10px;
-}
-div#cbb_location{
- text-transform: uppercase;
- font-size: 0.85em;
- border-bottom: 1px dotted #CCC;
- overflow: hidden;
-}
-div#cbb_location img{
- float: left;
- margin-right: 5px;
- padding-bottom: 3px;
-}
-span.topis_navigation{
- display: block;
- float: left;
- font-size: 0.85em;
- text-transform: uppercase;
- padding-top: 9px;
-}
-span.topis_navigation a{
- display: block;
- float: left;
- margin-right: 10px;
- padding: 2px 0 0 3px;
-}
-span.topis_navigation img{
- float: left;
- display: block;
- margin-right: 8px;
-}
-.border_bottom{
- border-bottom: 1px dotted #CCC;
-}
-
-/** Topic Posts **/
-div.forum_post_item{
- overflow: hidden;
-
- border: 1px solid #A9BAC7;
- padding: 1px;
-}
-div.post_title{
- padding: 5px;
- font-size: 1.1em;
- color: #000;
- font-weight: bold;
- overflow: hidden;
- background: #ebebeb;
- border: 1px solid #CCC;
- border-top: 1px solid #FFF;
- border-bottom: 1px solid #FFF;
- font-family: georgia, times, serif;
-}
-div.post_title_top{
- border-top: 1px solid #CCC;
- -moz-border-radius: 5px 5px 0 0;
- -khtml-border-radius-topleft: 5px;
- -khtml-border-radius-topright: 5px;
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- border-radius: 5px 5px 0 0;
-}
-div.post_title span{
- float: right;
-}
-div.post_title small{
- font-family: arial, helvetica, sans-serif;
- font-weight: normal;
- font-size: 0.8em;
- color: #333;
- text-transform: uppercase;
- float: right;
- display: block;
- margin-right: 10px;
- padding-top: 3px;
-}
-div.forum_post_item div.post_bg{
- background: #D6DEE4;
- overflow: hidden;
-}
-div.forum_post_item img.avatar{
- width: 50px;
- margin: 0 auto;
- padding: 1px;
- border: 1px solid #666;
- display: block;
- margin-bottom: 5px;
-}
-div.forum_post_item div.post_text{
- float: right;
- width: 500px;
- padding: 10px 10px 10px 15px;
- background: #FFF url(../images/bgtext.gif) no-repeat left;
- height: 100%;
- line-height: 150%;
-}
-div.forum_post_item div.post_text img{
- max-width: 495px;
-}
-div.forum_post_item div.post_data{
- width: 80px;
- float: left;
- margin: center;
- padding: 10px;
- text-align: center;
- border-right: none;
- background: transparent;
-}
-div.forum_post_item div.post_data a.show_more,
-div.forum_post_item div.post_data a.show_less{
- font-size: 0.9em;
-}
-div.forum_post_item div.post_data a.show_less{
- display: none;
-}
-div.forum_post_item div.post_data div.other_data{
- font-size: 0.9em;
- line-height: 140%;
- border-top: 1px dotted #666;
- border-bottom: 1px dotted #666;
- margin: 10px 0;
- text-align: left;
- display: none;
- padding: 5px 0;
-}
-#the_topic_posts div.forum_post_item:last-child{
- -moz-border-radius: 0 0 5px 5px;
- -khtml-border-radius-bottomleft: 5px;
- -khtml-border-radius-bottomright: 5px;
- -webkit-border-bottom-left-radius: 5px;
- -webkit-border-bottom-right-radius: 5px;
- border-radius: 0 0 5px 5px;
-}
-div.forum_post_item div.post_options{
- border-top: 1px solid #CCC;
- float: left;
- margin-top: 20px;
-}
-div.forum_post_item div.post_ip{
- text-align: right;
- margin-top: 20px;
- font-size: 0.9em;
-}
-div.forum_post_item div.post_signature{
- margin-top: 10px;
- font-size: 0.9em;
-}
-div.forum_post_item div.post_signature hr{
- background: transparent;
- border: 0;
- border-top: 1px dashed #B8C6CF;
+h1.title{
+ font-family: georgia, times, serif;
+ font-size: 2.2em;
+ font-weight: normal;
+ color: #333;
+ margin: 0 0 3px 0;
+ border-bottom: 2px solid #D6DEE4;
+ padding: 0 0 5px 0;
+}
+h2.category_title{
+ margin: 0 0 10px 0;
+ color: #14655C;
+ font-size: 1.3em;
+ font-weight: bold;
+}
+h1.title a{ color: #3f3f3f; }
+h1.title span{
+ display: block;
+ float: right;
+ font-size: 0.5em;
+ font-family: arial, helvetica, sans-serif;
+ padding: 14px 0 0 0;
+ color: #666;
+}
+span.wox_start{
+ display: block;
+ margin-bottom: 10px;
+ color: #3f3f3f;
+ padding: 3px 0 0 3px;
+}
+div.wox_cbb_options{
+ padding: 4px 0;
+}
+div.wox_cbb_options select{
+ background: #D6DEE4;
+ border: 1px solid #9BAEBD;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+div.wox_category_item{
+ margin-top: 20px;
+}
+
+/** OUTER **/
+.cbb_forums th{
+ background: #D6DEE4;
+ color: #333;
+ font-family: arial, helvetica, sans-serif;
+}
+.cbb_forums th:first-child{
+ -moz-border-radius: 5px 0 0 0;
+ -khtml-border-radius-topleft: 5px;
+ -webkit-border-top-left-radius: 5px;
+ border-radius: 5px 0 0 0;
+}
+.cbb_forums th:last-child{
+ -moz-border-radius: 0 5px 0 0;
+ -khtml-border-radius-topright: 5px;
+ -webkit-border-top-right-radius: 5px;
+ border-radius: 0 5px 0 0;
+}
+.cbb_forums tr td{
+ padding: 8px 5px;
+ border-bottom: 1px solid #D6DEE4;
+}
+.cbb_forums tbody tr:first-child td{
+ border-top: 2px solid #D6DEE4;
+}
+.cbb_forums span.forum_desc{
+ display: block;
+ font-size: 0.9em;
+ line-height: 140%;
+}
+hr{
+ border: 0;
+ height: 2px;
+ background: #D6DEE4;
+ margin-bottom: 10px;
+}
+div#cbb_location{
+ text-transform: uppercase;
+ font-size: 0.85em;
+ border-bottom: 1px dotted #CCC;
+ overflow: hidden;
+}
+div#cbb_location img{
+ float: left;
+ margin-right: 5px;
+ padding-bottom: 3px;
+}
+span.topis_navigation{
+ display: block;
+ float: left;
+ font-size: 0.85em;
+ text-transform: uppercase;
+ padding-top: 9px;
+}
+span.topis_navigation a{
+ display: block;
+ float: left;
+ margin-right: 10px;
+ padding: 2px 0 0 3px;
+}
+span.topis_navigation img{
+ float: left;
+ display: block;
+ margin-right: 8px;
+}
+.border_bottom{
+ border-bottom: 1px dotted #CCC;
+}
+
+/** Topic Posts **/
+div.forum_post_item{
+ overflow: hidden;
+
+ border: 1px solid #A9BAC7;
+ padding: 1px;
+}
+div.post_title{
+ padding: 5px;
+ font-size: 1.1em;
+ color: #000;
+ font-weight: bold;
+ overflow: hidden;
+ background: #ebebeb;
+ border: 1px solid #CCC;
+ border-top: 1px solid #FFF;
+ border-bottom: 1px solid #FFF;
+ font-family: georgia, times, serif;
+}
+div.post_title_top{
+ border-top: 1px solid #CCC;
+ -moz-border-radius: 5px 5px 0 0;
+ -khtml-border-radius-topleft: 5px;
+ -khtml-border-radius-topright: 5px;
+ -webkit-border-top-left-radius: 5px;
+ -webkit-border-top-right-radius: 5px;
+ border-radius: 5px 5px 0 0;
+}
+div.post_title span{
+ float: right;
+}
+div.post_title small{
+ font-family: arial, helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 0.8em;
+ color: #333;
+ text-transform: uppercase;
+ float: right;
+ display: block;
+ margin-right: 10px;
+ padding-top: 3px;
+}
+div.forum_post_item div.post_bg{
+ background: #D6DEE4;
+ overflow: hidden;
+}
+div.forum_post_item img.avatar{
+ width: 50px;
+ margin: 0 auto;
+ padding: 1px;
+ border: 1px solid #666;
+ display: block;
+ margin-bottom: 5px;
+}
+div.forum_post_item div.post_text{
+ float: right;
+ width: 500px;
+ padding: 10px 10px 10px 15px;
+ background: #FFF url(../images/bgtext.gif) no-repeat left;
+ height: 100%;
+ line-height: 150%;
+}
+div.forum_post_item div.post_text img{
+ max-width: 495px;
+}
+div.forum_post_item div.post_data{
+ width: 80px;
+ float: left;
+ margin: center;
+ padding: 10px;
+ text-align: center;
+ border-right: none;
+ background: transparent;
+}
+div.forum_post_item div.post_data a.show_more,
+div.forum_post_item div.post_data a.show_less{
+ font-size: 0.9em;
+}
+div.forum_post_item div.post_data a.show_less{
+ display: none;
+}
+div.forum_post_item div.post_data div.other_data{
+ font-size: 0.9em;
+ line-height: 140%;
+ border-top: 1px dotted #666;
+ border-bottom: 1px dotted #666;
+ margin: 10px 0;
+ text-align: left;
+ display: none;
+ padding: 5px 0;
+}
+#the_topic_posts div.forum_post_item:last-child{
+ -moz-border-radius: 0 0 5px 5px;
+ -khtml-border-radius-bottomleft: 5px;
+ -khtml-border-radius-bottomright: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ -webkit-border-bottom-right-radius: 5px;
+ border-radius: 0 0 5px 5px;
+}
+div.forum_post_item div.post_options{
+ border-top: 1px solid #CCC;
+ float: left;
+ margin-top: 20px;
+}
+div.forum_post_item div.post_ip{
+ text-align: right;
+ margin-top: 20px;
+ font-size: 0.9em;
+}
+div.forum_post_item div.post_signature{
+ margin-top: 10px;
+ font-size: 0.9em;
+}
+div.forum_post_item div.post_signature hr{
+ background: transparent;
+ border: 0;
+ border-top: 1px dashed #B8C6CF;
}
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/css/general.css
===================================================================
--- XoopsThemes/wox/trunk/css/general.css 2009-08-31 14:16:34 UTC (rev 3538)
+++ XoopsThemes/wox/trunk/css/general.css 2009-08-31 16:20:01 UTC (rev 3539)
@@ -1,233 +1,233 @@
-a{
- color: #14655C;
- text-decoration: none;
-}
-a:hover{
- color: #FF3300;
- text-decoration: underline;
-}
-a img{
- border: 0;
-}
-
-input[type='text'],input[type='password'], select,textarea{
- padding: 3px;
- font-family: georgia, times, serif;
- color: #333;
- border: 1px solid #CCC;
-}
-input[type='submit'],input[type='button']{
- background: #D6DEE4;
- border: 1px outset #A9BAC7;
- padding: 2px 6px;
- -moz-border-radius: 5px;
- -khtml-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-input.formButton{
- font-weight: bold;
-}
-
-/**
-* Theme styles
-*/
-#xt-no-script{
- background: #D6DEE4;
- color: #CC0000;
- text-align: center;
- padding: 3px;
- font-size: 0.85em;
-}
-
-/* Login Links */
-div#top-links-container{
- overflow: hidden;
- width: 950px;
- margin: 0 auto;
- height: 32px;
-}
-div#top-links-container div.login_links{
- float: right;
- background: #D6DEE4;
- height: 22px;
- text-align: center;
- font-size: 0.9em;
- padding: 4px 15px 6px 5px;
- color: #213A4E;
- -moz-border-radius: 0 0 8px 8px;
- -khtml-border-radius-bottomleft: 8px;
- -khtml-border-radius-bottomright: 8px;
- -webkit-border-bottom-left-radius: 8px;
- -webkit-border-bottom-right-radius: 8px;
- border-radius: 0 0 8px 8px;
-}
-div.login_links div.wox_search{
- float: left;
- border: 1px solid #CCC;
- overflow: hidden;
- background: #FFF;
- -moz-border-radius: 8px;
- -khtml-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- padding-right: 5px;
-}
-div.login_links input[type='text'],
-div.login_links input[type='password']{
- border: 0;
- background: #FFF;
- width: 130px;
- padding: 3px;
- -moz-border-radius: 8px;
- -khtml-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- color: #666;
-}
-div.login_links input[type='submit']{
- display: block;
- float: right;
- border: 0;
- background: #D6DEE4;
- text-decoration: underline;
- color: #213A4E;
- cursor: pointer;
-}
-div.login_links div.wox_search img{
- cursor: pointer;
- float: right;
- padding-top: 4px;
-}
-div.login_links div.the_links{
- float: right;
- padding: 4px 0 0 10px;
-}
-div#top-links-container a{
- color: #213A4E;
- text-decoration: none;
-}
-div#top-links-container a:hover{
- text-decoration: underline;
-}
-div#top-links-container span.icons{
- display: block;
- float: right;
- margin-left: 5px;
- margin-top: -1px;
-}
-
-
-
-
-/* XOOPS Generals */
-.outer{
- border: 0;
- width: 100%;
-}
-.even, tr.even td,
-.odd, tr.odd td{
- padding: 3px;
- vertical-align: top;
- border-bottom: 1px dotted #ccc;
-}
-.even, .odd{
- border-bottom: 0;
-}
-tr.even:hover, tr.odd:hover{
- background: #ebebeb;
-}
-.head{
- font-weight: bold;
- padding: 3px;
-}
-th{
- font-weight: bold;
- color: #333;
- padding: 4px;
- font-size: 1.1em;
- font-family: georgia, times, serif;
- border-bottom: 2px solid #D6DEE4;
-}
-tr.head td{
- font-weight: bold;
- color: #333;
- border-bottom: 1px dotted #D6DEE4;
-}
-
-/* ANNOUNCEMENT */
-div#wox-announcement{
- width: 950px;
- margin: 0 auto;
- position: absolute;
- display: none;
- left: 50%;
- top: 0;
- margin-left: -475px;
- background: #FFFFC0;
- border: 1px solid #FD9731;
- border-top: 0;
- padding: 10px 5px;
- text-align: center;
- -moz-border-radius: 0 0 5px 5px;
- -khtml-border-radius-topleft: 0;
- -khtml-border-radius-topright: 0;
- -khtml-border-radius-bottomright: 5px;
- -khtml-border-radius-bottomleft: 5px;
- -webkit-border-top-left-radius: 0;
- -webkit-border-top-right-radius: 0;
- -webkit-border-bottom-left-radius: 5px;
- -webkit-border-bottom-right-radius: 5px;
- border-radius: 0 0 5px 5px;
- color: #000;
- font-weight: bold;
-}
-div#wox-announcement img.close{
- float: right;
- margin: 0 0 0 5px;
- cursor: pointer;
-}
-
-div.comform{
- padding: 4px 0;
- text-align: center;
-}
-
-/** XOOPS Comments **/
-div.wox_com_item{
- overflow: hidden;
- margin-bottom: 10px;
- padding: 10px;
- border: 1px dotted #D6DEE4;
- border-right: none;
- border-left: none;
-}
-div.wox_com_item div.user_data{
- width: 90px;
- padding: 10px 10px 10px 0;
- float: left;
- text-align: center;
- background: #D6DEE4 url(../images/bgdata.png) no-repeat right;
- -moz-border-radius: 5px;
- -khtml-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-div.wox_com_item div.com_com{
- line-height: 150%;
- float: right;
- width: 470px;
- padding: 10px;
-}
-div.wox_com_item div.com_com div{
- font-size: 0.9em;
- line-height: 100%;
-}
-div.wox_com_item div.com_com div.com_date{
- font-size: 0.85em;
-}
-div.wox_com_item div.com_com div.com_date span{
- font-family: georgia, times, serif;
- font-size: 1.1em;
- color: #333;
+a{
+ color: #14655C;
+ text-decoration: none;
+}
+a:hover{
+ color: #FF3300;
+ text-decoration: underline;
+}
+a img{
+ border: 0;
+}
+
+input[type='text'],input[type='password'], select,textarea{
+ padding: 3px;
+ font-family: georgia, times, serif;
+ color: #333;
+ border: 1px solid #CCC;
+}
+input[type='submit'],input[type='button']{
+ background: #D6DEE4;
+ border: 1px outset #A9BAC7;
+ padding: 2px 6px;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+input.formButton{
+ font-weight: bold;
+}
+
+/**
+* Theme styles
+*/
+#xt-no-script{
+ background: #D6DEE4;
+ color: #CC0000;
+ text-align: center;
+ padding: 3px;
+ font-size: 0.85em;
+}
+
+/* Login Links */
+div#top-links-container{
+ overflow: hidden;
+ width: 950px;
+ margin: 0 auto;
+ height: 32px;
+}
+div#top-links-container div.login_links{
+ float: right;
+ background: #D6DEE4;
+ height: 22px;
+ text-align: center;
+ font-size: 0.9em;
+ padding: 4px 15px 6px 5px;
+ color: #213A4E;
+ -moz-border-radius: 0 0 8px 8px;
+ -khtml-border-radius-bottomleft: 8px;
+ -khtml-border-radius-bottomright: 8px;
+ -webkit-border-bottom-left-radius: 8px;
+ -webkit-border-bottom-right-radius: 8px;
+ border-radius: 0 0 8px 8px;
+}
+div.login_links div.wox_search{
+ float: left;
+ border: 1px solid #CCC;
+ overflow: hidden;
+ background: #FFF;
+ -moz-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ padding-right: 5px;
+}
+div.login_links input[type='text'],
+div.login_links input[type='password']{
+ border: 0;
+ background: #FFF;
+ width: 130px;
+ padding: 3px;
+ -moz-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ color: #666;
+}
+div.login_links input[type='submit']{
+ display: block...
[truncated message content] |
|
From: <tr...@us...> - 2009-08-31 14:16:42
|
Revision: 3538
http://xoops.svn.sourceforge.net/xoops/?rev=3538&view=rev
Author: trabis
Date: 2009-08-31 14:16:34 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Formating code for xoops standards
Modified Paths:
--------------
XoopsCore/trunk/htdocs/admin.php
XoopsCore/trunk/htdocs/backend.php
XoopsCore/trunk/htdocs/banners.php
XoopsCore/trunk/htdocs/class/database/databasefactory.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php
XoopsCore/trunk/htdocs/class/xoopssecurity.php
XoopsCore/trunk/htdocs/edituser.php
XoopsCore/trunk/htdocs/footer.php
XoopsCore/trunk/htdocs/header.php
XoopsCore/trunk/htdocs/imagemanager.php
XoopsCore/trunk/htdocs/include/common.php
XoopsCore/trunk/htdocs/include/defines.php
XoopsCore/trunk/htdocs/include/functions.legacy.php
XoopsCore/trunk/htdocs/include/functions.php
XoopsCore/trunk/htdocs/index.php
XoopsCore/trunk/htdocs/lostpass.php
XoopsCore/trunk/htdocs/misc.php
XoopsCore/trunk/htdocs/notifications.php
XoopsCore/trunk/htdocs/pda.php
XoopsCore/trunk/htdocs/pmlite.php
XoopsCore/trunk/htdocs/readpmsg.php
XoopsCore/trunk/htdocs/register.php
XoopsCore/trunk/htdocs/search.php
XoopsCore/trunk/htdocs/user.php
XoopsCore/trunk/htdocs/userinfo.php
XoopsCore/trunk/htdocs/viewpmsg.php
XoopsCore/trunk/htdocs/xmlrpc.php
Modified: XoopsCore/trunk/htdocs/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/admin.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/admin.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -27,7 +27,7 @@
* Admin Authentication
*/
if ($xoopsUser) {
- if (! $xoopsUser->isAdmin(-1)) {
+ if (!$xoopsUser->isAdmin(-1)) {
redirect_header('index.php', 2, _AD_NORIGHT);
exit();
}
@@ -75,7 +75,7 @@
echo '<br />';
}
-if (! empty($_GET['xoopsorgnews'])) {
+if (!empty($_GET['xoopsorgnews'])) {
// Multiple feeds
$myts =& MyTextSanitizer::getInstance();
$rssurl = array();
@@ -87,7 +87,7 @@
$rssfile = 'adminnews-' . xoops_getConfigOption('language');
xoops_load('cache');
$items = array();
- if (! $items = XoopsCache::read($rssfile)) {
+ if (!$items = XoopsCache::read($rssfile)) {
require_once $GLOBALS['xoops']->path('class/snoopy.php');
include_once $GLOBALS['xoops']->path('class/xml/rss/xmlrss2parser.php');
@@ -101,7 +101,7 @@
if (false != $rss2parser->parse()) {
$_items = $rss2parser->getItems();
$count = count($_items);
- for($i = 0; $i < $count; $i ++) {
+ for ($i = 0; $i < $count; $i ++) {
$_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
$_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
$items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
@@ -125,7 +125,7 @@
$ret .= ' <a href="' . htmlspecialchars($items[$i]['guid']) . '" rel="external">' . _MORE . '</a>';
}
$ret .= '</td></tr>';
- } elseif ($items[$i]['guid'] != "") {
+ } else if ($items[$i]['guid'] != "") {
$ret .= '<tr><td class="even" valign="top"></td><td colspan="2" class="odd"><a href="' . htmlspecialchars($items[$i]['guid']) . '" rel="external">' . _MORE . '</a></td></tr>';
}
}
Modified: XoopsCore/trunk/htdocs/backend.php
===================================================================
--- XoopsCore/trunk/htdocs/backend.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/backend.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -31,7 +31,7 @@
$tpl = new XoopsTpl();
$tpl->xoops_setCaching(2);
$tpl->xoops_setCacheTime(3600);
-if (! $tpl->is_cached('db:system_rss.html')) {
+if (!$tpl->is_cached('db:system_rss.html')) {
xoops_load('XoopsLocal');
$tpl->assign('channel_title', XoopsLocal::convert_encoding(htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
$tpl->assign('channel_link', XOOPS_URL . '/');
@@ -60,7 +60,7 @@
include $fileinc;
$sarray = NewsStory::getAllPublished(10, 0, true);
}
- if (! empty($sarray) && is_array($sarray)) {
+ if (!empty($sarray) && is_array($sarray)) {
foreach ($sarray as $story) {
$tpl->append('items', array(
'title' => XoopsLocal::convert_encoding(htmlspecialchars($story->title(), ENT_QUOTES)) ,
Modified: XoopsCore/trunk/htdocs/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/banners.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/banners.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -108,7 +108,7 @@
$result = $xoopsDB->query(sprintf("SELECT cid, name, passwd FROM %s WHERE login=%s", $xoopsDB->prefix("bannerclient"), $xoopsDB->quoteString($_SESSION['banner_login'])));
list ($cid, $name, $passwd) = $xoopsDB->fetchRow($result);
if ($_SESSION['banner_pass'] == $passwd) {
- include "header.php";
+ include $GLOBALS['xoops']->path('header.php');
$GLOBALS["xoTheme"]->addStylesheet(null, null, '
#bannerstats {}
#bannerstats td {
@@ -164,7 +164,7 @@
if ($numrows > 1) {
echo "<br />";
}
- if (! empty($htmlbanner) && ! empty($htmlcode)) {
+ if (!empty($htmlbanner) && !empty($htmlcode)) {
echo $myts->displayTarea($htmlcode);
} else {
if (strtolower(substr($imageurl, strrpos($imageurl, "."))) == ".swf") {
@@ -173,17 +173,17 @@
echo "<param name='quality' value='high' />";
echo "</object>";
} else {
- echo "<img src='$imageurl' alt='' />";
+ echo "<img src='{$imageurl}' alt='' />";
}
}
echo "<br /><strong>" . _BANNERS_ID . $bid . "</strong><br />" . sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&cid=' . $cid . '&bid=' . $bid) . "<br />";
- if (! $htmlbanner) {
+ if (!$htmlbanner) {
$clickurl = htmlspecialchars($clickurl, ENT_QUOTES);
echo sprintf(_BANNERS_POINTS, $clickurl) . "<br />
<form action='banners.php' method='post'>" . _BANNERS_URL . "
- <input type='text' name='url' size='50' maxlength='200' value='$clickurl' />
- <input type='hidden' name='bid' value='$bid' />
- <input type='hidden' name='cid' value='$cid' />
+ <input type='text' name='url' size='50' maxlength='200' value='{$clickurl}' />
+ <input type='hidden' name='bid' value='{$bid}' />
+ <input type='hidden' name='cid' value='{$cid}' />
<input type='submit' name='op' value='" . _BANNERS_CHANGE . "' />" . $GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_EDIT") . "</form>";
}
}
@@ -207,17 +207,17 @@
while (list ($bid, $impressions, $clicks, $datestart, $dateend) = $xoopsDB->fetchRow($result)) {
$percent = substr(100 * $clicks / $impressions, 0, 5);
$class = ($i % 2 == 0) ? 'even' : 'odd';
- echo "<tbody><tr class='$class'>
- <td>$bid</td>
- <td>$impressions</td>
- <td>$clicks</td>
- <td>$percent%</td>
+ echo "<tbody><tr class='{$class}'>
+ <td>{$bid}</td>
+ <td>{$impressions}</td>
+ <td>{$clicks}</td>
+ <td>{$percent}%</td>
<td>" . formatTimestamp($datestart) . "</td>
<td>" . formatTimestamp($dateend) . "</td></tr></tbody>";
}
echo "</table></div>";
}
- include "footer.php";
+ include $GLOBALS['xoops']->path('footer.php');
} else {
redirect_header("banners.php", 2);
exit();
@@ -319,24 +319,24 @@
}
$op = '';
-if (! empty($_POST['op'])) {
+if (!empty($_POST['op'])) {
$op = $_POST['op'];
-} elseif (! empty($_GET['op'])) {
+} elseif (!empty($_GET['op'])) {
$op = $_GET['op'];
}
-$myts = & MyTextSanitizer::getInstance();
+$myts =& MyTextSanitizer::getInstance();
switch ($op) {
case "click":
$bid = 0;
- if (! empty($_GET['bid'])) {
+ if (!empty($_GET['bid'])) {
$bid = intval($_GET['bid']);
}
clickbanner($bid);
break;
case "Ok":
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- if (! $GLOBALS['xoopsSecurity']->check(true, false, "BANNER_LOGIN")) {
+ if (!$GLOBALS['xoopsSecurity']->check(true, false, "BANNER_LOGIN")) {
redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
@@ -347,28 +347,28 @@
bannerstats();
break;
case _BANNERS_CHANGE:
- if (! $GLOBALS['xoopsSecurity']->check(true, false, "BANNER_EDIT")) {
+ if (!$GLOBALS['xoopsSecurity']->check(true, false, "BANNER_EDIT")) {
redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
$bid = $cid = 0;
- if (! empty($_POST['url'])) {
+ if (!empty($_POST['url'])) {
$url = $myts->stripslashesGPC(trim($_POST['url']));
}
- if (! empty($_POST['bid'])) {
+ if (!empty($_POST['bid'])) {
$bid = intval($_POST['bid']);
}
- if (! empty($_POST['cid'])) {
+ if (!empty($_POST['cid'])) {
$cid = intval($_POST['cid']);
}
change_banner_url_by_client($cid, $bid, $url);
break;
case "EmailStats":
$bid = $cid = 0;
- if (! empty($_GET['bid'])) {
+ if (!empty($_GET['bid'])) {
$bid = intval($_GET['bid']);
}
- if (! empty($_GET['cid'])) {
+ if (!empty($_GET['cid'])) {
$cid = intval($_GET['cid']);
}
EmailStats($cid, $bid);
Modified: XoopsCore/trunk/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/trunk/htdocs/class/database/databasefactory.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/database/databasefactory.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -56,13 +56,13 @@
if (! isset($instance)) {
if (file_exists($file = XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php')) {
require_once $file;
- if (! defined('XOOPS_DB_PROXY')) {
+ if (!defined('XOOPS_DB_PROXY')) {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseSafe';
} else {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
}
- $instance = &new $class();
- $instance->setLogger(XoopsLogger::instance());
+ $instance =& new $class();
+ $instance->setLogger(XoopsLogger::getInstance());
$instance->setPrefix(XOOPS_DB_PREFIX);
if (! $instance->connect()) {
trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
@@ -88,7 +88,7 @@
if (! isset($database)) {
if (file_exists($file = XOOPS_ROOT_PATH . '/class/database/' . XOOPS_DB_TYPE . 'database.php')) {
include_once $file;
- if (! defined('XOOPS_DB_PROXY')) {
+ if (!defined('XOOPS_DB_PROXY')) {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseSafe';
} else {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
@@ -102,4 +102,4 @@
}
}
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -58,13 +58,13 @@
return $comp->_syntax_error("foreachq: missing 'item' attribute", E_USER_ERROR, __FILE__, __LINE__);
}
$item = $comp->_dequote($attrs['item']);
- if (! preg_match('~^\w+$~', $item)) {
+ if (!preg_match('~^\w+$~', $item)) {
return $comp->_syntax_error("'foreachq: item' must be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
}
if (isset($attrs['key'])) {
$key = $comp->_dequote($attrs['key']);
- if (! preg_match('~^\w+$~', $key)) {
+ if (!preg_match('~^\w+$~', $key)) {
return $comp->_syntax_error("foreachq: 'key' must to be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
}
$key_part = "\$this->_tpl_vars['$key'] => ";
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -4,7 +4,7 @@
{
global $xoopsUser;
- if (! isset($xoopsUser) || ! is_object($xoopsUser)) {
+ if (!isset($xoopsUser) || !is_object($xoopsUser)) {
return;
}
$time = time();
@@ -22,7 +22,7 @@
$_SESSION['xoops_inbox_count'] = $count;
$_SESSION['xoops_inbox_count_expire'] = $time + 60;
}
- if (! @empty( $params['assign'] ) ) {
+ if (!@empty( $params['assign'])) {
$smarty->assign( $params['assign'], $count );
} else {
echo $count;
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -13,7 +13,7 @@
{
global $xoops;
- extract( $params );
+ extract($params);
if ($pageSize < 1) {
$pageSize = 10;
}
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -79,14 +79,14 @@
// Get default module/page from current ones if necessary
$module = '';
$page = '';
- if (! isset($params['module'])) {
+ if (!isset($params['module'])) {
if (isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule'])) {
$module = $GLOBALS['xoopsModule']->getVar('dirname');
}
} else {
$module = $params['module'];
}
- if (! isset($params['page'])) {
+ if (!isset($params['page'])) {
$cur = $_SERVER['PHP_SELF'];
$page = substr($cur, strrpos($cur, '/') + 1);
} else {
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -10,7 +10,7 @@
*/
function smarty_resource_db_source($tpl_name, &$tpl_source, &$smarty)
{
- if (! $tpl = smarty_resource_db_tplinfo($tpl_name)) {
+ if (!$tpl = smarty_resource_db_tplinfo($tpl_name)) {
return false;
}
if (is_object($tpl)) {
@@ -25,7 +25,7 @@
function smarty_resource_db_timestamp($tpl_name, &$tpl_timestamp, &$smarty)
{
- if (! $tpl = smarty_resource_db_tplinfo($tpl_name)) {
+ if (!$tpl = smarty_resource_db_tplinfo($tpl_name)) {
return false;
}
if (is_object($tpl)) {
@@ -56,7 +56,7 @@
return $cache[$tpl_name];
}
$tplset = $xoopsConfig['template_set'];
- $theme = isset( $xoopsConfig['theme_set'] ) ? $xoopsConfig['theme_set'] : 'default';
+ $theme = isset($xoopsConfig['theme_set']) ? $xoopsConfig['theme_set'] : 'default';
$tplfile_handler =& xoops_gethandler('tplfile');
// If we're not using the "default" template set, then get the templates from the DB
@@ -69,7 +69,7 @@
// If we'using the default tplset, get the template from the filesystem
$tplobj = $tplfile_handler->find("default", null, null, null, $tpl_name, true);
- if (! count($tplobj)) {
+ if (!count($tplobj)) {
return $cache[$tpl_name] = false;
}
$tplobj = $tplobj[0];
@@ -78,10 +78,10 @@
$blockpath = ($type == 'block') ? 'blocks/' : '';
// First, check for an overloaded version within the theme folder
$filepath = XOOPS_THEME_PATH . "/{$theme}/modules/{$module}/{$blockpath}{$tpl_name}";
- if (! file_exists($filepath)) {
+ if (!file_exists($filepath)) {
// If no custom version exists, get the tpl from its default location
$filepath = XOOPS_ROOT_PATH . "/modules/{$module}/templates/{$blockpath}{$tpl_name}";
- if (! file_exists($filepath)) {
+ if (!file_exists($filepath)) {
return $cache[$tpl_name] = $tplobj ;
}
}
Modified: XoopsCore/trunk/htdocs/class/xoopssecurity.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopssecurity.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/class/xoopssecurity.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -123,7 +123,7 @@
}
}
}
- if (! $validFound) {
+ if (!$validFound) {
$xoopsLogger->addExtra('Token Validation', 'No valid token found');
}
$this->garbageCollection($name);
@@ -149,7 +149,7 @@
**/
function filterToken($token)
{
- return (! empty($token['expire']) && $token['expire'] >= time());
+ return (!empty($token['expire']) && $token['expire'] >= time());
}
/**
@@ -241,7 +241,7 @@
global $xoopsConfig;
if ($xoopsConfig['enable_badips'] == 1 && isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != '') {
foreach($xoopsConfig['bad_ips'] as $bi) {
- if (! empty($bi) && preg_match('/' . $bi . '/', $_SERVER['REMOTE_ADDR'])) {
+ if (!empty($bi) && preg_match('/' . $bi . '/', $_SERVER['REMOTE_ADDR'])) {
exit();
}
}
@@ -258,7 +258,7 @@
**/
function getTokenHTML($name = 'XOOPS_TOKEN')
{
- require_once (XOOPS_ROOT_PATH . '/class/xoopsformloader.php');
+ require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
$token = new XoopsFormHiddenToken($name);
return $token->render();
}
@@ -282,12 +282,12 @@
*/
function &getErrors($ashtml = false)
{
- if (! $ashtml) {
+ if (!$ashtml) {
return $this->errors;
} else {
$ret = '';
if (count($this->errors) > 0) {
- foreach($this->errors as $error) {
+ foreach ($this->errors as $error) {
$ret .= $error . '<br />';
}
}
@@ -295,4 +295,4 @@
}
}
}
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/edituser.php
===================================================================
--- XoopsCore/trunk/htdocs/edituser.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/edituser.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -44,14 +44,14 @@
$config_handler =& xoops_gethandler('config');
$xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
-$myts = & MyTextSanitizer::getInstance();
+$myts =& MyTextSanitizer::getInstance();
if ($op == 'saveuser') {
- if (! $GLOBALS['xoopsSecurity']->check()) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('index.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
$uid = 0;
- if (! empty($_POST['uid'])) {
+ if (!empty($_POST['uid'])) {
$uid = intval($_POST['uid']);
}
if (empty($uid) || $xoopsUser->getVar('uid') != $uid) {
@@ -61,7 +61,7 @@
$errors = array();
if ($xoopsConfigUser['allow_chgmail'] == 1) {
$email = '';
- if (! empty($_POST['email'])) {
+ if (!empty($_POST['email'])) {
$email = $myts->stripSlashesGPC(trim($_POST['email']));
}
if ($email == '' || ! checkEmail($email)) {
@@ -69,7 +69,7 @@
}
}
$password = '';
- if (! empty($_POST['password'])) {
+ if (!empty($_POST['password'])) {
$password = $myts->stripSlashesGPC(trim($_POST['password']));
}
if ($password != '') {
@@ -77,7 +77,7 @@
$errors[] = sprintf(_US_PWDTOOSHORT, $xoopsConfigUser['minpass']);
}
$vpass = '';
- if (! empty($_POST['vpass'])) {
+ if (!empty($_POST['vpass'])) {
$vpass = $myts->stripSlashesGPC(trim($_POST['vpass']));
}
if ($password != $vpass) {
@@ -87,14 +87,14 @@
if (count($errors) > 0) {
include $GLOBALS['xoops']->path('header.php');
echo '<div>';
- foreach($errors as $er) {
+ foreach ($errors as $er) {
echo '<span style="color: #ff0000; font-weight: bold;">' . $er . '</span><br />';
}
echo '</div><br />';
$op = 'editprofile';
} else {
- $member_handler = & xoops_gethandler('member');
- $edituser = & $member_handler->getUser($uid);
+ $member_handler =& xoops_gethandler('member');
+ $edituser =& $member_handler->getUser($uid);
$edituser->setVar('name', $_POST['name']);
if ($xoopsConfigUser['allow_chgmail'] == 1) {
$edituser->setVar('email', $email, true);
@@ -103,7 +103,7 @@
$edituser->setVar('user_icq', $_POST['user_icq']);
$edituser->setVar('user_from', $_POST['user_from']);
$edituser->setVar('user_sig', xoops_substr($_POST['user_sig'], 0, 255));
- $user_viewemail = (! empty($_POST['user_viewemail'])) ? 1 : 0;
+ $user_viewemail = (!empty($_POST['user_viewemail'])) ? 1 : 0;
$edituser->setVar('user_viewemail', $user_viewemail);
$edituser->setVar('user_aim', $_POST['user_aim']);
$edituser->setVar('user_yim', $_POST['user_yim']);
@@ -111,7 +111,7 @@
if ($password != '') {
$edituser->setVar('pass', md5($password), true);
}
- $attachsig = (! empty($_POST['attachsig'])) ? 1 : 0;
+ $attachsig = (!empty($_POST['attachsig'])) ? 1 : 0;
$edituser->setVar('attachsig', $attachsig);
$edituser->setVar('timezone_offset', $_POST['timezone_offset']);
$edituser->setVar('uorder', $_POST['uorder']);
@@ -122,7 +122,7 @@
$edituser->setVar('user_occ', $_POST['user_occ']);
$edituser->setVar('user_intrest', $_POST['user_intrest']);
$edituser->setVar('user_mailok', $_POST['user_mailok']);
- if (! empty($_POST['usecookie'])) {
+ if (!empty($_POST['usecookie'])) {
setcookie($xoopsConfig['usercookie'], $xoopsUser->getVar('uname'), time() + 31536000, '/', XOOPS_COOKIE_DOMAIN);
} else {
setcookie($xoopsConfig['usercookie']);
@@ -246,12 +246,12 @@
include $GLOBALS['xoops']->path('header.php');
echo '<a href="userinfo.php?uid=' . $xoopsUser->getVar('uid') . '">' . _US_PROFILE . '</a> <span style="font-weight:bold;">»»</span> ' . _US_UPLOADMYAVATAR . '<br /><br />';
$oldavatar = $xoopsUser->getVar('user_avatar');
- if (! empty($oldavatar) && $oldavatar != 'blank.gif') {
+ if (!empty($oldavatar) && $oldavatar != 'blank.gif') {
echo '<div style="text-align:center;"><h4 style="color:#ff0000; font-weight:bold;">' . _US_OLDDELETED . '</h4>';
echo '<img src="' . XOOPS_UPLOAD_URL . '/' . $oldavatar . '" alt="" /></div>';
}
if ($xoopsConfigUser['avatar_allow_upload'] == 1 && $xoopsUser->getVar('posts') >= $xoopsConfigUser['avatar_minposts']) {
- include_once 'class/xoopsformloader.php';
+ include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
$form = new XoopsThemeForm(_US_UPLOADMYAVATAR, 'uploadavatar', 'edituser.php', 'post', true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement(new XoopsFormLabel(_US_MAXPIXEL, $xoopsConfigUser['avatar_width'] . ' x ' . $xoopsConfigUser['avatar_height']));
@@ -262,7 +262,7 @@
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
$form->display();
}
- $avatar_handler = & xoops_gethandler('avatar');
+ $avatar_handler =& xoops_gethandler('avatar');
$form2 = new XoopsThemeForm(_US_CHOOSEAVT, 'uploadavatar', 'edituser.php', 'post', true);
$avatar_select = new XoopsFormSelect('', 'user_avatar', $xoopsUser->getVar('user_avatar'));
$avatar_list = $avatar_handler->getList('S');
@@ -283,16 +283,16 @@
}
if ($op == 'avatarupload') {
- if (! $GLOBALS['xoopsSecurity']->check()) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('index.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
$xoops_upload_file = array();
$uid = 0;
- if (! empty($_POST['xoops_upload_file']) && is_array($_POST['xoops_upload_file'])) {
+ if (!empty($_POST['xoops_upload_file']) && is_array($_POST['xoops_upload_file'])) {
$xoops_upload_file = $_POST['xoops_upload_file'];
}
- if (! empty($_POST['uid'])) {
+ if (!empty($_POST['uid'])) {
$uid = intval($_POST['uid']);
}
if (empty($uid) || $xoopsUser->getVar('uid') != $uid) {
@@ -317,7 +317,7 @@
$avatar->setVar('avatar_mimetype', $uploader->getMediaType());
$avatar->setVar('avatar_display', 1);
$avatar->setVar('avatar_type', 'C');
- if (! $avt_handler->insert($avatar)) {
+ if (!$avt_handler->insert($avatar)) {
@unlink($uploader->getSavedDestination());
} else {
$oldavatar = $xoopsUser->getVar('user_avatar');
@@ -343,12 +343,12 @@
}
if ($op == 'avatarchoose') {
- if (! $GLOBALS['xoopsSecurity']->check()) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('index.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
$uid = 0;
- if (! empty($_POST['uid'])) {
+ if (!empty($_POST['uid'])) {
$uid = intval($_POST['uid']);
}
if (empty($uid) || $xoopsUser->getVar('uid') != $uid) {
@@ -357,12 +357,12 @@
}
$user_avatar = '';
$avt_handler =& xoops_gethandler('avatar');
- if (! empty($_POST['user_avatar'])) {
+ if (!empty($_POST['user_avatar'])) {
$user_avatar = $myts->addSlashes(trim($_POST['user_avatar']));
$criteria_avatar = new CriteriaCompo(new Criteria('avatar_file', $user_avatar));
$criteria_avatar->add(new Criteria('avatar_type', "S"));
$avatars = $avt_handler->getObjects($criteria_avatar);
- if (! is_array($avatars) || ! count($avatars)) {
+ if (!is_array($avatars) || ! count($avatars)) {
$user_avatar = 'blank.gif';
}
unset($avatars, $criteria_avatar);
@@ -372,7 +372,7 @@
$oldavatar = $xoopsUser->getVar('user_avatar');
$xoopsUser->setVar('user_avatar', $user_avatar);
$member_handler =& xoops_gethandler('member');
- if (! $member_handler->insertUser($xoopsUser)) {
+ if (!$member_handler->insertUser($xoopsUser)) {
include $GLOBALS['xoops']->path('header.php');
echo $xoopsUser->getHtmlErrors();
include $GLOBALS['xoops']->path('footer.php');
@@ -380,7 +380,7 @@
}
if ($oldavatar && preg_match("/^cavt/", strtolower($oldavatar))) {
$avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
- if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
+ if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
$avt_handler->delete($avatars[0]);
$oldavatar_path = str_replace("\\", "/", realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar));
if (0 === strpos($oldavatar_path, XOOPS_UPLOAD_PATH) && is_file($oldavatar_path)) {
Modified: XoopsCore/trunk/htdocs/footer.php
===================================================================
--- XoopsCore/trunk/htdocs/footer.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/footer.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -55,7 +55,7 @@
//@internal: using global $xoTheme dereferences the variable in old versions, this does not
if (!isset($xoTheme)) {
- $xoTheme = & $GLOBALS['xoTheme'];
+ $xoTheme =& $GLOBALS['xoTheme'];
}
if (isset($xoopsOption['template_main']) && $xoopsOption['template_main'] != $xoTheme->contentTemplate) {
Modified: XoopsCore/trunk/htdocs/header.php
===================================================================
--- XoopsCore/trunk/htdocs/header.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/header.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -78,23 +78,23 @@
}
if (@is_object($xoTheme->plugins['xos_logos_PageBuilder'])) {
- $aggreg = & $xoTheme->plugins['xos_logos_PageBuilder'];
+ $aggreg =& $xoTheme->plugins['xos_logos_PageBuilder'];
// Backward compatibility code for pre 2.0.14 themes
$xoopsTpl->assign_by_ref('xoops_lblocks', $aggreg->blocks['canvas_left']);
$xoopsTpl->assign_by_ref('xoops_rblocks', $aggreg->blocks['canvas_right']);
$xoopsTpl->assign_by_ref('xoops_ccblocks', $aggreg->blocks['page_topcenter']);
$xoopsTpl->assign_by_ref('xoops_clblocks', $aggreg->blocks['page_topleft']);
$xoopsTpl->assign_by_ref('xoops_crblocks', $aggreg->blocks['page_topright']);
- $xoopsTpl->assign('xoops_showlblock', ! empty($aggreg->blocks['canvas_left']));
- $xoopsTpl->assign('xoops_showrblock', ! empty($aggreg->blocks['canvas_right']));
- $xoopsTpl->assign('xoops_showcblock', ! empty($aggreg->blocks['page_topcenter']) || ! empty($aggreg->blocks['page_topleft']) || ! empty($aggreg->blocks['page_topright']));
+ $xoopsTpl->assign('xoops_showlblock', !empty($aggreg->blocks['canvas_left']));
+ $xoopsTpl->assign('xoops_showrblock', !empty($aggreg->blocks['canvas_right']));
+ $xoopsTpl->assign('xoops_showcblock', !empty($aggreg->blocks['page_topcenter']) || !empty($aggreg->blocks['page_topleft']) || !empty($aggreg->blocks['page_topright']));
}
// Sets cache time
- if (! empty($xoopsModule)) {
+ if (!empty($xoopsModule)) {
$xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')];
// Tricky solution for setting cache time for homepage
- } else if (! empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
+ } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
$xoTheme->contentCacheLifetime = 604800;
}
@@ -102,7 +102,7 @@
exit();
}
- if (! isset($xoopsOption['template_main']) && $xoopsModule) {
+ if (!isset($xoopsOption['template_main']) && $xoopsModule) {
// new themes using Smarty does not have old functions that are required in old modules, so include them now
include $GLOBALS['xoops']->path('include/old_theme_functions.php');
// need this also
Modified: XoopsCore/trunk/htdocs/imagemanager.php
===================================================================
--- XoopsCore/trunk/htdocs/imagemanager.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/imagemanager.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -21,7 +21,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
-if (! isset($_REQUEST['target'])) {
+if (!isset($_REQUEST['target'])) {
exit('Target not set');
}
@@ -33,7 +33,7 @@
$op = 'doupload';
}
-if (! is_object($xoopsUser)) {
+if (!is_object($xoopsUser)) {
$group = array(XOOPS_GROUP_ANONYMOUS);
} else {
$group = $xoopsUser->getGroups();
@@ -53,8 +53,8 @@
$xoopsTpl->assign('lang_close', _CLOSE);
if ($catcount > 0) {
$xoopsTpl->assign('lang_go', _GO);
- $catshow = (! isset($_GET['cat_id'])) ? 0 : intval($_GET['cat_id']);
- $catshow = (! empty($catshow) && in_array($catshow, array_keys($catlist))) ? $catshow : 0;
+ $catshow = (!isset($_GET['cat_id'])) ? 0 : intval($_GET['cat_id']);
+ $catshow = (!empty($catshow) && in_array($catshow, array_keys($catlist))) ? $catshow : 0;
$xoopsTpl->assign('show_cat', $catshow);
if ($catshow > 0) {
$xoopsTpl->assign('lang_addimage', _ADDIMAGE);
@@ -185,7 +185,7 @@
$imgcat_handler =& xoops_gethandler('imagecategory');
$imgcat =& $imgcat_handler->get($imgcat_id);
$error = false;
- if (! is_object($imgcat)) {
+ if (!is_object($imgcat)) {
$error = true;
} else {
$imgcatperm_handler =& xoops_gethandler('groupperm');
Modified: XoopsCore/trunk/htdocs/include/common.php
===================================================================
--- XoopsCore/trunk/htdocs/include/common.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/include/common.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -16,15 +16,22 @@
*/
defined('XOOPS_MAINFILE_INCLUDED') or die('Restricted access');
-defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-
set_magic_quotes_runtime(0);
global $xoops, $xoopsPreload, $xoopsLogger, $xoopsErrorHandler, $xoopsSecurity, $sess_handler;
+defined('DS') or define('DS', DIRECTORY_SEPARATOR);
+defined('NWLINE')or define('NWLINE', "\n");
+
/**
+ * Include files with definitions
+ */
+include_once XOOPS_ROOT_PATH . DS . 'include' . DS .'defines.php';
+include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'version.php';
+
+/**
* Include XoopsLoad
*/
-require_once XOOPS_ROOT_PATH . '/class/xoopsload.php';
+require_once XOOPS_ROOT_PATH . DS . 'class' . DS . 'xoopsload.php';
/**
* Create Instance of Preload Object
@@ -35,6 +42,7 @@
/**
* Create Instance of xos_kernel_Xoops2 Object
+ * Atention, not all methods can be used at this point
*/
XoopsLoad::load('xoopskernel');
$xoops =& new xos_kernel_Xoops2();
@@ -57,29 +65,44 @@
$xoopsLogger->startTime('XOOPS Boot');
/**
- * Include Required Files, requires security loaded
+ * Include Required Files
*/
include_once $xoops->path('kernel/object.php');
-include_once $xoops->path('class/database/databasefactory.php');
include_once $xoops->path('class/criteria.php');
include_once $xoops->path('class/module.textsanitizer.php');
include_once $xoops->path('include/functions.php');
-include_once $xoops->path('include/version.php');
-include_once $xoops->path('include/defines.php');
/**
- * Get database for making it global. We should rethink this in future versions;
+ * Set cookie dope for multiple subdomains remove the '.'. to use top level dope for session cookie;
+ * Requires functions
*/
+define("XOOPS_COOKIE_DOMAIN", '.' . xoops_base_domain(XOOPS_URL));
+
+/**
+ * Check Proxy;
+ * Requires functions
+ */
+if ($_SERVER['REQUEST_METHOD'] != 'POST' || ! $xoopsSecurity->checkReferer(XOOPS_DB_CHKREF)) {
+ define('XOOPS_DB_PROXY', 1);
+}
+
+/**
+ * Get database for making it global
+ * Requires XoopsLogger, XOOPS_DB_PROXY;
+ */
+include_once $xoops->path('class/database/databasefactory.php');
$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
/**
- * Get xoops configs, requires functions and database loaded
+ * Get xoops configs
+ * Requires functions and database loaded
*/
$config_handler =& xoops_gethandler('config');
$xoopsConfig = $config_handler->getConfigsByCat(XOOPS_CONF);
/**
- * Enable Gzip compression, requires configs loaded and should go before any output
+ * Enable Gzip compression, r
+ * Requires configs loaded and should go before any output
*/
$xoops->gzipCompression();
@@ -88,12 +111,12 @@
*/
if ($xoopsConfig['debug_mode'] == 1 || $xoopsConfig['debug_mode'] == 2) {
xoops_loadLanguage('logger');
- error_reporting(E_ALL);
- $xoopsLogger->enableRendering();
- $xoopsLogger->usePopup = ($xoopsConfig['debug_mode'] == 2);
+ error_reporting(E_ALL);
+ $xoopsLogger->enableRendering();
+ $xoopsLogger->usePopup = ($xoopsConfig['debug_mode'] == 2);
} else {
- error_reporting(0);
- $xoopsLogger->activated = false;
+ error_reporting(0);
+ $xoopsLogger->activated = false;
}
/**
@@ -116,16 +139,19 @@
$xoopsUserIsAdmin = false;
$member_handler =& xoops_gethandler('member');
$sess_handler =& xoops_gethandler('session');
-if ($xoopsConfig['use_ssl'] && isset($_POST[$xoopsConfig['sslpost_name']]) && $_POST[$xoopsConfig['sslpost_name']] != '') {
- session_id($_POST[$xoopsConfig['sslpost_name']]);
+if ($xoopsConfig['use_ssl']
+ && isset($_POST[$xoopsConfig['sslpost_name']])
+ && $_POST[$xoopsConfig['sslpost_name']] != ''
+) {
+ session_id($_POST[$xoopsConfig['sslpost_name']]);
} else if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && $xoopsConfig['session_expire'] > 0) {
- if (isset($_COOKIE[$xoopsConfig['session_name']])) {
- session_id($_COOKIE[$xoopsConfig['session_name']]);
- }
- if (function_exists('session_cache_expire')) {
- session_cache_expire($xoopsConfig['session_expire']);
- }
- @ini_set('session.gc_maxlifetime', $xoopsConfig['session_expire'] * 60);
+ if (isset($_COOKIE[$xoopsConfig['session_name']])) {
+ session_id($_COOKIE[$xoopsConfig['session_name']]);
+ }
+ if (function_exists('session_cache_expire')) {
+ session_cache_expire($xoopsConfig['session_expire']);
+ }
+ @ini_set('session.gc_maxlifetime', $xoopsConfig['session_expire'] * 60);
}
session_set_save_handler(array(&$sess_handler, 'open'),
array(&$sess_handler, 'close'),
@@ -138,44 +164,52 @@
/**
* Remove expired session for xoopsUserId
*/
-if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && !isset($_COOKIE[$xoopsConfig['session_name']]) && !empty($_SESSION['xoopsUserId'])) {
- unset( $_SESSION['xoopsUserId'] );
+if ($xoopsConfig['use_mysession']
+ && $xoopsConfig['session_name'] != ''
+ && !isset($_COOKIE[$xoopsConfig['session_name']])
+ && !empty($_SESSION['xoopsUserId'])
+) {
+ unset( $_SESSION['xoopsUserId'] );
}
/**
* Load xoopsUserId from cookie if "Remember me" is enabled.
*/
-if (empty($_SESSION['xoopsUserId']) && !empty($xoopsConfig['usercookie']) && !empty($_COOKIE[$xoopsConfig['usercookie']])) {
- $hash_data = @explode("-", $_COOKIE[$xoopsConfig['usercookie']], 2);
- list($_SESSION['xoopsUserId'], $hash_login) = array($hash_data[0], strval(@$hash_data[1]));
+if (empty($_SESSION['xoopsUserId'])
+ && !empty($xoopsConfig['usercookie'])
+ && !empty($_COOKIE[$xoopsConfig['usercookie']])
+) {
+ $hash_data = @explode("-", $_COOKIE[$xoopsConfig['usercookie']], 2);
+ list($_SESSION['xoopsUserId'], $hash_login) = array($hash_data[0], strval(@$hash_data[1]));
}
/**
* Log user is and deal with Sessions and Cookies
*/
if (!empty($_SESSION['xoopsUserId'])) {
- $xoopsUser =& $member_handler->getUser($_SESSION['xoopsUserId']);
- if (!is_object($xoopsUser) || (isset($hash_login) && md5($xoopsUser->getVar('pass') . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX) != $hash_login)) {
- $xoopsUser = '';
- $_SESSION = array();
- session_destroy();
- setcookie($xoopsConfig['usercookie'], 0, - 1, '/');
- } else {
- if ((intval($xoopsUser->getVar('last_login')) + 60 * 5) < time()) {
- $sql = "UPDATE " . $xoopsDB->prefix('users') . " SET last_login = '" . time() . "' WHERE uid = " . $_SESSION['xoopsUserId'];
- @$xoopsDB->queryF($sql);
- }
- $sess_handler->update_cookie();
- if (isset($_SESSION['xoopsUserGroups'])) {
- $xoopsUser->setGroups($_SESSION['xoopsUserGroups']);
- } else {
- $_SESSION['xoopsUserGroups'] = $xoopsUser->getGroups();
- }
- $xoopsUserIsAdmin = $xoopsUser->isAdmin();
- }
+ $xoopsUser =& $member_handler->getUser($_SESSION['xoopsUserId']);
+ if (!is_object($xoopsUser) || (isset($hash_login) && md5($xoopsUser->getVar('pass') . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX) != $hash_login)) {
+ $xoopsUser = '';
+ $_SESSION = array();
+ session_destroy();
+ setcookie($xoopsConfig['usercookie'], 0, - 1, '/');
+ } else {
+ if ((intval($xoopsUser->getVar('last_login')) + 60 * 5) < time()) {
+ $sql = "UPDATE " . $xoopsDB->prefix('users')
+ . " SET last_login = '" . time()
+ . "' WHERE uid = " . $_SESSION['xoopsUserId'];
+ @$xoopsDB->queryF($sql);
+ }
+ $sess_handler->update_cookie();
+ if (isset($_SESSION['xoopsUserGroups'])) {
+ $xoopsUser->setGroups($_SESSION['xoopsUserGroups']);
+ } else {
+ $_SESSION['xoopsUserGroups'] = $xoopsUser->getGroups();
+ }
+ $xoopsUserIsAdmin = $xoopsUser->isAdmin();
+ }
}
-
/**
* *#@+
* Debug level for XOOPS
@@ -208,48 +242,48 @@
* Load Xoops Module
*/
if (file_exists('./xoops_version.php')) {
- $url_arr = explode('/', strstr($_SERVER['PHP_SELF'], '/modules/'));
- $module_handler =& xoops_gethandler( 'module' );
- $xoopsModule =& $module_handler->getByDirname($url_arr[2]);
- unset($url_arr);
+ $url_arr = explode('/', strstr($_SERVER['PHP_SELF'], '/modules/'));
+ $module_handler =& xoops_gethandler( 'module' );
+ $xoopsModule =& $module_handler->getByDirname($url_arr[2]);
+ unset($url_arr);
- if (!$xoopsModule || !$xoopsModule->getVar('isactive')) {
- include_once $xoops->path('header.php');
- echo '<h4>' . _MODULENOEXIST . '</h4>';
- include_once $xoops->path('footer.php');
- exit();
- }
+ if (! $xoopsModule || ! $xoopsModule->getVar('isactive')) {
+ include_once $xoops->path('header.php');
+ echo '<h4>' . _MODULENOEXIST . '</h4>';
+ include_once $xoops->path('footer.php');
+ exit();
+ }
$moduleperm_handler =& xoops_gethandler('groupperm');
- if ($xoopsUser) {
- if (!$moduleperm_handler->checkRight('module_read', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM, false);
- exit();
- }
- $xoopsUserIsAdmin = $xoopsUser->isAdmin($xoopsModule->getVar('mid'));
- } else {
- if (!$moduleperm_handler->checkRight('module_read', $xoopsModule->getVar('mid'), XOOPS_GROUP_ANONYMOUS)) {
- redirect_header(XOOPS_URL . '/user.php?from=' . $xoopsModule->getVar('dirname', 'n'), 1, _NOPERM);
- exit();
- }
- }
+ if ($xoopsUser) {
+ if (!$moduleperm_handler->checkRight('module_read', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM, false);
+ exit();
+ }
+ $xoopsUserIsAdmin = $xoopsUser->isAdmin($xoopsModule->getVar('mid'));
+ } else {
+ if (!$moduleperm_handler->checkRight('module_read', $xoopsModule->getVar('mid'), XOOPS_GROUP_ANONYMOUS)) {
+ redirect_header(XOOPS_URL . '/user.php?from=' . $xoopsModule->getVar('dirname', 'n'), 1, _NOPERM);
+ exit();
+ }
+ }
if ($xoopsModule->getVar('dirname', 'n') != 'system') {
- if (file_exists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/language/' . $xoopsConfig['language'] . '/main.php'))) {
+ if (file_exists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/language/' . $xoopsConfig['language'] . '/main.php'))) {
include_once $file;
- } elseif (file_exists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/language/english/main.php'))) {
+ } else if (file_exists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/language/english/main.php'))) {
include_once $file;
}
- }
-
- if ($xoopsModule->getVar('hasconfig') == 1 || $xoopsModule->getVar('hascomments') == 1 || $xoopsModule->getVar('hasnotification') == 1 ) {
- $xoopsModuleConfig = $config_handler->getConfigsByCat(0, $xoopsModule->getVar('mid'));
- }
+ }
+
+ if ($xoopsModule->getVar('hasconfig') == 1 || $xoopsModule->getVar('hascomments') == 1 || $xoopsModule->getVar('hasnotification') == 1 ) {
+ $xoopsModuleConfig = $config_handler->getConfigsByCat(0, $xoopsModule->getVar('mid'));
+ }
} else if ($xoopsUser) {
- $xoopsUserIsAdmin = $xoopsUser->isAdmin(1);
+ $xoopsUserIsAdmin = $xoopsUser->isAdmin(1);
}
$xoopsLogger->stopTime('XOOPS Boot');
$xoopsLogger->startTime('Module init');
$xoopsPreload->triggerEvent('core.include.common.end');
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/include/defines.php
===================================================================
--- XoopsCore/trunk/htdocs/include/defines.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/include/defines.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -59,26 +59,12 @@
}
/**
- * Catzwolf: Add these two defines, one for new lines and the other as a directory seperator
- */
-define('NWLINE', "\n");
-if ($_SERVER['REQUEST_METHOD'] != 'POST' || ! $xoopsSecurity->checkReferer(XOOPS_DB_CHKREF)) {
- define('XOOPS_DB_PROXY', 1);
-}
-
-/**
* User Mulitbytes
*/
// if ( !defined( 'XOOPS_USE_MULTIBYTES' ) ) {
// define( 'XOOPS_USE_MULTIBYTES', 0 );
// }
-/**
- * Set cookie dope for multiple subdomains remove the '.'. to use top level dope for session cookie;
- */
-define("XOOPS_COOKIE_DOMAIN", '.' . xoops_base_domain(XOOPS_URL));
-
-
/*
* Some language definitions that cannot be translated
*/
@@ -90,4 +76,4 @@
define('_XOOPS_FATAL_BACKTRACE', "Backtrace");
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/include/functions.legacy.php
===================================================================
--- XoopsCore/trunk/htdocs/include/functions.legacy.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/include/functions.legacy.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -76,7 +76,7 @@
function &getMailer()
{
trigger_error("Function " . __FUNCTION__ . "() is deprecated, use xoops_getMailer instead", E_USER_NOTICE);
- $mailer = & xoops_getMailer();
+ $mailer =& xoops_getMailer();
return $mailer;
}
Modified: XoopsCore/trunk/htdocs/include/functions.php
===================================================================
--- XoopsCore/trunk/htdocs/include/functions.php 2009-08-31 13:40:31 UTC (rev 3537)
+++ XoopsCore/trunk/htdocs/include/functions.php 2009-08-31 14:16:34 UTC (rev 3538)
@@ -34,18 +34,19 @@
{
static $handlers;
$name = strtolower(trim($name));
- if (! isset($handlers[$name])) {
+ if (!isset($handlers[$name])) {
if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
require_once $hnd_file;
}
$class = 'Xoops' . ucfirst($name) . 'Handler';
if (class_exists($class)) {
- $xoopsDB = &XoopsDatabaseFactory::getDatabaseConnection();
- $handlers[$name] = &new $class($xoopsDB);
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+ $handlers[$name] =& new $class($xoopsDB);
}
}
- if (! isset($handlers[$name])) {
- trigger_error('Class <strong>' . $class . '</strong> does not exist<br />Handler Name: ' . $name, $optional ? E_USER_WARNING : E_USER_ERROR);
+ if (!isset($handlers[$name])) {
+ trigger_error('Class <strong>' . $class . '</strong> does not exist<br />Handler Name: ' . $name,
+ $optional ? E_USER_WARNING : E_USER_ERROR);
}
if (isset($handlers[$name])) {
return $handlers[$name];
@@ -66,7 +67,7 @@
{
static $handlers;
// if $module_dir is not specified
- if (! isset($module_dir)) {
+ if (!isset($module_dir)) {
// if a module is loaded
if (isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule'])) {
$module_dir = $GLOBALS['xoopsModule']->getVar('dirname', 'n');
@@ -76,19 +77,20 @@
} else {
$module_dir = trim($module_dir);
}
- $name = (! isset($name)) ? $module_dir : trim($name);
- if (! isset($handlers[$module_dir][$name])) {
+ $name = (!isset($name)) ? $module_dir : trim($name);
+ if (!isset($handlers[$module_dir][$name])) {
if (file_exists($hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/{$name}.php")) {
include_once $hnd_file;
}
$class = ucfirst(strtolower($module_dir)) . ucfirst($name) . 'Handler';
if (class_exists($class)) {
- $xoopsDB = &XoopsDatabaseFactory::getDatabaseConnection();
- $handlers[$module_dir][$name] = &new $class($xoopsDB);
+ $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
+ $handlers[$module_dir][$name] =& new $class($xoopsDB);
}
}
- if (! isset($handlers[$module_dir][$name])) {
- trigger_error('Handler does not exist<br />Module: ' . $module_dir . '<br />Name: ' . $name, $optional ? E_USER_WARNING : E_USER_ERROR);
+ if (!isset($handlers[$module_dir][$name])) {
+ trigger_error('Handler does not exist<br />Module: ' . $module_dir . '<br />Name: ' . $name,
+ $optional ? E_USER_WARNING : E_USER_ERROR);
}
if (isset($handlers[$module_dir][$name])) {
return $handlers[$module_dir][$name];
@@ -108,7 +110,7 @@
*/
function xoops_load($name, $type = 'core')
{
- if (! class_exists('XoopsLoad')) {
+ if (!class_exists('XoopsLoad')) {
require_once XOOPS_ROOT_PATH . '/class/xoopsload.php';
}
return XoopsLoad::load($name, $type);
@@ -141,9 +143,9 @@
return false;
}
$language = empty($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
- $path = ( (empty($domain) || 'global' == $domain) ? '' : "modules/{$domain}/" ) . 'language';
- if ( !file_exists( $fileinc = $GLOBALS['xoops']->path( "{$path}/{$language}/{$name}.php" )) ) {
- if ( !file_exists( $fileinc = $GLOBALS['xoops']->path( "{$path}/english/{$name}.php" )) ) {
+ $path = ((empty($domain) || 'global' == $domain) ? '' : "modules/{$domain}/" ) . 'language';
+ if (!file_exists($fileinc = $GLOBALS['xoops']->path("{$path}/{$language}/{$name}.php" ))) {
+ if (!file_exists( $fileinc = $GLOBALS['xoops']->path("{$path}/english/{$name}.php"))) {
return false;
}
}
@@ -162,7 +164,7 @@
global $xoopsConfig, $xoopsTheme, $xoopsConfigMetaFooter;
$myts =& MyTextSanitizer::getInstance();
- if (! headers_sent()) {
+ if (!headers_sent()) {
header('Content-Type:text/html; charset=' . _CHARSET);
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -172,19 +174,18 @@
echo "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>\n";
echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />
- <meta http-equiv="content-language" content="' . _LANGCODE . '" />
- <meta name="robots" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_robots']) . '" />
- <meta name="keywords" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_keywords']) . '" />
- <meta name="description" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_desc']) . '" />
- <meta name="rating" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_rating']) . '" />
- <meta name="author" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_author']) . '" />
- <meta name="copyright" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_copyright']) . '" />
- <meta name="generator" content="XOOPS" />
- <title>' . htmlspecialchars($xoopsConfig['sitename']) . '</title>
- <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>
- ';
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />
+ <meta http-equiv="content-language" content="' . _LANGCODE . '" />
+ <meta name="robots" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_robots']) . '" />
+ <meta name="keywords" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_keywords']) . '" />
+ <meta name="description" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_desc']) . '" />
+ <meta name="rating" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_rating']) . '" />
+ <meta name="author" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_author']) . '" />
+ <meta name="copyright" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_copyright']) . '" />
+ <meta name="generator" content="XOOPS" />
+ <title>' . htmlspecialchars($xoopsConfig['sitename']) . '</title>
+ <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>';
$themecss = xoops_getcss($xoopsConfig['theme_set']);
echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />';
if ($themecss) {
@@ -266,11 +267,10 @@
{
$submit = ($submit != '') ? trim($submit) : _SUBMIT;
echo '<div class="confirmMsg">' . $msg . '<br />
- <form method="post" action="' . $action . '">
- ';
- foreach($hiddens as $name => $value) {
+ <form method="post" action="' . $action . '">';
+ foreach ($hiddens as $name => $value) {
if (is_array($value)) {
- foreach($value as $caption => $newvalue) {
+ foreach ($value as $caption => $newvalue) {
echo '<input type="radio" name="' . $name . '" value="' . htmlspecialchars($newvalue) . '" /> ' . $caption;
}
echo '<br />';
@@ -281,11 +281,10 @@
if ($addtoken != false) {
echo $GLOBALS['xoopsSecurity']->getTokenHTML();
}
- echo '
- <input type="submit" name="confirm_submit" value="' . $submit . '" title="' . $submit . '"/> <input type="button" name="confirm_back" value="' . _CANCEL . '" title="' . _CANCEL . '" />
- </form>
- </div>
- ';
+ echo '<input type="submit" name="confirm_submit" value="' . $submit . '" title="' . $submit . '"/>
+ <input type="button" name="confirm_back" value="' . _CANCEL . '" title="' . _CANCEL . '" />
+ </form>
+ </div>';
}
/**
@@ -324,7 +323,7 @@
function userTimeToServerTime($timestamp, $userTZ = null)
{
global $xoopsConfig;
- if (! isset($userTZ)) {
+ if (!isset($userTZ)) {
$userTZ = $xoopsConfig['default_TZ'];
}
$timestamp = $timestamp - (($userTZ - $xoopsConfig['server_TZ']) * 3600);
@@ -368,7 +367,7 @@
*/
function checkEmail($email, $antispam = false)
{
- if (! $email || ! preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i', $email)) {
+ if (!$email || !preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i', $email)) {
return false;
}
if ($antispam) {
@@ -388,7 +387,10 @@
{
$url = trim($url);
if ($url != '') {
- if ((! preg_match('/^http[s]*:\/\//i', $url)) && (! preg_match('/^ftp*:\/\//i', $url)) && (! preg_match('/^ed2k*:\/\//i', $url))) {
+ if ((!preg_match('/^http[s]*:\/\//i', $url))
+ && (!preg_match('/^ftp*:\/\//i', $url))
+ && (!preg_match('/^ed2k*:\/\//i', $url))
+ ) {
$url = 'http://' . $url;
}
}
@@ -434,7 +436,11 @@
} else {
$bannerobject = '<div><a href="' . XOOPS_URL . '/banners.php?op=click&bid=' . $bid . '" rel="external">';
if (stristr($imageurl, '.swf')) {
- $bannerobject = $bannerobject . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="quality" value="high" />' . '</object>';
+ $bannerobject = $bannerobject
+ . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '">'
+ . '<param name="movie" value="' . $imageurl . '" />'
+ . '<param name="quality" value="high" />'
+ . '</object>';
} else {
$bannerobject = $bannerobject . '<img src="' . $imageurl . '" alt="" />';
}
@@ -452,11 +458,11 @@
{
global $xoopsConfig, $xoopsLogger, $xoopsUserIsAdmin;
if (preg_match("/[\\0-\\31]|about:|script:/i", $url)) {
- if (! preg_match('/^\b(java)?script:([\s]*)history\.go\(-[0-9]*\)([\s]*[;]*[\s]*)$/si', $url)) {
+ if (!preg_match('/^\b(java)?script:([\s]*)history\.go\(-[0-9]*\)([\s]*[;]*[\s]*)$/si', $url)) {
$url = XOOPS_URL;
}
}
- if (! $allowExternalLink && $pos = strpos($url, '://')) {
+ if (!$allowExternalLink && $pos = strpos($url, '://')) {
$xoopsLocation = substr(XOOPS_URL, strpos(XOOPS_URL, '://') + 3);
if (strcasecmp(substr($url, $pos + 3, strlen($xoopsLocation)), $xoopsLocation)) {
$url = XOOPS_URL;
@@ -470,12 +476,12 @@
require_once XOOPS_ROOT_PATH . '/class/template.php';
require_once XOOPS_ROOT_PATH . '/class/theme.php';
- ...
[truncated message content] |
|
From: <dj...@us...> - 2009-08-31 13:40:42
|
Revision: 3537
http://xoops.svn.sourceforge.net/xoops/?rev=3537&view=rev
Author: djculex
Date: 2009-08-31 13:40:31 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Moved array item inside the while function
Modified Paths:
--------------
XoopsModules/onair/onair 1.04/blocks/simple_now.php
Modified: XoopsModules/onair/onair 1.04/blocks/simple_now.php
===================================================================
--- XoopsModules/onair/onair 1.04/blocks/simple_now.php 2009-08-31 01:44:52 UTC (rev 3536)
+++ XoopsModules/onair/onair 1.04/blocks/simple_now.php 2009-08-31 13:40:31 UTC (rev 3537)
@@ -13,8 +13,8 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Michael Albertsen (culex) <http://www.culex.dk>
- * @version $Id:simple_now.php 2009-08-03 13:30 culex $
- * @since File available since Release 1.0.4
+ * @version $Id:simple_now.php 2009-08-31 15:38 culex $
+ * @since File available since Release 1.0.0
*/
/**
@@ -63,9 +63,9 @@
} else {
$dayoffset='0';
}
- if ($myrow['oa_stop'] < $myrow['oa_start']){$myrow['oa_stop']= '23:59:59';}
while($myrow=$xoopsDB->fetchArray($result))
{
+ if ($myrow['oa_stop'] < $myrow['oa_start']){$myrow['oa_stop']= '23:59:59';}
$limiter = $myrow['oa_stop'];
$message = array();
$oa_pluginname = $myrow['oa_plugin'];
@@ -102,7 +102,7 @@
// Get data according to upcomming event
$sqlnext = "SELECT * FROM ".$xoopsDB->prefix("oa_program")." WHERE '$nextstop' <= oa_start AND '$nowday2' = oa_day order by oa_start, oa_stop LIMIT 1";
$resultnext=$xoopsDB->queryF($sqlnext);
- if ( getRowsNum($resultnext) < 1) {
+ if ( $resultnext < 1) {
$nowday2 = date("w", strtotime($nowday. " +1 days"));
$sqlnext2 = "SELECT * FROM ".$xoopsDB->prefix("oa_program")." WHERE '$nowday2' = oa_day order by oa_start, oa_stop LIMIT 1";
$resultnext2=$xoopsDB->queryF($sqlnext2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-31 01:45:02
|
Revision: 3536
http://xoops.svn.sourceforge.net/xoops/?rev=3536&view=rev
Author: trabis
Date: 2009-08-31 01:44:52 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Coding Standards, fixing bug in image.php(XOOPS_UPLOAD_PATH), fixing bug in backend.php(news class not included), moving encoding functions from functions.php to other file(lets see what you can do with them latter)
Modified Paths:
--------------
XoopsCore/trunk/htdocs/admin.php
XoopsCore/trunk/htdocs/backend.php
XoopsCore/trunk/htdocs/banners.php
XoopsCore/trunk/htdocs/class/smarty/Config_File.class.php
XoopsCore/trunk/htdocs/class/smarty/Smarty.class.php
XoopsCore/trunk/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.includeq.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/modifier.debug_print_var.php
XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php
XoopsCore/trunk/htdocs/class/textsanitizer/config.php
XoopsCore/trunk/htdocs/class/textsanitizer/mms/mms.php
XoopsCore/trunk/htdocs/class/textsanitizer/wmp/wmp.php
XoopsCore/trunk/htdocs/class/theme.php
XoopsCore/trunk/htdocs/edituser.php
XoopsCore/trunk/htdocs/footer.php
XoopsCore/trunk/htdocs/header.php
XoopsCore/trunk/htdocs/image.php
XoopsCore/trunk/htdocs/imagemanager.php
XoopsCore/trunk/htdocs/include/cp_header.php
XoopsCore/trunk/htdocs/include/functions.php
XoopsCore/trunk/htdocs/index.php
XoopsCore/trunk/htdocs/lostpass.php
XoopsCore/trunk/htdocs/misc.php
XoopsCore/trunk/htdocs/notifications.php
XoopsCore/trunk/htdocs/pmlite.php
XoopsCore/trunk/htdocs/readpmsg.php
XoopsCore/trunk/htdocs/register.php
XoopsCore/trunk/htdocs/search.php
XoopsCore/trunk/htdocs/user.php
XoopsCore/trunk/htdocs/userinfo.php
XoopsCore/trunk/htdocs/viewpmsg.php
XoopsCore/trunk/htdocs/xmlrpc.php
Added Paths:
-----------
XoopsCore/trunk/htdocs/include/functions.encoding.php
Modified: XoopsCore/trunk/htdocs/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/admin.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/admin.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -27,7 +27,7 @@
* Admin Authentication
*/
if ($xoopsUser) {
- if (! $xoopsUser->isAdmin(- 1)) {
+ if (! $xoopsUser->isAdmin(-1)) {
redirect_header('index.php', 2, _AD_NORIGHT);
exit();
}
@@ -77,7 +77,7 @@
if (! empty($_GET['xoopsorgnews'])) {
// Multiple feeds
- $myts = &MyTextSanitizer::getInstance();
+ $myts =& MyTextSanitizer::getInstance();
$rssurl = array();
$rssurl[] = 'http://sourceforge.net/export/rss2_projnews.php?group_id=41586&rss_fulltext=1';
$rssurl[] = 'http://www.xoops.org/backend.php';
@@ -94,7 +94,7 @@
xoops_load('xoopslocal');
$snoopy = new Snoopy();
$cnt = 0;
- foreach($rssurl as $url) {
+ foreach ($rssurl as $url) {
if ($snoopy->fetch($url)) {
$rssdata = $snoopy->results;
$rss2parser = new XoopsXmlRss2Parser($rssdata);
@@ -104,7 +104,7 @@
for($i = 0; $i < $count; $i ++) {
$_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
$_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
- $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++ $cnt)] = $_items[$i];
+ $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
}
} else {
echo $rss2parser->getErrors();
Modified: XoopsCore/trunk/htdocs/backend.php
===================================================================
--- XoopsCore/trunk/htdocs/backend.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/backend.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -27,7 +27,7 @@
}
header('Content-Type:text/xml; charset=utf-8');
-include_once XOOPS_ROOT_PATH . '/class/template.php';
+include_once $GLOBALS['xoops']->path('class/template.php');
$tpl = new XoopsTpl();
$tpl->xoops_setCaching(2);
$tpl->xoops_setCacheTime(3600);
@@ -56,16 +56,17 @@
}
$tpl->assign('image_width', $width);
$tpl->assign('image_height', $height);
- if (file_exists(XOOPS_ROOT_PATH . '/modules/news/class/class.newsstory.php')) {
+ if (file_exists($fileinc = $GLOBALS['xoops']->path('modules/news/class/class.newsstory.php'))) {
+ include $fileinc;
$sarray = NewsStory::getAllPublished(10, 0, true);
}
if (! empty($sarray) && is_array($sarray)) {
- foreach($sarray as $story) {
+ foreach ($sarray as $story) {
$tpl->append('items', array(
- 'title' => XoopsLocal::convert_encoding(htmlspecialchars($story->title(), ENT_QUOTES)) ,
- 'link' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid() ,
- 'guid' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid() ,
- 'pubdate' => formatTimestamp($story->published(), 'rss') ,
+ 'title' => XoopsLocal::convert_encoding(htmlspecialchars($story->title(), ENT_QUOTES)) ,
+ 'link' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid() ,
+ 'guid' => XOOPS_URL . '/modules/news/article.php?storyid=' . $story->storyid() ,
+ 'pubdate' => formatTimestamp($story->published(), 'rss') ,
'description' => XoopsLocal::convert_encoding(htmlspecialchars($story->hometext(), ENT_QUOTES))));
}
}
Modified: XoopsCore/trunk/htdocs/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/banners.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/banners.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -115,7 +115,7 @@
text-align: center;
}
');
-
+
echo "<div id='bannerstats'>
<h4 class='content_title'>" . sprintf(_BANNERS_TITLE, $name) . "</h4><hr />
<table summary=''>
@@ -129,7 +129,7 @@
<td>" . _BANNERS_PER_CLICKS . "</td>
<td>" . _BANNERS_FUNCTIONS . "</td></tr></thead>
<tfoot><tr><td colspan='7'></td></tr></tfoot>";
-
+
$result = $xoopsDB->query("select bid, imptotal, impmade, clicks, date from " . $xoopsDB->prefix("banner") . " where cid=$cid");
$i = 0;
while (list ($bid, $imptotal, $impmade, $clicks, $date) = $xoopsDB->fetchRow($result)) {
@@ -157,7 +157,7 @@
echo "</table>
<br /><br />
<h4 class='content_title'>" . _BANNERS_FOW_IN . htmlspecialchars($xoopsConfig['sitename']) . "</h4><hr />";
-
+
$result = $xoopsDB->query("select bid, imageurl, clickurl, htmlbanner, htmlcode from " . $xoopsDB->prefix("banner") . " where cid=$cid");
while (list ($bid, $imageurl, $clickurl, $htmlbanner, $htmlcode) = $xoopsDB->fetchRow($result)) {
$numrows = $xoopsDB->getRowsNum($result);
@@ -187,7 +187,7 @@
<input type='submit' name='op' value='" . _BANNERS_CHANGE . "' />" . $GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_EDIT") . "</form>";
}
}
-
+
/* Finnished Banners */
echo "<br />";
if ($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from " . $xoopsDB->prefix("bannerfinish") . " where cid=$cid")) {
@@ -202,7 +202,7 @@
<td>" . _BANNERS_STARTED . "</td>
<td>" . _BANNERS_ENDED . "</td></tr></thead>
<tfoot><tr><td colspan='6'></td></tr></tfoot>";
-
+
$i = 0;
while (list ($bid, $impressions, $clicks, $datestart, $dateend) = $xoopsDB->fetchRow($result)) {
$percent = substr(100 * $clicks / $impressions, 0, 5);
@@ -317,12 +317,14 @@
}
exit();
}
+
$op = '';
if (! empty($_POST['op'])) {
$op = $_POST['op'];
} elseif (! empty($_GET['op'])) {
$op = $_GET['op'];
}
+
$myts = & MyTextSanitizer::getInstance();
switch ($op) {
case "click":
@@ -338,7 +340,7 @@
redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
-
+
$_SESSION['banner_login'] = $myts->stripslashesGPC(trim($_POST['login']));
$_SESSION['banner_pass'] = $myts->stripslashesGPC(trim($_POST['pass']));
}
Modified: XoopsCore/trunk/htdocs/class/smarty/Config_File.class.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/Config_File.class.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/Config_File.class.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -19,7 +19,7 @@
*
* For questions, help, comments, discussion, etc., please join the
* Smarty mailing list. Send a blank e-mail to
- * sma...@go...
+ * sma...@go...
*
* @link http://www.smarty.net/
* @version 2.6.26
@@ -301,7 +301,7 @@
$vars = array();
continue;
}
- } else {
+ } else {
$section_name = $match[1];
}
if (!isset($config_data['sections'][$section_name]))
@@ -390,4 +390,4 @@
/**#@-*/
}
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/Smarty.class.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/Smarty.class.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/Smarty.class.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -20,7 +20,7 @@
*
* For questions, help, comments, discussion, etc., please join the
* Smarty mailing list. Send a blank e-mail to
- * sma...@go...
+ * sma...@go...
*
* @link http://www.smarty.net/
* @copyright 2001-2005 New Digital Group, Inc.
@@ -1058,7 +1058,7 @@
} else {
// var non-existant, return valid reference
$_tmp = null;
- return $_tmp;
+ return $_tmp;
}
}
@@ -1117,7 +1117,7 @@
function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
{
static $_cache_info = array();
-
+
$_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
? $this->error_reporting : error_reporting() & ~E_NOTICE);
@@ -1933,10 +1933,10 @@
{
return eval($code);
}
-
+
/**
* Extracts the filter name from the given callback
- *
+ *
* @param callback $function
* @return string
*/
@@ -1951,11 +1951,11 @@
return $function;
}
}
-
+
/**#@-*/
}
/* vim: set expandtab: */
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/Smarty_Compiler.class.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/Smarty_Compiler.class.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -162,7 +162,7 @@
. '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-
+
// matches valid modifier syntax:
// |foo
// |@foo
@@ -304,7 +304,7 @@
}
}
}
-
+
/* Compile the template tags into PHP code. */
$compiled_tags = array();
for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) {
@@ -333,7 +333,7 @@
for ($j = $i + 1; $j < $for_max; $j++) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
- if ($compiled_tags[$j] == '{/strip}') {
+ if ($compiled_tags[$j] == '{/strip}') {
/* remove trailing whitespaces from the last text_block */
$text_blocks[$j] = rtrim($text_blocks[$j]);
}
@@ -349,9 +349,9 @@
}
}
$compiled_content = '';
-
+
$tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
-
+
/* Interleave the compiled contents and text blocks to get the final result. */
for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
if ($compiled_tags[$i] == '') {
@@ -361,7 +361,7 @@
// replace legit PHP tags with placeholder
$text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
$compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
-
+
$compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
}
$compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
@@ -371,8 +371,8 @@
$compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content);
// recover legit tags
- $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
-
+ $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
+
// remove \n from the end of the file, if any
if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
$compiled_content = substr($compiled_content, 0, -1);
@@ -437,7 +437,7 @@
/* Matched comment. */
if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
return '';
-
+
/* Split tag into two three parts: command, command modifiers and the arguments. */
if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
. '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
@@ -445,7 +445,7 @@
~xs', $template_tag, $match)) {
$this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
$tag_command = $match[1];
$tag_modifier = isset($match[2]) ? $match[2] : null;
$tag_args = isset($match[3]) ? $match[3] : null;
@@ -585,7 +585,7 @@
} else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
return $output;
} else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
- return $output;
+ return $output;
} else {
$this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -936,7 +936,7 @@
if (empty($name)) {
return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
if (!preg_match('~^\w+$~', $name)) {
return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -1225,7 +1225,7 @@
$buffer = isset($attrs['name']) ? $attrs['name'] : "'default'";
$assign = isset($attrs['assign']) ? $attrs['assign'] : null;
$append = isset($attrs['append']) ? $attrs['append'] : null;
-
+
$output = "<?php ob_start(); ?>";
$this->_capture_stack[] = array($buffer, $assign, $append);
} else {
@@ -1266,11 +1266,11 @@
if(empty($tokens)) {
$_error_msg = $elseif ? "'elseif'" : "'if'";
- $_error_msg .= ' statement requires arguments';
+ $_error_msg .= ' statement requires arguments';
$this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
}
-
-
+
+
// make sure we have balanced parenthesis
$token_count = array_count_values($tokens);
if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
@@ -1368,8 +1368,8 @@
if ($is_arg_start != 0) {
if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
$is_arg_start--;
- }
- }
+ }
+ }
} else
$is_arg_start = $i-1;
/* Construct the argument for 'is' expression, so it knows
@@ -1400,7 +1400,7 @@
}
} elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
// variable function call
- $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
+ $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
} elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
// object or variable
$token = $this->_parse_var_props($token);
@@ -1753,12 +1753,12 @@
$_var_ref = $var_expr;
else
$_var_ref = substr($var_expr, 1);
-
+
if(!$_has_math) {
-
+
// get [foo] and .foo and ->foo and (...) pieces
preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
-
+
$_indexes = $match[0];
$_var_name = array_shift($_indexes);
@@ -2018,7 +2018,7 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
break;
-
+
case 'first':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
@@ -2028,12 +2028,12 @@
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
break;
-
+
case 'show':
array_shift($indexes);
$compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
break;
-
+
default:
unset($_max_index);
$compiled_ref = "\$this->_foreach[$_var]";
@@ -2159,7 +2159,7 @@
case 'rdelim':
$compiled_ref = "'$this->right_delimiter'";
break;
-
+
default:
$this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
break;
@@ -2362,4 +2362,4 @@
/* vim: set et: */
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -19,17 +19,17 @@
*
* This plug-in works as a direct replacement for the original Smarty
* {@link http://smarty.php.net/manual/en/language.function.foreach.php foreach} function.
- *
+ *
* The difference with <var>foreach</var> is minimal in terms of functionality, but can boost your templates
* a lot: foreach duplicates the content of the variable that is iterated, to ensure non-array
* variables can be specified freely. This implementation does not do that, but as a consequence
* requires that the variable you specify in the <var>from</var> parameter is an array or
* (when using PHP5) an object. Check the difference between the code generated by foreach
* and foreachq to understand completely.
- *
+ *
* <b>Note:</b> to use foreachq, only the opening tag has to be replaced. The closing tab still
* remains {/foreach}
- *
+ *
* <code>
* // Iterate, slow version
* {foreach from=$array item=elt}
@@ -58,13 +58,13 @@
return $comp->_syntax_error("foreachq: missing 'item' attribute", E_USER_ERROR, __FILE__, __LINE__);
}
$item = $comp->_dequote($attrs['item']);
- if (!preg_match('~^\w+$~', $item)) {
+ if (! preg_match('~^\w+$~', $item)) {
return $comp->_syntax_error("'foreachq: item' must be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
}
if (isset($attrs['key'])) {
$key = $comp->_dequote($attrs['key']);
- if (!preg_match('~^\w+$~', $key)) {
+ if (! preg_match('~^\w+$~', $key)) {
return $comp->_syntax_error("foreachq: 'key' must to be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
}
$key_part = "\$this->_tpl_vars['$key'] => ";
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.includeq.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.includeq.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.includeq.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -19,30 +19,30 @@
*
* Like {@link smarty_compiler_foreachq() foreachq}, this plug-in has been written to provide
* a faster version of an already existing Smarty function. <var>includeq</var> can be used
- * as a replacement for the Smarty
+ * as a replacement for the Smarty
* {@link http://smarty.php.net/manual/en/language.function.include.php include} function as long
* as you are aware of the differences between them.
- *
+ *
* Normally, when you include a template, Smarty does the following:
* - Backup all your template variables in an array
* - Include the template you specified
* - Restore the template variables from the previously created backup array
- *
+ *
* The advantage of this method is that it makes the main template variables <i>safe</i>: if your
* main template uses a variable called <var>$stuff</var> and the included template modifies it
* value, the main template will recover the original value automatically.
- *
+ *
* While this can be useful in some cases (for example, when you include templates you have absolutely
* no control over), some may consider this a limitation and it has the disadvantage of slowing down
* the inclusion mechanism a lot.
- *
+ *
* <var>includeq</var> fixes that: the code it generates doesn't contain the variables backup/recovery
* mechanism and thus makes templates inclusion faster. Note that however, this new behavior may
* create problems in some cases (but you can prevent them most of the times, for example by always
* using a <var>tmp_</var> prefix for the variables you create in included templates looping sections).
*/
-function smarty_compiler_includeq( $tag_args, &$comp ) {
-
+function smarty_compiler_includeq($tag_args, &$comp)
+{
$attrs = $comp->_parse_attrs($tag_args);
$arg_list = array();
@@ -58,8 +58,9 @@
$assign_var = $arg_value;
continue;
}
- if (is_bool($arg_value))
+ if (is_bool($arg_value)) {
$arg_value = $arg_value ? 'true' : 'false';
+ }
$arg_list[] = "'$arg_name' => $arg_value";
}
@@ -70,7 +71,7 @@
}
//$output .= "\$_smarty_tpl_vars = \$this->_tpl_vars;\n";
- $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
+ $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(" . implode(',', (array)$arg_list) . "))";
$output .= "\$this->_smarty_include($_params);\n";
//"\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
//"unset(\$_smarty_tpl_vars);\n";
@@ -82,5 +83,4 @@
return $output;
}
-
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -16,24 +16,24 @@
/**
* Inserts the URL of an application page
- *
+ *
* This plug-in allows you to generate a module location URL. It uses any URL rewriting
* mechanism and rules you'll have configured for the system.
- *
+ *
* To ensure this can be as optimized as possible, it accepts 2 modes of operation:
- *
+ *
* <b>Static address generation</b>:<br>
* This is the default mode and fastest mode. When used, the URL is generated during
* the template compilation, and statically written in the compiled template file.
* To use it, you just need to provide a location in a format XOOPS understands.
- *
+ *
* <code>
* // Generate an URL using a physical path
* ([xoAppUrl modules/something/yourpage.php])
* // Generate an URL using a module+location identifier (2.3+)
* ([xoAppUrl mod_xoops_Identification#logout])
* </code>
- *
+ *
* <b>Dynamic address generation</b>:<br>
* The is the slowest mode, and its use should be prevented unless necessary. Here,
* the URL is generated dynamically each time the template is displayed, thus allowing
@@ -41,50 +41,51 @@
* must surround your location with double-quotes ("), and use the
* {@link http://smarty.php.net/manual/en/language.syntax.quotes.php Smarty quoted strings}
* syntax to insert variables values.
- *
+ *
* <code>
* // Use the value of the $sortby template variable in the URL
* ([xoAppUrl "modules/something/yourpage.php?order=`$sortby`"])
* </code>
*/
-function smarty_compiler_xoAppUrl( $argStr, &$compiler ) {
- global $xoops;
- $argStr = trim( $argStr );
-
- @list( $url, $params ) = explode( ' ', $argStr, 2 );
-
- if ( substr( $url, 0, 1 ) == '/' ) {
- $url = 'www' . $url;
- }
- // Static URL generation
- if ( strpos( $argStr, '$' ) === false && $url != '.' ) {
- if ( isset($params) ) {
- $params = $compiler->_parse_attrs( $params, false );
- foreach ( $params as $k => $v ) {
- if ( in_array( substr( $v, 0, 1 ), array( '"', "'" ) ) ) {
- $params[$k] = substr( $v, 1, -1 );
- }
- }
- $url = $xoops->buildUrl( $url, $params );
- }
- $url = $xoops->path( $url, true );
- return "echo '" . addslashes( htmlspecialchars( $url ) ) . "';";
- }
- // Dynamic URL generation
- if ( $url == '.' ) {
- $str = "\$_SERVER['REQUEST_URI']";
- } else {
- $str = "\$GLOBALS['xoops']->path( '$url', true )";
- }
- if ( isset($params) ) {
- $params = $compiler->_parse_attrs( $params, false );
- $str = "\$GLOBALS['xoops']->buildUrl( $str, array(\n";
- foreach ( $params as $k => $v ) {
- $str .= var_export( $k, true ) . " => $v,\n";
- }
- $str .= ") )";
- }
- return "echo htmlspecialchars( $str );";
+function smarty_compiler_xoAppUrl($argStr, &$compiler)
+{
+ global $xoops;
+ $argStr = trim($argStr);
+
+ @list($url, $params) = explode(' ', $argStr, 2);
+
+ if (substr($url, 0, 1) == '/') {
+ $url = 'www' . $url;
+ }
+ // Static URL generation
+ if (strpos($argStr, '$') === false && $url != '.') {
+ if (isset($params)) {
+ $params = $compiler->_parse_attrs($params, false);
+ foreach ($params as $k => $v) {
+ if (in_array(substr($v, 0, 1), array('"', "'"))) {
+ $params[$k] = substr($v, 1, -1);
+ }
+ }
+ $url = $xoops->buildUrl($url, $params);
+ }
+ $url = $xoops->path($url, true);
+ return "echo '" . addslashes(htmlspecialchars($url)) . "';";
+ }
+ // Dynamic URL generation
+ if ($url == '.') {
+ $str = "\$_SERVER['REQUEST_URI']";
+ } else {
+ $str = "\$GLOBALS['xoops']->path('$url', true)";
+ }
+ if (isset($params)) {
+ $params = $compiler->_parse_attrs($params, false);
+ $str = "\$GLOBALS['xoops']->buildUrl($str, array(\n";
+ foreach ($params as $k => $v) {
+ $str .= var_export($k, true) . " => $v,\n";
+ }
+ $str .= "))";
+ }
+ return "echo htmlspecialchars($str);";
}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -20,24 +20,23 @@
* This plug-in works like the {@link smarty_compiler_xoAppUrl() xoAppUrl} plug-in,
* except that it is intended to generate the URL of resource files customizable by
* themes.
- *
+ *
* Here the current theme is asked to check if a custom version of the requested file exists, and
* if one is found its URL is returned. Otherwise, the request will be passed to the
* theme parents one by one. Ultimately, if no custom version has been found, the resource
* default URL location will be returned.
- *
+ *
* <b>Note:</b> the themes inheritance system can generate many filesystem accesses depending
* on your themes configuration. Because of this, the use of the dynamic syntax with this plug-in
* is not possible right now.
*/
-function smarty_compiler_xoImgUrl( $argStr, &$smarty ) {
- global $xoops, $xoTheme;
-
- $argStr = trim( $argStr );
- $path = ( isset($xoTheme) && is_object( $xoTheme ) ) ? $xoTheme->resourcePath( $argStr ) : $argStr;
- return "\necho '" . addslashes( $xoops->url( $path ) ) . "';";
+function smarty_compiler_xoImgUrl($argStr, &$smarty)
+{
+ global $xoops, $xoTheme;
-}
+ $argStr = trim( $argStr );
+ $path = (isset($xoTheme) && is_object($xoTheme)) ? $xoTheme->resourcePath($argStr) : $argStr;
+ return "\necho '" . addslashes($xoops->url($path)) . "';";
-
+}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -1,32 +1,32 @@
<?php
-function smarty_function_xoInboxCount( $params, &$smarty )
+function smarty_function_xoInboxCount($params, &$smarty)
{
global $xoopsUser;
-
- if ( !isset($xoopsUser) || !is_object($xoopsUser) ) {
+
+ if (! isset($xoopsUser) || ! is_object($xoopsUser)) {
return;
}
$time = time();
- if ( isset( $_SESSION['xoops_inbox_count'] ) && @$_SESSION['xoops_inbox_count_expire'] > $time ) {
+ if (isset($_SESSION['xoops_inbox_count']) && @$_SESSION['xoops_inbox_count_expire'] > $time) {
$count = intval( $_SESSION['xoops_inbox_count'] );
} else {
$pm_handler =& xoops_gethandler('privmessage');
$xoopsPreload =& XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.class.smarty.xoops_plugins.xoinboxcount', array($pm_handler));
-
- $criteria = new CriteriaCompo( new Criteria('read_msg', 0) );
- $criteria->add( new Criteria( 'to_userid', $xoopsUser->getVar('uid') ) );
- $count = intval( $pm_handler->getCount($criteria) );
+
+ $criteria = new CriteriaCompo(new Criteria('read_msg', 0));
+ $criteria->add(new Criteria('to_userid', $xoopsUser->getVar('uid')));
+ $count = intval($pm_handler->getCount($criteria));
$_SESSION['xoops_inbox_count'] = $count;
$_SESSION['xoops_inbox_count_expire'] = $time + 60;
}
- if ( !@empty( $params['assign'] ) ) {
+ if (! @empty( $params['assign'] ) ) {
$smarty->assign( $params['assign'], $count );
} else {
echo $count;
}
}
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -9,39 +9,41 @@
url="viewcat.php?cid=`$entity.cid`&orderby=`$sort_order`&offset=%s"
*/
-function smarty_function_xoPageNav( $params, &$smarty ) {
- global $xoops;
+function smarty_function_xoPageNav($params, &$smarty)
+{
+ global $xoops;
- extract( $params );
- if ( $pageSize < 1 ) {
- $pageSize = 10;
- }
- $pagesCount = intval( $itemsCount / $pageSize );
- if ( $itemsCount <= $pageSize || $pagesCount < 2 ) {
- return '';
- }
- $str = '';
- $currentPage = intval( $offset / $pageSize ) + 1;
- $lastPage = intval( $itemsCount / $pageSize ) + 1;
-
- $minPage = min( 1, ceil( $currentPage - $linksCount/2 ) );
- $maxPage = max( $lastPage, floor( $currentPage + $linksCount/2 ) );
+ extract( $params );
+ if ($pageSize < 1) {
+ $pageSize = 10;
+ }
+ $pagesCount = intval($itemsCount / $pageSize);
+ if ($itemsCount <= $pageSize || $pagesCount < 2) {
+ return '';
+ }
+ $str = '';
+ $currentPage = intval($offset / $pageSize) + 1;
+ $lastPage = intval($itemsCount / $pageSize) + 1;
- if ( $currentPage > 1 ) {
- $str .= '<a href="' . $xoops->url( str_replace( '%s', $offset-$pageSize, $url ) ) . '">Previous</a>';
- }
- for ( $i = $minPage; $i <= $maxPage; $i++ ) {
- $tgt = htmlspecialchars( $xoops->url( str_replace( '%s', ($i - 1) * $pageSize, $url ) ), ENT_QUOTES );
- $str .= "<a href='$tgt'>$i</a>";
- }
- if ( $currentPage < $lastPage ) {
- $str .= '<a href="' . $xoops->url( str_replace( '%s', $offset+$pageSize, $url ) ) . '">Next</a>';
- }
- $class = @!empty($class) ? htmlspecialchars( $class, ENT_QUOTES ) : 'pagenav';
-
- $str = "<div class='$class'>$str</div>";
- return $str;
+ $minPage = min(1, ceil($currentPage - $linksCount / 2));
+ $maxPage = max($lastPage, floor($currentPage + $linksCount / 2));
+ //TODO Remove this hardocded strings
+ if ($currentPage > 1) {
+ $str .= '<a href="' . $xoops->url(str_replace( '%s', $offset - $pageSize, $url)) . '">Previous</a>';
+ }
+ for ($i = $minPage; $i <= $maxPage; $i++) {
+ $tgt = htmlspecialchars($xoops->url(str_replace('%s', ($i - 1) * $pageSize, $url)), ENT_QUOTES);
+ $str .= "<a href='$tgt'>$i</a>";
+ }
+ if ($currentPage < $lastPage) {
+ $str .= '<a href="' . $xoops->url(str_replace('%s', $offset + $pageSize, $url)) . '">Next</a>';
+ }
+ $class = @!empty($class) ? htmlspecialchars($class, ENT_QUOTES) : 'pagenav';
+
+ $str = "<div class='{$class}'>{$str}</div>";
+ return $str;
+
}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/function.xoops_link.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -33,70 +33,71 @@
* Version: 1.0
* Author: Skalpa Keo <sk...@xo...>
* Purpose: format URL for linking to specific Xoops page
- * Input: module = module to link to (optional, default to current module)
- * page = page to link to (optional, default to current page)
- * params = query string parameters (optional, default to empty)
- * ex: urlparm1=,urlparm2,urlparm3=val3, etc.....
- * urlparm3 value will be set to val3
- * urlparm2 value will keep current one (no = sign)
- * urlparm1 value will be set to empty ( = sign, but nothing after)
+ * Input: module = module to link to (optional, default to current module)
+ * page = page to link to (optional, default to current page)
+ * params = query string parameters (optional, default to empty)
+ * ex: urlparm1=,urlparm2,urlparm3=val3, etc.....
+ * urlparm3 value will be set to val3
+ * urlparm2 value will keep current one (no = sign)
+ * urlparm1 value will be set to empty ( = sign, but nothing after)
*
- * I.e: The template called by 'index.php?cid=5' calls this function with
- * {xoops_link page="viewcat.php" urlvars="cid,orderby=titleA"}>
- * Then the generated URL will be:
- * XOOPS_URL/modules/MODULENAME/viewcat.php?cid=5&orderby=titleA
+ * I.e: The template called by 'index.php?cid=5' calls this function with
+ * {xoops_link page="viewcat.php" urlvars="cid,orderby=titleA"}>
+ * Then the generated URL will be:
+ * XOOPS_URL/modules/MODULENAME/viewcat.php?cid=5&orderby=titleA
* -------------------------------------------------------------
*/
-function smarty_function_xoops_link($params, $smarty) {
- $urlstr='';
- if (isset($params['urlvars'])) {
- $szvars=explode( '&', $params['urlvars'] );
- $vars=array();
- // Split the string making an array from the ('name','value') pairs
- foreach ($szvars as $szvar) {
- $pos=strpos($szvar,'=');
- if ( $pos != false ) { // If a value is specified, use it
- $vars[] = array( 'name' => substr($szvar,0,$pos), 'value' => substr($szvar,$pos+1) );
- } else { // Otherwise use current one (if any)
- if ( isset($_POST[$szvar]) ) {
- $vars[] = array( 'name' => $szvar, 'value' => $_POST[$szvar] );
- } elseif ( isset($_GET[$szvar]) ) {
- $vars[] = array( 'name' => $szvar, 'value' => $_GET[$szvar] );
- }
- }
- }
- // Now reconstruct query string from specified variables
- foreach ($vars as $var) {
- $urlstr = "$urlstr&{$var['name']}={$var['value']}";
- }
- if ( strlen($urlstr) > 0 ) {
- $urlstr = '?' . substr( $urlstr, 1 );
- }
- }
+function smarty_function_xoops_link($params, &$smarty)
+{
+ $urlstr = '';
+ if (isset($params['urlvars'])) {
+ $szvars = explode('&', $params['urlvars']);
+ $vars = array();
+ // Split the string making an array from the ('name','value') pairs
+ foreach ($szvars as $szvar) {
+ $pos = strpos($szvar, '=');
+ if ($pos != false) { // If a value is specified, use it
+ $vars[] = array('name' => substr($szvar, 0, $pos), 'value' => substr($szvar, $pos + 1));
+ } else { // Otherwise use current one (if any)
+ if (isset($_POST[$szvar])) {
+ $vars[] = array('name' => $szvar, 'value' => $_POST[$szvar]);
+ } elseif ( isset($_GET[$szvar]) ) {
+ $vars[] = array('name' => $szvar, 'value' => $_GET[$szvar]);
+ }
+ }
+ }
+ // Now reconstruct query string from specified variables
+ foreach ($vars as $var) {
+ $urlstr = "$urlstr&{$var['name']}={$var['value']}";
+ }
+ if (strlen($urlstr) > 0) {
+ $urlstr = '?' . substr($urlstr, 1);
+ }
+ }
- // Get default module/page from current ones if necessary
- $module='';
- $page='';
- if ( !isset($params['module']) ) {
- if ( isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) ) {
- $module = $GLOBALS['xoopsModule']->getVar('dirname');
- }
- } else {
- $module = $params['module'];
- }
- if ( !isset($params['page']) ) {
- $cur = $_SERVER['PHP_SELF'];
- $page = substr( $cur, strrpos( $cur, '/' ) + 1 );
- } else {
- $page = $params['page'];
- }
- // Now, return entire link URL :-)
- if ( empty($module) ) {
- echo XOOPS_URL . "/$page" . $urlstr;
- } else {
- echo XOOPS_URL . "/modules/$module/$page" . $urlstr;
- }
+ // Get default module/page from current ones if necessary
+ $module = '';
+ $page = '';
+ if (! isset($params['module'])) {
+ if (isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule'])) {
+ $module = $GLOBALS['xoopsModule']->getVar('dirname');
+ }
+ } else {
+ $module = $params['module'];
+ }
+ if (! isset($params['page'])) {
+ $cur = $_SERVER['PHP_SELF'];
+ $page = substr($cur, strrpos($cur, '/') + 1);
+ } else {
+ $page = $params['page'];
+ }
+ // Now, return entire link URL :-)
+ if (empty($module)) {
+ echo XOOPS_URL . "/{$page}" . $urlstr;
+ } else {
+ echo XOOPS_URL . "/modules/{$module}/{$page}" . $urlstr;
+ }
}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/modifier.debug_print_var.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/modifier.debug_print_var.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/modifier.debug_print_var.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -7,12 +7,12 @@
/**
* Smarty debug_print_var modifier plugin
- *
+ *
* Modified version of the default smarty plug-in that prevents endless looping when dealing with assigned
* objects
- *
- *
*
+ *
+ *
* Type: modifier<br>
* Name: debug_print_var<br>
* Purpose: formats variable contents for display in the console
@@ -27,29 +27,29 @@
{
$_replace = array("\n"=>'<i>\n</i>', "\r"=>'<i>\r</i>', "\t"=>'<i>\t</i>');
if (is_array($var)) {
- $results = "<b>Array (".count($var).")</b>";
+ $results = "<b>Array (" . count($var) . ")</b>";
foreach ($var as $curr_key => $curr_val) {
- $return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length);
- $results .= "<br>".str_repeat(' ', $depth*2)."<b>".strtr($curr_key, $_replace)."</b> => $return";
+ $return = smarty_modifier_debug_print_var($curr_val, $depth + 1, $length);
+ $results .= "<br>" . str_repeat(' ', $depth * 2) . "<b>" . strtr($curr_key, $_replace) . "</b> => {$return}";
}
} else if (is_object($var)) {
$object_vars = get_object_vars($var);
- $results = "<b>".get_class($var)." Object (".count($object_vars).")</b>";
+ $results = "<b>" . get_class($var) . " Object (" . count($object_vars) . ")</b>";
foreach ($object_vars as $curr_key => $curr_val) {
- if ( is_object( $curr_val ) ) {
- $return ='[object ' . get_class( $curr_val ) . ']';
- } else {
- $return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length);
- }
- $results .= "<br>".str_repeat(' ', $depth*2)."<b>$curr_key</b> => $return";
+ if (is_object($curr_val)) {
+ $return ='[object ' . get_class($curr_val) . ']';
+ } else {
+ $return = smarty_modifier_debug_print_var($curr_val, $depth + 1, $length);
+ }
+ $results .= "<br>" . str_repeat(' ', $depth * 2) . "<b>{$curr_key}</b> => {$return}";
}
} else if (is_resource($var)) {
- $results = '<i>'.(string)$var.'</i>';
+ $results = '<i>' . (string)$var . '</i>';
} else if (empty($var) && $var != "0") {
$results = '<i>empty</i>';
} else {
- if (strlen($var) > $length ) {
- $results = substr($var, 0, $length-3).'...';
+ if (strlen($var) > $length) {
+ $results = substr($var, 0, $length - 3) . '...';
} else {
$results = $var;
}
@@ -61,4 +61,4 @@
/* vim: set expandtab: */
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php
===================================================================
--- XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/smarty/xoops_plugins/resource.db.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -1,37 +1,39 @@
<?php
/*
* Smarty plugin
- * -------------------------------------------------------------
+ * -------------------------------------------------------------
* File: resource.db.php
* Type: resource
* Name: db
* Purpose: Fetches templates from a database
* -------------------------------------------------------------
*/
-function smarty_resource_db_source($tpl_name, &$tpl_source, &$smarty) {
- if ( !$tpl = smarty_resource_db_tplinfo( $tpl_name ) ) {
- return false;
- }
- if ( is_object( $tpl ) ) {
- $tpl_source = $tpl->getVar( 'tpl_source', 'n' );
- } else {
- $fp = fopen( $tpl, 'r' );
- $tpl_source = fread( $fp, filesize( $tpl ) );
- fclose( $fp );
- }
- return true;
+function smarty_resource_db_source($tpl_name, &$tpl_source, &$smarty)
+{
+ if (! $tpl = smarty_resource_db_tplinfo($tpl_name)) {
+ return false;
+ }
+ if (is_object($tpl)) {
+ $tpl_source = $tpl->getVar('tpl_source', 'n');
+ } else {
+ $fp = fopen($tpl, 'r');
+ $tpl_source = fread($fp, filesize($tpl));
+ fclose($fp);
+ }
+ return true;
}
-function smarty_resource_db_timestamp($tpl_name, &$tpl_timestamp, &$smarty) {
- if ( !$tpl = smarty_resource_db_tplinfo( $tpl_name ) ) {
- return false;
- }
- if ( is_object( $tpl ) ) {
- $tpl_timestamp = $tpl->getVar( 'tpl_lastmodified', 'n' );
- } else {
- $tpl_timestamp = filemtime( $tpl );
- }
- return true;
+function smarty_resource_db_timestamp($tpl_name, &$tpl_timestamp, &$smarty)
+{
+ if (! $tpl = smarty_resource_db_tplinfo($tpl_name)) {
+ return false;
+ }
+ if (is_object($tpl)) {
+ $tpl_timestamp = $tpl->getVar('tpl_lastmodified', 'n');
+ } else {
+ $tpl_timestamp = filemtime($tpl);
+ }
+ return true;
}
function smarty_resource_db_secure($tpl_name, &$smarty)
@@ -45,46 +47,45 @@
// not used for templates
}
-function smarty_resource_db_tplinfo( $tpl_name ) {
- static $cache = array();
- global $xoopsConfig;
+function smarty_resource_db_tplinfo($tpl_name)
+{
+ static $cache = array();
+ global $xoopsConfig;
- if ( isset( $cache[$tpl_name] ) ) {
- return $cache[$tpl_name];
- }
- $tplset = $xoopsConfig['template_set'];
- $theme = isset( $xoopsConfig['theme_set'] ) ? $xoopsConfig['theme_set'] : 'default';
-
- $tplfile_handler =& xoops_gethandler('tplfile');
- // If we're not using the "default" template set, then get the templates from the DB
- if ( $tplset != "default" ) {
- $tplobj = $tplfile_handler->find( $tplset, null, null, null, $tpl_name, true);
- if ( count( $tplobj ) ) {
- return $cache[$tpl_name] = $tplobj[0];
- }
- }
- // If we'using the default tplset, get the template from the filesystem
- $tplobj = $tplfile_handler->find( "default", null, null, null, $tpl_name, true);
+ if (isset($cache[$tpl_name])) {
+ return $cache[$tpl_name];
+ }
+ $tplset = $xoopsConfig['template_set'];
+ $theme = isset( $xoopsConfig['theme_set'] ) ? $xoopsConfig['theme_set'] : 'default';
- if ( !count( $tplobj ) ) {
- return $cache[$tpl_name] = false;
- }
- $tplobj = $tplobj[0];
- $module = $tplobj->getVar( 'tpl_module', 'n' );
- $type = $tplobj->getVar( 'tpl_type', 'n' );
- $blockpath = ( $type == 'block' ) ? 'blocks/' : '';
- // First, check for an overloaded version within the theme folder
- $filepath = XOOPS_THEME_PATH . "/$theme/modules/$module/$blockpath$tpl_name";
- if ( !file_exists( $filepath ) ) {
- // If no custom version exists, get the tpl from its default location
- $filepath = XOOPS_ROOT_PATH . "/modules/$module/templates/$blockpath$tpl_name";
- if ( !file_exists( $filepath ) ) {
- return $cache[$tpl_name] = $tplobj ;
- }
- }
- return $cache[$tpl_name] = $filepath;
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ // If we're not using the "default" template set, then get the templates from the DB
+ if ($tplset != "default") {
+ $tplobj = $tplfile_handler->find($tplset, null, null, null, $tpl_name, true);
+ if (count($tplobj)) {
+ return $cache[$tpl_name] = $tplobj[0];
+ }
+ }
+ // If we'using the default tplset, get the template from the filesystem
+ $tplobj = $tplfile_handler->find("default", null, null, null, $tpl_name, true);
+
+ if (! count($tplobj)) {
+ return $cache[$tpl_name] = false;
+ }
+ $tplobj = $tplobj[0];
+ $module = $tplobj->getVar('tpl_module', 'n');
+ $type = $tplobj->getVar('tpl_type', 'n');
+ $blockpath = ($type == 'block') ? 'blocks/' : '';
+ // First, check for an overloaded version within the theme folder
+ $filepath = XOOPS_THEME_PATH . "/{$theme}/modules/{$module}/{$blockpath}{$tpl_name}";
+ if (! file_exists($filepath)) {
+ // If no custom version exists, get the tpl from its default location
+ $filepath = XOOPS_ROOT_PATH . "/modules/{$module}/templates/{$blockpath}{$tpl_name}";
+ if (! file_exists($filepath)) {
+ return $cache[$tpl_name] = $tplobj ;
+ }
+ }
+ return $cache[$tpl_name] = $filepath;
}
-
-
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/textsanitizer/config.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/config.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/config.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -1,46 +1,46 @@
<?php
-/*
- 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.
+/*
+ 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.
*/
-/**
- * TextSanitizer extension
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package class
- * @subpackage textsanitizer
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
+/**
+ * TextSanitizer extension
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package class
+ * @subpackage textsanitizer
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
return $config = array(
"extensions" => array(
- "iframe" => 0 ,
- "image" => 1 ,
- "flash" => 1 ,
- "youtube" => 1 ,
- "mp3" => 0 ,
- "wmp" => 0 ,
- // If other module is used, please modify the following detection and 'link' in /wiki/config.php
- "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/') ,
- "mms" => 0 ,
- "rtsp" => 0) ,
-
- "truncate_length" => 60 ,
-
- // Stop request processing if malicious words found
- "censor_stop" => false ,
-
- // Filters XSS scripts on display of text
- // There is considerable trade-off between security and performance
+ "iframe" => 0,
+ "image" => 1,
+ "flash" => 1,
+ "youtube" => 1 ,
+ "mp3" => 0,
+ "wmp" => 0,
+ // If other module is used, please modify the following detection and 'link' in /wiki/config.php
+ "wiki" => is_dir(XOOPS_ROOT_PATH . '/modules/mediawiki/') ,
+ "mms" => 0,
+ "rtsp" => 0),
+
+ "truncate_length" => 60,
+
+ // Stop request processing if malicious words found
+ "censor_stop" => false,
+
+ // Filters XSS scripts on display of text
+ // There is considerable trade-off between security and performance
"filterxss_on_display" => false);
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/textsanitizer/mms/mms.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/mms/mms.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/mms/mms.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -21,7 +21,7 @@
* @version $Id$
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+
class MytsMms extends MyTextSanitizerExtension
{
function encode($textarea_id)
@@ -47,11 +47,13 @@
}
domobj.focus();
}
-EOH;
- return ($code, $javascript);
+EOH;
+ return array(
+ $code,
+ $javascript);
}
-
- function load(&$ts)
+
+ function load(&$ts)
{
$ts->patterns[] = "/\[mms=(['\"]?)([^\"']*),([^\"']*)\\1]([^\"]*)\[\/mms\]/sU";
$rp = "<OBJECT id=videowindow1 height='\\3' width='\\2' classid='CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6'>";
@@ -82,7 +84,7 @@
$rp .= "<PARAM NAME=\"_cy\" VALUE=\"8731\">";
$rp .= "</OBJECT>";
$ts->replacements[] = $rp;
-
+
return true;
}
}
Modified: XoopsCore/trunk/htdocs/class/textsanitizer/wmp/wmp.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/wmp/wmp.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/wmp/wmp.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -47,7 +47,7 @@
}
EOH;
return array(
- $code ,
+ $code,
$javascript);
}
@@ -62,4 +62,4 @@
$ts->replacements[] = $rp;
}
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/trunk/htdocs/class/theme.php
===================================================================
--- XoopsCore/trunk/htdocs/class/theme.php 2009-08-30 23:44:58 UTC (rev 3535)
+++ XoopsCore/trunk/htdocs/class/theme.php 2009-08-31 01:44:52 UTC (rev 3536)
@@ -1,9 +1,9 @@
<?php
/*
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
+ 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.
@@ -53,7 +53,7 @@
* @var bool
*/
var $allowUserSelection = true;
-
+
/**
* Instanciate the specified theme
*/
@@ -81,7 +81,7 @@
$inst->xoInit();
return $inst;
}
-
+
/**
* Checks if the specified theme is enabled or not
*
@@ -105,13 +105,13 @@
*/
class xos_opal_AdminThemeFactory extends xos_opal_ThemeFactory
{
- function &createInstance( $options = array(), $initArgs = array() )
+ function &createInstance($options = array(), $initArgs = array())
{
$options["plugins"] = array();
- $inst =& parent::createInstance( $options, $initArgs );
+ $inst =& parent::createInstance($options, $initArgs);
$inst->path = XOOPS_ROOT_PATH . '/modules/system/class/gui/' . $inst->folderName;
$inst->url = XOOPS_URL . '/modules/system/class/gui/' . $inst->folderName;
- $inst->template->assign( array(
+ $inst->template->assign(array(
'theme_path' => $inst->path,
'theme_tpl' => $inst->path.'/xotpl',
'theme_url' => $inst->url,
@@ -119,7 +119,7 @@
'theme_icons' => $inst->url.'/icons',
'theme_css' => $inst->url.'/css',
'theme_js' => $inst->url.'/js',
- ) );
+ ));
return $inst;
}
@@ -149,7 +149,7 @@
*/
var $path = '';
var $url = '';
-
+
/**
* Whether or not the theme engine should include the output generated by php
*
@@ -176,10 +176,10 @@
* @var string
*/
var $contentTemplate = '';
-
+
var $contentCacheLifetime = 0;
var $contentCacheId = null;
-
+
/**
* Text content to display right after the contentTemplate output
*
@@ -201,7 +201,7 @@
* @var XoopsTpl
*/
var $template = false;
-
+
/**
* Array containing the document meta-information
*
@@ -209,12 +209,12 @@
*/
var $metas = array(
'http' => array(
- 'Content-Script-Type' => 'text/javascript' ,
- 'Content-Style-Type' => 'text/css') ,
- 'meta' => array() ,
- 'link' => array() ,
+ 'Content-Script-Type' => 'text/javascript' ,
+ 'Con...
[truncated message content] |
|
From: <Bi...@us...> - 2009-08-31 00:50:42
|
Revision: 3535
http://xoops.svn.sourceforge.net/xoops/?rev=3535&view=rev
Author: BitC3R0
Date: 2009-08-30 23:44:58 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
Changed theme to work with new xThemes renamed module
Modified Paths:
--------------
XoopsThemes/wox/trunk/config/config_me.php
XoopsThemes/wox/trunk/config/theme.php
XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html
XoopsThemes/wox/trunk/modules/news/news_article.html
XoopsThemes/wox/trunk/modules/news/news_index.html
XoopsThemes/wox/trunk/theme.html
XoopsThemes/wox/trunk/tpls/content.html
XoopsThemes/wox/trunk/tpls/home.html
Added Paths:
-----------
XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_thread.html
Modified: XoopsThemes/wox/trunk/config/config_me.php
===================================================================
--- XoopsThemes/wox/trunk/config/config_me.php 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/config/config_me.php 2009-08-30 23:44:58 UTC (rev 3535)
@@ -22,7 +22,7 @@
<span class="descriptions">You can specify an announcemente to show at the home page of site.</span>
</div>
<div class="content">
- <textarea name="itconf_announcement" id="announcement" style="width: 98%; height: 70px;"><?php echo $announcement; ?></textarea>
+ <textarea name="xtconf_announcement" id="announcement" style="width: 98%; height: 70px;"><?php echo $announcement; ?></textarea>
</div>
</div>
<div class="field_item">
@@ -31,7 +31,7 @@
<span class="descriptions">The items number limit for recent news.</span>
</div>
<div class="content">
- <input type="text" name="itconf_limit_news" id="limit_news" size="10" value="<?php echo $limit_news; ?>" />
+ <input type="text" name="xtconf_limit_news" id="limit_news" size="10" value="<?php echo $limit_news; ?>" />
</div>
</div>
<div class="field_item">
@@ -40,7 +40,7 @@
<span class="descriptions">Specify the max length for text.</span>
</div>
<div class="content">
- <input type="text" name="itconf_length" id="length" size="10" value="<?php echo $length; ?>" />
+ <input type="text" name="xtconf_length" id="length" size="10" value="<?php echo $length; ?>" />
</div>
</div>
<div class="field_item">
@@ -49,7 +49,7 @@
<span class="descriptions">Select the category that you wish to show at homepage</span>
</div>
<div class="content">
- <select name="itconf_news_category" id="news-category">
+ <select name="xtconf_news_category" id="news-category">
<?php foreach($categories as $row): ?>
<option value="<?php echo $row['topic_id']; ?>"<?php echo $featured==$row['topic_id'] ? ' selected="selected"' : ''; ?>><?php echo $row['topic_title']; ?></option>
<?php endforeach; ?>
@@ -65,8 +65,8 @@
<span class="descriptions">Select method to show avatars in comments.</span>
</div>
<div class="content">
- <label><input type="radio" name="itconf_avatar_comments" id="avatar-comments" value="0"<?php echo $avatar_comments==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
- <label><input type="radio" name="itconf_avatar_comments" id="avatar-comments" value="1"<?php echo $avatar_comments==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
+ <label><input type="radio" name="xtconf_avatar_comments" id="avatar-comments" value="0"<?php echo $avatar_comments==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
+ <label><input type="radio" name="xtconf_avatar_comments" id="avatar-comments" value="1"<?php echo $avatar_comments==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
</div>
</div>
@@ -76,8 +76,8 @@
<span class="descriptions">Select method to show avatars in forum posts.</span>
</div>
<div class="content">
- <label><input type="radio" name="itconf_avatar_forum" id="avatar-forum" value="0"<?php echo $avatar_forum==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
- <label><input type="radio" name="itconf_avatar_forum" id="avatar-forum" value="1"<?php echo $avatar_forum==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
+ <label><input type="radio" name="xtconf_avatar_forum" id="avatar-forum" value="0"<?php echo $avatar_forum==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
+ <label><input type="radio" name="xtconf_avatar_forum" id="avatar-forum" value="1"<?php echo $avatar_forum==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
</div>
</div>
</div>
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/config/theme.php
===================================================================
--- XoopsThemes/wox/trunk/config/theme.php 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/config/theme.php 2009-08-30 23:44:58 UTC (rev 3535)
@@ -7,7 +7,7 @@
// License: http://creativecommons.org/licenses/by-nc-sa/2.5/mx/
// --------------------------------------------------------------
-class IThemeWox extends IThemesTheme
+class XThemeWox extends XThemesTheme
{
public function __construct(){
$this->set_config();
Modified: XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -73,9 +73,6 @@
<{/foreach}>
<option value="">--------</option>
<{/if}>
- <{foreach item=menu from=$menumode_other}>
- <option value="<{$menu.link}>"><{$menu.title}></option>
- <{/foreach}>
<!--
<option value="">--------</option>
<option value="<{$topic_print_link}>"><{$smarty.const._MD_PRINTTOPICS}></option>
@@ -123,7 +120,7 @@
<{include file="$newbb_template_path/newbb_item.html" topic_post=$topic_post}>
<{else}>
<{*include file="db:newbb_thread.html" topic_post=$topic_post mode=$mode*}>
- <{ithemes_process action="get_config"}>
+ <{xthemes_process action="get_config"}>
<{include file="wox/modules/newbb/newbb_thread.html" topic_post=$topic_post mode=$mode}>
<{/if}>
<{assign var="pi" value=$pi+1}>
Added: XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_thread.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_thread.html (rev 0)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_thread.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -0,0 +1,171 @@
+<script type="text/javascript" src="<{$xoops_imageurl}>js/forums.js"></script>
+<div id="cbb_location">
+<img src="<{$xoops_imageurl}>images/forum_location.png" alt="" />
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php">Forum Index</a>
+»
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.id}>"><{$category.title}></a>
+<{if $parentforum}>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$parentforum.id}>"><{$parentforum.name}></a>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a>
+<{else}>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a> <{$forum_topictype}>
+<{/if}>
+» <strong><{$topic_title}></strong> <{if $topictype}><{$topictype}><{/if}>
+</div>
+
+<br />
+
+<{if $online}>
+<div style="padding: 5px;">
+<{$smarty.const._MD_BROWSING}>
+<{foreach item=user from=$online.users}>
+ <a href="<{$user.link}>">
+ <{if $user.color}>
+ <span style="color:<{$user.color}>"><{$user.uname}></span>
+ <{else}>
+ <{$user.uname}>
+ <{/if}>
+ </a>
+<{/foreach}>
+<{if $online.num_anonymous}> <{$online.num_anonymous}> <{$smarty.const._MD_ANONYMOUS_USERS}>
+<{/if}>
+</div>
+<br />
+<{/if}>
+
+<{if $topic_poll}>
+<{if $topic_pollresult}> <{include file="db:newbb_poll_results.html" poll=$poll}>
+<{else}> <{include file="db:newbb_poll_view.html" poll=$poll}> <{/if}>
+<{/if}>
+
+<br />
+
+<div style="overflow: hidden; margin-bottom: 10px;">
+<span style="float: right; text-align:right;">
+<{$forum_reply}><{$forum_addpoll}> <{$forum_post_or_register}>
+</span>
+<span class="topis_navigation">
+<a id="threadtop"></a><{$down2}> <a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$left}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+</span>
+</div>
+<div class="clear"></div>
+
+<br />
+
+<div>
+<div class="wox_cbb_options border_bottom">
+ <{if $rating_enable}>
+ <select
+ name="rate" id="rate"
+ class="menu"
+
+ >
+ <option value=""><{$smarty.const._MD_RATE}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=5"><{$smarty.const._MD_RATE5}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=4"><{$smarty.const._MD_RATE4}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=3"><{$smarty.const._MD_RATE3}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=2"><{$smarty.const._MD_RATE2}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=1"><{$smarty.const._MD_RATE1}></option>
+ </select>
+ <{/if}>
+
+ <select
+ name="viewmode" id="viewmode"
+ class="menu"
+ >
+ <option value=""><{$smarty.const._MD_VIEWMODE}></option>
+ <{foreach item=act from=$viewmode_options}>
+ <option value="<{$act.link}>"><{$act.title}></option>
+ <{/foreach}>
+ </select>
+</div>
+<div class="pages_nav"><{$forum_page_nav|replace:"(":''|replace:")":""}></div>
+</div>
+<div class="clear"></div>
+<br />
+
+<{assign var="pi" value=1}>
+<div id="the_topic_posts">
+<{foreach item=topic_post from=$topic_posts}>
+<{if $viewmode_compact}>
+<{include file="$newbb_template_path/newbb_item.html" topic_post=$topic_post}>
+<{else}>
+<{xthemes_process action="get_config"}>
+<{include file="wox/modules/newbb/newbb_thread.html" topic_post=$topic_post}>
+<{/if}>
+<br />
+<{assign var="pi" value=$pi+1}>
+<{/foreach}>
+</div>
+<div class="clear"></div>
+
+<!-- start topic tree -->
+<table class="outer" cellspacing="1" width="100%">
+ <tr align="left">
+ <th width="50%"><{$smarty.const._MD_SUBJECT}></th>
+ <th width="20%"><{$smarty.const._MD_POSTER}></th>
+ <th><{$smarty.const._MD_DATE}></th>
+ </tr>
+<{foreach item=topic_tree from=$topic_trees}>
+ <tr class="<{cycle values="even,odd"}>">
+ <td><{$topic_tree.post_prefix}> <{$topic_tree.post_image}> <{$topic_tree.post_title}></td>
+ <td><{$topic_tree.poster}></td>
+ <td><{$topic_tree.post_time}></td>
+ </tr>
+<{/foreach}>
+</table>
+<!-- end topic tree -->
+
+<br />
+
+<div style="overflow: hidden; margin-bottom: 10px;">
+<span style="float: right; text-align:right;">
+<{$forum_reply}><{$forum_addpoll}> <{$forum_post_or_register}>
+</span>
+<span class="topis_navigation">
+<a id="threadtop"></a><{$down2}> <a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$left}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+</span>
+</div>
+
+<div class="clear"></div>
+
+<br />
+<br />
+
+<{if $quickreply.show}>
+<div>
+<a href="#threadbottom" > <{$quickreply.icon}></a>
+</div>
+<br />
+<div id="qr" style="display: <{$quickreply.display}>">
+<div><{$quickreply.form}></div>
+</div>
+<br />
+<br />
+<{/if}>
+
+<div>
+<div style="float: left; text-align: left;">
+<{foreach item=perm from=$permission_table}>
+<div><{$perm}></div>
+<{/foreach}>
+</div>
+<div style="float: right; text-align: right;">
+<form action="search.php" method="get">
+<input name="term" id="term" type="text" size="15" />
+<input type="hidden" name="forum" id="forum" value="<{$forum_id}>" />
+<input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
+<input type="hidden" name="since" id="since" value="<{$forum_since}>" />
+<input type="hidden" name="action" id="action" value="yes" />
+<input type="hidden" name="searchin" id="searchin" value="both" />
+<input type="submit" class="formButton" value="<{$smarty.const._MD_SEARCH}>" /><br />
+[<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>]
+</form><br />
+<{$forum_jumpbox}>
+</div>
+</div>
+<div class="clear"></div>
+
+<br />
+
+<{include file='db:system_notification_select.html'}>
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/modules/news/news_article.html
===================================================================
--- XoopsThemes/wox/trunk/modules/news/news_article.html 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/modules/news/news_article.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -6,7 +6,7 @@
<{if $previous_story_id != -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$previous_story_id}>' title="<{$previous_story_title}>" class="prev">« <{$lang_previous_story}></a><{/if}>
</div>
<{/if}>
-<{ithemes_process action="run_method" method="clean_post" post=$story}>
+<{xthemes_process action="run_method" method="clean_post" post=$story}>
<{assign var="no_image" value=1}>
<{include file="db:news_item.html" story=$story}>
@@ -59,7 +59,7 @@
<{/if}>
<a id="comments"></a>
<div style="text-align: center">
- <{ithemes_process action="run_method" method="comments_options"}>
+ <{xthemes_process action="run_method" method="comments_options"}>
<{$lang_notice}>
</div>
Modified: XoopsThemes/wox/trunk/modules/news/news_index.html
===================================================================
--- XoopsThemes/wox/trunk/modules/news/news_index.html 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/modules/news/news_index.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -11,7 +11,7 @@
<{/if}>
<div class="pages_nav"><{$pagenav|replace:"(":''|replace:")":""}></div>
- <{ithemes_process action="run_method" method="format_news"}>
+ <{xthemes_process action="run_method" method="format_news"}>
<{assign var="i" value=0}>
<{foreach item=story from=$wox_posts}>
<{include file="db:news_item.html" story=$story}>
Modified: XoopsThemes/wox/trunk/theme.html
===================================================================
--- XoopsThemes/wox/trunk/theme.html 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/theme.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head><{ithemes_process action="get_config"}>
+<head><{xthemes_process action="get_config"}>
<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
<meta name="robots" content="<{$xoops_meta_robots}>" />
Modified: XoopsThemes/wox/trunk/tpls/content.html
===================================================================
--- XoopsThemes/wox/trunk/tpls/content.html 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/tpls/content.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -81,7 +81,7 @@
<div class="container">
<div class="fcolumns">
<h3 class="block_title">Recent Comments</h3>
- <{ithemes_process action="run_method" method="get_comments" limit=5}>
+ <{xthemes_process action="run_method" method="get_comments" limit=5}>
<{foreach item=com from=$wox_comments}>
<div class="com_item">
» <strong><{$com.title}></strong><br />
Modified: XoopsThemes/wox/trunk/tpls/home.html
===================================================================
--- XoopsThemes/wox/trunk/tpls/home.html 2009-08-30 21:58:34 UTC (rev 3534)
+++ XoopsThemes/wox/trunk/tpls/home.html 2009-08-30 23:44:58 UTC (rev 3535)
@@ -98,7 +98,7 @@
<div id="xt-home-resume">
<div id="home-left">
<h2 class="title">Recent News</h2>
- <{ithemes_process action="run_method" method="get_recent_news" limit=$woxConfig.limit_news length=$woxConfig.length}>
+ <{xthemes_process action="run_method" method="get_recent_news" limit=$woxConfig.limit_news length=$woxConfig.length}>
<div class="first_post">
<{if $recent_news[0].image!=''}>
<a class="post_image" href="http://www.xoops.org/modules/news/article.php?storyid=<{$recent_news[0].id}>" style="background-image: url(<{$recent_news[0].image}>);"><span></span></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-30 21:58:43
|
Revision: 3534
http://xoops.svn.sourceforge.net/xoops/?rev=3534&view=rev
Author: trabis
Date: 2009-08-30 21:58:34 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
Better javascript solution for rel="external" links.
Modified Paths:
--------------
XoopsCore/trunk/htdocs/include/xoops.js
Modified: XoopsCore/trunk/htdocs/include/xoops.js
===================================================================
--- XoopsCore/trunk/htdocs/include/xoops.js 2009-08-30 21:54:23 UTC (rev 3533)
+++ XoopsCore/trunk/htdocs/include/xoops.js 2009-08-30 21:58:34 UTC (rev 3534)
@@ -214,7 +214,10 @@
// Check rel value with extra rels, like "external noflow". No test for performance yet
var $pattern = new RegExp("external", "i");
if ($pattern.test(anchor.getAttribute("rel"))) {
- anchor.target = "_blank";
+ anchor. {
+ window.open(this.href);
+ return false;
+ }
}
}
}
@@ -222,14 +225,22 @@
function xoopsOnloadEvent(func)
{
- var existEvent = window.onload;
- if (!window.onload) {
- window.
+ if (window.onload) {
+ xoopsAddEvent(window, 'load' , window.onload);
+ }
+ xoopsAddEvent(window, 'load' , func);
+}
+
+function xoopsAddEvent(obj, evType, fn)
+{
+ if (obj.addEventListener) {
+ obj.addEventListener(evType, fn, true);
+ return true;
+ } else if (obj.attachEvent) {
+ var r = obj.attachEvent("on" + evType, fn);
+ return r;
} else {
- window. {
- existEvent();
- func();
- }
+ return false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-30 21:54:29
|
Revision: 3533
http://xoops.svn.sourceforge.net/xoops/?rev=3533&view=rev
Author: trabis
Date: 2009-08-30 21:54:23 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
reverting authentication system on profile
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/profile/activate.php
XoopsCore/trunk/htdocs/modules/profile/include/forms.php
XoopsCore/trunk/htdocs/modules/profile/register.php
XoopsCore/trunk/htdocs/modules/profile/templates/profile_admin_visibility.html
XoopsCore/trunk/htdocs/modules/profile/xoops_version.php
Modified: XoopsCore/trunk/htdocs/modules/profile/activate.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/activate.php 2009-08-30 17:55:35 UTC (rev 3532)
+++ XoopsCore/trunk/htdocs/modules/profile/activate.php 2009-08-30 21:54:23 UTC (rev 3533)
@@ -15,7 +15,6 @@
* @since 2.3.0
* @author Jan Pedersen
* @author Taiwen Jiang <ph...@us...>
- * @author Simon Roberts <si...@xo...>
* @version $Id$
*/
@@ -30,32 +29,82 @@
redirect_header(XOOPS_URL, 1, '');
exit();
}
- $uname = trim($_GET['uname']);
- $actkey = trim($_GET['actkey']);
- if (empty($uname)) {
- redirect_header('index.php', 1, '');
+ $member_handler =& xoops_gethandler('member');
+ $thisuser =& $member_handler->getUser($id);
+ if (!is_object($thisuser)) {
+ redirect_header(XOOPS_URL, 1, '');
exit();
}
-
- $myts =& MyTextSanitizer::getInstance();
- include_once $GLOBALS['xoops']->path('/class/auth/authfactory.php');
- include_once $GLOBALS['xoops']->path('/language/'.$xoopsConfig['language'].'/auth.php');
- $xoopsAuth =& XoopsAuthFactory::getAuthConnection($myts->addSlashes($uname));
- $result = $xoopsAuth->check_activation($uname, $actkey, $xoopsAuth->check_siteinfo($siteinfo));
+ if ($thisuser->getVar('actkey') != $actkey) {
+ redirect_header(XOOPS_URL . '/', 5, _US_ACTKEYNOT);
+ } else {
+ if ($thisuser->getVar('level') > 0 ) {
+ redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n'). '/index.php', 5, _US_ACONTACT, false);
+ } else {
+ if (false != $member_handler->activateUser($thisuser)) {
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
+ if ($xoopsConfigUser['activation_type'] == 2) {
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsMailer = xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('activated.tpl');
+ $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+ $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
+ $xoopsMailer->setToUsers($thisuser);
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoopsConfig['sitename']));
+ include XOOPS_ROOT_PATH . '/header.php';
+ if ( !$xoopsMailer->send() ) {
+ printf(_US_ACTVMAILNG, $thisuser->getVar('uname'));
+ } else {
+ printf(_US_ACTVMAILOK, $thisuser->getVar('uname'));
+ }
+ include 'footer.php';
+ } else {
+ redirect_header(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false);
+ }
+ } else {
+ redirect_header(XOOPS_URL . '/index.php', 5, 'Activation failed!');
+ }
+ }
+ }
+// Not implemented yet: re-send activiation code
+} elseif (!empty($_REQUEST['email'])) {
+ $myts =& MyTextSanitizer::getInstance();
+ $member_handler =& xoops_gethandler('member');
+ $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes(trim($_REQUEST['email']))));
+ if (count($getuser) == 0) {
+ redirect_header(XOOPS_URL, 2, _US_SORRYNOTFOUND);
+ }
+ if ($getuser[0]->isActive()) {
+ redirect_header(XOOPS_URL, 2, sprintf(_US_USERALREADYACTIVE, $getuser[0]->getVar('email')));
+ }
+ $xoopsMailer = xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('register.tpl');
+ $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+ $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
+ $xoopsMailer->setToUsers($getuser[0]);
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser[0]->getVar('uname')));
+ if ( !$xoopsMailer->send() ) {
+ echo _US_YOURREGMAILNG;
+ } else {
+ echo _US_YOURREGISTERED;
+ }
+} else {
+ include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+ $form = new XoopsThemeForm('', 'form', 'activate.php');
+ $form->addElement(new XoopsFormText(_US_EMAIL, 'email', 25, 255));
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->display();
+}
- switch ($result['state']) {
- case _US_STATE_ONE:
- if (!isset($result['set'])){
- redirect_header($result['url'], $result['opt'], $result['text']);
- } else {
- redirect_header($result['url'], $result['opt'], $result['text'], $result['set']);
- }
- exit();
- break;
- case _US_STATE_TWO:
- echo $result['text'];
- }
-}
$xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER);
include 'footer.php';
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/include/forms.php 2009-08-30 17:55:35 UTC (rev 3532)
+++ XoopsCore/trunk/htdocs/modules/profile/include/forms.php 2009-08-30 21:54:23 UTC (rev 3533)
@@ -30,6 +30,7 @@
{
if ($action === false) {
$action = $_SERVER['REQUEST_URI'];
+ echo "string{$variable}" . ' string{$variable} '. $varibale;
}
$title = $field->isNew() ? sprintf(_PROFILE_AM_ADD, _PROFILE_AM_FIELD) : sprintf(_PROFILE_AM_EDIT, _PROFILE_AM_FIELD);
@@ -84,22 +85,22 @@
switch ($field->getVar('field_type')) {
case "textbox":
$valuetypes = array(
- XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
- XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
- XOBJ_DTYPE_INT => _PROFILE_AM_INT,
- XOBJ_DTYPE_FLOAT => _PROFILE_AM_FLOAT,
- XOBJ_DTYPE_DECIMAL => _PROFILE_AM_DECIMAL,
- XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
- XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
- XOBJ_DTYPE_URL => _PROFILE_AM_URL,
+ XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
+ XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
+ XOBJ_DTYPE_INT => _PROFILE_AM_INT,
+ XOBJ_DTYPE_FLOAT => _PROFILE_AM_FLOAT,
+ XOBJ_DTYPE_DECIMAL => _PROFILE_AM_DECIMAL,
+ XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
+ XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
+ XOBJ_DTYPE_URL => _PROFILE_AM_URL,
XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER,
- XOBJ_DTYPE_UNICODE_ARRAY => _PROFILE_AM_UNICODE_ARRAY,
- XOBJ_DTYPE_UNICODE_TXTBOX => _PROFILE_AM_UNICODE_TXTBOX,
- XOBJ_DTYPE_UNICODE_TXTAREA => _PROFILE_AM_UNICODE_TXTAREA,
- XOBJ_DTYPE_UNICODE_EMAIL => _PROFILE_AM_UNICODE_EMAIL,
- XOBJ_DTYPE_UNICODE_URL => _PROFILE_AM_UNICODE_URL);
-
- $type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
+ XOBJ_DTYPE_UNICODE_ARRAY => _PROFILE_AM_UNICODE_ARRAY,
+ XOBJ_DTYPE_UNICODE_TXTBOX => _PROFILE_AM_UNICODE_TXTBOX,
+ XOBJ_DTYPE_UNICODE_TXTAREA => _PROFILE_AM_UNICODE_TXTAREA,
+ XOBJ_DTYPE_UNICODE_EMAIL => _PROFILE_AM_UNICODE_EMAIL,
+ XOBJ_DTYPE_UNICODE_URL => _PROFILE_AM_UNICODE_URL);
+
+ $type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
$type_select->addOptionArray($valuetypes);
$form->addElement($type_select);
break;
@@ -107,21 +108,21 @@
case "select":
case "radio":
$valuetypes = array(
- XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
- XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
- XOBJ_DTYPE_INT => _PROFILE_AM_INT,
- XOBJ_DTYPE_FLOAT => _PROFILE_AM_FLOAT,
- XOBJ_DTYPE_DECIMAL => _PROFILE_AM_DECIMAL,
- XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
- XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
- XOBJ_DTYPE_URL => _PROFILE_AM_URL,
- XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER,
- XOBJ_DTYPE_UNICODE_ARRAY => _PROFILE_AM_UNICODE_ARRAY,
- XOBJ_DTYPE_UNICODE_TXTBOX => _PROFILE_AM_UNICODE_TXTBOX,
- XOBJ_DTYPE_UNICODE_TXTAREA => _PROFILE_AM_UNICODE_TXTAREA,
- XOBJ_DTYPE_UNICODE_EMAIL => _PROFILE_AM_UNICODE_EMAIL,
- XOBJ_DTYPE_UNICODE_URL => _PROFILE_AM_UNICODE_URL);
-
+ XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
+ XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
+ XOBJ_DTYPE_INT => _PROFILE_AM_INT,
+ XOBJ_DTYPE_FLOAT => _PROFILE_AM_FLOAT,
+ XOBJ_DTYPE_DECIMAL => _PROFILE_AM_DECIMAL,
+ XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
+ XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
+ XOBJ_DTYPE_URL => _PROFILE_AM_URL,
+ XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER,
+ XOBJ_DTYPE_UNICODE_ARRAY => _PROFILE_AM_UNICODE_ARRAY,
+ XOBJ_DTYPE_UNICODE_TXTBOX => _PROFILE_AM_UNICODE_TXTBOX,
+ XOBJ_DTYPE_UNICODE_TXTAREA => _PROFILE_AM_UNICODE_TXTAREA,
+ XOBJ_DTYPE_UNICODE_EMAIL => _PROFILE_AM_UNICODE_EMAIL,
+ XOBJ_DTYPE_UNICODE_URL => _PROFILE_AM_UNICODE_URL);
+
$type_select = new XoopsFormSelect(_PROFILE_AM_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
$type_select->addOptionArray($valuetypes);
$form->addElement($type_select);
@@ -156,7 +157,6 @@
if ($field->getVar('field_edit')) {
switch ($field->getVar('field_type')) {
case "textbox":
- //proceed to next cases
case "textarea":
case "dhtml":
$form->addElement(new XoopsFormText(_PROFILE_AM_MAXLENGTH, 'field_maxlength', 35, 35, $field->getVar('field_maxlength', 'e')));
@@ -341,21 +341,15 @@
}
//end of Dynamic User fields
- include_once $GLOBALS['xoops']->path('/class/auth/authfactory.php');
- include_once $GLOBALS['xoops']->path('/language/'.$xoopsConfig['language'].'/auth.php');
- $xoopsAuth =& XoopsAuthFactory::getAuthConnection();
-
- if ($step_no == 1 && $xoopsAuth->network_disclaimer()!='') {
+ if ($step_no == 1 && $xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
$disc_tray = new XoopsFormElementTray(_US_DISCLAIMER, '<br />');
- $disc_text = new XoopsFormLabel("", "<div style=\"padding: 5px;\">" . $GLOBALS["myts"]->displayTarea($xoopsAuth->network_disclaimer(), 1) . "</div>");
+ $disc_text = new XoopsFormLabel("", "<div style=\"padding: 5px;\">" . $GLOBALS["myts"]->displayTarea($xoopsConfigUser['reg_disclaimer'], 1) . "</div>");
$disc_tray->addElement($disc_text);
$agree_chk = new XoopsFormCheckBox('', 'agree_disc');
$agree_chk->addOption(1, _US_IAGREE);
$disc_tray->addElement($agree_chk);
$reg_form->addElement($disc_tray);
- } else {
- $reg_form->addElement(new XoopsFormHidden('no_disclaimer', true));
- }
+ }
if ($step_no == 1) {
$reg_form->addElement(new XoopsFormCaptcha(), true);
@@ -529,4 +523,4 @@
return $form;
}
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/profile/register.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/register.php 2009-08-30 17:55:35 UTC (rev 3532)
+++ XoopsCore/trunk/htdocs/modules/profile/register.php 2009-08-30 21:54:23 UTC (rev 3533)
@@ -137,10 +137,6 @@
}
}
-include_once $GLOBALS['xoops']->path('/class/auth/authfactory.php');
-include_once $GLOBALS['xoops']->path('/language/'.$xoopsConfig['language'].'/auth.php');
-$xoopsAuth =& XoopsAuthFactory::getAuthConnection($myts->addSlashes($uname));
-
$stop = '';
// Check user data at first step
@@ -166,7 +162,7 @@
xoops_load("captcha");
$xoopsCaptcha = XoopsCaptcha::getInstance();
if (! $xoopsCaptcha->verify() ) {
- $stop .= $xoopsCaptcha->getMessage();
+ $stop .= $xoopsCaptcha->getMessage();
}
}
@@ -181,21 +177,19 @@
$email = isset($_POST['email']) ? $myts->stripSlashesGPC(trim($_POST['email'])) : '';
$url = isset($_POST['url']) ? $myts->stripSlashesGPC(trim($_POST['url'])) : '';
$pass = isset($_POST['pass']) ? $myts->stripSlashesGPC(trim($_POST['pass'])) : '';
- $user_viewemail = isset($_POST['user_viewemail']) ? $myts->stripSlashesGPC(trim($_POST['user_viewemail'])) : 0;
- $timezone_offset = isset($_POST['timezone_offset']) ? $myts->stripSlashesGPC(trim($_POST['timezone_offset'])) : 0;
- $user_mailok = isset($_POST['user_mailok']) ? $myts->stripSlashesGPC(trim($_POST['user_mailok'])) : 1;
-
- $result = $xoopsAuth->create_user($user_viewemail, $uname, $email, $url, $actkey,
- $pass, $timezone_offset, $user_mailok, $xoopsAuth->check_siteinfo($siteinfo), false);
- $newuser->assignVars($result['user']);
-
+ $newuser->setVar('uname', $uname);
+ $newuser->setVar('email', $email);
+ $newuser->setVar('pass', $pass ? md5($pass) : '');
+ $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
+ $newuser->setVar('actkey', $actkey, true);
+ $newuser->setVar('user_regdate', time(), true);
if ($xoopsConfigUser['activation_type'] == 1) {
$newuser->setVar('level', 1, true);
} else {
$newuser->setVar('level', 0, true);
}
- }
-
+ }
+
// Insert/update user and check if we have succeded
if (!$member_handler->insertUser($newuser)) {
$stop .= _US_REGISTERNG . "<br />";
@@ -266,7 +260,7 @@
}
}
}
-
+
if (!empty($stop) || isset($steps[$current_step])) {
include_once dirname(__FILE__) . '/include/forms.php';
$current_step = empty($stop) ? $current_step : $current_step - 1;
@@ -293,4 +287,4 @@
include dirname(__FILE__) . '/footer.php';
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/profile/templates/profile_admin_visibility.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/templates/profile_admin_visibility.html 2009-08-30 17:55:35 UTC (rev 3532)
+++ XoopsCore/trunk/htdocs/modules/profile/templates/profile_admin_visibility.html 2009-08-30 21:54:23 UTC (rev 3533)
@@ -22,7 +22,7 @@
<{$smarty.const._PROFILE_AM_FIELDVISIBLEON}> <{$groups.$profile_gid}>
<a href="visibility.php?op=del&field_id=<{$field_id}>&ug=<{$user_gid}>&pg=<{$profile_gid}>" title="<{$smarty.const._DELETE}>">
<img src="<{$xoops_url}>/modules/profile/images/no.png" alt="<{$smarty.const._DELETE}>" />
- </a
+ </a>
</li>
<{/foreach}>
</ul>
Modified: XoopsCore/trunk/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/xoops_version.php 2009-08-30 17:55:35 UTC (rev 3532)
+++ XoopsCore/trunk/htdocs/modules/profile/xoops_version.php 2009-08-30 21:54:23 UTC (rev 3533)
@@ -3,7 +3,7 @@
* Extended User Profile
*
* 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
+ * 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
@@ -17,7 +17,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
+
/**
* This is a temporary solution for merging XOOPS 2.0 and 2.2 series
* A thorough solution will be available in XOOPS 3.0
@@ -25,7 +25,7 @@
*/
$modversion = array();
$modversion['name'] = _PROFILE_MI_NAME;
-$modversion['version'] = 1.55;
+$modversion['version'] = 1.53;
$modversion['description'] = _PROFILE_MI_DESC;
$modversion['author'] = "Jan Pedersen; Taiwen Jiang <ph...@us...>; alfred <my...@t-...>; Wishcraft <si...@xo...>";
$modversion['credits'] = "Ackbarr, mboyden, marco, mamba, etc.";
@@ -136,4 +136,4 @@
$modversion['templates'][$i]['file'] = 'profile_email.html';
$modversion['templates'][$i]['description'] = '';
-?>
+?>
\ 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: <be...@us...> - 2009-08-30 17:55:45
|
Revision: 3532
http://xoops.svn.sourceforge.net/xoops/?rev=3532&view=rev
Author: beckmi
Date: 2009-08-30 17:55:35 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
Added XOOPS 2.4 image for installer (provided by Kris)
Removed Paths:
-------------
XoopsCore/trunk/htdocs/install/img/xoops_2.3.3.png
Deleted: XoopsCore/trunk/htdocs/install/img/xoops_2.3.3.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-29 22:38:00
|
Revision: 3531
http://xoops.svn.sourceforge.net/xoops/?rev=3531&view=rev
Author: trabis
Date: 2009-08-29 22:37:47 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Deleting templates from oxygen
Removed Paths:
-------------
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/templates/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-29 22:36:26
|
Revision: 3530
http://xoops.svn.sourceforge.net/xoops/?rev=3530&view=rev
Author: trabis
Date: 2009-08-29 22:36:07 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
adming themable administration - Using some of Muss work with ThAdmin - refactoring GUI's
Modified Paths:
--------------
XoopsCore/trunk/htdocs/class/theme.php
XoopsCore/trunk/htdocs/modules/system/class/cpanel.php
XoopsCore/trunk/htdocs/modules/system/class/gui/default/default.php
XoopsCore/trunk/htdocs/modules/system/class/gui/exm/exm.php
XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/cp_functions.php
XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/legacy.php
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/oxygen.php
XoopsCore/trunk/htdocs/modules/system/class/gui.php
Added Paths:
-----------
XoopsCore/trunk/htdocs/modules/system/class/gui/default/theme.html
XoopsCore/trunk/htdocs/modules/system/class/gui/exm/theme.html
XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/theme.html
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/language/persian/style.css
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_footer.html
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_navbar.html
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_indexcp.html
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/theme.html
Removed Paths:
-------------
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/css/en.css
XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/css/fa.css
Property Changed:
----------------
XoopsCore/trunk/htdocs/language/
XoopsCore/trunk/htdocs/modules/
XoopsCore/trunk/htdocs/modules/system/class/gui/
Modified: XoopsCore/trunk/htdocs/class/theme.php
===================================================================
--- XoopsCore/trunk/htdocs/class/theme.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/class/theme.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -95,6 +95,37 @@
}
/**
+ * xos_opal_AdminThemeFactory
+ *
+ * @author Andricq Nicolas (AKA MusS)
+ * @author trabis
+ * @package xos_opal
+ * @subpackage xos_opal_Theme
+ * @since 2.4.0
+ */
+class xos_opal_AdminThemeFactory extends xos_opal_ThemeFactory
+{
+ function &createInstance( $options = array(), $initArgs = array() )
+ {
+ $options["plugins"] = array();
+ $inst =& parent::createInstance( $options, $initArgs );
+ $inst->path = XOOPS_ROOT_PATH . '/modules/system/class/gui/' . $inst->folderName;
+ $inst->url = XOOPS_URL . '/modules/system/class/gui/' . $inst->folderName;
+ $inst->template->assign( array(
+ 'theme_path' => $inst->path,
+ 'theme_tpl' => $inst->path.'/xotpl',
+ 'theme_url' => $inst->url,
+ 'theme_img' => $inst->url.'/img',
+ 'theme_icons' => $inst->url.'/icons',
+ 'theme_css' => $inst->url.'/css',
+ 'theme_js' => $inst->url.'/js',
+ ) );
+
+ return $inst;
+ }
+}
+
+/**
* xos_opal_Theme
*
* @package
@@ -131,6 +162,14 @@
* @var string
*/
var $canvasTemplate = 'theme.html';
+
+ /**
+ * Theme folder path
+ *
+ * @var string
+ */
+ var $themesPath = 'themes';
+
/**
* Content-level template to use
*
@@ -419,16 +458,19 @@
* <li>script.js - localization script</li>
* </ul>
*/
- function loadLocalization()
+ function loadLocalization($type = "main")
{
$language = xoops_getConfigOption('language');
if (! file_exists($this->path . '/language/' . $language)) {
return true;
}
-
- $this->addLanguage();
- $this->addScript('language/' . $language . '/script.js');
- $this->addStylesheet('language/' . $language . '/style.css');
+ $this->addLanguage($type);
+ if (file_exists($this->path . '/language/' . $language . '/script.js')) {
+ $this->addScript($this->url . '/language/' . $language . '/script.js');
+ }
+ if (file_exists($this->path . '/language/' . $language . '/style.css')) {
+ $this->addStylesheet($this->url . '/language/' . $language . '/style.css');
+ }
return true;
}
@@ -438,14 +480,16 @@
* @param string $type language type, like 'main', 'admin'; Needs to be declared in theme xo-info.php
* @param string $language specific language
*/
- function addLanguage($type = 'main', $language = null)
+ function addLanguage($type = "main", $language = null)
{
- $language = is_null($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
-
- if (false === include $GLOBALS['xoops']->path($this->resourcePath('/language/' . $language . '/' . $type . '.php'))) {
- include $GLOBALS['xoops']->path($this->resourcePath('/language/english/' . $type . '.php'));
+ $language = is_null($language) ? $GLOBALS["xoopsConfig"]["language"] : $language;
+ if (!file_exists($fileinc = $GLOBALS['xoops']->path($this->resourcePath("/language/{$language}/{$type}.php")))) {
+ if (!file_exists($fileinc = $GLOBALS['xoops']->path($this->resourcePath( "/language/english/{$type}.php")))) {
+ return false;
+ }
}
- return true;
+ $ret = include_once $fileinc;
+ return $ret;
}
/**
@@ -681,7 +725,7 @@
$path = substr($path, 1);
}
if (file_exists("$this->path/$path")) {
- return "themes/$this->folderName/$path";
+ return "$this->themesPath/$this->folderName/$path";
}
return $path;
}
Property changes on: XoopsCore/trunk/htdocs/language
___________________________________________________________________
Added: svn:ignore
+ french
Property changes on: XoopsCore/trunk/htdocs/modules
___________________________________________________________________
Modified: svn:ignore
- smartsection
xforum
xinvite
xpnews
xreaggregator
xsoap
xtransam
news
salat
myinviter
subscribers
thadmin
newbb
mxdirectory
xdir
+ smartsection
xforum
xinvite
xpnews
xreaggregator
xsoap
xtransam
news
salat
myinviter
subscribers
thadmin
newbb
mxdirectory
xdir
xlanguage
protector
trunk
xlanguage2
wfchannel
wfresource
imagemanager
Modified: XoopsCore/trunk/htdocs/modules/system/class/cpanel.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/cpanel.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/cpanel.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -1,30 +1,30 @@
<?php
-/*
- 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.
+/*
+ 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.
*/
-/**
- * Xoops Cpanel class
- *
- * @copyright The XOOPS Project http://sf.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package system
- * @subpackage class
- * @since 2.3.0
- * @author Taiwen Jiang <ph...@us...>
- * @version $Id$
+/**
+ * Xoops Cpanel class
+ *
+ * @copyright The XOOPS Project http://sf.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package system
+ * @subpackage class
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id$
*/
class XoopsSystemCpanel
{
- /**
- * Reference to GUI object
+ /**
+ * Reference to GUI object
*/
var $gui;
@@ -78,6 +78,7 @@
if (class_exists($class)) {
if (call_user_func(array($class , 'validate'))) {
$this->gui = & new $class();
+ $this->gui->foldername = $gui;
}
}
}
@@ -85,6 +86,7 @@
if (file_exists($file = dirname(__FILE__) . '/gui/default/default.php')) {
include_once $file;
$this->gui = & new XoopsGuiDefault();
+ $this->gui->foldername = 'default';
}
}
}
@@ -130,4 +132,4 @@
}
}
-?>
\ No newline at end of file
+?>
Property changes on: XoopsCore/trunk/htdocs/modules/system/class/gui
___________________________________________________________________
Added: svn:ignore
+ oxygen2
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui/default/default.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/default/default.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/default/default.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -23,7 +23,7 @@
* @version $Id$
*/
-class XoopsGuiDefault extends /* implements */ XoopsSystemGui
+class XoopsGuiDefault extends XoopsSystemGui
{
/**
* Reference to template object
@@ -147,18 +147,8 @@
function header()
{
global $xoopsConfig, $xoopsUser;
+ parent::header();
- xoops_loadLanguage("cpanel", "system");
-
- if (!headers_sent()) {
- header('Content-Type:text/html; charset=' . _CHARSET);
- header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
- header('Cache-Control: no-store, no-cache, must-revalidate');
- header("Cache-Control: post-check=0, pre-check=0", false);
- header("Pragma: no-cache");
- }
-
echo "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>";
echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">
<head>
@@ -327,8 +317,8 @@
</body>
</html>
";
- echo $GLOBALS['xoopsLogger']->render( '' );
- ob_end_flush();
+
+ parent::footer();
}
}
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/default/theme.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/default/theme.html (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/default/theme.html 2009-08-29 22:36:07 UTC (rev 3530)
@@ -0,0 +1 @@
+<{$xoops_contents}>
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui/exm/exm.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/exm/exm.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/exm/exm.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -23,24 +23,12 @@
* @version $Id$
*/
-class XoopsGuiExm extends /* implements */ XoopsSystemGui
+class XoopsGuiExm extends XoopsSystemGui
{
- /**
- * Reference to template object
- */
- var $template;
- /**
- * Holding navigation
- */
- var $navigation;
-
- var $menu;
-
function __construct()
{
- include_once XOOPS_ROOT_PATH . '/class/template.php';
- $this->template = new XoopsTpl();
+
}
function XoopsGuiExm()
@@ -60,8 +48,12 @@
function header()
{
- global $xoopsConfig, $xoopsUser, $xoopsModule;
+ global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme;
+ parent::header();
+ $tpl =& $this->template;
+ $xoTheme =& $this->xoTheme;
+
xoops_loadLanguage('cpanel', 'system');
xoops_loadLanguage('modinfo', 'system');
xoops_loadLanguage('admin', 'system');
@@ -72,16 +64,6 @@
include_once XOOPS_ROOT_PATH . '/modules/system/class/gui/exm/language/english/admin.php';
}
- if (!headers_sent()) {
- header('Content-Type:text/html; charset='._CHARSET);
- header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
- header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
- header('Cache-Control: no-store, no-cache, must-revalidate');
- header('Cache-Control: post-check=0, pre-check=0', false);
- header('Pragma: no-cache');
- }
-
- $tpl = $this->template;
$tpl->assign('lang_cp', _CPHOME);
$tpl->assign('system_options', _AD_SYSOPTIONS);
$tpl->assign('lang_banners', _MD_AM_BANS);
@@ -252,11 +234,11 @@
function footer()
{
- echo $this->template->fetch(XOOPS_ROOT_PATH . '/modules/system/class/gui/exm/templates/admin/system_adm_footer.html');
- echo $GLOBALS['xoopsLogger']->render('');
- ob_end_flush();
+ echo $GLOBALS['xoopsTpl']->fetch(XOOPS_ROOT_PATH . '/modules/system/class/gui/exm/templates/admin/system_adm_footer.html');
+
+ parent::footer();
return true;
}
}
-?>
\ No newline at end of file
+?>
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/exm/theme.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/exm/theme.html (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/exm/theme.html 2009-08-29 22:36:07 UTC (rev 3530)
@@ -0,0 +1 @@
+<{$xoops_contents}>
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/cp_functions.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/cp_functions.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/cp_functions.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -27,7 +27,7 @@
global $xoopsConfig, $xoopsUser;
xoops_loadLanguage("cpanel", "system");
-
+ /*
if (!headers_sent()) {
header('Content-Type:text/html; charset='._CHARSET);
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -35,7 +35,7 @@
header('Cache-Control: no-store, no-cache, must-revalidate');
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
- }
+ } */
echo "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>";
echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">
<head>
@@ -156,9 +156,9 @@
</table>";
include XOOPS_CACHE_PATH.'/adminmenu.php';
echo $xoops_admin_menu_dv;
-
+ /*
echo $GLOBALS['xoopsLogger']->render( '' );
- ob_end_flush();
+ ob_end_flush(); */
echo "
</body>
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/legacy.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/legacy.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/legacy.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -69,6 +69,7 @@
function header()
{
+ parent::header();
if (!file_exists( XOOPS_CACHE_PATH . '/adminmenu.php' )) {
$this->generateMenu();
}
@@ -80,8 +81,9 @@
function footer()
{
xoops_legacy_cp_footer();
+ parent::footer();
return true;
}
}
-?>
\ No newline at end of file
+?>
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/theme.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/theme.html (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/legacy/theme.html 2009-08-29 22:36:07 UTC (rev 3530)
@@ -0,0 +1 @@
+<{$xoops_contents}>
Deleted: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/css/fa.css
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/css/fa.css 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/css/fa.css 2009-08-29 22:36:07 UTC (rev 3530)
@@ -1,74 +0,0 @@
-/* $Id$ */
-body {
- font-family: Tahoma !important;
-}
-
-table,table td,table tr,ul,li,div.content,div#containBodyCP {
- direction: rtl;
- text-align: right;
-}
-
-input,textarea,input.formTextBox,select {
- font: 11px tahoma !important;
-}
-
-div.confirmMsg {
- text-align: center !important;
-}
-
-/*================================================================*/
-div#navbarCP {
- font: 11px Tahoma !important;
- direction: rtl;
- text-align: right;
-}
-
-div#navbarCP ul li {
- float: right;
- margin-right: 3px;
-}
-
-div#navOptionsCP a {
- float: left;
- margin-left: 2px;
-}
-
-div.cpicon a,div.cpicon a:hover,div.cpiconmodules a,div.cpiconmodules a:hover
- {
- direction: rtl;
- text-align: center;
- float: right;
-}
-
-div.confirmMsg {
- direction: rtl;
-}
-
-div#navOptionsCP .modname {
- float: right;
-}
-
-div#navbarCP ul.menu li {
- float: right;
- margin-left: 2px;
-}
-
-div#navbarCP ul.menu ul ul {
- right: 148px;
-}
-
-div#navbarCP ul.menu ul {
- background: none;
-}
-
-#choosestyle a {
- float: left;
-}
-
-div#logoHead td.other {
- float: left;
-}
-
-#main_logo {
- float: right;
-}
\ No newline at end of file
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/language/persian/style.css
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/language/persian/style.css (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/language/persian/style.css 2009-08-29 22:36:07 UTC (rev 3530)
@@ -0,0 +1,74 @@
+/* $Id: fa.css 3478 2009-08-21 07:32:55Z voltan1 $ */
+body {
+ font-family: Tahoma !important;
+}
+
+table,table td,table tr,ul,li,div.content,div#containBodyCP {
+ direction: rtl;
+ text-align: right;
+}
+
+input,textarea,input.formTextBox,select {
+ font: 11px tahoma !important;
+}
+
+div.confirmMsg {
+ text-align: center !important;
+}
+
+/*================================================================*/
+div#navbarCP {
+ font: 11px Tahoma !important;
+ direction: rtl;
+ text-align: right;
+}
+
+div#navbarCP ul li {
+ float: right;
+ margin-right: 3px;
+}
+
+div#navOptionsCP a {
+ float: left;
+ margin-left: 2px;
+}
+
+div.cpicon a,div.cpicon a:hover,div.cpiconmodules a,div.cpiconmodules a:hover
+ {
+ direction: rtl;
+ text-align: center;
+ float: right;
+}
+
+div.confirmMsg {
+ direction: rtl;
+}
+
+div#navOptionsCP .modname {
+ float: right;
+}
+
+div#navbarCP ul.menu li {
+ float: right;
+ margin-left: 2px;
+}
+
+div#navbarCP ul.menu ul ul {
+ right: 148px;
+}
+
+div#navbarCP ul.menu ul {
+ background: none;
+}
+
+#choosestyle a {
+ float: left;
+}
+
+div#logoHead td.other {
+ float: left;
+}
+
+#main_logo {
+ float: right;
+}
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/oxygen.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/oxygen.php 2009-08-29 17:24:53 UTC (rev 3529)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/oxygen.php 2009-08-29 22:36:07 UTC (rev 3530)
@@ -22,378 +22,333 @@
* @author Mamba XXXXXXXXXXXXXXXXXXX
* @author Mojtabajml <jam...@gm...>
* @author Voltan <djv...@gm...>
- * @auther BitC3R0 <Bi...@gm...>
+ * @author BitC3R0 <Bi...@gm...>
+ * @author trabis <lus...@gm...>
* @version 1.2
* @version $Id$
*/
-class XoopsGuiOXYGEN extends /* implements */ XoopsSystemGui
+class XoopsGuiOxygen extends XoopsSystemGui
{
- /**
- * Reference to template object
- */
- var $template;
- /**
- * Holding navigation
- */
- var $navigation;
+ function __construct()
+ {
+ }
- var $menu;
+ function XoopsGuiOxygen()
+ {
+ $this->__construct();
+ }
- function __construct()
- {
- include_once XOOPS_ROOT_PATH . '/class/template.php';
- $this->template = new XoopsTpl();
- }
+ function validate()
+ {
+ return true;
+ }
- function XoopsGuiOXYGEN()
- {
- $this->__construct();
- }
- function validate()
- {
- return true;
- }
+ function header()
+ {
+ parent::header();
- function generateMenu()
- {
- return true;
- }
+ global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme, $xoopsTpl;
+ $tpl =& $this->template;
- function header()
- {
- global $xoopsConfig, $xoopsUser, $xoopsModule;
+ $xoTheme->addStylesheet(XOOPS_URL . '/xoops.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/class/gui/oxygen/css/style.css');
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/class/gui/oxygen/css/style.css', array('title' => 'style'));
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/class/gui/oxygen/css/style2.css', array('title' => 'style2'));
+ $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/class/gui/oxygen/css/orange.css', array('title' => 'orange'));
+ $xoTheme->addScript(XOOPS_URL . '/modules/system/class/gui/oxygen/js/jquery.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/system/class/gui/oxygen/js/styleswitch.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/system/class/gui/oxygen/js/accordion.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/system/class/gui/oxygen/js/formenu.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/system/class/gui/oxygen/js/menu.js');
+ $xoTheme->addScript(XOOPS_URL . '/modules/system/class/gui/oxygen/js/tooltip.js');
- xoops_loadLanguage('cpanel', 'system');
- xoops_loadLanguage('modinfo', 'system');
- xoops_loadLanguage('admin', 'system');
+ $tpl->assign('lang_cp', _CPHOME);
- if (file_exists($file = XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/language/' . $xoopsConfig['language'] . '/admin.php')) {
- include_once $file;
- } else {
- include_once XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/language/english/admin.php';
- }
+ //for system options
+ $tpl->assign('system_options', _AD_SYSOPTIONS);
+ $tpl->assign('lang_banners', _MD_AM_BANS);
+ $tpl->assign('lang_blocks', _MD_AM_BKAD);
+ $tpl->assign('lang_groups', _MD_AM_ADGS);
+ $tpl->assign('lang_images', _MD_AM_IMAGES);
+ $tpl->assign('lang_modules', _MD_AM_MDAD);
+ $tpl->assign('lang_preferences', _MD_AM_PREF);
+ $tpl->assign('lang_smilies', _MD_AM_SMLS);
+ $tpl->assign('lang_ranks', _MD_AM_RANK);
+ $tpl->assign('lang_edituser', _MD_AM_USER);
+ $tpl->assign('lang_finduser', _MD_AM_FINDUSER);
+ $tpl->assign('lang_mailuser', _MD_AM_MLUS);
+ $tpl->assign('lang_avatars', _MD_AM_AVATARS);
+ $tpl->assign('lang_tpls', _MD_AM_TPLSETS);
+ $tpl->assign('lang_comments', _MD_AM_COMMENTS);
+ $tpl->assign('lang_insmodules', _AD_INSTALLEDMODULES);
- if (!headers_sent()) {
- header('Content-Type:text/html; charset='._CHARSET);
- header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
- header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
- header('Cache-Control: no-store, no-cache, must-revalidate');
- header('Cache-Control: post-check=0, pre-check=0', false);
- header('Pragma: no-cache');
- }
+ //for toolpit help texts
+ $tpl->assign('lang_banners_help', _MD_AM_BANS_HELP);
+ $tpl->assign('lang_blocks_help', _MD_AM_BKAD_HELP);
+ $tpl->assign('lang_groups_help', _MD_AM_ADGS_HELP);
+ $tpl->assign('lang_images_help', _MD_AM_IMAGES_HELP);
+ $tpl->assign('lang_modules_help', _MD_AM_MDAD_HELP);
+ $tpl->assign('lang_preferences_help', _MD_AM_PREF_HELP);
+ $tpl->assign('lang_smilies_help', _MD_AM_SMLS_HELP);
+ $tpl->assign('lang_ranks_help', _MD_AM_RANK_HELP);
+ $tpl->assign('lang_edituser_help', _MD_AM_USER_HELP);
+ $tpl->assign('lang_finduser_help', _MD_AM_FINDUSER_HELP);
+ $tpl->assign('lang_mailuser_help', _MD_AM_MLUS_HELP);
+ $tpl->assign('lang_avatars_help', _MD_AM_AVATARS_HELP);
+ $tpl->assign('lang_tpls_help', _MD_AM_TPLSETS_HELP);
+ $tpl->assign('lang_comments_help', _MD_AM_COMMENTS_HELP);
- $tpl = $this->template;
- $tpl->assign('lang_cp', _CPHOME);
+ //for system overview
+ $tpl->assign('lang_overview', _MD_CPANEL_OVERVIEW);
+ $tpl->assign('lang_phpextensions', _MD_CPANEL_PHPEXTENSIONS);
+ $tpl->assign('lang_about_xoops', _MD_OXYGEN_ABOUT);
+ $tpl->assign('lang_about_xoops_text', _MD_OXYGEN_ABOUT_TEXT);
+ $tpl->assign('lang_version', _MD_OXYGEN_VERSION);
+ $tpl->assign('lang_version_xoops', _MD_OXYGEN_VERSION_XOOPS);
+ $tpl->assign('lang_version_php', _MD_OXYGEN_VERSION_PHP);
+ $tpl->assign('lang_version_mysql', _MD_OXYGEN_VERSION_MYSQL);
+ $tpl->assign('lang_server_api_name', _MD_OXYGEN_Server_API);
+ $tpl->assign('lang_os', _MD_OXYGEN_OS);
+ $tpl->assign('lang_xoops_links', _MD_OXYGEN_XOOPS_LINKS);
- //for system options
- $tpl->assign('system_options', _AD_SYSOPTIONS);
- $tpl->assign('lang_banners', _MD_AM_BANS);
- $tpl->assign('lang_blocks', _MD_AM_BKAD);
- $tpl->assign('lang_groups', _MD_AM_ADGS);
- $tpl->assign('lang_images', _MD_AM_IMAGES);
- $tpl->assign('lang_modules', _MD_AM_MDAD);
- $tpl->assign('lang_preferences', _MD_AM_PREF);
- $tpl->assign('lang_smilies', _MD_AM_SMLS);
- $tpl->assign('lang_ranks', _MD_AM_RANK);
- $tpl->assign('lang_edituser', _MD_AM_USER);
- $tpl->assign('lang_finduser', _MD_AM_FINDUSER);
- $tpl->assign('lang_mailuser', _MD_AM_MLUS);
- $tpl->assign('lang_avatars', _MD_AM_AVATARS);
- $tpl->assign('lang_tpls', _MD_AM_TPLSETS);
- $tpl->assign('lang_comments', _MD_AM_COMMENTS);
- $tpl->assign('lang_insmodules', _AD_INSTALLEDMODULES);
+ //for xoops links
+ $tpl->assign('lang_xoops_xoopsproject', _MD_OXYGEN_XOOPSPROJECT);
+ $tpl->assign('lang_xoops_localsupport', _MD_OXYGEN_LOCALSUPPORT);
+ $tpl->assign('lang_xoops_xoopscore', _MD_OXYGEN_XOOPSCORE);
+ $tpl->assign('lang_xoops_xoopsthems', _MD_OXYGEN_XOOPSTHEME);
+ $tpl->assign('lang_xoops_xoopswiki', _MD_OXYGEN_XOOPSWIKI);
+ $tpl->assign('lang_xoops_xoopsbooks', _MD_OXYGEN_XOOPSBOOKS);
+ $tpl->assign('lang_xgiftshop', _MD_OXYGEN_XGIFTSHOP);
+ $tpl->assign('lang_xdonations', _MD_OXYGEN_XDONATIONS);
+ $tpl->assign('lang_xdonations_text', _MD_OXYGEN_XDONATIONS_TEXT);
+ $tpl->assign('lang_xoops_newmodule', _MD_OXYGEN_NEWMODULE);
+ $tpl->assign('lang_xoops_xoopsfaq', _MD_OXYGEN_XOOPSFAQ);
+ $tpl->assign('lang_xoops_codesvn', _MD_OXYGEN_CODESVN);
+ $tpl->assign('lang_xoops_reportbug', _MD_OXYGEN_REPORTBUG);
- //for toolpit help texts
- $tpl->assign('lang_banners_help', _MD_AM_BANS_HELP);
- $tpl->assign('lang_blocks_help', _MD_AM_BKAD_HELP);
- $tpl->assign('lang_groups_help', _MD_AM_ADGS_HELP);
- $tpl->assign('lang_images_help', _MD_AM_IMAGES_HELP);
- $tpl->assign('lang_modules_help', _MD_AM_MDAD_HELP);
- $tpl->assign('lang_preferences_help', _MD_AM_PREF_HELP);
- $tpl->assign('lang_smilies_help', _MD_AM_SMLS_HELP);
- $tpl->assign('lang_ranks_help', _MD_AM_RANK_HELP);
- $tpl->assign('lang_edituser_help', _MD_AM_USER_HELP);
- $tpl->assign('lang_finduser_help', _MD_AM_FINDUSER_HELP);
- $tpl->assign('lang_mailuser_help', _MD_AM_MLUS_HELP);
- $tpl->assign('lang_avatars_help', _MD_AM_AVATARS_HELP);
- $tpl->assign('lang_tpls_help', _MD_AM_TPLSETS_HELP);
- $tpl->assign('lang_comments_help', _MD_AM_COMMENTS_HELP);
+ //add for styles name
+ $tpl->assign('lang_silver', _MD_LANG_SILVER);
+ $tpl->assign('lang_dark', _MD_LANG_DARK);
+ $tpl->assign('lang_orange', _MD_LANG_ORANGE);
- //for system overview
- $tpl->assign('lang_overview', _MD_CPANEL_OVERVIEW);
- $tpl->assign('lang_phpextensions', _MD_CPANEL_PHPEXTENSIONS);
- $tpl->assign('lang_about_xoops', _MD_OXYGEN_ABOUT);
- $tpl->assign('lang_about_xoops_text', _MD_OXYGEN_ABOUT_TEXT);
- $tpl->assign('lang_version', _MD_OXYGEN_VERSION);
- $tpl->assign('lang_version_xoops', _MD_OXYGEN_VERSION_XOOPS);
- $tpl->assign('lang_version_php', _MD_OXYGEN_VERSION_PHP);
- $tpl->assign('lang_version_mysql', _MD_OXYGEN_VERSION_MYSQL);
- $tpl->assign('lang_server_api_name', _MD_OXYGEN_Server_API);
- $tpl->assign('lang_os', _MD_OXYGEN_OS);
- $tpl->assign('lang_xoops_links', _MD_OXYGEN_XOOPS_LINKS);
+ //start system overview
+ $tpl->assign('lang_xoops_version', XOOPS_VERSION);
+ $tpl->assign('lang_php_vesion', PHP_VERSION);
+ $tpl->assign('lang_mysql_version', mysql_get_server_info());
+ $tpl->assign('lang_server_api', PHP_SAPI);
+ $tpl->assign('lang_os_name', PHP_OS);
+ $tpl->assign('safe_mode', ini_get( 'safe_mode' ) ? 'On' : 'Off');
+ $tpl->assign('register_globals', ini_get( 'register_globals' ) ? 'On' : 'Off');
+ $tpl->assign('magic_quotes_gpc', ini_get( 'magic_quotes_gpc' ) ? 'On' : 'Off');
+ $tpl->assign('allow_url_fopen', ini_get( 'allow_url_fopen' ) ? 'On' : 'Off');
+ $tpl->assign('fsockopen', function_exists( 'fsockopen' ) ? 'On' : 'Off');
+ $tpl->assign('allow_call_time_pass_reference', ini_get( 'allow_call_time_pass_reference' ) ? 'On' : 'Off');
+ $tpl->assign('post_max_size', ini_get( 'post_max_size' ));
+ $tpl->assign('max_input_time', ini_get( 'max_input_time' ));
+ $tpl->assign('output_buffering', ini_get( 'output_buffering' ));
+ $tpl->assign('max_execution_time', ini_get( 'max_execution_time' ));
+ $tpl->assign('memory_limit', ini_get( 'memory_limit' ));
+ $tpl->assign('file_uploads', ini_get( 'file_uploads' ) ? 'On' : 'Off');
+ $tpl->assign('upload_max_filesize', ini_get( 'upload_max_filesize' ));
+ $tpl->assign('xoops_sitename', $xoopsConfig['sitename']);
- //for xoops links
- $tpl->assign('lang_xoops_xoopsproject', _MD_OXYGEN_XOOPSPROJECT);
- $tpl->assign('lang_xoops_localsupport', _MD_OXYGEN_LOCALSUPPORT);
- $tpl->assign('lang_xoops_xoopscore', _MD_OXYGEN_XOOPSCORE);
- $tpl->assign('lang_xoops_xoopsthems', _MD_OXYGEN_XOOPSTHEME);
- $tpl->assign('lang_xoops_xoopswiki', _MD_OXYGEN_XOOPSWIKI);
- $tpl->assign('lang_xoops_xoopsbooks', _MD_OXYGEN_XOOPSBOOKS);
- $tpl->assign('lang_xgiftshop', _MD_OXYGEN_XGIFTSHOP);
- $tpl->assign('lang_xdonations', _MD_OXYGEN_XDONATIONS);
- $tpl->assign('lang_xdonations_text', _MD_OXYGEN_XDONATIONS_TEXT);
- $tpl->assign('lang_xoops_newmodule', _MD_OXYGEN_NEWMODULE);
- $tpl->assign('lang_xoops_xoopsfaq', _MD_OXYGEN_XOOPSFAQ);
- $tpl->assign('lang_xoops_codesvn', _MD_OXYGEN_CODESVN);
- $tpl->assign('lang_xoops_reportbug', _MD_OXYGEN_REPORTBUG);
+ // ADD MENU *****************************************
- //add for styles name
- $tpl->assign('lang_silver', _MD_LANG_SILVER);
- $tpl->assign('lang_dark', _MD_LANG_DARK);
- $tpl->assign('lang_orange', _MD_LANG_ORANGE);
+ //Add CONTROL PANEL Menu items
+ $menu = array();
+ $menu[0]['link'] = XOOPS_URL;
+ $menu[0]['title'] = _YOURHOME;
+ $menu[0]['absolute'] = 1;
+ $menu[1]['link'] = XOOPS_URL . '/admin.php?xoopsorgnews=1';
+ $menu[1]['title'] = _XOOPS_NEWS;
+ $menu[1]['absolute'] = 1;
+ $menu[1]['icon'] = XOOPS_URL . '/modules/system/class/gui/oxygen/images/xoops.png';
+ $menu[2]['link'] = XOOPS_URL . '/user.php?op=logout';
+ $menu[2]['title'] = _LOGOUT;
+ $menu[2]['absolute'] = 1;
+ $menu[2]['icon'] = XOOPS_URL . '/modules/system/class/gui/oxygen/images/logout.png';
+ $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _CPHOME, 'menu' => $menu));
- //start system overview
- $tpl->assign('lang_xoops_version', XOOPS_VERSION);
- $tpl->assign('lang_php_vesion', PHP_VERSION);
- $tpl->assign('lang_mysql_version', mysql_get_server_info());
- $tpl->assign('lang_server_api', PHP_SAPI);
- $tpl->assign('lang_os_name', PHP_OS);
- $tpl->assign('safe_mode', ini_get( 'safe_mode' ) ? 'On' : 'Off');
- $tpl->assign('register_globals', ini_get( 'register_globals' ) ? 'On' : 'Off');
- $tpl->assign('magic_quotes_gpc', ini_get( 'magic_quotes_gpc' ) ? 'On' : 'Off');
- $tpl->assign('allow_url_fopen', ini_get( 'allow_url_fopen' ) ? 'On' : 'Off');
- $tpl->assign('fsockopen', function_exists( 'fsockopen' ) ? 'On' : 'Off');
- $tpl->assign('allow_call_time_pass_reference', ini_get( 'allow_call_time_pass_reference' ) ? 'On' : 'Off');
- $tpl->assign('post_max_size', ini_get( 'post_max_size' ));
- $tpl->assign('max_input_time', ini_get( 'max_input_time' ));
- $tpl->assign('output_buffering', ini_get( 'output_buffering' ));
- $tpl->assign('max_execution_time', ini_get( 'max_execution_time' ));
- $tpl->assign('memory_limit', ini_get( 'memory_limit' ));
- $tpl->assign('file_uploads', ini_get( 'file_uploads' ) ? 'On' : 'Off');
- $tpl->assign('upload_max_filesize', ini_get( 'upload_max_filesize' ));
- $tpl->assign('xoops_sitename', $xoopsConfig['sitename']);
+ //add SYSTEM Menu items
+ include dirname(__FILE__) . '/menu.php';
+ if (empty($xoopsModule) || 'system' == $xoopsModule->getVar('dirname', 'n')) {
+ $modpath = XOOPS_URL . '/admin.php';
+ $modname = _AD_SYSOPTIONS;
+ $modid = 1;
+ $moddir = 'system';
- $lang = '';
- if (file_exists(XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/css/' . _LANGCODE . '.css')) {
- $lang .= '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/system/class/gui/oxygen/css/' . _LANGCODE . '.css" />';
- }
- if (file_exists(XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/style.css')) {
- $lang .= '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/language/' . $xoopsConfig['language'] . '/style.css" />';
- }
- $tpl->assign('xoops_lang', $lang);
+ $mod_options = $adminmenu;
+ foreach (array_keys($mod_options) as $item) {
+ $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/'.$moddir.'/' . $mod_options[$item]['link'] : $mod_options[$item]['link'];
+ $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . '/modules/system/class/gui/oxygen/' . $mod_options[$item]['icon'];
+ unset($mod_options[$item]['icon_small']);
+ }
+ } else {
+ $moddir = $xoopsModule->getVar('dirname', 'n');
+ $modpath = XOOPS_URL . '/modules/' . $moddir;
+ $modname = $xoopsModule->getVar('name');
+ $modid = $xoopsModule->getVar('mid');
- // ADD MENU *****************************************
+ $mod_options = $xoopsModule->getAdminMenu();
+ foreach (array_keys($mod_options) as $item) {
+ $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
+ $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
+ }
+ }
- //Add CONTROL PANEL Menu items
- $menu = array();
- $menu[0]['link'] = XOOPS_URL;
- $menu[0]['title'] = _YOURHOME;
- $menu[0]['absolute'] = 1;
- $menu[1]['link'] = XOOPS_URL . '/admin.php?xoopsorgnews=1';
- $menu[1]['title'] = _XOOPS_NEWS;
- $menu[1]['absolute'] = 1;
- $menu[1]['icon'] = XOOPS_URL . '/modules/system/class/gui/oxygen/images/xoops.png';
- $menu[2]['link'] = XOOPS_URL . '/user.php?op=logout';
- $menu[2]['title'] = _LOGOUT;
- $menu[2]['absolute'] = 1;
- $menu[2]['icon'] = XOOPS_URL . '/modules/system/class/gui/oxygen/images/logout.png';
- $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _CPHOME, 'menu' => $menu));
+ $tpl->assign('mod_options', $mod_options);
+ $tpl->assign('modpath', $modpath);
+ $tpl->assign('modname', $modname);
+ $tpl->assign('modid', $modid);
+ $tpl->assign('moddir', $moddir);
- //add SYSTEM Menu items
- include dirname(__FILE__) . '/menu.php';
- if (empty($xoopsModule) || 'system' == $xoopsModule->getVar('dirname', 'n')) {
- $modpath = XOOPS_URL . '/admin.php';
- $modname = _AD_SYSOPTIONS;
- $modid = 1;
- $moddir = 'system';
+ // add MODULES Menu items
+ $module_handler =& xoops_gethandler('module');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('hasadmin', 1));
+ $criteria->add(new Criteria('isactive', 1));
+ $criteria->setSort('mid');
+ $mods = $module_handler->getObjects($criteria);
- $mod_options = $adminmenu;
- foreach (array_keys($mod_options) as $item) {
- $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . '/modules/'.$moddir.'/' . $mod_options[$item]['link'] : $mod_options[$item]['link'];
- $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . '/modules/system/class/gui/oxygen/' . $mod_options[$item]['icon'];
- unset($mod_options[$item]['icon_small']);
- }
+ $menu = array();
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ foreach ($mods as $mod) {
+ $rtn = array();
+ $modOptions = array(); //add for sub menus
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
+ if ($sadmin) {
+ $info = $mod->getInfo();
+ if (!empty($info['adminindex'])) {
+ $rtn['link'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
} else {
- $moddir = $xoopsModule->getVar('dirname', 'n');
- $modpath = XOOPS_URL . '/modules/' . $moddir;
- $modname = $xoopsModule->getVar('name');
- $modid = $xoopsModule->getVar('mid');
-
- $mod_options = $xoopsModule->getAdminMenu();
- foreach (array_keys($mod_options) as $item) {
- $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
- $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
- }
+ $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
}
+ $rtn['title'] = $mod->name();
+ $rtn['absolute'] = 1;
+ $rtn['url'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/'; //add for sub menus
+ $modOptions = $mod->getAdminMenu(); //add for sub menus
+ $rtn['options'] = $modOptions; //add for sub menus
- $tpl->assign('mod_options', $mod_options);
- $tpl->assign('modpath', $modpath);
- $tpl->assign('modname', $modname);
- $tpl->assign('modid', $modid);
- $tpl->assign('moddir', $moddir);
-
- // add MODULES Menu items
- $module_handler =& xoops_gethandler('module');
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('hasadmin', 1));
- $criteria->add(new Criteria('isactive', 1));
- $criteria->setSort('mid');
- $mods = $module_handler->getObjects($criteria);
-
- $menu = array();
- $moduleperm_handler =& xoops_gethandler('groupperm');
- foreach ($mods as $mod) {
- $rtn = array();
- $modOptions = array(); //add for sub menus
- $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
- if ($sadmin) {
- $info = $mod->getInfo();
- if (!empty($info['adminindex'])) {
- $rtn['link'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
- } else {
- $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
- }
- $rtn['title'] = $mod->name();
- $rtn['absolute'] = 1;
- $rtn['url'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/'; //add for sub menus
- $modOptions = $mod->getAdminMenu(); //add for sub menus
- $rtn['options'] = $modOptions; //add for sub menus
-
- if (isset($info['icon']) && $info['icon'] != '' ) {
- $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon'];
- }
- }
- $menu[] = $rtn;
+ if (isset($info['icon']) && $info['icon'] != '' ) {
+ $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon'];
}
- $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
- 'text' => _MD_AM_MDAD, 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu));
+ }
+ $menu[] = $rtn;
+ }
+ $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
+ 'text' => _MD_AM_MDAD, 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu));
-
- // add preferences menu
- $menu = array();
- $menu[] = array(
+ // add preferences menu
+ $menu = array();
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=1',
'title' => _MD_OXYGEN_GENERAL,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
- $menu[] = array(
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=2',
'title' => _MD_OXYGEN_USERSETTINGS,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
- $menu[] = array(
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=3',
'title' => _MD_OXYGEN_METAFOOTER,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
- $menu[] = array(
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=4',
'title' => _MD_OXYGEN_CENSOR,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
- $menu[] = array(
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=5',
'title' => _MD_OXYGEN_SEARCH,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
- $menu[] = array(
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=6',
'title' => _MD_OXYGEN_MAILER,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
- $menu[] = array(
+ $menu[] = array(
'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=show&confcat_id=7',
'title' => _MD_OXYGEN_AUTHENTICATION,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png');
foreach ($mods as $mod) {
- $rtn = array();
- $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
- if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) {
- $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
- $rtn['title'] = $mod->name();
- $rtn['absolute'] = 1;
- $rtn['icon'] = XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png';
+ $rtn = array();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
+ if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) {
+ $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
+ $rtn['title'] = $mod->name();
+ $rtn['absolute'] = 1;
+ $rtn['icon'] = XOOPS_URL . '/modules/system/class/gui/oxygen/images/navIcons/prefs_small.png';
$menu[] = $rtn;
}
- }
- $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'text' => _MD_OXYGEN_SITEPREF, 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu));
+ }
+ $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'text' => _MD_OXYGEN_SITEPREF, 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu));
- //add OPTIONS/Links Menu Items
- $menu = array();
- $menu[] = array(
+ //add OPTIONS/Links Menu Items
+ $menu = array();
+ $menu[] = array(
'link' => 'http://www.xoops.org',
'title' => _XOOPS_WEBSITE,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/xoops.png');
- $menu[] = array(
+ $menu[] = array(
'link' => 'http://www.xoops.org/modules/extgallery/',
'title' => _AD_XOOPSTHEMES,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/tweb.png');
- $menu[] = array(
+ $menu[] = array(
'link' => 'http://www.xoops.org/modules/repository/',
'title' => _AD_XOOPSMODULES,
'absolute' => 1,
'icon' => XOOPS_URL . '/modules/system/class/gui/oxygen/images/xoops.png');
- $menu[] = array(
+ $menu[] = array(
'link' => 'http://sourceforge.net/projects/xoops/',
'title' => _SOURCEFORGE,
'absolute' => 1);
- $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _AD_INTERESTSITES, 'menu' => $menu));
+ $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _AD_INTERESTSITES, 'menu' => $menu));
- //add OPTIONS/links for local support
- if (file_exists($file = XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/language/' . $xoopsConfig['language'] . '/localsupport.php' )) {
- $links = include XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/language/' . $xoopsConfig['language'] . '/localsupport.php';
- if ( count($links) > 0 ) {
- $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _AD_LOCALSUPPORT, 'menu' => $links));
- }
- }
+ //add OPTIONS/links for local support
+ if (file_exists($file = XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/language/' . $xoopsConfig['language'] . '/localsupport.php' )) {
+ $links = include XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/language/' . $xoopsConfig['language'] . '/localsupport.php';
+ if ( count($links) > 0 ) {
+ $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _AD_LOCALSUPPORT, 'menu' => $links));
+ }
+ }
- echo $tpl->fetch(XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/templates/admin/system_adm_header.html');
- echo $tpl->fetch(XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/templates/admin/system_adm_navbar.html');
- echo '<div id="containBodyCP"><br /><div id="bodyCP">';
+ if (is_object($xoopsModule) || !empty($_GET['xoopsorgnews'])) {
+ return;
+ }
- if (is_object($xoopsModule) || !empty($_GET['xoopsorgnews'])) {
- return;
+ foreach ($mods as $mod) {
+ $rtn = array();
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
+ if ($sadmin) {
+ $info = $mod->getInfo();
+ if (!empty($info['adminindex'])) {
+ $rtn['link'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
+ } else {
+ $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
}
-
- foreach ($mods as $mod) {
- $rtn = array();
- $moduleperm_handler =& xoops_gethandler('groupperm');
- $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
- if ($sadmin) {
- $info = $mod->getInfo();
- if (!empty($info['adminindex'])) {
- $rtn['link'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
- } else {
- $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
- }
- $rtn['title'] = $mod->getVar('name');
- $rtn['absolute'] = 1;
- if (isset($info['icon_big'])) {
- $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon_big'];
- } elseif (isset($info['image'])) {
- $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['image'];
- }
- }
- $tpl->append('modules', $rtn);
+ $rtn['title'] = $mod->getVar('name');
+ $rtn['absolute'] = 1;
+ if (isset($info['icon_big'])) {
+ $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon_big'];
+ } elseif (isset($info['image'])) {
+ $rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['image'];
}
-
- echo $tpl->fetch(XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/templates/admin/system_indexcp.html');
+ }
+ $tpl->append('modules', $rtn);
}
-
- function footer()
- {
- echo $this->template->fetch(XOOPS_ROOT_PATH . '/modules/system/class/gui/oxygen/templates/admin/system_adm_footer.html');
- echo $GLOBALS['xoopsLogger']->render('');
- ob_end_flush();
- return true;
- }
+ }
}
-?>
+?>
\ No newline at end of file
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_footer.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_footer.html (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_footer.html 2009-08-29 22:36:07 UTC (rev 3530)
@@ -0,0 +1,7 @@
+</div>
+<br />
+</div>
+
+<div class='CPfoot'>
+ Powered by <{$xoops_version}>
+</div>
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_navbar.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_navbar.html (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_adm_navbar.html 2009-08-29 22:36:07 UTC (rev 3530)
@@ -0,0 +1,69 @@
+<div id="logoHead">
+ <table width="100%" cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td>
+ <a id="main_logo" class="tooltip" href="http://www.xoops.org" rel="external" title="Powered by XOOPS"></a>
+ </td>
+ <td id="choosestyle" class="other">
+ <a href="<{$xoops_url}>/user.php?op=logout" title="<{$smarty.const._LOGOUT}>"><{$smarty.const._LOGOUT}></a>
+ <a href="<{$xoops_url}>" title="<{$smarty.const._YOURHOME}>"><{$smarty.const._YOURHOME}></a>
+ </td>
+ </tr>
+ </table>
+</div>
+<div id="navbarCP">
+ <!-- start menu -->
+ <ul class="menu" id="menu">
+ <{foreach item=item from=$navitems}>
+ <li>
+ <a href="<{$item.link}>" class="menulink"><{$item.text}></a>
+ <ul>
+ <{foreach item=sub from=$item.menu}>
+ <li>
+ <{if $sub.options != 0}>
+ <a class="sub" href="<{$sub.link}>" title="<{$sub.title}>"><{$sub.title}></a>
+ <ul>
+ <{foreach item=option from=$sub.options}>
+ <li><a href="<{$sub.url}><{$option.link}>"><{$option.title}></a></li>
+ <{/foreach}>
+ </ul>
+ <{else}>
+ <a href="<{$sub.link}>" title="<{$sub.title}>"><{$sub.title}></a>
+ <{/if}>
+ </li>
+ <{/foreach}>
+ </ul>
+ </li>
+ <{/foreach}>
+ </ul>
+ <!-- start style choose -->
+ <div id="choosestyle">
+ <a href="<{$xoops_url}>/modules/system/class/gui/oxygen/css/index.html?style=style" rel="style" class="styleswitch"><{$lang_dark}></a>
+ <a href="<{$xoops_url}>/modules/system/class/gui/oxygen/css/index.html?style=style2" rel="style2" class="styleswitch"><{$lang_silver}></a>
+ <a href="<{$xoops_url}>/modules/system/class/gui/oxygen/css/index.html?style=orange" rel="orange" class="styleswitch"><{$lang_orange}></a>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var menu=new menu.dd("menu");
+ menu.init("menu","menuhover");
+</script>
+
+<!-- get the toolbar icons -->
+
+<div id="navOptionsCP">
+ <div class="modname">
+ <{$modname}>
+ </div>
+ <{foreach item=op from=$mod_options}>
+ <a class="tooltip" href="<{$op.link}>" title="<{$op.title}>">
+ <img src='<{$op.icon|default:"$xoops_url/modules/system/class/gui/oxygen/images/icon_options.png"}>' alt="<{$op.title}>" />
+ </a>
+ <{/foreach}>
+
+ <{if $moddir!='system' && $mod_options}>
+ <a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>" title="<{$lang_preferences}>">
+ <img src="<{$xoops_url}>/modules/system/class/gui/oxygen/images/navIcons/prefs.png" alt="<{$lang_preferences}>" />
+ </a>
+ <{/if}>
+</div>
Added: XoopsCore/trunk/htdocs/modules/system/class/gui/oxygen/system_indexcp.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui/oxyge...
[truncated message content] |
|
From: <dj...@us...> - 2009-08-29 17:24:59
|
Revision: 3529
http://xoops.svn.sourceforge.net/xoops/?rev=3529&view=rev
Author: djculex
Date: 2009-08-29 17:24:53 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/onair/onair 1.04/sql/mysql.sql
Modified: XoopsModules/onair/onair 1.04/sql/mysql.sql
===================================================================
--- XoopsModules/onair/onair 1.04/sql/mysql.sql 2009-08-29 10:10:24 UTC (rev 3528)
+++ XoopsModules/onair/onair 1.04/sql/mysql.sql 2009-08-29 17:24:53 UTC (rev 3529)
@@ -46,5 +46,6 @@
ch_songtopplace varchar(3) NOT NULL default '',
ch_songthisweek varchar(3) NOT NULL default'',
ch_songweek varchar(2) NOT NULL default '',
+ ch_songplaytime varchar(8) NOT NULL default '',
PRIMARY KEY (ch_songid)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=15 ;
\ 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: <tr...@us...> - 2009-08-29 10:10:31
|
Revision: 3528
http://xoops.svn.sourceforge.net/xoops/?rev=3528&view=rev
Author: trabis
Date: 2009-08-29 10:10:24 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Updating the core preloads - arguments are passed by reference
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/pm/preloads/core.php
XoopsCore/trunk/htdocs/modules/pm/preloads/system.php
XoopsCore/trunk/htdocs/modules/profile/preloads/core.php
XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php
Modified: XoopsCore/trunk/htdocs/modules/pm/preloads/core.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/preloads/core.php 2009-08-29 09:32:59 UTC (rev 3527)
+++ XoopsCore/trunk/htdocs/modules/pm/preloads/core.php 2009-08-29 10:10:24 UTC (rev 3528)
@@ -29,7 +29,7 @@
class PmCorePreload extends XoopsPreloadItem
{
- function eventCorePmliteStart(&$args)
+ function eventCorePmliteStart($args)
{
if (PmCorePreload::isActive()) {
header("location: ./modules/pm/pmlite.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
@@ -37,7 +37,7 @@
}
}
- function eventCorerReadpmsgStart(&$args)
+ function eventCorerReadpmsgStart($args)
{
if (PmCorePreload::isActive()) {
header("location: ./modules/pm/readpmsg.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
@@ -45,7 +45,7 @@
}
}
- function eventCoreViewpmsgStart(&$args)
+ function eventCoreViewpmsgStart($args)
{
if (PmCorePreload::isActive()) {
header("location: ./modules/pm/viewpmsg.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
@@ -53,7 +53,7 @@
}
}
- function eventCoreClassSmartyXoops_pluginsXoinboxcount(&$args)
+ function eventCoreClassSmartyXoops_pluginsXoinboxcount($args)
{
if (PmCorePreload::isActive()) {
$args[0] =& xoops_getModuleHandler('message', 'pm');
@@ -63,8 +63,8 @@
function isActive()
{
$module_handler =& xoops_getHandler('module');
- $pm_module = $module_handler->getByDirname('pm');
- return ($pm_module && $pm_module->getVar('isactive')) ? true : false;
+ $module = $module_handler->getByDirname('pm');
+ return ($module && $module->getVar('isactive')) ? true : false;
}
}
?>
Modified: XoopsCore/trunk/htdocs/modules/pm/preloads/system.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/preloads/system.php 2009-08-29 09:32:59 UTC (rev 3527)
+++ XoopsCore/trunk/htdocs/modules/pm/preloads/system.php 2009-08-29 10:10:24 UTC (rev 3528)
@@ -29,7 +29,7 @@
class PmSystemPreload extends XoopsPreloadItem
{
- function eventSystemBlocksSystem_blocksUsershow(&$args)
+ function eventSystemBlocksSystem_blocksUsershow($args)
{
if (PmSystemPreload::isActive()) {
$args[0] =& xoops_getModuleHandler('message', 'pm');
@@ -40,8 +40,8 @@
function isActive()
{
$module_handler =& xoops_getHandler('module');
- $pm_module = $module_handler->getByDirname('pm');
- return ($pm_module && $pm_module->getVar('isactive')) ? true : false;
+ $module = $module_handler->getByDirname('pm');
+ return ($module && $module->getVar('isactive')) ? true : false;
}
}
?>
Modified: XoopsCore/trunk/htdocs/modules/profile/preloads/core.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/preloads/core.php 2009-08-29 09:32:59 UTC (rev 3527)
+++ XoopsCore/trunk/htdocs/modules/profile/preloads/core.php 2009-08-29 10:10:24 UTC (rev 3528)
@@ -28,7 +28,7 @@
*/
class ProfileCorePreload extends XoopsPreloadItem
{
- function eventCoreUserStart(&$args)
+ function eventCoreUserStart($args)
{
$op = 'main';
if (isset($_POST['op'])) {
@@ -44,7 +44,7 @@
}
}
- function eventCoreEdituserStart(&$args)
+ function eventCoreEdituserStart($args)
{
if (ProfileCorePreload::isActive()) {
header("location: ./modules/profile/edituser.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
@@ -52,7 +52,7 @@
}
}
- function eventCoreLostpassStart(&$args)
+ function eventCoreLostpassStart($args)
{
$email = isset($_GET['email']) ? trim($_GET['email']) : '';
$email = isset($_POST['email']) ? trim($_POST['email']) : $email;
@@ -63,7 +63,7 @@
}
}
- function eventCoreRegisterStart(&$args)
+ function eventCoreRegisterStart($args)
{
if (ProfileCorePreload::isActive()) {
header("location: ./modules/profile/register.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
@@ -71,7 +71,7 @@
}
}
- function eventCoreUserinfoStart(&$args)
+ function eventCoreUserinfoStart($args)
{
if (ProfileCorePreload::isActive()) {
header("location: ./modules/profile/userinfo.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
@@ -82,8 +82,8 @@
function isActive()
{
$module_handler =& xoops_getHandler('module');
- $profile_module = $module_handler->getByDirname('profile');
- return ($profile_module && $profile_module->getVar('isactive')) ? true : false;
+ $module = $module_handler->getByDirname('profile');
+ return ($module && $module->getVar('isactive')) ? true : false;
}
}
?>
Modified: XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php 2009-08-29 09:32:59 UTC (rev 3527)
+++ XoopsCore/trunk/htdocs/modules/system/blocks/system_blocks.php 2009-08-29 10:10:24 UTC (rev 3528)
@@ -159,7 +159,7 @@
$pm_handler =& xoops_gethandler('privmessage');
$xoopsPreload =& XoopsPreload::getInstance();
- $xoopsPreload->triggerEvent('system.blocks.system_blocks.usershow', array($pm_handler));
+ $xoopsPreload->triggerEvent('system.blocks.system_blocks.usershow', array(&$pm_handler));
$block['new_messages'] = $pm_handler->getCount($criteria);
$block['lang_inbox'] = _MB_SYSTEM_INBOX;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-29 09:33:08
|
Revision: 3527
http://xoops.svn.sourceforge.net/xoops/?rev=3527&view=rev
Author: trabis
Date: 2009-08-29 09:32:59 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
adding one preload hook for image manager
Modified Paths:
--------------
XoopsCore/trunk/htdocs/class/xoopsform/formdhtmltextarea.php
Modified: XoopsCore/trunk/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopsform/formdhtmltextarea.php 2009-08-28 21:25:38 UTC (rev 3526)
+++ XoopsCore/trunk/htdocs/class/xoopsform/formdhtmltextarea.php 2009-08-29 09:32:59 UTC (rev 3527)
@@ -214,6 +214,9 @@
}
}
$code .= "<img src='" . XOOPS_URL . "/images/code.gif' alt='" . _XOOPS_FORM_ALT_CODE . "' title='" . _XOOPS_FORM_ALT_CODE . "' /> " . "<img src='" . XOOPS_URL . "/images/quote.gif' alt='" . _XOOPS_FORM_ALT_QUOTE . "' title='" . _XOOPS_FORM_ALT_QUOTE . "' />";
+
+ $xoopsPreload =& XoopsPreload::getInstance();
+ $xoopsPreload->triggerEvent('core.class.xoopsform.formdhtmltextarea.codeicon', array(&$code));
return $code;
}
@@ -281,4 +284,4 @@
}
}
-?>
\ 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: <Bi...@us...> - 2009-08-28 21:25:50
|
Revision: 3526
http://xoops.svn.sourceforge.net/xoops/?rev=3526&view=rev
Author: BitC3R0
Date: 2009-08-28 21:25:38 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Forums templates almost done.
For pages navigation bar use pages_nav css class
Added to theme configuration option fro gravatar and xoops avatar
Modified Paths:
--------------
XoopsThemes/wox/trunk/config/config_me.php
XoopsThemes/wox/trunk/css/content.css
XoopsThemes/wox/trunk/css/forums.css
XoopsThemes/wox/trunk/css/news.css
XoopsThemes/wox/trunk/modules/news/news_index.html
Added Paths:
-----------
XoopsThemes/wox/trunk/images/bgtext.gif
XoopsThemes/wox/trunk/js/forums.js
XoopsThemes/wox/trunk/modules/newbb/newbb_item.html
XoopsThemes/wox/trunk/modules/newbb/newbb_thread.html
XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html
Removed Paths:
-------------
XoopsThemes/wox/trunk/images/Thumbs.db
XoopsThemes/wox/trunk/images/nav/Thumbs.db
Modified: XoopsThemes/wox/trunk/config/config_me.php
===================================================================
--- XoopsThemes/wox/trunk/config/config_me.php 2009-08-28 19:50:42 UTC (rev 3525)
+++ XoopsThemes/wox/trunk/config/config_me.php 2009-08-28 21:25:38 UTC (rev 3526)
@@ -11,6 +11,7 @@
<div class="it_config_tabs">
<ul>
<li id="li-e-home">Homepage</li>
+ <li id="li-e-avatars">Avatars</li>
</ul>
</div>
@@ -55,4 +56,28 @@
</select>
</div>
</div>
+</div>
+
+<div class="it_config_container" id="e-avatars">
+ <div class="field_item">
+ <div class="caption">
+ <label>Avatars for Comments:</label>
+ <span class="descriptions">Select method to show avatars in comments.</span>
+ </div>
+ <div class="content">
+ <label><input type="radio" name="itconf_avatar_comments" id="avatar-comments" value="0"<?php echo $avatar_comments==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
+ <label><input type="radio" name="itconf_avatar_comments" id="avatar-comments" value="1"<?php echo $avatar_comments==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
+ </div>
+ </div>
+
+ <div class="field_item">
+ <div class="caption">
+ <label>Avatars for Forums:</label>
+ <span class="descriptions">Select method to show avatars in forum posts.</span>
+ </div>
+ <div class="content">
+ <label><input type="radio" name="itconf_avatar_forum" id="avatar-forum" value="0"<?php echo $avatar_forum==0 ? ' checked="checked" ' : ''; ?> /> Use XOOPS Avatars</label>
+ <label><input type="radio" name="itconf_avatar_forum" id="avatar-forum" value="1"<?php echo $avatar_forum==1 ? ' checked="checked" ' : ''; ?> /> Use Gravatar</label>
+ </div>
+ </div>
</div>
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/css/content.css
===================================================================
--- XoopsThemes/wox/trunk/css/content.css 2009-08-28 19:50:42 UTC (rev 3525)
+++ XoopsThemes/wox/trunk/css/content.css 2009-08-28 21:25:38 UTC (rev 3526)
@@ -255,4 +255,36 @@
div#wox-footer div.com_item strong a{
font-size: 1.1em;
color: #000;
+}
+
+/** Pages Navigation **/
+div.pages_nav{
+ overflow: hidden;
+ margin-bottom: 15px;
+ padding: 5px 0;
+}
+div.pages_nav u{
+ text-decoration: none;
+ font-weight: bold;
+}
+div.pages_nav a, div.pages_nav strong{
+ display: block;
+ padding: 2px 6px;
+ float: left;
+ font-size: 1.1em;
+ background: #D6DEE4;
+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ margin-right: 1px;
+}
+div.pages_nav strong{
+ background: #ebebeb;
+ color: #333;
+}
+div.pages_nav a:hover{
+ background: #3f3f3f;
+ color: #FFF;
+ text-decoration: none;
}
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/css/forums.css
===================================================================
--- XoopsThemes/wox/trunk/css/forums.css 2009-08-28 19:50:42 UTC (rev 3525)
+++ XoopsThemes/wox/trunk/css/forums.css 2009-08-28 21:25:38 UTC (rev 3526)
@@ -89,4 +89,144 @@
float: left;
margin-right: 5px;
padding-bottom: 3px;
+}
+span.topis_navigation{
+ display: block;
+ float: left;
+ font-size: 0.85em;
+ text-transform: uppercase;
+ padding-top: 9px;
+}
+span.topis_navigation a{
+ display: block;
+ float: left;
+ margin-right: 10px;
+ padding: 2px 0 0 3px;
+}
+span.topis_navigation img{
+ float: left;
+ display: block;
+ margin-right: 8px;
+}
+.border_bottom{
+ border-bottom: 1px dotted #CCC;
+}
+
+/** Topic Posts **/
+div.forum_post_item{
+ overflow: hidden;
+
+ border: 1px solid #A9BAC7;
+ padding: 1px;
+}
+div.post_title{
+ padding: 5px;
+ font-size: 1.1em;
+ color: #000;
+ font-weight: bold;
+ overflow: hidden;
+ background: #ebebeb;
+ border: 1px solid #CCC;
+ border-top: 1px solid #FFF;
+ border-bottom: 1px solid #FFF;
+ font-family: georgia, times, serif;
+}
+div.post_title_top{
+ border-top: 1px solid #CCC;
+ -moz-border-radius: 5px 5px 0 0;
+ -khtml-border-radius-topleft: 5px;
+ -khtml-border-radius-topright: 5px;
+ -webkit-border-top-left-radius: 5px;
+ -webkit-border-top-right-radius: 5px;
+ border-radius: 5px 5px 0 0;
+}
+div.post_title span{
+ float: right;
+}
+div.post_title small{
+ font-family: arial, helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 0.8em;
+ color: #333;
+ text-transform: uppercase;
+ float: right;
+ display: block;
+ margin-right: 10px;
+ padding-top: 3px;
+}
+div.forum_post_item div.post_bg{
+ background: #D6DEE4;
+ overflow: hidden;
+}
+div.forum_post_item img.avatar{
+ width: 50px;
+ margin: 0 auto;
+ padding: 1px;
+ border: 1px solid #666;
+ display: block;
+ margin-bottom: 5px;
+}
+div.forum_post_item div.post_text{
+ float: right;
+ width: 500px;
+ padding: 10px 10px 10px 15px;
+ background: #FFF url(../images/bgtext.gif) no-repeat left;
+ height: 100%;
+ line-height: 150%;
+}
+div.forum_post_item div.post_text img{
+ max-width: 495px;
+}
+div.forum_post_item div.post_data{
+ width: 80px;
+ float: left;
+ margin: center;
+ padding: 10px;
+ text-align: center;
+ border-right: none;
+ background: transparent;
+}
+div.forum_post_item div.post_data a.show_more,
+div.forum_post_item div.post_data a.show_less{
+ font-size: 0.9em;
+}
+div.forum_post_item div.post_data a.show_less{
+ display: none;
+}
+div.forum_post_item div.post_data div.other_data{
+ font-size: 0.9em;
+ line-height: 140%;
+ border-top: 1px dotted #666;
+ border-bottom: 1px dotted #666;
+ margin: 10px 0;
+ text-align: left;
+ display: none;
+ padding: 5px 0;
+}
+#the_topic_posts div.forum_post_item:last-child{
+ -moz-border-radius: 0 0 5px 5px;
+ -khtml-border-radius-bottomleft: 5px;
+ -khtml-border-radius-bottomright: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ -webkit-border-bottom-right-radius: 5px;
+ border-radius: 0 0 5px 5px;
+}
+div.forum_post_item div.post_options{
+ border-top: 1px solid #CCC;
+ float: left;
+ margin-top: 20px;
+}
+div.forum_post_item div.post_ip{
+ text-align: right;
+ margin-top: 20px;
+ font-size: 0.9em;
+}
+div.forum_post_item div.post_signature{
+ margin-top: 10px;
+ font-size: 0.9em;
+}
+div.forum_post_item div.post_signature hr{
+ background: transparent;
+ border: 0;
+ border-top: 1px dashed #B8C6CF;
}
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/css/news.css
===================================================================
--- XoopsThemes/wox/trunk/css/news.css 2009-08-28 19:50:42 UTC (rev 3525)
+++ XoopsThemes/wox/trunk/css/news.css 2009-08-28 21:25:38 UTC (rev 3526)
@@ -71,37 +71,6 @@
max-width: 630px;
}
-/** Navigation Bar **/
-div.news_nav{
- overflow: hidden;
- margin-bottom: 15px;
-}
-div.news_nav u{
- text-decoration: none;
- font-weight: bold;
-}
-div.news_nav a, div.news_nav strong{
- display: block;
- padding: 2px 6px;
- float: left;
- font-size: 1.1em;
- background: #D6DEE4;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- margin-right: 1px;
-}
-div.news_nav strong{
- background: #ebebeb;
- color: #333;
-}
-div.news_nav a:hover{
- background: #3f3f3f;
- color: #FFF;
- text-decoration: none;
-}
-
/** Heading **/
div.wox_news_item h1,
div.wox_news_item h2,
Deleted: XoopsThemes/wox/trunk/images/Thumbs.db
===================================================================
(Binary files differ)
Added: XoopsThemes/wox/trunk/images/bgtext.gif
===================================================================
(Binary files differ)
Property changes on: XoopsThemes/wox/trunk/images/bgtext.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: XoopsThemes/wox/trunk/images/nav/Thumbs.db
===================================================================
(Binary files differ)
Added: XoopsThemes/wox/trunk/js/forums.js
===================================================================
--- XoopsThemes/wox/trunk/js/forums.js (rev 0)
+++ XoopsThemes/wox/trunk/js/forums.js 2009-08-28 21:25:38 UTC (rev 3526)
@@ -0,0 +1,35 @@
+$(document).ready(function(){
+
+ $("div.forum_post_item").each(function(i){
+ id = $(this).attr("id");
+ height = $("#"+id+" div.post_data").height();
+ $("#"+id+" div.post_text").css("min-height",height+"px");
+ });
+
+ $("a.show_more").click(function(){
+ id = $(this).attr("rel");
+ data = id.replace("other-data-","");
+ $("#post-text-"+data).css('width','430px');
+ $("#post-data-"+data).css("width",'150px');
+ $("#"+id).slideDown('slow', function(){
+ height = $("#post-data-"+data).height();
+ $("#post-text-"+data).css("min-height",height+"px");
+ });
+ $(this).hide();
+ $("a.show_less[rel='"+$(this).attr('rel')+"']").show();
+ });
+
+ $("a.show_less").click(function(){
+ id = $(this).attr("rel");
+ $("#"+id).slideUp('slow', function(){
+ data = id.replace("other-data-","");
+ $("#post-text-"+data).css('width','500px');
+ $("#post-data-"+data).css("width",'80px');
+ height = $("#post-data-"+data).height();
+ $("#post-text-"+data).css("min-height",height+"px");
+ });
+ $(this).hide();
+ $("a.show_more[rel='"+$(this).attr('rel')+"']").show();
+ });
+
+});
\ No newline at end of file
Property changes on: XoopsThemes/wox/trunk/js/forums.js
___________________________________________________________________
Added: svn:keywords
+ Id Date Rev Author
Added: XoopsThemes/wox/trunk/modules/newbb/newbb_item.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_item.html (rev 0)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_item.html 2009-08-28 21:25:38 UTC (rev 3526)
@@ -0,0 +1,29 @@
+<div style="padding: 5px;">
+
+<a id="forumpost<{$topic_post.post_id}>"></a>
+
+<div class="head" style="padding:5px;">
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$topic_post.post_id}>#forumpost<{$topic_post.post_id}>">#<{$topic_post.post_no}></a>
+<{$topic_post.post_title}>
+</div>
+
+<div class="even">
+<{$topic_post.poster.link}>
+<{if $topic_post.poster_ip}>
+IP: <a href="http://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a>
+<{/if}>
+<{$smarty.const._MD_POSTEDON}> <{$topic_post.post_date}>
+</div>
+
+<div class="odd" style="padding:5px;"><{$topic_post.post_text}></div>
+<{if $topic_post.post_attachment}>
+<div class="odd" style="padding:5px;"><{$topic_post.post_attachment}>
+</div>
+<{/if}>
+
+<div class="foot">
+<{foreach item=btn from=$topic_post.thread_buttons}> <a href="<{$btn.link}>&post_id=<{$topic_post.post_id}>" title="<{$btn.name}>"> <{$btn.image}></a> <{/foreach}>
+<a href="#threadtop" title="<{$smarty.const._MD_UP}>"> <{$p_up}></a>
+</div>
+
+</div>
\ No newline at end of file
Added: XoopsThemes/wox/trunk/modules/newbb/newbb_thread.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_thread.html (rev 0)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_thread.html 2009-08-28 21:25:38 UTC (rev 3526)
@@ -0,0 +1,130 @@
+<a id="forumpost<{$topic_post.post_id}>"></a>
+<div class="post_title<{if $pi==1}> post_title_top<{/if}>">
+ <span><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$topic_post.post_id}>#forumpost<{$topic_post.post_id}>">#<{$topic_post.post_no}></a></span>
+ <small><{$smarty.const._MD_POSTEDON}><{$topic_post.post_date}></small>
+ <{$topic_post.post_title}>
+</div>
+<div class="forum_post_item" id="post-<{$topic_post.post_id}>">
+ <div class="post_bg">
+ <div class="post_text" id="post-text-<{$topic_post.post_id}>">
+ <{$topic_post.post_text}>
+ <{if $topic_post.post_attachment}>
+ <div class="post_attach"><{$topic_post.post_attachment}></div>
+ <{/if}>
+ <br clear="all" />
+ <div class="post_options">
+ <{if $mode gt 1}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=1" target="_self" title="<{$smarty.const._MD_SPLIT_ONE}>"><{$smarty.const._MD_SPLIT_ONE}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=2" target="_self" title="<{$smarty.const._MD_SPLIT_TREE}>"><{$smarty.const._MD_SPLIT_TREE}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=3" target="_self" title="<{$smarty.const._MD_SPLIT_ALL}>"><{$smarty.const._MD_SPLIT_ALL}></a> |
+ <input type="checkbox" name="post_id[]" id="post_id[<{$topic_post.post_id}>]" value="<{$topic_post.post_id}>" />
+ <{else}>
+ <{foreach item=btn from=$topic_post.thread_buttons}> <a href="<{$btn.link}>&post_id=<{$topic_post.post_id}>" title="<{$btn.name}>"><{$btn.name}></a> |<{/foreach}>
+ <{/if}>
+ <a href="#threadtop" title="<{$smarty.const._MD_UP}>">Top</a>
+ </div>
+ <{if $topic_post.poster_ip}>
+ <div class="post_ip">
+ IP: <a href="http://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a>
+ </div>
+ <{/if}>
+ <br clear="all" />
+ <{if $topic_post.post_edit}>
+ <div style="float: right; padding: 5px; margin-top: 10px;"><small><{$topic_post.post_edit}></small></div>
+ <{/if}>
+
+ <{if $topic_post.post_signature}>
+ <div class="post_signature">
+ <hr />
+ <{$topic_post.post_signature}>
+ </div>
+ <{/if}>
+ </div>
+ <div class="post_data" id="post-data-<{$topic_post.post_id}>">
+ <{if $woxConfig.avatar_forum}>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$topic_post.poster.uid}>"><img class="avatar" src="http://www.gravatar.com/avatar/<{$topic_post.poster.email}>?s=50" /></a>
+ <{else}>
+ <{if $topic_post.poster.avatar}><a href="<{$xoops_url}>/userinfo.php?uid=<{$topic_post.poster.uid}>"><img class="avatar" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" /></a><{/if}>
+ <{/if}>
+ <{$topic_post.poster.link}><br />
+ <{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}>
+ <div id="other-data-<{$topic_post.post_id}>" class="other_data">
+ <{if $topic_post.poster.uid != 0}>
+
+
+ <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_JOINED}>:</span><br /><{$topic_post.poster.regdate}></div>
+ <{if $topic_post.poster.from}>
+ <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_FROM}></span> <{$topic_post.poster.from}></div>
+ <{/if}>
+ <{if $topic_post.poster.groups}>
+ <div class="comUserStat"> <span class="comUserStatCaption"><{$smarty.const._MD_GROUP}></span>
+ <{foreach item=group from=$topic_post.poster.groups}> <br /><{$group}><{/foreach}>
+ </div>
+ <{/if}>
+ <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_POSTS}>:</span>
+ <{if $topic_post.poster.posts gt 0}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?uid=<{$topic_post.poster.uid}>" title="<{$smarty.const._ALL}>" target="_self"><{$topic_post.poster.posts}></a>
+ <{else}>
+ 0
+ <{/if}>
+ </div>
+ <{if $topic_post.poster.level}>
+ <div class="comUserStat"><{$topic_post.poster.level}></div>
+ <{/if}>
+ <{if $topic_post.poster.status}>
+ <div class="comUserStatus"><{$topic_post.poster.status}></div>
+ <{/if}>
+ <{else}>
+ <div class="comUserRankText"><{$anonymous_prefix}><{$topic_post.poster.name}></div>
+ <{/if}>
+ </div>
+ <a href="javascript:;" class="show_more" rel="other-data-<{$topic_post.post_id}>">(Show More)</a>
+ <a href="javascript:;" class="show_less" rel="other-data-<{$topic_post.post_id}>">(Show Less)</a>
+ </div>
+ </div>
+</div>
+<!--<table class="outer" cellpadding="0" cellspacing="0" border="0" width="100%" align="center" style="border-bottom-width: 0px;">
+ <tr>
+ <th width="20%" align="left">
+ <div class="comUserName"><{$topic_post.poster.link}></div>
+ </th>
+
+ <th width="75%" align="left"><div class="comTitle"><{$topic_post.post_title}></div></th>
+ <th align="right"><div class="comTitle" style="float: right;"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$topic_post.post_id}>#forumpost<{$topic_post.post_id}>">#<{$topic_post.post_no}></a></div></th>
+ </tr>
+
+ <tr>
+ <td width="20%" class="odd" rowspan="2" valign="top">
+
+ </td>
+
+ <td colspan="2" class="odd">
+ <div class="comText"><{$topic_post.post_text}></div>
+ <{if $topic_post.post_attachment}>
+ <div class="comText"><{$topic_post.post_attachment}></div>
+ <{/if}>
+ <div class="clear"></div>
+ <br />
+ <div style="float: right; padding: 5px; margin-top: 10px;">
+
+ <{$smarty.const._MD_POSTEDON}><{$topic_post.post_date}></div>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" class="odd" valign="bottom">
+
+ </td>
+ </tr>
+
+ <tr>
+ <td width="20%" class="foot">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.transfer.php?post_id=<{$topic_post.post_id}>" target="_blank" title="<{$smarty.const._MD_TRANSFER_DESC}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/external.png" alt="<{$smarty.const._MD_TRANSFER_DESC}>" /> <{$smarty.const._MD_TRANSFER}></a>
+ </td>
+ <td colspan="2" class="foot"><div align="right">
+
+ </div>
+ </td>
+ </tr>
+</table>-->
\ No newline at end of file
Added: XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html (rev 0)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_viewtopic_flat.html 2009-08-28 21:25:38 UTC (rev 3526)
@@ -0,0 +1,220 @@
+<script type="text/javascript" src="<{$xoops_imageurl}>js/forums.js"></script>
+<div id="cbb_location">
+<img src="<{$xoops_imageurl}>images/forum_location.png" alt="" />
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php">Forum Index</a>
+»
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.id}>"><{$category.title}></a>
+<{if $parentforum}>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$parentforum.id}>"><{$parentforum.name}></a>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a>
+<{else}>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a> <{$forum_topictype}>
+<{/if}>
+» <strong><{$topic_title}></strong> <{if $topictype}><{$topictype}><{/if}>
+</div>
+
+<div class="clear"></div>
+
+<br />
+
+<{if $online}>
+<div style="padding: 5px;">
+<{$smarty.const._MD_BROWSING}>
+<{foreach item=user from=$online.users}>
+ <a href="<{$user.link}>">
+ <{if $user.level eq 2}>
+ <span class="online_admin"><{$user.uname}></span>
+ <{elseif $user.level eq 1}>
+ <span class="online_moderator"><{$user.uname}></span>
+ <{else}>
+ <{$user.uname}>
+ <{/if}>
+ </a>
+<{/foreach}>
+<{if $online.num_anonymous}> <{$online.num_anonymous}> <{$smarty.const._MD_ANONYMOUS_USERS}>
+<{/if}>
+</div>
+<br />
+<{/if}>
+
+<{if $topic_poll}>
+<{if $topic_pollresult}> <{include file="db:newbb_poll_results.html" poll=$poll}>
+<{else}> <{include file="db:newbb_poll_view.html" poll=$poll}> <{/if}>
+<{/if}>
+<div class="clear"></div>
+
+<br />
+
+<div style="overflow: hidden; margin-bottom: 10px;">
+<span style="float: right; text-align:right;">
+<{$forum_reply}><{$forum_addpoll}> <{$forum_post_or_register}>
+</span>
+<span class="topis_navigation">
+<a id="threadtop"></a><{$down2}> <a href="#threadbottom"><{$smarty.const._MD_BOTTOM}></a> <{$left}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+</span>
+</div>
+
+<br />
+
+<div>
+<div class="wox_cbb_options border_bottom">
+ <select name="topicoption" id="topicoption" class="menu" >
+ <option value=""><{$smarty.const._MD_TOPICOPTION}></option>
+ <{if $viewer_level gt 1}>
+ <{foreach item=act from=$admin_actions}>
+ <option value="<{$act.link}>"><{$act.name}></option>
+ <{/foreach}>
+ <option value="">--------</option>
+ <{/if}>
+ <{if count($adminpoll_actions)>0 }>
+ <option value=""><{$smarty.const._MD_POLLOPTIONADMIN}></option>
+ <{foreach item=actpoll from=$adminpoll_actions}>
+ <option value="<{$actpoll.link}>"><{$actpoll.name}></option>
+ <{/foreach}>
+ <option value="">--------</option>
+ <{/if}>
+ <{foreach item=menu from=$menumode_other}>
+ <option value="<{$menu.link}>"><{$menu.title}></option>
+ <{/foreach}>
+ <!--
+ <option value="">--------</option>
+ <option value="<{$topic_print_link}>"><{$smarty.const._MD_PRINTTOPICS}></option>
+ -->
+ </select>
+
+ <{if $rating_enable}>
+ <select
+ name="rate" id="rate"
+ class="menu"
+
+ >
+ <option value=""><{$smarty.const._MD_RATE}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=5"><{$smarty.const._MD_RATE5}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=4"><{$smarty.const._MD_RATE4}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=3"><{$smarty.const._MD_RATE3}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=2"><{$smarty.const._MD_RATE2}></option>
+ <option value="ratethread.php?topic_id=<{$topic_id}>&forum=<{$forum_id}>&rate=1"><{$smarty.const._MD_RATE1}></option>
+ </select>
+ <{/if}>
+
+ <select
+ name="viewmode" id="viewmode"
+ class="menu"
+ >
+ <option value=""><{$smarty.const._MD_VIEWMODE}></option>
+ <{foreach item=act from=$viewmode_options}>
+ <option value="<{$act.link}>"><{$act.title}></option>
+ <{/foreach}>
+ </select>
+</div>
+
+<div class="pages_nav"><{$forum_page_nav|replace:"(":''|replace:")":""}></div>
+</div>
+
+
+<{if $mode gt 1}>
+<form name="form_posts_admin" action="action.post.php" method="POST" >
+<{/if}>
+
+<{assign var="pi" value=1}>
+<div id="the_topic_posts">
+<{foreach item=topic_post from=$topic_posts}>
+ <{if $viewmode_compact}>
+ <{include file="$newbb_template_path/newbb_item.html" topic_post=$topic_post}>
+ <{else}>
+ <{*include file="db:newbb_thread.html" topic_post=$topic_post mode=$mode*}>
+ <{ithemes_process action="get_config"}>
+ <{include file="wox/modules/newbb/newbb_thread.html" topic_post=$topic_post mode=$mode}>
+ <{/if}>
+ <{assign var="pi" value=$pi+1}>
+<{/foreach}>
+</div>
+
+<{if $viewer_level gt 1}>
+<div style="float: right; text-align:right;" id="admin">
+<{if $mode gt 1}>
+<{$smarty.const._ALL}>: <input type="checkbox" name="post_check" id="post_check" value="1" />
+<select name="op">
+ <option value="0"><{$smarty.const._SELECT}></option>
+ <option value="delete"><{$smarty.const._DELETE}></option>
+ <{if $type eq "pending"}>
+ <option value="approve"><{$smarty.const._MD_APPROVE}></option>
+ <{elseif $type eq "deleted"}>
+ <option value="restore"><{$smarty.const._MD_RESTORE}></option>
+ <{/if}>
+</select>
+<input type="hidden" name="topic_id" value="<{$topic_id}>" />
+<input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&mode=1#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
+</form>
+<{elseif $mode eq 1}>
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&type=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&type=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&type=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
+<{else}>
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&mode=1#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
+<{/if}>
+</div>
+<br />
+<{/if}>
+<div class="clear"></div>
+
+<br />
+<div>
+<div style="float: left; text-align:left;">
+ <a id="threadbottom"></a><{$up}> <a href="#threadtop"><{$smarty.const._MD_TOP}></a> <{$left}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=prev"><{$smarty.const._MD_PREVTOPIC}></a> <{$right}> <a href="viewtopic.php?viewmode=flat&order=<{$order_current}>&topic_id=<{$topic_id}>&forum=<{$forum_id}>&move=next"><{$smarty.const._MD_NEXTTOPIC}></a>
+</div>
+<div style="float: right; text-align:right;">
+<{$forum_page_nav}>
+</div>
+</div>
+<div class="clear"></div>
+
+<br />
+
+<div style="padding: 5px; float: left; text-align:left;">
+<{$forum_addpoll}><{$forum_reply}> <{$forum_post_or_register}>
+</div>
+<div class="clear"></div>
+
+<br />
+<br />
+
+<{if $quickreply.show}>
+<div>
+<a href="#threadbottom" > <{$quickreply.icon}></a>
+</div>
+<br />
+<div id="qr" style="display: <{$quickreply.display}>">
+<div><{$quickreply.form}></div>
+</div>
+<br />
+<br />
+<{/if}>
+
+<div>
+<div style="float: left; text-align: left;">
+<{foreach item=perm from=$permission_table}>
+<div><{$perm}></div>
+<{/foreach}>
+</div>
+<div style="float: right; text-align: right;">
+<form action="search.php" method="get">
+<input name="term" id="term" type="text" size="15" />
+<input type="hidden" name="forum" id="forum" value="<{$forum_id}>" />
+<input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
+<input type="hidden" name="since" id="since" value="<{$forum_since}>" />
+<input type="hidden" name="action" id="action" value="yes" />
+<input type="hidden" name="searchin" id="searchin" value="both" />
+<input type="submit" class="formButton" value="<{$smarty.const._MD_SEARCH}>" /><br />
+[<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>]
+</form><br />
+<{$forum_jumpbox}>
+</div>
+</div>
+<div class="clear"></div>
+
+<br />
+
+<{include file='db:system_notification_select.html'}>
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/modules/news/news_index.html
===================================================================
--- XoopsThemes/wox/trunk/modules/news/news_index.html 2009-08-28 19:50:42 UTC (rev 3525)
+++ XoopsThemes/wox/trunk/modules/news/news_index.html 2009-08-28 21:25:38 UTC (rev 3526)
@@ -10,7 +10,7 @@
</div>
<{/if}>
-<div class="news_nav"><{$pagenav|replace:"(":''|replace:")":""}></div>
+<div class="pages_nav"><{$pagenav|replace:"(":''|replace:")":""}></div>
<{ithemes_process action="run_method" method="format_news"}>
<{assign var="i" value=0}>
<{foreach item=story from=$wox_posts}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2009-08-28 19:50:50
|
Revision: 3525
http://xoops.svn.sourceforge.net/xoops/?rev=3525&view=rev
Author: djculex
Date: 2009-08-28 19:50:42 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Added Paths:
-----------
XoopsModules/indexscan/admin/
XoopsModules/indexscan/admin/admin_header.php
XoopsModules/indexscan/admin/index.html
XoopsModules/indexscan/admin/index.php
XoopsModules/indexscan/admin/menu.php
XoopsModules/indexscan/changelog.txt
XoopsModules/indexscan/header.php
XoopsModules/indexscan/index.html
XoopsModules/indexscan/language/
XoopsModules/indexscan/language/danish/
XoopsModules/indexscan/language/danish/admin.php
XoopsModules/indexscan/language/danish/index.html
XoopsModules/indexscan/language/danish/modinfo.php
XoopsModules/indexscan/language/english/
XoopsModules/indexscan/language/english/admin.php
XoopsModules/indexscan/language/english/index.html
XoopsModules/indexscan/language/english/modinfo.php
XoopsModules/indexscan/language/index.html
XoopsModules/indexscan/logo.png
XoopsModules/indexscan/readme.txt
XoopsModules/indexscan/xoops_version.php
Added: XoopsModules/indexscan/admin/admin_header.php
===================================================================
--- XoopsModules/indexscan/admin/admin_header.php (rev 0)
+++ XoopsModules/indexscan/admin/admin_header.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:admin_header.php 2009-07-09 11:42 culex $
+ * @since File available since Release 1.0.0
+ */
+ include '../../../mainfile.php';
+ include_once XOOPS_ROOT_PATH.'/class/xoopsmodule.php';
+ include XOOPS_ROOT_PATH.'/include/cp_functions.php';
+ if ( $xoopsUser ) {
+ $xoopsModule = XoopsModule::getByDirname("indexscan");
+
+ if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ redirect_header(XOOPS_URL."/",2,_NOPERM);
+ exit();
+ }
+ }
+ else {
+ redirect_header(XOOPS_URL."/",2,_NOPERM);
+ exit();
+ }
+
+ if ( file_exists("../language/".$xoopsConfig['language']."/admin.php") ) {
+ include("../language/".$xoopsConfig['language']."/admin.php");
+ }
+ else {
+ include("../language/english/admin.php");
+ }
+
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/admin/index.html
===================================================================
--- XoopsModules/indexscan/admin/index.html (rev 0)
+++ XoopsModules/indexscan/admin/index.html 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/indexscan/admin/index.php
===================================================================
--- XoopsModules/indexscan/admin/index.php (rev 0)
+++ XoopsModules/indexscan/admin/index.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:index.php 2009-07-09 17:06 culex $
+ * @since File available since Release 1.0.0
+ */
+ include_once 'admin_header.php';
+ include XOOPS_ROOT_PATH.'/include/xoopscodes.php';
+ $op='';
+
+ if (isset($_GET['op']) && $_GET['op'] == 'ScanNow') {
+ $op = 'ScanNow';
+ }
+ if (isset($_GET['op']) && $_GET['op'] == 'CreateNow') {
+ $op = 'CreateNow';
+ }
+ if (isset($_GET['op']) && $_GET['op'] == '') {
+ $op = '';
+ }
+function indexScan_Choice() {
+ global $xoopsModule,$count;
+ echo '<table class="outer" width="100%"><tr>';
+ echo "<td class='even'><center><a href='index.php?op=ScanNow'>"._AM_INDEXSCAN_NOW."</a></center></td>";
+ echo "<td class='even'><center><a href='index.php?op=CreateNow'>"._AM_INDEXSCAN_CREATE."</a></center></td>";
+ echo "<td class='even'><center><a href='../../system/admin.php?fct=preferences&op=showmod&mod="
+ .$xoopsModule ->getVar('mid')."'>"._AM_INDEXSCAN_CONFIG."</a></center></td>";
+ echo '</tr></table>';
+ }
+
+// Switch for choises
+ global $op,$count;
+switch($op) {
+ case "ScanNow":
+ global $count;
+ xoops_cp_header();
+ indexScan_Choice();
+ print "<br><table align='center'";
+ print "<tr class='header'><center><th colspan=2><h2>"._AM_INDEXSCAN_HEADER."</h2></center></th></tr>";
+
+/*
+Print the dir found via xoops_look4Files and show where the index.html is not found,
+*/
+function xoops_PrintPaths ( $xoopsFilePath,$File2Look4,$count ) {
+ $xoopsFilePath = substr($xoopsFilePath,7);
+ print "<tr><td><small>$xoopsFilePath</small></td><td><font color='#FF0000'><small>".
+ _AM_INDEXSCAN_NOTFOUND."</font color></small></td></tr>";
+}
+
+// Setting up the search //
+ $RootDir = '../../../';
+ $File2Look4 = 'index.html';
+ $ReturnFindings = 'xoops_PrintPaths';
+ global $xoopsModuleConfig;
+
+// Define wich folders not to scan
+ $Dirs2Exclude = array( $xoopsModuleConfig['exep_01'], $xoopsModuleConfig['exep_02'], $xoopsModuleConfig['exep_03'], $xoopsModuleConfig['exep_04'] );
+
+/*
+This function will look through all folder on server starting from $RootDir. And will call back all missing
+dirs not having index.html
+*/
+function xoops_Look4Files ( $RootDir, $File2Look4, $ReturnFindings = NULL, $Dirs2Exclude = array() ) {
+ global $count;
+ $count = 0;
+ $Queue2Array = array( rtrim( $RootDir, '/' ).'/' ); // normalize all paths
+ foreach ( $Dirs2Exclude as &$path ) { // &$path Req. PHP ver 5.x and later
+ $path = $RootDir.trim( $path, '/' ).'/';
+ }
+ while ( $BaSe = array_shift( $Queue2Array ) ) {
+ $File_Path = $BaSe.$File2Look4;
+ $File_Path2 = $BaSe.'index.php';
+ $File_Path3 = $BaSe.'index.htm';
+ $File_Path4 = $BaSe.'index.php3';
+ if (!file_exists( $File_Path ) && !file_exists($File_Path2) && !file_exists($File_Path3) && !file_exists($File_Path4)) { // files not found
+ if ( is_callable( $ReturnFindings ) ) {
+ $count = $count+1;
+ $ReturnFindings( $BaSe,$File2Look4,$count ); // callback => CONTINUE
+ } else {
+ return $File_Path; // return file-path => EXIT
+ }
+ }
+ if ( ( $handle = opendir( $BaSe ) ) ) {
+ while ( ( $SubFolder = readdir( $handle ) ) !== FALSE ) {
+ if ( is_dir( $BaSe.$SubFolder ) && $SubFolder != '.' && $SubFolder != '..' ) {
+ $combined_path = $BaSe.$SubFolder.'/';
+ if ( !in_array( $combined_path, $Dirs2Exclude ) ) {
+ array_push( $Queue2Array, $combined_path);
+ }
+ }
+ }
+ closedir( $handle );
+ } // else unable to open directory => NEXT CHILD
+ }
+ return FALSE; // end of tree.
+ }
+// $Dirs2Exclude = array( 'modules', './', 'themes' );
+ print xoops_Look4Files ( $RootDir, $File2Look4, $ReturnFindings, $Dirs2Exclude );
+ print "<tr><td colspan=2></td></tr><tr><th colspan=2><center>$count "._AM_INDEXSCAN_FOUNDMISSING."</center></th></tr><tr><td colspan=2></td></tr>";
+ print "</table>";
+ xoops_cp_footer();
+ break;
+case "CreateNow":
+ global $count,$myts;
+ xoops_cp_header();
+ indexScan_Choice();
+ print "<br><table align='center'";
+ print "<tr class='header'><center><th colspan=2><h2>"._AM_INDEXSCAN_MAKINGHEADER."</h2></center></th></tr>";
+ function xoops_PrintPathsCR ( $xoopsFilePathCR,$File2Look4CR,$countCR ) {
+ $xoopsFilePathCRSHORT = substr($xoopsFilePathCR,7);
+ xoops_CreateMissingIndexFiles ($xoopsFilePathCR);
+ print "<tr><td><small>$xoopsFilePathCRSHORT</small></td><td><font color='#077F00'><small>".
+ _AM_INDEXSCAN_CREATED."</font color></small></td></tr>";
+}
+
+// Setting up the search //
+ $RootDirCR = '../../../';
+ $File2Look4CR = 'index.html';
+ $ReturnFindingsCR = 'xoops_PrintPathsCR';
+ global $xoopsModuleConfig;
+
+// Define wich folders not to scan
+ $Dirs2ExcludeCR = array( $xoopsModuleConfig['exep_01'], $xoopsModuleConfig['exep_02'], $xoopsModuleConfig['exep_03'], $xoopsModuleConfig['exep_04'] );
+
+/*
+This function opens a file called index.html, write content, and saves where not found
+*/
+function xoops_CreateMissingIndexFiles ($folderUrl) {
+$myts =& MyTextSanitizer::getInstance();
+file_put_contents($folderUrl.'index.html', "<script>history.go(-1);</script>");
+}
+/*
+This function will look through all folder on server starting from $RootDir. And will call back all missing
+dirs not having index.html
+*/
+function xoops_Look4FilesCR ( $RootDirCR, $File2Look4CR, $ReturnFindingsCR = NULL, $Dirs2ExcludeCR = array() ) {
+ global $countCR;
+ $countCR = 0;
+ $Queue2ArrayCR = array( rtrim( $RootDirCR, '/' ).'/' ); // normalize all paths
+ foreach ( $Dirs2ExcludeCR as &$pathCR ) { // &$path Req. PHP ver 5.x and later
+ $pathCR = $RootDirCR.trim( $pathCR, '/' ).'/';
+ }
+ while ( $BaSeCR = array_shift( $Queue2ArrayCR ) ) {
+ $File_PathCR = $BaSeCR.$File2Look4CR;
+ $File_Path2CR = $BaSeCR.'index.php';
+ $File_Path3CR = $BaSeCR.'index.htm';
+ $File_Path4CR = $BaSeCR.'index.php3';
+ if (!file_exists( $File_PathCR ) && !file_exists($File_Path2CR) && !file_exists($File_Path3CR) && !file_exists($File_Path4CR)) { // files not found
+ if ( is_callable( $ReturnFindingsCR ) ) {
+ $countCR = $countCR+1;
+ $ReturnFindingsCR( $BaSeCR,$File2Look4CR,$countCR ); // callback => CONTINUE
+ } else {
+ return $File_PathCR; // return file-path => EXIT
+ }
+ }
+ if ( ( $handleCR = opendir( $BaSeCR ) ) ) {
+ while ( ( $SubFolderCR = readdir( $handleCR ) ) !== FALSE ) {
+ if ( is_dir( $BaSeCR.$SubFolderCR ) && $SubFolderCR != '.' && $SubFolderCR != '..' ) {
+ $combined_pathCR = $BaSeCR.$SubFolderCR.'/';
+ if ( !in_array( $combined_pathCR, $Dirs2ExcludeCR ) ) {
+ array_push( $Queue2ArrayCR, $combined_pathCR);
+ }
+ }
+ }
+ closedir( $handleCR );
+ } // else unable to open directory => NEXT CHILD
+ }
+ return FALSE; // end of tree.
+ }
+// $Dirs2Exclude = array( 'modules', './', 'themes' );
+ print xoops_Look4FilesCR ( $RootDirCR, $File2Look4CR, $ReturnFindingsCR, $Dirs2ExcludeCR );
+ print "<tr><td colspan=2></td></tr><tr><th colspan=2><center>$countCR "._AM_INDEXSCAN_CREATEDINDEXFILES."</center></th></tr><tr><td colspan=2></td></tr>";
+ print "</table>";
+
+ xoops_cp_footer();
+ break;
+ default:
+ xoops_cp_header();
+ indexScan_Choice();
+ xoops_cp_footer();
+ break;
+}
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/admin/menu.php
===================================================================
--- XoopsModules/indexscan/admin/menu.php (rev 0)
+++ XoopsModules/indexscan/admin/menu.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:menu.php 2009-07-09 11:41 culex $
+ * @since File available since Release 1.0.0
+ */
+
+$adminmenu[1]['title'] = _MI_INDEXSCAN_MAIN;
+$adminmenu[1]['link'] = "admin/index.php";
+$adminmenu[2]['title'] = _MI_INDEXSCAN_SCANNOW;
+$adminmenu[2]['link'] = "admin/index.php?op=ScanNow";
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/changelog.txt
===================================================================
--- XoopsModules/indexscan/changelog.txt (rev 0)
+++ XoopsModules/indexscan/changelog.txt 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,27 @@
+ *
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:readme.txt 2009-07-09 17:08 culex $
+ * @since File available since Release 1.0.0
+ *
+
+ Index scan
+ ----------
+ v1.0 Thursdag 9 july 2009 - 17:08 (GMT +1)
+
+- Changed function to create index.html, as it ignored index.php3. Now working
\ No newline at end of file
Added: XoopsModules/indexscan/header.php
===================================================================
--- XoopsModules/indexscan/header.php (rev 0)
+++ XoopsModules/indexscan/header.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:header.php 2009-07-09 11:46 culex $
+ * @since File available since Release 1.0.0
+ */
+
+include '../../mainfile.php';
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/index.html
===================================================================
--- XoopsModules/indexscan/index.html (rev 0)
+++ XoopsModules/indexscan/index.html 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/indexscan/language/danish/admin.php
===================================================================
--- XoopsModules/indexscan/language/danish/admin.php (rev 0)
+++ XoopsModules/indexscan/language/danish/admin.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,14 @@
+<?php
+//%%%%%% Admins language for index scan admin.php %%%%%
+define("_AM_INDEXSCAN_NOW","Skan for manglende index filer");
+define("_AM_INDEXSCAN_CREATE","Opret manglende indexfiler");
+define("_AM_INDEXSCAN_CHMODNOW","Chmod dine xoops dirs til 775");
+define("_AM_INDEXSCAN_HELP","Hjælp");
+define("_AM_INDEXSCAN_CONFIG","Konfigurer");
+define("_AM_INDEXSCAN_HEADER","Disse mapper mangler index filer");
+define("_AM_INDEXSCAN_NOTFOUND","Index files <b>not</b> found<br>\n");
+define("_AM_INDEXSCAN_FOUNDMISSING","<b>manglende</b> index files fundet\n");
+define("_AM_INDEXSCAN_MAKINGHEADER","Laver manglende index.html filer");
+define("_AM_INDEXSCAN_CREATED","index.html oprettet");
+define("_AM_INDEXSCAN_CREATEDINDEXFILES","indexfiler oprettet");
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/language/danish/index.html
===================================================================
--- XoopsModules/indexscan/language/danish/index.html (rev 0)
+++ XoopsModules/indexscan/language/danish/index.html 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/indexscan/language/danish/modinfo.php
===================================================================
--- XoopsModules/indexscan/language/danish/modinfo.php (rev 0)
+++ XoopsModules/indexscan/language/danish/modinfo.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,18 @@
+<?php
+// Danish language for indexscan
+
+define("_MI_INDEXSCAN_MAIN","Main");
+define("_MI_INDEXSCAN_SCANNOW","Skan nu");
+define("_MI_INDEXSCAN_HELP","Hjælp");
+define("_MI_INDEXSCAN_SETTINGS","Indstillinger");
+define("_MI_INDEXSCAN_MODULE_NAME","Indexscan");
+define("_MI_INDEXSCAN_MODULE_DESC","Skanner din xoops installation for manglende<br> index filer. Herefter kan du oprette hvis der mangler.");
+define("_MI_INDEXSCAN_EXEP1","Mappe Der ikke skal skannes 01");
+define("_MI_INDEXSCAN_EXEP1_DESC","Hvis der er mapper der ikke skal skannes anfør her (eks.) <b>uploads</b>");
+define("_MI_INDEXSCAN_EXEP2","Mappe Der ikke skal skannes 02");
+define("_MI_INDEXSCAN_EXEP2_DESC","");
+define("_MI_INDEXSCAN_EXEP3","Mappe Der ikke skal skannes 03");
+define("_MI_INDEXSCAN_EXEP3_DESC","");
+define("_MI_INDEXSCAN_EXEP4","Mappe Der ikke skal skannes 04");
+define("_MI_INDEXSCAN_EXEP4_DESC","");
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/language/english/admin.php
===================================================================
--- XoopsModules/indexscan/language/english/admin.php (rev 0)
+++ XoopsModules/indexscan/language/english/admin.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,13 @@
+<?php
+//%%%%%% English language file for index scan / admin %%%%%
+define("_AM_INDEXSCAN_NOW","Scan for missing index files");
+define("_AM_INDEXSCAN_CREATE","Create index files where missing");
+define("_AM_INDEXSCAN_HELP","Help");
+define("_AM_INDEXSCAN_CONFIG","Config");
+define("_AM_INDEXSCAN_HEADER","These folders are missing index files");
+define("_AM_INDEXSCAN_NOTFOUND","Index files <b>not</b> found<br>\n");
+define("_AM_INDEXSCAN_FOUNDMISSING","<b>missing</b> index files found\n");
+define("_AM_INDEXSCAN_MAKINGHEADER","Creating missing index.html files");
+define("_AM_INDEXSCAN_CREATED","index.html created");
+define("_AM_INDEXSCAN_CREATEDINDEXFILES","indexfiler created");
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/language/english/index.html
===================================================================
--- XoopsModules/indexscan/language/english/index.html (rev 0)
+++ XoopsModules/indexscan/language/english/index.html 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/indexscan/language/english/modinfo.php
===================================================================
--- XoopsModules/indexscan/language/english/modinfo.php (rev 0)
+++ XoopsModules/indexscan/language/english/modinfo.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,19 @@
+<?php
+
+// English language file for indexscan
+
+define("_MI_INDEXSCAN_MAIN","Main");
+define("_MI_INDEXSCAN_SCANNOW","Scan now");
+define("_MI_INDEXSCAN_HELP","Help");
+define("_MI_INDEXSCAN_SETTINGS","Settings");
+define("_MI_INDEXSCAN_MODULE_NAME","Indexscan");
+define("_MI_INDEXSCAN_MODULE_DESC","Scans your xoops installation for missing<br> index files. If some are missing you can create.");
+define("_MI_INDEXSCAN_EXEP1","Folder to not scan 01");
+define("_MI_INDEXSCAN_EXEP1_DESC","If there are folders you dont want scanned (for instance.) <b>uploads</b><br> you can write the name here");
+define("_MI_INDEXSCAN_EXEP2","Folder to not scan 02");
+define("_MI_INDEXSCAN_EXEP2_DESC","");
+define("_MI_INDEXSCAN_EXEP3","Folder to not scan 03");
+define("_MI_INDEXSCAN_EXEP3_DESC","");
+define("_MI_INDEXSCAN_EXEP4","Folder to not scan 04");
+define("_MI_INDEXSCAN_EXEP4_DESC","");
+?>
\ No newline at end of file
Added: XoopsModules/indexscan/language/index.html
===================================================================
--- XoopsModules/indexscan/language/index.html (rev 0)
+++ XoopsModules/indexscan/language/index.html 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/indexscan/logo.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/indexscan/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/indexscan/readme.txt
===================================================================
--- XoopsModules/indexscan/readme.txt (rev 0)
+++ XoopsModules/indexscan/readme.txt 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,34 @@
+ *
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:readme.txt 2009-07-09 12:08 culex $
+ * @since File available since Release 1.0.0
+ *
+
+ Index scan
+ ----------
+
+ This is a small module to scan your server folders for missing index.html files. If missing you can create.
+
+ The module obviously does not have a place in the frontpage main menu, but can only be accessed through administration as admin.
+
+ The module is testet with FF, Opera, and IE8 and checks out fine with all.
+
+ Should you discover any errors or is it not operating as intented please send email to cu...@cu....
+ ....
+
\ No newline at end of file
Added: XoopsModules/indexscan/xoops_version.php
===================================================================
--- XoopsModules/indexscan/xoops_version.php (rev 0)
+++ XoopsModules/indexscan/xoops_version.php 2009-08-28 19:50:42 UTC (rev 3525)
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Index Scan module
+ *
+ * Use this module to scan your web folders for missing index files. If any found
+ * you can create automaticly.
+ *
+ * The module uses a function to scan for files originally found on php.net examples
+ * but modified to suit the needs / standards of xoops 2.3.3 & php5.
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Michael Albertsen (culex) <http://www.culex.dk>
+ * @version $Id:xoops_version.php 2009-07-09 11:45 culex $
+ * @since File available since Release 1.0.0
+ */
+
+$modversion['name'] =_MI_INDEXSCAN_MODULE_NAME;
+$modversion['version'] = 1.00;
+$modversion['description'] = _MI_INDEXSCAN_MODULE_DESC;
+$modversion['credits'] = "Developped by Culex http://www.culex.dk";
+$modversion['author'] = "Culex";
+$modversion['help'] = "top.html";
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 1;
+$modversion['image'] = "logo.png";
+$modversion['dirname'] = "indexscan";
+
+// Sql file (must contain sql generated by phpMyAdmin or phpPgAdmin)
+// All tables should not have any prefix!
+
+// Tables created by sql file (without prefix!)
+
+//Admin things
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+
+// Menu
+$modversion['hasMain'] = 0;
+$modversion['sub'][1]['name'] = _MI_INDEXSCAN_SCANNOW;
+$modversion['sub'][1]['url'] = "index.php?op=ScanNow";
+$modversion['sub'][2]['name'] = _MI_INDEXSCAN_CREATEINDEX;
+$modversion['sub'][2]['url'] = "index.php?op=CreateNow";
+
+// Blocks
+
+// Templates
+
+$modversion['config'][] = array(
+ 'name' => 'exep_01',
+ 'title' => '_MI_INDEXSCAN_EXEP1',
+ 'description' => '_MI_INDEXSCAN_EXEP1_DESC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'text',
+ 'default' => '');
+
+$modversion['config'][] = array(
+ 'name' => 'exep_02',
+ 'title' => '_MI_INDEXSCAN_EXEP2',
+ 'description' => '_MI_INDEXSCAN_EXEP2_DESC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'text',
+ 'default' => '');
+
+$modversion['config'][] = array(
+ 'name' => 'exep_03',
+ 'title' => '_MI_INDEXSCAN_EXEP3',
+ 'description' => '_MI_INDEXSCAN_EXEP3_DESC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'text',
+ 'default' => '');
+
+$modversion['config'][] = array(
+ 'name' => 'exep_04',
+ 'title' => '_MI_INDEXSCAN_EXEP4',
+ 'description' => '_MI_INDEXSCAN_EXEP4_DESC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'text',
+ 'default' => '');
+
+?>
\ 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: <dj...@us...> - 2009-08-28 19:49:27
|
Revision: 3524
http://xoops.svn.sourceforge.net/xoops/?rev=3524&view=rev
Author: djculex
Date: 2009-08-28 19:49:20 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Scan and creates missing index files
Added Paths:
-----------
XoopsModules/indexscan/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Bi...@us...> - 2009-08-28 15:57:07
|
Revision: 3523
http://xoops.svn.sourceforge.net/xoops/?rev=3523&view=rev
Author: BitC3R0
Date: 2009-08-28 15:56:55 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
XoopsThemes/wox/trunk/css/general.css
XoopsThemes/wox/trunk/theme.html
XoopsThemes/wox/trunk/tpls/content.html
Added Paths:
-----------
XoopsThemes/wox/trunk/css/forums.css
XoopsThemes/wox/trunk/images/forum_location.png
XoopsThemes/wox/trunk/images/forums.png
XoopsThemes/wox/trunk/images/nav/forums32.png
XoopsThemes/wox/trunk/modules/newbb/
XoopsThemes/wox/trunk/modules/newbb/newbb_index.html
XoopsThemes/wox/trunk/modules/newbb/newbb_viewforum.html
XoopsThemes/wox/trunk/tpls/cbb_menu.html
Added: XoopsThemes/wox/trunk/css/forums.css
===================================================================
--- XoopsThemes/wox/trunk/css/forums.css (rev 0)
+++ XoopsThemes/wox/trunk/css/forums.css 2009-08-28 15:56:55 UTC (rev 3523)
@@ -0,0 +1,92 @@
+h1.title{
+ font-family: georgia, times, serif;
+ font-size: 2.2em;
+ font-weight: normal;
+ color: #333;
+ margin: 0 0 3px 0;
+ border-bottom: 2px solid #D6DEE4;
+ padding: 0 0 5px 0;
+}
+h2.category_title{
+ margin: 0 0 10px 0;
+ color: #14655C;
+ font-size: 1.3em;
+ font-weight: bold;
+}
+h1.title a{ color: #3f3f3f; }
+h1.title span{
+ display: block;
+ float: right;
+ font-size: 0.5em;
+ font-family: arial, helvetica, sans-serif;
+ padding: 14px 0 0 0;
+ color: #666;
+}
+span.wox_start{
+ display: block;
+ margin-bottom: 10px;
+ color: #3f3f3f;
+ padding: 3px 0 0 3px;
+}
+div.wox_cbb_options{
+ padding: 4px 0;
+}
+div.wox_cbb_options select{
+ background: #D6DEE4;
+ border: 1px solid #9BAEBD;
+ -moz-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+div.wox_category_item{
+ margin-top: 20px;
+}
+
+/** OUTER **/
+.cbb_forums th{
+ background: #D6DEE4;
+ color: #333;
+ font-family: arial, helvetica, sans-serif;
+}
+.cbb_forums th:first-child{
+ -moz-border-radius: 5px 0 0 0;
+ -khtml-border-radius-topleft: 5px;
+ -webkit-border-top-left-radius: 5px;
+ border-radius: 5px 0 0 0;
+}
+.cbb_forums th:last-child{
+ -moz-border-radius: 0 5px 0 0;
+ -khtml-border-radius-topright: 5px;
+ -webkit-border-top-right-radius: 5px;
+ border-radius: 0 5px 0 0;
+}
+.cbb_forums tr td{
+ padding: 8px 5px;
+ border-bottom: 1px solid #D6DEE4;
+}
+.cbb_forums tbody tr:first-child td{
+ border-top: 2px solid #D6DEE4;
+}
+.cbb_forums span.forum_desc{
+ display: block;
+ font-size: 0.9em;
+ line-height: 140%;
+}
+hr{
+ border: 0;
+ height: 2px;
+ background: #D6DEE4;
+ margin-bottom: 10px;
+}
+div#cbb_location{
+ text-transform: uppercase;
+ font-size: 0.85em;
+ border-bottom: 1px dotted #CCC;
+ overflow: hidden;
+}
+div#cbb_location img{
+ float: left;
+ margin-right: 5px;
+ padding-bottom: 3px;
+}
\ No newline at end of file
Property changes on: XoopsThemes/wox/trunk/css/forums.css
___________________________________________________________________
Added: svn:keywords
+ Id Date Rev Author
Modified: XoopsThemes/wox/trunk/css/general.css
===================================================================
--- XoopsThemes/wox/trunk/css/general.css 2009-08-28 09:32:34 UTC (rev 3522)
+++ XoopsThemes/wox/trunk/css/general.css 2009-08-28 15:56:55 UTC (rev 3523)
@@ -45,7 +45,7 @@
overflow: hidden;
width: 950px;
margin: 0 auto;
- height: 35px;
+ height: 32px;
}
div#top-links-container div.login_links{
float: right;
Added: XoopsThemes/wox/trunk/images/forum_location.png
===================================================================
(Binary files differ)
Property changes on: XoopsThemes/wox/trunk/images/forum_location.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsThemes/wox/trunk/images/forums.png
===================================================================
(Binary files differ)
Property changes on: XoopsThemes/wox/trunk/images/forums.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsThemes/wox/trunk/images/nav/forums32.png
===================================================================
(Binary files differ)
Property changes on: XoopsThemes/wox/trunk/images/nav/forums32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsThemes/wox/trunk/modules/newbb/newbb_index.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_index.html (rev 0)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_index.html 2009-08-28 15:56:55 UTC (rev 3523)
@@ -0,0 +1,257 @@
+<h1 class="title">
+<span><{$smarty.const._MD_TOTALTOPICSC}><strong><{$total_topics}></strong> • <{$smarty.const._MD_TOTALPOSTSC}><strong><{$total_posts}></strong></span>
+<a href="<{$xoops_url}>/modules/newbb/">Welcome to Xoops Forums</a>
+</h1>
+<span class="wox_start"><{$smarty.const._MD_TOSTART}></span>
+<div class="clear"></div>
+
+<{if $viewer_level eq 2 AND $mode gt 0}>
+ <div style="padding: 5px;float: right; text-align:right;">
+
+ <{$smarty.const._MD_TOPIC}>:
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewall.php?type=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewall.php?type=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewall.php?type=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a>
+ <br style="clear:both;" />
+
+ <{$smarty.const._MD_POST2}>:
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?type=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?type=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?type=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a>
+ <br style="clear:both;" />
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" target="_self" title="<{$smarty.const._MD_ADMINCP}>"><{$smarty.const._MD_ADMINCP}></a>
+
+ </div>
+ <br />
+ <div class="clear"></div>
+<{/if}>
+
+<div class="wox_cbb_options">
+ <select
+ name="mainoption" id="mainoption"
+ class="menu"
+
+ >
+ <option value=""><{$smarty.const._MD_MAINFORUMOPT}></option>
+ <option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_FORUMS}> <{$smarty.const._MD_MARK_READ}></option>
+ <option value="<{$mark_unread}>"><{$smarty.const._MD_MARK_ALL_FORUMS}> <{$smarty.const._MD_MARK_UNREAD}></option>
+ <option value="">--------</option>
+ <option value="<{$post_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALLPOSTS}></option>
+ <option value="<{$newpost_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_NEWPOSTS}></option>
+ <option value="<{$all_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALL}></option>
+ <option value="<{$digest_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_DIGEST}></option>
+ <option value="<{$unreplied_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREPLIED}></option>
+ <option value="<{$unread_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREAD}></option>
+ <{if $forum_index_cpanel}>
+ <option value="">--------</option>
+ <option value="<{$forum_index_cpanel.link}>"><{$forum_index_cpanel.name}></option>
+ <{/if}>
+ </select>
+</div>
+
+<!-- start forum categories -->
+<{foreach item=category from=$categories}>
+<div class="wox_category_item">
+ <h2 class="category_title"><img src="<{$category.cat_display_icon}>" alt="" /> <{$category.cat_title}></h2>
+</div>
+
+<div id="cat_<{$category.cat_id}>" style="display: <{$category.cat_display}>">
+<table cellspacing="1" width="100%" class="cbb_forums">
+<{if $category.forums}>
+ <thead>
+ <tr class="head" align="center">
+ <th width="5%"> </th>
+ <{if $subforum_display == "expand"}>
+ <th colspan="2" width="57%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></th>
+ <{else}>
+ <th width="57%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></th>
+ <{/if}>
+ <th width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></th>
+ <th width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></th>
+ <th width="20%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></th>
+ </tr>
+ </thead>
+<{/if}>
+
+<!-- start forums -->
+
+<{if $subforum_display == "expand"}>
+<tbody>
+<{foreach item=forum from=$category.forums}>
+ <tr>
+ <td class="even" align="center" valign="top"><{$forum.forum_folder}></td>
+ <td colspan="2" class="odd">
+ <strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a></strong>
+ <{if $rss_enable}>
+ (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
+ <{/if}>
+ <span class="forum_desc"><{$forum.forum_desc}></span>
+ </div>
+ </td>
+ <td class="even" align="center" valign="top"><strong><{$forum.forum_topics}></strong></td>
+ <td class="odd" align="center" valign="top"><{$forum.forum_posts}> </td>
+ <td class="even" align="right" valign="top"><{$forum.forum_lastpost_time}> <br />
+ <{$forum.forum_lastpost_icon}> <br />
+ <{$forum.forum_lastpost_user}>
+ </td>
+ </tr>
+<{if $forum.subforum}>
+ <tr class="head" >
+ <td width="5%"> </td>
+ <td width="5%" align="center"><{$img_subforum}> </td>
+ <td colspan="4" nowrap="nowrap" align="left"><{$smarty.const._MD_SUBFORUMS}></td>
+ </tr>
+<{foreach item=subforum from=$forum.subforum}>
+ <tr>
+ <td class="odd" width="5%"> </td>
+ <td class="even" align="center" valign="middle" width="5%"><{$subforum.forum_folder}></td>
+ <td width="52%" class="odd">
+ <div id="index_forum">
+ <span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><strong><{$subforum.forum_name}></strong></a>
+ <{if $rss_enable}>
+ (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$subforum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
+ <{/if}>
+ <br /><{$subforum.forum_desc}>
+ </span>
+ <{if $subforum.forum_moderators}>
+ <span class="extra">
+ <{$smarty.const._MD_MODERATOR}>: <{$subforum.forum_moderators}>
+ </span>
+ <{/if}>
+ </div>
+ </td>
+ <td class="even" width="9%" align="center" valign="middle"><{$subforum.forum_topics}> </td>
+ <td class="odd" width="9%" align="center" valign="middle"><{$subforum.forum_posts}> </td>
+ <td class="even" width="20%" align="right" valign="middle"><{$subforum.forum_lastpost_time}> <br />
+ <{$subforum.forum_lastpost_icon}> <br />
+ <{$subforum.forum_lastpost_user}>
+ </td>
+ </tr>
+<{/foreach}>
+<{/if}>
+<{/foreach}>
+</tbody>
+<{elseif $subforum_display == "collapse"}>
+
+<{foreach item=forum from=$category.forums}>
+ <tr>
+ <{if $forum.subforum}>
+ <td class="even" rowspan="2" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <{else}>
+ <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <{/if}>
+ <td class="odd">
+ <div id="index_forum">
+ <span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a>
+ <{if $rss_enable}>
+ (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
+ <{/if}>
+ <br /><{$forum.forum_desc}>
+ </span>
+ <{if $forum.forum_moderators}>
+ <span class="extra">
+ <{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}>
+ </span>
+ <{/if}>
+ </div>
+ </td>
+ <td class="even" align="center" valign="middle"><{$forum.forum_topics}> </td>
+ <td class="odd" align="center" valign="middle"><{$forum.forum_posts}> </td>
+ <td class="even" align="right" valign="middle"><{$forum.forum_lastpost_time}> <br />
+ <{$forum.forum_lastpost_icon}> <br />
+ <{$forum.forum_lastpost_user}> </td>
+ </tr>
+ <{if $forum.subforum}>
+ <tr>
+ <td class="odd" colspan="4" align="left"><{$smarty.const._MD_SUBFORUMS}> <{$img_subforum}>
+ <{foreach item=subforum from=$forum.subforum}>
+ [<a href="viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>]
+ <{/foreach}>
+ </td>
+ </tr>
+ <{/if}>
+<{/foreach}>
+
+<{else}>
+
+<{foreach item=forum from=$category.forums}>
+ <tr>
+ <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <td class="odd">
+ <div id="index_forum">
+ <span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a>
+ <{if $rss_enable}>
+ (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
+ <{/if}>
+ <br /><{$forum.forum_desc}>
+ </span>
+ <{if $forum.forum_moderators}>
+ <span class="extra">
+ <{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}>
+ </span>
+ <{/if}>
+ </div>
+ </td>
+ <td class="even" align="center" valign="middle"><{$forum.forum_topics}> </td>
+ <td class="odd" align="center" valign="middle"><{$forum.forum_posts}> </td>
+ <td class="even" align="right" valign="middle"><{$forum.forum_lastpost_time}> <br />
+ <{$forum.forum_lastpost_icon}> <br />
+ <{$forum.forum_lastpost_user}>
+ </td>
+ </tr>
+<{/foreach}>
+
+<{/if}>
+ <!-- end forums -->
+</table>
+</div>
+<{/foreach}>
+<!-- end forum categories -->
+
+<hr />
+
+<div>
+<div style="float: left; text-align: left;">
+ <{$img_hotfolder}> = <{$smarty.const._MD_NEWPOSTS}><br />
+ <{$img_folder}> = <{$smarty.const._MD_NONEWPOSTS}><br />
+ <{$img_locked_newposts}> = <{$smarty.const._MD_INACTIVEFORUM_NEWPOSTS}><br />
+ <{$img_locked_nonewposts}> = <{$smarty.const._MD_INACTIVEFORUM_NONEWPOSTS}>
+</div>
+<div style="float: right; text-align: right;">
+ <form action="search.php" method="post" name="search" id="search">
+ <input name="term" id="term" type="text" size="20" />
+ <input type="hidden" name="forum" id="forum" value="all" />
+ <input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
+ <input type="hidden" name="searchin" id="searchin" value="both" />
+ <input type="submit" name="submit" id="submit" value="<{$smarty.const._MD_SEARCH}>" />
+ <br />
+ [ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a> ]
+ </form>
+</div>
+</div>
+<div class="clear"></div>
+
+<br style="clear: both;" />
+<div style="float:right;text-align:right;padding-top: 5px;">
+ <{if $viewer_level gt 1}>
+ <{if $mode gt 0}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?mode=0&cat=<{$viewcat}>" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
+ <{else}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?mode=1&cat=<{$viewcat}>" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
+ <{/if}>
+ <{/if}>
+ <{if $rss_button}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED"><{$rss_button}></a>
+ <br />
+ <{/if}>
+ <a href="http://xoopsforge.com" target="_blank" title="Powered by CBB v<{$version}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/cbb.png" alt="Powered by CBB v<{$version}>" title="Powered by CBB v<{$version}>" /></a>
+</div>
+<div class="clear"></div>
+
+<br />
+<br />
+<{if $online}><{include file="db:newbb_online.html"}><{/if}>
+<{include file='db:system_notification_select.html'}>
+<!-- end module contents -->
\ No newline at end of file
Added: XoopsThemes/wox/trunk/modules/newbb/newbb_viewforum.html
===================================================================
--- XoopsThemes/wox/trunk/modules/newbb/newbb_viewforum.html (rev 0)
+++ XoopsThemes/wox/trunk/modules/newbb/newbb_viewforum.html 2009-08-28 15:56:55 UTC (rev 3523)
@@ -0,0 +1,279 @@
+<div id="cbb_location">
+<img src="<{$xoops_imageurl}>images/forum_location.png" alt="" /> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php">Forum Index</a>
+»
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.id}>"><{$category.title}></a>
+<{if $parentforum}>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$parentforum.id}>"><{$parentforum.name}></a>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a>
+<{else}>
+» <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a> <{$forum_topictype}>
+<{/if}>
+</div>
+
+<br />
+
+<{if $subforum}>
+<table cellspacing="1" class="cbb_forums" width="100%">
+ <thead>
+ <tr class="head" align="center">
+ <th width="5%"> </th>
+ <th nowrap="nowrap" align="left"><{$smarty.const._MD_SUBFORUMS}></th>
+ <th nowrap="nowrap"><{$smarty.const._MD_TOPICS}></th>
+ <th nowrap="nowrap"><{$smarty.const._MD_POSTS}></th>
+ <th nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></th>
+ </tr>
+ </thead>
+ <!-- start subforums -->
+ <{foreach item=sforum from=$subforum}>
+ <tr>
+ <td class="even" align="center" valign="middle"><{$sforum.forum_folder}></td>
+ <td class="odd" ><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$sforum.forum_id}>"><strong><{$sforum.forum_name}></strong></a><br />
+ <{$sforum.forum_desc}>
+ <{if $sforum.forum_moderators}><br/>
+ <strong><{$smarty.const._MD_MODERATOR}>: </strong><{$sforum.forum_moderators}>
+ <{/if}>
+ </td>
+ <td class="even" align="center" valign="middle"><{$sforum.forum_topics}></td>
+ <td class="odd" align="center" valign="middle"><{$sforum.forum_posts}></td>
+ <td class="even" align="right" valign="middle"><{$sforum.forum_lastpost_time}><br />
+ <{$sforum.forum_lastpost_user}> <{$sforum.forum_lastpost_icon}>
+ </td>
+ </tr>
+ <{/foreach}>
+ <!-- end subforums -->
+
+</table>
+<br />
+<{/if}>
+
+<{if $mode gt 1}>
+<form name="form_topics_admin" action="action.topic.php" method="POST" >
+<{/if}>
+
+<{if $mode gt 0}>
+<div style="padding: 5px;float: left; text-align:left;" id="admin">
+<{$forum_addpoll}><{$forum_post_or_register}>
+</div>
+<div style="padding: 5px;float: right; text-align:right;">
+<{if $mode gt 1}>
+<{$smarty.const._ALL}>: <input type="checkbox" name="topic_check1" id="topic_check1" value="1" />
+<select name="op">
+ <option value="0"><{$smarty.const._SELECT}></option>
+ <option value="delete"><{$smarty.const._DELETE}></option>
+ <{if $type eq "pending"}>
+ <option value="approve"><{$smarty.const._MD_APPROVE}></option>
+ <option value="move"><{$smarty.const._MD_MOVE}></option>
+ <{elseif $type eq "deleted"}>
+ <option value="restore"><{$smarty.const._MD_RESTORE}></option>
+ <{else}>
+ <option value="move"><{$smarty.const._MD_MOVE}></option>
+ <{/if}>
+</select>
+<input type="hidden" name="forum_id" value="<{$forum_id}>" />
+<input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>&mode=1#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
+<{elseif $mode eq 1}>
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>&type=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>&type=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>&type=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a> |
+<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php?forum=<{$forum_id}>" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a>
+<{/if}>
+</div>
+<{else}>
+<div style="padding: 5px;float: right; text-align:right;">
+<{$forum_addpoll}><{$forum_post_or_register}>
+</div>
+<{/if}>
+<div class="clear"></div>
+
+<br />
+<div>
+<div class="wox_cbb_options">
+ <select name="forumoption" id="forumoption"
+ class="menu"
+ >
+ <option value=""><{$smarty.const._MD_FORUMOPTION}></option>
+ <option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option>
+ <option value="<{$mark_unread}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_UNREAD}></option>
+ <option value="">--------</option>
+ <option value="<{$post_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALLPOSTS}></option>
+ <option value="<{$newpost_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_NEWPOSTS}></option>
+ <option value="<{$all_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALL}></option>
+ <option value="<{$digest_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_DIGEST}></option>
+ <option value="<{$unreplied_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREPLIED}></option>
+ <option value="<{$unread_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREAD}></option>
+ <option value="">--------</option>
+ <{foreach item=menu from=$menumode_other}>
+ <option value="<{$menu.link}>"><{$menu.title}></option>
+ <{/foreach}>
+ </select>
+</div>
+<div style="padding: 5px;float: right; text-align:right;">
+<{$forum_pagenav}>
+</div>
+</div>
+<div class="clear"></div>
+<br />
+
+<table class="cbb_forums" cellpadding="6" cellspacing="1" border="0" width="100%" align="center">
+ <tr class="head" align="left">
+ <th width="5%" colspan="2">
+ <{if $mode gt 1}>
+ <{$smarty.const._ALL}>: <input type="checkbox" name="topic_check" id="topic_check" value="1" />
+ <{else}>
+
+ <{/if}>
+ </th>
+ <th> <strong><a href="<{$h_topic_link}>"><{$smarty.const._MD_TOPICS}></a></strong></th>
+ <th width="10%" align="center" nowrap="nowrap"><strong><a href="<{$h_poster_link}>"><{$smarty.const._MD_POSTER}></a></strong></th>
+ <th width="10%" align="center" nowrap="nowrap"><strong><a href="<{$h_publish_link}>"><{$smarty.const._MD_TOPICTIME}></a></strong></th>
+ <th width="5%" align="center" nowrap="nowrap"><strong><a href="<{$h_reply_link}>"><{$smarty.const._MD_REPLIES}></a></strong></th>
+ <th width="5%" align="center" nowrap="nowrap"><strong><a href="<{$h_views_link}>"><{$smarty.const._MD_VIEWS}></a></strong></th>
+<{if $rating_enable}>
+ <th width="5%" align="center" nowrap="nowrap"><strong><a href="<{$h_rating_link}>"><{$smarty.const._MD_RATINGS}></a></strong></th>
+<{/if}>
+ <th width="15%" align="center" nowrap="nowrap"><strong><a href="<{$h_date_link}>"><{$smarty.const._MD_DATE}></a></strong></th>
+ </tr>
+ <tbody>
+ <{if $sticky > 0}>
+ <tr class="head">
+ <td colspan="2"> </td>
+ <{if $rating_enable}>
+ <td colspan="7"><strong><{$smarty.const._MD_IMTOPICS}></strong></td>
+ <{else}>
+ <td colspan="6"><strong><{$smarty.const._MD_IMTOPICS}></strong></td>
+ <{/if}>
+ </tr>
+ <{/if}>
+
+ <!-- start forum topic -->
+ <{foreach name=loop item=topic from=$topics}>
+ <!--<{if $topic.stick AND $smarty.foreach.loop.iteration == $sticky+1}>
+ <tr class="head">
+ <td colspan="2"> </td>
+ <{if $rating_enable}>
+ <td colspan="7"><strong><{$smarty.const._MD_NOTIMTOPICS}></strong></td>
+ <{else}>
+ <td colspan="6"><strong><{$smarty.const._MD_NOTIMTOPICS}></strong></td>
+ <{/if}>
+ </tr>
+ <{/if}>-->
+
+ <tr class="<{cycle values="even,odd"}>">
+ <td width="4%" align="center">
+ <{if $mode gt 1}>
+ <input type="checkbox" name="topic_id[]" id="topic_id[<{$topic.topic_id}>]" value="<{$topic.topic_id}>" />
+ <{else}>
+ <{$topic.topic_folder}>
+ <{/if}>
+ </td>
+ <td width="4%" align="center"><{$topic.topic_icon}></td>
+ <td> <a href="<{$topic.topic_link}>" title="<{$topic.topic_excerpt|strip_tags}>">
+ <{$topic.topic_title}></a><{$topic.attachment}> <{$topic.topic_page_jump}>
+ </td>
+ <td align="center" valign="middle"><{$topic.topic_poster}></td>
+ <td align="center" valign="middle"><{$topic.topic_time}></td>
+ <td align="center" valign="middle"><{$topic.topic_replies}></td>
+ <td align="center" valign="middle"><{$topic.topic_views}></td>
+ <{if $rating_enable}>
+ <td align="center" valign="middle"><{$topic.rating_img}></td>
+ <{/if}>
+ <td align="right" valign="middle"><{$topic.topic_last_posttime}><br />
+ <{$topic.topic_last_poster}> <{$topic.topic_page_jump_icon}></td>
+
+ </tr>
+
+ <{/foreach}>
+ </tbody>
+
+ <!-- end forum topic -->
+
+ <{if $mode gt 1}>
+ </form>
+ <{/if}>
+
+ <tr class="foot">
+ <{if $rating_enable}>
+ <td colspan="9" align="center"><{else}><td colspan="8" align="center"><{/if}>
+ <{strip}>
+ <form method="get" action="viewforum.php">
+ <strong><{$smarty.const._MD_SORTEDBY}></strong> <{$forum_selection_sort}> <{$forum_selection_order}> <{$forum_selection_since}>
+ <input type="hidden" name="forum" id="forum" value="<{$forum_id}>" />
+ <input type="hidden" name="type" value="<{$type}>" />
+ <input type="submit" name="refresh" value="<{$smarty.const._MD_GO}>" />
+ </form>
+ <{/strip}>
+ </td>
+ </tr>
+</table>
+<!-- end forum main table -->
+
+<br />
+
+<div>
+<div style="float: left; text-align:left;">
+<{$forum_addpoll}><{$forum_post_or_register}>
+</div>
+<div style="float: right; text-align:right;">
+<{$forum_pagenav}>
+</div>
+</div>
+<div class="clear"></div>
+
+<br style="clear: both;" />
+<br />
+<div>
+<div style="float: left; text-align: left;">
+ <{$img_newposts}> = <{$smarty.const._MD_NEWPOSTS}> (<{$img_hotnewposts}> = <{$smarty.const._MD_MORETHAN}>) <br />
+ <{$img_folder}> = <{$smarty.const._MD_NONEWPOSTS}> (<{$img_hotfolder}> = <{$smarty.const._MD_MORETHAN2}>) <br />
+ <{$img_locked}> = <{$smarty.const._MD_TOPICLOCKED}> <br />
+ <{$img_sticky}> = <{$smarty.const._MD_TOPICSTICKY}> <br />
+ <{$img_digest}> = <{$smarty.const._MD_TOPICDIGEST}> <br />
+ <{$img_poll}> = <{$smarty.const._MD_TOPICHASPOLL}>
+</div>
+<div style="float: right; text-align: right;">
+<form action="search.php" method="get">
+<input name="term" id="term" type="text" size="15" />
+<input type="hidden" name="forum" id="forum" value="<{$forum_id}>" />
+<input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
+<input type="hidden" name="since" id="since" value="<{$forum_since}>" />
+<input type="hidden" name="action" id="action" value="yes" />
+<input type="hidden" name="searchin" id="searchin" value="both" />
+<input type="submit" class="formButton" value="<{$smarty.const._MD_SEARCH}>" /><br />
+[<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>]
+</form><br />
+<{$forum_jumpbox}>
+</div>
+</div>
+<div class="clear"></div>
+<br style="clear: both;" />
+<br />
+
+<div>
+<div style="float: left;">
+<{foreach item=perm from=$permission_table}>
+<div><{$perm}></div>
+<{/foreach}>
+</div>
+<{if $rss_button OR $viewer_level gt 1}>
+<div style="float: right; text-align: right;">
+ <{if $viewer_level gt 1}>
+ <{if $mode gt 0}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>&mode=0" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
+ <{else}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>&mode=1" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
+ <{/if}>
+ <{/if}>
+ <{if $rss_button}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum_id}>" target="_blank" title="RSS FEED"><{$rss_button}></a>
+ <{/if}>
+</div>
+<{/if}>
+</div>
+<div class="clear"></div>
+
+<br style="clear: both;" />
+<br />
+<{if $online}><{include file="db:newbb_online.html"}><{/if}>
+<{include file='db:system_notification_select.html'}>
+<!-- end module contents -->
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/theme.html
===================================================================
--- XoopsThemes/wox/trunk/theme.html 2009-08-28 09:32:34 UTC (rev 3522)
+++ XoopsThemes/wox/trunk/theme.html 2009-08-28 15:56:55 UTC (rev 3523)
@@ -22,6 +22,8 @@
<{/if}>
<{if $xoops_dirname=='news'}>
<link rel="stylesheet" type="text/css" media="screen" href="<{$xoops_imageurl}>css/news.css" />
+<{elseif $xoops_dirname=='newbb'}>
+<link rel="stylesheet" type="text/css" media="screen" href="<{$xoops_imageurl}>css/forums.css" />
<{/if}>
<script type="text/javascript" src="<{$xoops_imageurl}>js/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="<{$xoops_imageurl}>js/jquery-ui-1.7.2.custom.min.js"></script>
Added: XoopsThemes/wox/trunk/tpls/cbb_menu.html
===================================================================
--- XoopsThemes/wox/trunk/tpls/cbb_menu.html (rev 0)
+++ XoopsThemes/wox/trunk/tpls/cbb_menu.html 2009-08-28 15:56:55 UTC (rev 3523)
@@ -0,0 +1,7 @@
+<a href="<{$xoops_url}>/modules/newbb/">Forum Index</a>
+<a href="<{$xoops_url}>/modules/newbb/index.php?cat=4">General Forums</a>
+<a href="<{$xoops_url}>/modules/newbb/index.php?cat=7">Community Support</a>
+<a href="<{$xoops_url}>/modules/newbb/index.php?cat=2">Modules Support</a>
+<a href="<{$xoops_url}>/modules/newbb/index.php?cat=1">Themes Support</a>
+<a href="<{$xoops_url}>/modules/newbb/index.php?cat=3">Development</a>
+<a href="<{$xoops_url}>/modules/newbb/index.php?cat=10">International Support</a>
\ No newline at end of file
Modified: XoopsThemes/wox/trunk/tpls/content.html
===================================================================
--- XoopsThemes/wox/trunk/tpls/content.html 2009-08-28 09:32:34 UTC (rev 3522)
+++ XoopsThemes/wox/trunk/tpls/content.html 2009-08-28 15:56:55 UTC (rev 3523)
@@ -50,7 +50,7 @@
<a href="<{$xoops_url}>/modules/core/" title="Get XOOPS" class="get"><img src="<{$xoops_imageurl}>images/nav/get.png" alt="Get XOOPS" /></a>
<a href="#"><span>Overview</span><img src="<{$xoops_imageurl}>images/nav/overview32.png" /></a>
<a href="#"><span>FAQ</span><img src="<{$xoops_imageurl}>images/nav/faq.png" /></a>
- <a href="#"><span>Support</span><img src="<{$xoops_imageurl}>images/nav/support.png" /></a>
+ <a href="<{$xoops_url}>/modules/newbb/"<{if $xoops_dirname=='newbb'}> class="selected"<{/if}>><span>Forums</span><img src="<{$xoops_imageurl}>images/nav/forums32.png" /></a>
<a href="#"><span>Modules</span><img src="<{$xoops_imageurl}>images/nav/downs32.png" /></a>
<a href="<{$xoops_url}>/modules/news/"<{if $xoops_dirname=='news'}> class="selected"<{/if}>><span>News</span><img src="<{$xoops_imageurl}>images/nav/news32.png" /></a>
</div>
@@ -59,6 +59,8 @@
<div>
<{if $xoops_dirname=='news'}>
<{include file="wox/tpls/news_menu.html"}>
+ <{elseif $xoops_dirname=='newbb'}>
+ <{include file="wox/tpls/cbb_menu.html"}>
<{/if}>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <urb...@us...> - 2009-08-28 09:50:34
|
Revision: 3519
http://xoops.svn.sourceforge.net/xoops/?rev=3519&view=rev
Author: urbanspaceman
Date: 2009-08-28 08:38:05 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xsitemap/trunk/admin/xml.php
XoopsModules/xsitemap/trunk/changelog.txt
XoopsModules/xsitemap/trunk/include/functions.php
XoopsModules/xsitemap/trunk/include/install.php
XoopsModules/xsitemap/trunk/xml_google.php
XoopsModules/xsitemap/trunk/xoops_version.php
Modified: XoopsModules/xsitemap/trunk/admin/xml.php
===================================================================
--- XoopsModules/xsitemap/trunk/admin/xml.php 2009-08-28 08:34:30 UTC (rev 3518)
+++ XoopsModules/xsitemap/trunk/admin/xml.php 2009-08-28 08:38:05 UTC (rev 3519)
@@ -53,10 +53,10 @@
echo "<div class=\"CPbigTitle\" style=\"background-image: url(../images/deco/xml.png); background-repeat: no-repeat; background-position: left; padding-left: 50px;\"><strong>"._AM_XSITEMAP_MANAGER_XML."</strong>
</div><br />";
-$xmlfile = "../xsitemap.xml";
+$xmlfile = XOOPS_ROOT_PATH."/xsitemap.xml";
$stat = stat($xmlfile);
$last_mod = date("d-m-Y H:i:s",$stat['mtime']);
-if ( is_readable( $xmlfile ) ){
+//if ( is_readable( $xmlfile ) ){
echo "<div style=\"padding: 8px;\">";
@@ -80,6 +80,6 @@
echo "<div>";
echo "invia la sitemap a google <a href='http://www.google.com/webmasters/tools/ping?sitemap=".$site_url."'>CLICCA</a>";
echo "</div>";*/
-}
+//}
?>
Modified: XoopsModules/xsitemap/trunk/changelog.txt
===================================================================
--- XoopsModules/xsitemap/trunk/changelog.txt 2009-08-28 08:34:30 UTC (rev 3518)
+++ XoopsModules/xsitemap/trunk/changelog.txt 2009-08-28 08:38:05 UTC (rev 3519)
@@ -1,4 +1,11 @@
-26/08/2009
+28/08/2009
+- Modificata la fase di creazione del file XML. Ora il file viene creato durante l'installazione del modulo nella ROOT del sito come richiesto
+ dallo standard XML per le sitemap. Quando viene creato il file XML in fase di installazione del modulo, esso non è completo poichè
+ Xsitemap non è ancora in grado di leggere i plugin installati.
+ Bisogna quindi rigenerare il file xml con l'apposito pulsante dal pannello di controllo oppure visitando la pagina xsitemap/xml_google.php.
+
+
+26/08/2009
- Aggiunta la gestione della sitemap XML ora viene generato dal sistema un file xsitemap.xml da inviare ai motori di ricerca
- Aggiunto file di lingua main.php
- Aggiunte nuove definizioni per la lingua nei file admin.php, modinfo.php
@@ -12,7 +19,7 @@
- Aggiunto l'inglese tra le lingue del modulo by dbman
- Modificato file di traduzione admin.php
-
+x
21/08/2009
RELEASE:
@@ -23,4 +30,3 @@
DA FINIRE:
- Verificare la funzionalità XML e verificare la compatibilità con Google Sitemap.
- Con alcuni moduli non si vedono i sublinks.
-
Modified: XoopsModules/xsitemap/trunk/include/functions.php
===================================================================
--- XoopsModules/xsitemap/trunk/include/functions.php 2009-08-28 08:34:30 UTC (rev 3518)
+++ XoopsModules/xsitemap/trunk/include/functions.php 2009-08-28 08:38:05 UTC (rev 3519)
@@ -154,8 +154,8 @@
$xsitemap_show = xsitemap_show_sitemap();
if ($xsitemap_show != 0) {
- //$file= fopen("xsitemap.xml", "w");
- $file= fopen(XOOPS_ROOT_PATH."/modules/xsitemap/xsitemap.xml", "w");
+ //$file= fopen(XOOPS_ROOT_PATH."/modules/xsitemap/xsitemap.xml", "w");
+ $file= fopen(XOOPS_ROOT_PATH."/xsitemap.xml", "w");
//intestazione xml
$_xml ="<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n";
@@ -197,7 +197,7 @@
fwrite($file, $_xml);
fclose($file);
- $update = (_MA_XSITEMAP_XML_UPDATE). "<a href=\"xsitemap.xml\"> <br/>"._MA_XSITEMAP_XML_VIEW_XML."</a>";
+ $update = (_MA_XSITEMAP_XML_UPDATE). "<a href=\"".XOOPS_URL."/xsitemap.xml\"> <br/>"._MA_XSITEMAP_XML_VIEW_XML."</a>";
} else {
@@ -212,7 +212,8 @@
if ($xsitemap_show != 0) {
//$file= fopen("xsitemap.xml", "w");
- $file= fopen(XOOPS_ROOT_PATH."/modules/xsitemap/xsitemap.xml", "w");
+ //$file= fopen(XOOPS_ROOT_PATH."/modules/xsitemap/xsitemap.xml", "w");
+ $file= fopen(XOOPS_ROOT_PATH."/xsitemap.xml", "w");
//intestazione xml
$_xml ="<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n";
@@ -254,7 +255,7 @@
fwrite($file, $_xml);
fclose($file);
- $update = (_AM_XSITEMAP_XML_UPDATE). "<a href=\"../xsitemap.xml\"> <br/>"._AM_XSITEMAP_XML_VIEW_XML."</a>";
+ $update = (_AM_XSITEMAP_XML_UPDATE). "<a href=\"".XOOPS_URL."/xsitemap.xml\"> <br/>"._AM_XSITEMAP_XML_VIEW_XML."</a>";
} else {
@@ -264,4 +265,59 @@
print $update;
}
+function xsitemap_install(){
+ $xsitemap_show = xsitemap_show_sitemap();
+
+ if ($xsitemap_show != 0) {
+ $file= fopen(XOOPS_ROOT_PATH."/xsitemap.xml", "w");
+
+ //intestazione xml
+ $_xml ="<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n";
+ $_xml .="<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\r\n";
+
+ foreach ($xsitemap_show['modules'] as $mod){
+ if ($mod["directory"]) {
+
+ //scrivo l'xml del modulo
+ $_xml .="<url>";
+ $_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/index.php</loc>\r\n";
+
+ if ($mod["parent"]) {
+ foreach ($mod["parent"] as $parent){
+ $_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$parent["url"]."</loc>\r\n";
+ }
+ $z = 0;
+ if ($mod["parent"][$z]["child"]) {
+ foreach ($mod["parent"][$z]["child"] as $child){
+ $_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$child["url"]."</loc>\r\n";
+ }
+ $z++;
+ }
+ }
+ $_xml .="</url>";
+
+ } else {
+
+ $_xml .="\t<page title=\"Nothing Returned\">\r\n";
+ $_xml .="\t\t<loc>none</loc>\r\n";
+
+ $_xml .="\t</page>\r\n";
+ }
+ }
+
+ $_xml .="</urlset>";
+
+ //scrivo il file xml
+ fwrite($file, $_xml);
+ fclose($file);
+
+ $update = (_AM_XSITEMAP_XML_UPDATE). "<a href=\"".XOOPS_URL."/xsitemap.xml\"> <br/>"._AM_XSITEMAP_XML_VIEW_XML."</a>";
+
+ } else {
+
+ $update = _AM_XSITEMAP_XML_ERROR_UPDATE;
+
+ }
+
+}
?>
\ No newline at end of file
Modified: XoopsModules/xsitemap/trunk/include/install.php
===================================================================
--- XoopsModules/xsitemap/trunk/include/install.php 2009-08-28 08:34:30 UTC (rev 3518)
+++ XoopsModules/xsitemap/trunk/include/install.php 2009-08-28 08:38:05 UTC (rev 3519)
@@ -22,6 +22,14 @@
* ****************************************************************************
*/
+//28/08/2009 by urbanspaceman
+
+include_once(XOOPS_ROOT_PATH . "/class/tree.php");
+include_once XOOPS_ROOT_PATH."/modules/xsitemap/class/plugin.php";
+include_once XOOPS_ROOT_PATH."/modules/xsitemap/include/functions.php";
+include_once(XOOPS_ROOT_PATH . "/modules/xsitemap/class/xsitemap_class.php");
+$xsitemap_configs = $xoopsModuleConfig ;
+
$indexFile = XOOPS_ROOT_PATH."/modules/xsitemap/include/index.html";
$blankFile = XOOPS_ROOT_PATH."/modules/xsitemap/images/deco/blank.gif";
@@ -38,5 +46,8 @@
mkdir($module_uploads, 0777);
chmod($module_uploads, 0777);
copy($indexFile, XOOPS_ROOT_PATH."/uploads/xsitemap/plugin/index.html");
+
+//Creazione del file xsitemap.xml nella root del sito
+xsitemap_install();
?>
\ No newline at end of file
Modified: XoopsModules/xsitemap/trunk/xml_google.php
===================================================================
--- XoopsModules/xsitemap/trunk/xml_google.php 2009-08-28 08:34:30 UTC (rev 3518)
+++ XoopsModules/xsitemap/trunk/xml_google.php 2009-08-28 08:38:05 UTC (rev 3519)
@@ -35,7 +35,8 @@
$xsitemap_configs = $xoopsModuleConfig ;
xsitemap_xml_public();
-$xmlfile = "xsitemap.xml";
+$xmlfile = XOOPS_ROOT_PATH."/xsitemap.xml";
+
$stat = stat($xmlfile);
$last_mod = date("d-m-Y H:i:s",$stat['mtime']);
Modified: XoopsModules/xsitemap/trunk/xoops_version.php
===================================================================
--- XoopsModules/xsitemap/trunk/xoops_version.php 2009-08-28 08:34:30 UTC (rev 3518)
+++ XoopsModules/xsitemap/trunk/xoops_version.php 2009-08-28 08:38:05 UTC (rev 3519)
@@ -24,7 +24,7 @@
$modversion["name"] = "xsitemap";
- $modversion["version"] = 1.50;
+ $modversion["version"] = 1.51;
$modversion["description"] = "Modulo per la visualizzazione della sitemap in xoops.";
$modversion["author"] = "Urbanspaceman";
$modversion["author_website_url"] = "http://www.takeaweb.it";
@@ -62,7 +62,9 @@
// Scripts to run upon installation or update
$modversion["onInstall"] = "include/install.php";
- //$modversion["onUpdate"] = "include/update.php";// Menu
+ //$modversion["onUpdate"] = "include/update.php";
+
+ // Menu
$modversion["hasMain"] = 1;
//Templates
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <urb...@us...> - 2009-08-28 09:32:40
|
Revision: 3522
http://xoops.svn.sourceforge.net/xoops/?rev=3522&view=rev
Author: urbanspaceman
Date: 2009-08-28 09:32:34 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xsitemap/trunk/include/functions.php
Modified: XoopsModules/xsitemap/trunk/include/functions.php
===================================================================
--- XoopsModules/xsitemap/trunk/include/functions.php 2009-08-28 09:25:30 UTC (rev 3521)
+++ XoopsModules/xsitemap/trunk/include/functions.php 2009-08-28 09:32:34 UTC (rev 3522)
@@ -167,20 +167,24 @@
//scrivo l'xml del modulo
$_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/index.php</loc>\r\n";
-
+ $_xml .="</url>";
+
if ($mod["parent"]) {
foreach ($mod["parent"] as $parent){
+ $_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$parent["url"]."</loc>\r\n";
+ $_xml .="</url>";
}
$z = 0;
if ($mod["parent"][$z]["child"]) {
foreach ($mod["parent"][$z]["child"] as $child){
+ $_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$child["url"]."</loc>\r\n";
+ $_xml .="</url>";
}
$z++;
}
}
- $_xml .="</url>";
} else {
@@ -225,20 +229,24 @@
//scrivo l'xml del modulo
$_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/index.php</loc>\r\n";
-
+ $_xml .="</url>";
+
if ($mod["parent"]) {
foreach ($mod["parent"] as $parent){
+ $_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$parent["url"]."</loc>\r\n";
+ $_xml .="</url>";
}
$z = 0;
if ($mod["parent"][$z]["child"]) {
foreach ($mod["parent"][$z]["child"] as $child){
+ $_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$child["url"]."</loc>\r\n";
+ $_xml .="</url>";
}
$z++;
}
}
- $_xml .="</url>";
} else {
@@ -281,20 +289,24 @@
//scrivo l'xml del modulo
$_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/index.php</loc>\r\n";
-
+ $_xml .="</url>";
+
if ($mod["parent"]) {
foreach ($mod["parent"] as $parent){
+ $_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$parent["url"]."</loc>\r\n";
+ $_xml .="</url>";
}
$z = 0;
if ($mod["parent"][$z]["child"]) {
foreach ($mod["parent"][$z]["child"] as $child){
+ $_xml .="<url>";
$_xml .="\t\t<loc>" . XOOPS_URL."/modules/".$mod["directory"]."/".$child["url"]."</loc>\r\n";
+ $_xml .="</url>";
}
$z++;
}
}
- $_xml .="</url>";
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-08-28 09:25:37
|
Revision: 3521
http://xoops.svn.sourceforge.net/xoops/?rev=3521&view=rev
Author: trabis
Date: 2009-08-28 09:25:30 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Not sure where block['tag'] should be set. It is giving me an error so I'll set it with the module name.
Modified Paths:
--------------
XoopsModules/xlanguage/trunk/include/functions.php
Modified: XoopsModules/xlanguage/trunk/include/functions.php
===================================================================
--- XoopsModules/xlanguage/trunk/include/functions.php 2009-08-28 08:40:24 UTC (rev 3520)
+++ XoopsModules/xlanguage/trunk/include/functions.php 2009-08-28 09:25:30 UTC (rev 3521)
@@ -234,6 +234,7 @@
}
$block = b_xlanguage_select_show($options);
+ $block["tag"] = "xlanguage";
$content = "";
$i = 1;
@@ -272,4 +273,4 @@
return true;
}
-?>
\ 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: <urb...@us...> - 2009-08-28 08:56:31
|
Revision: 3520
http://xoops.svn.sourceforge.net/xoops/?rev=3520&view=rev
Author: urbanspaceman
Date: 2009-08-28 08:40:24 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Changes the phase of creating the XML file. Now the file is created during installation of the module in the root of the site as required the standard for the XML sitemap. When you create the XML file during installation of the module, it is not complete because Xsitemap is not yet able to read the plugin installed.
It must then rebuild the XML file with the appropriate button on the control panel or visiting xsitemap/xml_google.php.
Removed Paths:
-------------
XoopsModules/xsitemap/trunk/xsitemap.xml
Deleted: XoopsModules/xsitemap/trunk/xsitemap.xml
===================================================================
--- XoopsModules/xsitemap/trunk/xsitemap.xml 2009-08-28 08:38:05 UTC (rev 3519)
+++ XoopsModules/xsitemap/trunk/xsitemap.xml 2009-08-28 08:40:24 UTC (rev 3520)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<url> <loc>C:/wamp/www/xoops_sviluppo_2/modules/AMS/index.php</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/AMS/index.php?storytopic=1</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/AMS/index.php?storytopic=4</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/AMS/index.php?storytopic=2</loc>
-</url><url> <loc>C:/wamp/www/xoops_sviluppo_2/modules/news/index.php</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/news/index.php?storytopic=2</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/news/index.php?storytopic=1</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/news/index.php?storytopic=3</loc>
- <loc>C:/wamp/www/xoops_sviluppo_2/modules/news/index.php?storytopic=5</loc>
-</url></urlset>
\ 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: <vo...@us...> - 2009-08-28 08:34:40
|
Revision: 3518
http://xoops.svn.sourceforge.net/xoops/?rev=3518&view=rev
Author: voltan1
Date: 2009-08-28 08:34:30 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Update Persian language
Modified Paths:
--------------
XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/admin.php
XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/modinfo.php
Modified: XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/admin.php
===================================================================
--- XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/admin.php 2009-08-28 00:51:42 UTC (rev 3517)
+++ XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/admin.php 2009-08-28 08:34:30 UTC (rev 3518)
@@ -1,6 +1,11 @@
<?php
// mymenu
+
+// Appended by Xoops Language Checker -GIJOE- in 2009-01-14 11:10:53
+define('_AM_ADV_DBFACTORYPATCHED',' فایل databasefactory شما برای فعال سازی سیستم تله گذاری لایه های پایگاه داده ها در برابر تزریق به sql یا( DB Layer trapping anti-SQL-Injection ) آماده است.');
+define('_AM_ADV_DBFACTORYUNPATCHED',' فایل databasefactory شما برای فعال سازی سیستم تله گذاری لایه های پایگاه داده ها در برابر تزریق به sql یا( DB Layer trapping anti-SQL-Injection ) آماده نیست. شما باید چند فایل را ویرایش کنید.');
+
define('_MD_A_MYMENU_MYTPLSADMIN','');
define('_MD_A_MYMENU_MYBLOCKSADMIN','دسترسی ها');
define('_MD_A_MYMENU_MYPREFERENCES','ویژگی ها');
Modified: XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/modinfo.php
===================================================================
--- XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/modinfo.php 2009-08-28 00:51:42 UTC (rev 3517)
+++ XoopsModules/protector/htdocs/xoops_lib/modules/protector/language/persian/modinfo.php 2009-08-28 08:34:30 UTC (rev 3518)
@@ -1,114 +1,124 @@
-<?php
+<?php
+
+if( defined( 'FOR_XOOPS_LANG_CHECKER' ) ) $mydirname = 'protector' ;
+$constpref = '_MI_' . strtoupper( $mydirname ) ;
+
+if( defined( 'FOR_XOOPS_LANG_CHECKER' ) || ! defined( $constpref.'_LOADED' ) ) {
+
-if( defined( 'FOR_XOOPS_LANG_CHECKER' ) ) $mydirname = 'protector' ;
-$constpref = '_MI_' . strtoupper( $mydirname ) ;
-if( defined( 'FOR_XOOPS_LANG_CHECKER' ) || ! defined( $constpref.'_LOADED' ) ) {
+// Appended by Xoops Language Checker -GIJOE- in 2009-07-06 05:46:52
+define($constpref.'_DBTRAPWOSRV','هیچ وقت _SERVER برای anti-SQL-Injection برسی نکن');
+define($constpref.'_DBTRAPWOSRVDSC','بعضی از کارگذار ها اجازه میدهند سیستم تله گذاری پایگاه داده ها فعال باشد. این باعث اشتباه در تشخیص حمله تزریق به SQL میشود. اگر شما خطاهای دریافت کردید, این گزینه را روشن کنید. باید توجه داشته باشید که این گزینه باعث تضعیف سیستم تله گذاری لایه های پایگاه داده ها در برابر تزریق به sql میشود.');
-define( $constpref.'_LOADED' , 1 ) ;
+// Appended by Xoops Language Checker -GIJOE- in 2009-01-14 11:10:53
+define($constpref.'_DBLAYERTRAP','فعال سازی سیستم تله گذاری لایه های پایگاه داده ها در برابر تزریق به sql یا ( DB Layer trapping anti-SQL-Injection ) ');
+define($constpref.'_DBLAYERTRAPDSC','همچنین حملات تزریق به SQL توسط این گزینه دفع میشوند. این ویژگی لازم دارد که توسط databasefactory پشتیبانی شود. شما میتوانید این گزینه را در صفحه مشاوره امنیتی برسی کنید.');
-// The name of this module
-define($constpref."_NAME","ماژول امنيتي پروتکتور");
-
-// A brief description of this module
-define($constpref."_DESC","اين ماژول سايت زوپس شما را در برابر حملات ويروسي و لینک های داس نفوذ به پایگاه داده ها و ... محافظت ميکند.");
-
-// Menu
-define($constpref."_ADMININDEX","مرکز حفاظت");
-define($constpref."_ADVISORY","مشاوره ی امنیتی");
-define($constpref."_PREFIXMANAGER","مدیریت پیشوند نام جدول های پایگاه داده ها");
-define($constpref.'_ADMENU_MYBLOCKSADMIN','دسترسی ها');
-
-// Configs
-define($constpref.'_GLOBAL_DISBL','غیر فعال کردن موقت حفاظت');
-define($constpref.'_GLOBAL_DISBLDSC','تمام حفاظت ها به طور موقت غیر فعال میشود.<br />فراموش نکنید بعد از رفع نقص دوباره این گزینه را فعال کنید');
-
-define($constpref.'_DEFAULT_LANG','ربان پیش فرض');
-define($constpref.'_DEFAULT_LANGDSC','زبان مورد نظر خود را برای نمایش پیام های بعد از عنلکرد فایل common.php مشخص کنید');
-
-define($constpref.'_RELIABLE_IPS','IP های قابل اطمینان');
-define($constpref.'_RELIABLE_IPSDSC','IP ها را با | از هم جدا کنید . ابتدا ردیف را با ^ مشخص کنید, انتهای ردیف را با $.');
-
-define($constpref.'_LOG_LEVEL','درجه ثبت کردن وقایع');
-define($constpref.'_LOG_LEVELDSC','');
-
-define($constpref.'_BANIP_TIME0','زمان تعلیق IP های غیر مجاز (ثانیه)');
-
-define($constpref.'_LOGLEVEL0','هیچ');
-define($constpref.'_LOGLEVEL15','آرام');
-define($constpref.'_LOGLEVEL63','بی صدا');
-define($constpref.'_LOGLEVEL255','کامل');
-
-define($constpref.'_HIJACK_TOPBIT','تعداد بیت های IP که در هر جلسه محافظت میشود');
-define($constpref.'_HIJACK_TOPBITDSC','مقابله با دزدی جلسه (Anti Session Hi-Jacking):<br />به طور پیش فرض 32(bit). (تمام بیت ها حفاظت شده است)<br />وقتی IP شما پایدار نیست, محدوده ی IP خود را باعددی مشخص از بیت ها تنظیم کنید.<br /> اگر IP شما در محدوده ای بین 192.168.0.0 تا 192.168.0.255 میتواند تغییر کنید عدد 24 ( بیت) را انتخاب کنید <br /><br />Session Hi-Jacking(دزدی جلسه): در اصل ترکیب ماهرانه ای است از دو نوع حمله ی دزدین IP و استراق سمع با این روش حمله یک مهاجم خودش را به جای شما جا زده و اقدام به ادامه دادن کار ها و فعالیت های شما در سایت مطابق خواسته ی خود میکند البته در حدی که شما دسترسی دارید');
-define($constpref.'_HIJACK_DENYGP','گره های که IP اجازه ی تغییر در جلسه ( بین کاربر و زوپس) را ندارد');
-define($constpref.'_HIJACK_DENYGPDSC','مقابله با دزدی جلسه (Anti Session Hi-Jacking):<br />گروه های که IP شان در جلسه بین زوپس و کاربر نباید تغییر کند انتخاب کنید.<br />(پیشنهاد میشود فقط برای وب مستر ها روشن باشد.)<br /><br />Session Hi-Jacking(دزدی جلسه): در اصل ترکیب ماهرانه ای است از دو نوع حمله ی دزدین IP و استراق سمع با این روش حمله یک مهاجم خودش را به جای شما جا زده و اقدام به ادامه دادن کار ها و فعالیت های شما در سایت مطابق خواسته ی خود میکند البته در حدی که شما دسترسی دارید');
-define($constpref.'_SAN_NULLBYTE','پاک سازی بایت ها خالی');
-define($constpref.'_SAN_NULLBYTEDSC','اگر در کارکتر های پایان بخش به طور مکرر از "\\0" استفاده شده بود این حرکت یک حمله ثبت شود<br />بایت های خالی با فشار دادن کلید space تغییر میکند<br />(به شدت توصیه میشود این گزینه روشن باشد)');
-define($constpref.'_DIE_NULLBYTE','اگر بایت های خالی پیدا شد کاربر از سایت بیرون انداخته شود');
-define($constpref.'_DIE_NULLBYTEDSC','The terminating character "\\0" is often used in malicious attacks.<br />(قویا توصیه میشود این گزینه روشن باشد)');
-define($constpref.'_DIE_BADEXT','اگر کاربر فایل بد بارگذای کرد از سایت بیرون انداخته شود');
-define($constpref.'_DIE_BADEXTDSC','اگر به فایل بارگذاری شده به وسیله ی کاربر لینک .php بدی الحاق شده بود , این ماژول کاربر را از سایت زوپس شما بیرون می اندازد.<br />اگر شما بکرات فایل های php به ماژول های PukiWiki و B-Wiki اضافه میکنید این گزینه را خاموش کنید');
-define($constpref.'_CONTAMI_ACTION','نوع عملکرد اگر یک آلودگی پیدا شد');
-define($constpref.'_CONTAMI_ACTIONDS','رفتاری را که میخواید در برابر کاربری که قصد وارد کمردن داده های نا مناسب به سیستم زوپس شما را دارد انجام شود مشخص کنید.<br />(پیشنهاد میشود بر روی صفحه ی سفید قرار دهید)');
-define($constpref.'_ISOCOM_ACTION','نوع عملکرد وقتی نظرات منفرد به سیستم وارد شد');
-define($constpref.'_ISOCOM_ACTIONDSC','جلوگیری ازوارد کردن داده های خطر ناک به SQL:<br />این گزینه را فعال کنید برای وقتی که علامت ها "/*" به صورت منفرد پیدا شد<br />معنی " پاک سازی داده ها از کد های خطرناک "در اینجا این است که علامت های "*/" جداگانه در جدول های پایگاه داده ها اضافه شوند<br />(سفارش میشود تنظیمها بر روی ((پاک سازی داده ها از کد های خطرناک)) باشد)');
-define($constpref.'_UNION_ACTION','عملکرد وقتی که یک UNION پیدا شد');
-define($constpref.'_UNION_ACTIONDSC','جلوگیری از وارد کردن داده های خطر ناک به SQL:<br />نوع عملکرد را وقتی ترکیب هم جنسی از پیوند به SQL پیدا شد مشخص کنید<br />معنی "پاک سازی داده ها از کد های خطرناک" این است کهunion" " را به "uni-on" تغییر میدهد . یعنی اتحاد ترکیبات هم جنس را از بین میبرد و مانع ورود داده های خطر ناک به پایگاه داده ها گردد<br />(سفارش میشود تنظیمها بر روی ((پاک سازی داده ها از کد های خطرناک)) باشد)');
-define($constpref.'_ID_INTVAL','مقدار های عددی را حتما به متغیر های عددی تفسیر کن');
-define($constpref.'_ID_INTVALDSC','تمام در خواست های که نام "*id" را دارند یک عدد صحیح در نظر گرفته شود.یعنی مانع قرار دادن هر چیز به جای عدد در جلوی id میشود<br />این گزینه از فرم شما در برابر وارد کردن بعضی از داده های XSS و SQL محافظت میکند<br />این گزینه در حالت پیش فرض روشن میباشد اما ممکن است باعث بروز مشکل در برخی از ماژول ها شود.');
-define($constpref.'_FILE_DOTDOT','حفاظت در برار پیمایش شاخه ها');
-define($constpref.'_FILE_DOTDOTDSC','تمام نشانه های ".." را از همه درخواست های مشابه پیمایش شاخه ها حذف کن ');
-
-define($constpref.'_BF_COUNT','Anti Brute Force');
-define($constpref.'_BF_COUNTDSC','تعداد دفعاتی را که کاربر مهمان میتواند نام کاربری و پسورد خود رادر مدت 10 دقیقه وارد کند مشخص کنید اگر او بعد از گذشت این زمان موفق به ورود (login) نشد IP او توسط سیستم بسته شده است<br /><br />این روش هک روشی است که در آن هکر یک سری کلمات را به عنوان پسورددر نرم افزار هک وارد کرده و این کلمات به ترتیب به عنوان پسورد کاربر چک میشود');
-
-define($constpref.'_BWLIMIT_COUNT','محدودیت پهنای باند');
-define($constpref.'_BWLIMIT_COUNTDSC','Specify the max access to mainfile.php during watching time. This value should be 0 for normal environments which have enough CPU bandwidth. The number fewer than 10 will be ignored.');
-
-define($constpref.'_DOS_SKIPMODS','ماژول های که در برابر حملات DoS/Crawler چک نمیشوند');
-define($constpref.'_DOS_SKIPMODSDSC','نام ماژول ها را با | از هم جدا کنید.همچنین این اجازه برای ماژول ها ی چپ مفید خواهد بود.<br />منظور از Crawler روبات های خزنده ی موتور های جستجوگر میباشد');
-
-define($constpref.'_DOS_EXPIRE','مدت زمان برای لود ( بار گذاری) بیش از اندازه (ثانیه)');
-define($constpref.'_DOS_EXPIREDSC','این گزینه مشخص میکند زمان درخواست های لود شدن مکرر (F5 attack) و بار گذاری بیش از حد رباط های خزنده موتور های جستجو چقدر باشد.');
-
-define($constpref.'_DOS_F5COUNT','تعداد ریفریش ها با F5 که یک حمله حساب میشود');
-define($constpref.'_DOS_F5COUNTDSC','از حملات DoS پیشگیری میکند.<br />تعداد مجاز ((دوباره بارگذاری کردن)) صفحات را مشخص کنید بیش از این تعداد حمله حساب میشود.');
-define($constpref.'_DOS_F5ACTION','عکس العمل در برابر حمله با F5');
-
-define($constpref.'_DOS_CRCOUNT','شمار غیر صحیح روبات های خزنده');
-define($constpref.'_DOS_CRCOUNTDSC','جلو گیری کردن از لود بیش از حد به وسیله ی روبات های خزنده ی موتور های جستجو.<br />عدد وارد شده تعداد مناسب ورود ربات های جستگور به سایت میباشد تعداد بیش از این یک حرکت غلط حساب میشود.');
-define($constpref.'_DOS_CRACTION','عکس العمل در برابر لود بیش از حد به وسیله ی روبات های خزنده ی موتور های جستجو');
-
-define($constpref.'_DOS_CRSAFE','رباط های خزنده مجاز به ورود');
-define($constpref.'_DOS_CRSAFEDSC','روش به کار رفته برای جدا سازی رباط های خزنده متور های جستجو (User-Agent) از هم.<br />اگر به خوبی تنظیم شود ( خزنده در لیست رو به رو باشد), رابط های خزنده نمیتوانند لود بیش از حد ایجاد کنند.<br />نمونه :) /(msnbot|Googlebot|Yahoo! Slurp)/i');
-
-define($constpref.'_OPT_NONE','هیچکدام( فقط گزارش)');
-define($constpref.'_OPT_SAN','پاک سازی داده ها از کد های خطرناک ');
-define($constpref.'_OPT_EXIT','صفحه ی سفید');
-define($constpref.'_OPT_BIP','بستن IP (بدون محدودیت)');
-define($constpref.'_OPT_BIPTIME0','بستن IP (مدت دار)');
-
-define($constpref.'_DOSOPT_NONE','هیچکدام( فقط گزارش)');
-define($constpref.'_DOSOPT_SLEEP','خواب');
-define($constpref.'_DOSOPT_EXIT','صفحه ی سفید');
-define($constpref.'_DOSOPT_BIP','بستن IP (بدون محدودیت)');
-define($constpref.'_DOSOPT_BIPTIME0','بستن IP (مدت دار)');
-define($constpref.'_DOSOPT_HTA','دفع کردن به وسیله .htaccess(آزمایشی)');
-
-define($constpref.'_BIP_EXCEPT','گروه های که هیچ وقت جز IP بد ثبت نمیشوند');
-define($constpref.'_BIP_EXCEPTDSC','کاربرانی که جز گروه انتخابی شما هستند هیچ وقت بن نمیشوند.<br />(پیشنهاد میشود فقط برای وب مستر ها روشن باشد)');
-
-define($constpref.'_DISABLES','خصوصيات خطرناک در زوپس رو غير فعال کن');
-
-define($constpref.'_BIGUMBRELLA','فعال کردن anti-XSS( محافظ بزرگ)');
-define($constpref.'_BIGUMBRELLADSC','این گزینه از شما در برابر اکثر حمله های که بر اساس آسیب پذیری XSS برنامه ریزی شده اند محافظت میکند. اما 100% نیست<br /><br />حملات XSS شبیه به حملات تزیق اسکریپ میباشد و هدف اصلی از آن هک کردن سایت نیست بلکه حمله به کاربران است در این نوع حمله مهاجم کد های خطر ناکی را در صفحات سایت وارد میکند که این کد ها کامپیوتر کاربر را آلوده میکند');
-
-define($constpref.'_SPAMURI4U','محافظ- هرزنامه (anti-SPAM): تعداد لینک ها برای کابر معمولی');
-define($constpref.'_SPAMURI4UDSC','اگر به تعداد عدد مشخص شده در کادر مقابل لینک در پست کاربر پیدا شد با پست او به عنوان هرز نامه برخورد گردد. با انتخاب صفر این گزینه را غیر فعال کنید.');
-define($constpref.'_SPAMURI4G','محافظ- هرزنامه (anti-SPAM): تعدا لینک ها برای گروه ها');
-define($constpref.'_SPAMURI4GDSC','اگر به تعداد عدد مشخص شده در کادر مقابل لینک در پست گروه ها پیدا شد با پست او به عنوان هرز نامه برخورد گردد. با انتخاب صفر این گزینه را غیر فعال کنید.');
-
-}
-
+define( $constpref.'_LOADED' , 1 ) ;
+
+// The name of this module
+define($constpref."_NAME","ماژول امنيتي پروتکتور");
+
+// A brief description of this module
+define($constpref."_DESC","اين ماژول سايت زوپس شما را در برابر حملات ويروسي و لینک های داس نفوذ به پایگاه داده ها و ... محافظت ميکند.");
+
+// Menu
+define($constpref."_ADMININDEX","مرکز حفاظت");
+define($constpref."_ADVISORY","مشاوره ی امنیتی");
+define($constpref."_PREFIXMANAGER","مدیریت پیشوند نام جدول های پایگاه داده ها");
+define($constpref.'_ADMENU_MYBLOCKSADMIN','دسترسی ها');
+
+// Configs
+define($constpref.'_GLOBAL_DISBL','غیر فعال کردن موقت حفاظت');
+define($constpref.'_GLOBAL_DISBLDSC','تمام حفاظت ها به طور موقت غیر فعال میشود.<br />فراموش نکنید بعد از رفع نقص دوباره این گزینه را فعال کنید');
+
+define($constpref.'_DEFAULT_LANG','ربان پیش فرض');
+define($constpref.'_DEFAULT_LANGDSC','زبان مورد نظر خود را برای نمایش پیام های بعد از عنلکرد فایل common.php مشخص کنید');
+
+define($constpref.'_RELIABLE_IPS','IP های قابل اطمینان');
+define($constpref.'_RELIABLE_IPSDSC','IP ها را با | از هم جدا کنید . ابتدا ردیف را با ^ مشخص کنید, انتهای ردیف را با $.');
+
+define($constpref.'_LOG_LEVEL','درجه ثبت کردن وقایع');
+define($constpref.'_LOG_LEVELDSC','');
+
+define($constpref.'_BANIP_TIME0','زمان تعلیق IP های غیر مجاز (ثانیه)');
+
+define($constpref.'_LOGLEVEL0','هیچ');
+define($constpref.'_LOGLEVEL15','آرام');
+define($constpref.'_LOGLEVEL63','بی صدا');
+define($constpref.'_LOGLEVEL255','کامل');
+
+define($constpref.'_HIJACK_TOPBIT','تعداد بیت های IP که در هر جلسه محافظت میشود');
+define($constpref.'_HIJACK_TOPBITDSC','مقابله با دزدی جلسه (Anti Session Hi-Jacking):<br />به طور پیش فرض 32(bit). (تمام بیت ها حفاظت شده است)<br />وقتی IP شما پایدار نیست, محدوده ی IP خود را باعددی مشخص از بیت ها تنظیم کنید.<br /> اگر IP شما در محدوده ای بین 192.168.0.0 تا 192.168.0.255 میتواند تغییر کنید عدد 24 ( بیت) را انتخاب کنید <br /><br />Session Hi-Jacking(دزدی جلسه): در اصل ترکیب ماهرانه ای است از دو نوع حمله ی دزدین IP و استراق سمع با این روش حمله یک مهاجم خودش را به جای شما جا زده و اقدام به ادامه دادن کار ها و فعالیت های شما در سایت مطابق خواسته ی خود میکند البته در حدی که شما دسترسی دارید');
+define($constpref.'_HIJACK_DENYGP','گره های که IP اجازه ی تغییر در جلسه ( بین کاربر و زوپس) را ندارد');
+define($constpref.'_HIJACK_DENYGPDSC','مقابله با دزدی جلسه (Anti Session Hi-Jacking):<br />گروه های که IP شان در جلسه بین زوپس و کاربر نباید تغییر کند انتخاب کنید.<br />(پیشنهاد میشود فقط برای وب مستر ها روشن باشد.)<br /><br />Session Hi-Jacking(دزدی جلسه): در اصل ترکیب ماهرانه ای است از دو نوع حمله ی دزدین IP و استراق سمع با این روش حمله یک مهاجم خودش را به جای شما جا زده و اقدام به ادامه دادن کار ها و فعالیت های شما در سایت مطابق خواسته ی خود میکند البته در حدی که شما دسترسی دارید');
+define($constpref.'_SAN_NULLBYTE','پاک سازی بایت ها خالی');
+define($constpref.'_SAN_NULLBYTEDSC','اگر در کارکتر های پایان بخش به طور مکرر از "\\0" استفاده شده بود این حرکت یک حمله ثبت شود<br />بایت های خالی با فشار دادن کلید space تغییر میکند<br />(به شدت توصیه میشود این گزینه روشن باشد)');
+define($constpref.'_DIE_NULLBYTE','اگر بایت های خالی پیدا شد کاربر از سایت بیرون انداخته شود');
+define($constpref.'_DIE_NULLBYTEDSC','The terminating character "\\0" is often used in malicious attacks.<br />(قویا توصیه میشود این گزینه روشن باشد)');
+define($constpref.'_DIE_BADEXT','اگر کاربر فایل بد بارگذای کرد از سایت بیرون انداخته شود');
+define($constpref.'_DIE_BADEXTDSC','اگر به فایل بارگذاری شده به وسیله ی کاربر لینک .php بدی الحاق شده بود , این ماژول کاربر را از سایت زوپس شما بیرون می اندازد.<br />اگر شما بکرات فایل های php به ماژول های PukiWiki و B-Wiki اضافه میکنید این گزینه را خاموش کنید');
+define($constpref.'_CONTAMI_ACTION','نوع عملکرد اگر یک آلودگی پیدا شد');
+define($constpref.'_CONTAMI_ACTIONDS','رفتاری را که میخواید در برابر کاربری که قصد وارد کمردن داده های نا مناسب به سیستم زوپس شما را دارد انجام شود مشخص کنید.<br />(پیشنهاد میشود بر روی صفحه ی سفید قرار دهید)');
+define($constpref.'_ISOCOM_ACTION','نوع عملکرد وقتی نظرات منفرد به سیستم وارد شد');
+define($constpref.'_ISOCOM_ACTIONDSC','جلوگیری ازوارد کردن داده های خطر ناک به SQL:<br />این گزینه را فعال کنید برای وقتی که علامت ها "/*" به صورت منفرد پیدا شد<br />معنی " پاک سازی داده ها از کد های خطرناک "در اینجا این است که علامت های "*/" جداگانه در جدول های پایگاه داده ها اضافه شوند<br />(سفارش میشود تنظیمها بر روی ((پاک سازی داده ها از کد های خطرناک)) باشد)');
+define($constpref.'_UNION_ACTION','عملکرد وقتی که یک UNION پیدا شد');
+define($constpref.'_UNION_ACTIONDSC','جلوگیری از وارد کردن داده های خطر ناک به SQL:<br />نوع عملکرد را وقتی ترکیب هم جنسی از پیوند به SQL پیدا شد مشخص کنید<br />معنی "پاک سازی داده ها از کد های خطرناک" این است کهunion" " را به "uni-on" تغییر میدهد . یعنی اتحاد ترکیبات هم جنس را از بین میبرد و مانع ورود داده های خطر ناک به پایگاه داده ها گردد<br />(سفارش میشود تنظیمها بر روی ((پاک سازی داده ها از کد های خطرناک)) باشد)');
+define($constpref.'_ID_INTVAL','مقدار های عددی را حتما به متغیر های عددی تفسیر کن');
+define($constpref.'_ID_INTVALDSC','تمام در خواست های که نام "*id" را دارند یک عدد صحیح در نظر گرفته شود.یعنی مانع قرار دادن هر چیز به جای عدد در جلوی id میشود<br />این گزینه از فرم شما در برابر وارد کردن بعضی از داده های XSS و SQL محافظت میکند<br />این گزینه در حالت پیش فرض روشن میباشد اما ممکن است باعث بروز مشکل در برخی از ماژول ها شود.');
+define($constpref.'_FILE_DOTDOT','حفاظت در برار پیمایش شاخه ها');
+define($constpref.'_FILE_DOTDOTDSC','تمام نشانه های ".." را از همه درخواست های مشابه پیمایش شاخه ها حذف کن ');
+
+define($constpref.'_BF_COUNT','Anti Brute Force');
+define($constpref.'_BF_COUNTDSC','تعداد دفعاتی را که کاربر مهمان میتواند نام کاربری و پسورد خود رادر مدت 10 دقیقه وارد کند مشخص کنید اگر او بعد از گذشت این زمان موفق به ورود (login) نشد IP او توسط سیستم بسته شده است<br /><br />این روش هک روشی است که در آن هکر یک سری کلمات را به عنوان پسورددر نرم افزار هک وارد کرده و این کلمات به ترتیب به عنوان پسورد کاربر چک میشود');
+
+define($constpref.'_BWLIMIT_COUNT','محدودیت پهنای باند');
+define($constpref.'_BWLIMIT_COUNTDSC','بیشترین دسترسی به mainfile.php را در زمان مشخص شده تعیین کنید. این مقدار در زمان های که پهنای باند کافی CPU را در اختیار دارید بهتر است بر روی ۰ باشد. عدد کمتر از ۱۰ در نظر گرفته نمیشود.');
+
+define($constpref.'_DOS_SKIPMODS','ماژول های که در برابر حملات DoS/Crawler چک نمیشوند');
+define($constpref.'_DOS_SKIPMODSDSC','نام ماژول ها را با | از هم جدا کنید.همچنین این اجازه برای ماژول ها ی چپ مفید خواهد بود.<br />منظور از Crawler روبات های خزنده ی موتور های جستجوگر میباشد');
+
+define($constpref.'_DOS_EXPIRE','مدت زمان برای لود ( بار گذاری) بیش از اندازه (ثانیه)');
+define($constpref.'_DOS_EXPIREDSC','این گزینه مشخص میکند زمان درخواست های لود شدن مکرر (F5 attack) و بار گذاری بیش از حد رباط های خزنده موتور های جستجو چقدر باشد.');
+
+define($constpref.'_DOS_F5COUNT','تعداد ریفریش ها با F5 که یک حمله حساب میشود');
+define($constpref.'_DOS_F5COUNTDSC','از حملات DoS پیشگیری میکند.<br />تعداد مجاز ((دوباره بارگذاری کردن)) صفحات را مشخص کنید بیش از این تعداد حمله حساب میشود.');
+define($constpref.'_DOS_F5ACTION','عکس العمل در برابر حمله با F5');
+
+define($constpref.'_DOS_CRCOUNT','شمار غیر صحیح روبات های خزنده');
+define($constpref.'_DOS_CRCOUNTDSC','جلو گیری کردن از لود بیش از حد به وسیله ی روبات های خزنده ی موتور های جستجو.<br />عدد وارد شده تعداد مناسب ورود ربات های جستگور به سایت میباشد تعداد بیش از این یک حرکت غلط حساب میشود.');
+define($constpref.'_DOS_CRACTION','عکس العمل در برابر لود بیش از حد به وسیله ی روبات های خزنده ی موتور های جستجو');
+
+define($constpref.'_DOS_CRSAFE','رباط های خزنده مجاز به ورود');
+define($constpref.'_DOS_CRSAFEDSC','روش به کار رفته برای جدا سازی رباط های خزنده متور های جستجو (User-Agent) از هم.<br />اگر به خوبی تنظیم شود ( خزنده در لیست رو به رو باشد), رابط های خزنده نمیتوانند لود بیش از حد ایجاد کنند.<br />نمونه :) /(msnbot|Googlebot|Yahoo! Slurp)/i');
+
+define($constpref.'_OPT_NONE','هیچکدام( فقط گزارش)');
+define($constpref.'_OPT_SAN','پاک سازی داده ها از کد های خطرناک ');
+define($constpref.'_OPT_EXIT','صفحه ی سفید');
+define($constpref.'_OPT_BIP','بستن IP (بدون محدودیت)');
+define($constpref.'_OPT_BIPTIME0','بستن IP (مدت دار)');
+
+define($constpref.'_DOSOPT_NONE','هیچکدام( فقط گزارش)');
+define($constpref.'_DOSOPT_SLEEP','خواب');
+define($constpref.'_DOSOPT_EXIT','صفحه ی سفید');
+define($constpref.'_DOSOPT_BIP','بستن IP (بدون محدودیت)');
+define($constpref.'_DOSOPT_BIPTIME0','بستن IP (مدت دار)');
+define($constpref.'_DOSOPT_HTA','دفع کردن به وسیله .htaccess(آزمایشی)');
+
+define($constpref.'_BIP_EXCEPT','گروه های که هیچ وقت جز IP بد ثبت نمیشوند');
+define($constpref.'_BIP_EXCEPTDSC','کاربرانی که جز گروه انتخابی شما هستند هیچ وقت بن نمیشوند.<br />(پیشنهاد میشود فقط برای وب مستر ها روشن باشد)');
+
+define($constpref.'_DISABLES','خصوصيات خطرناک در زوپس رو غير فعال کن');
+
+define($constpref.'_BIGUMBRELLA','فعال کردن anti-XSS( محافظ بزرگ)');
+define($constpref.'_BIGUMBRELLADSC','این گزینه از شما در برابر اکثر حمله های که بر اساس آسیب پذیری XSS برنامه ریزی شده اند محافظت میکند. اما 100% نیست<br /><br />حملات XSS شبیه به حملات تزیق اسکریپ میباشد و هدف اصلی از آن هک کردن سایت نیست بلکه حمله به کاربران است در این نوع حمله مهاجم کد های خطر ناکی را در صفحات سایت وارد میکند که این کد ها کامپیوتر کاربر را آلوده میکند');
+
+define($constpref.'_SPAMURI4U','محافظ- هرزنامه (anti-SPAM): تعداد لینک ها برای کابر معمولی');
+define($constpref.'_SPAMURI4UDSC','اگر به تعداد عدد مشخص شده در کادر مقابل لینک در پست کاربر پیدا شد با پست او به عنوان هرز نامه برخورد گردد. با انتخاب صفر این گزینه را غیر فعال کنید.');
+define($constpref.'_SPAMURI4G','محافظ- هرزنامه (anti-SPAM): تعدا لینک ها برای گروه ها');
+define($constpref.'_SPAMURI4GDSC','اگر به تعداد عدد مشخص شده در کادر مقابل لینک در پست گروه ها پیدا شد با پست او به عنوان هرز نامه برخورد گردد. با انتخاب صفر این گزینه را غیر فعال کنید.');
+
+}
+
?>
\ 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: <tr...@us...> - 2009-08-28 00:51:49
|
Revision: 3517
http://xoops.svn.sourceforge.net/xoops/?rev=3517&view=rev
Author: trabis
Date: 2009-08-28 00:51:42 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Adding preload point for language overriding in common.php.
Modified Paths:
--------------
XoopsCore/trunk/htdocs/include/common.php
Modified: XoopsCore/trunk/htdocs/include/common.php
===================================================================
--- XoopsCore/trunk/htdocs/include/common.php 2009-08-28 00:48:51 UTC (rev 3516)
+++ XoopsCore/trunk/htdocs/include/common.php 2009-08-28 00:51:42 UTC (rev 3517)
@@ -104,6 +104,7 @@
/**
* Load Language settings and defines
*/
+$xoopsPreload->triggerEvent('core.include.common.language');
xoops_loadLanguage('global');
xoops_loadLanguage('errors');
xoops_loadLanguage('pagetype');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
3 messages has been excluded from this view by a project administrator.