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
(4) |
2
|
3
|
4
|
5
|
6
|
|
7
(1) |
8
|
9
|
10
|
11
(3) |
12
|
13
(3) |
|
14
|
15
|
16
(7) |
17
|
18
(14) |
19
(10) |
20
(5) |
|
21
(4) |
22
(2) |
23
(9) |
24
(4) |
25
(2) |
26
|
27
|
|
28
|
29
|
30
|
31
(1) |
|
|
|
|
From: <sme...@au...> - 2007-10-31 22:01:00
|
Just a little Halloween fun. http://24.192.232.129/ |
|
From: <rea...@us...> - 2007-10-25 16:37:26
|
Revision: 1133
http://xoops.svn.sourceforge.net/xoops/?rev=1133&view=rev
Author: real_therplima
Date: 2007-10-25 09:37:26 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Adding dynamic block area/position system by EXM version and Activating the block clone functionality
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
Modified: XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
===================================================================
--- XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-25 16:36:48 UTC (rev 1132)
+++ XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-25 16:37:26 UTC (rev 1133)
@@ -14,6 +14,7 @@
- Added: New advice function level, the warning. (young-pee)
- Added: In the admin.php added 3 warnings for the corrects rights for /cache /templates_c and for /uploads. (young-pee)
- Added: Adding the Password Quality meeter functionality by EXM version (TheRplima)
+- Added: Adding dynamic block area/position system by EXM version and Activating the block clone functionality (TheRplima)
- Change XOOPS_VERSION number
============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rea...@us...> - 2007-10-25 16:36:46
|
Revision: 1132
http://xoops.svn.sourceforge.net/xoops/?rev=1132&view=rev
Author: real_therplima
Date: 2007-10-25 09:36:48 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Adding the Password Quality meeter functionality by EXM version
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
Modified: XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
===================================================================
--- XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-24 16:10:53 UTC (rev 1131)
+++ XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-25 16:36:48 UTC (rev 1132)
@@ -13,6 +13,7 @@
- Fixed: More harcoded lines now in common.php. (young-pee)
- Added: New advice function level, the warning. (young-pee)
- Added: In the admin.php added 3 warnings for the corrects rights for /cache /templates_c and for /uploads. (young-pee)
+- Added: Adding the Password Quality meeter functionality by EXM version (TheRplima)
- Change XOOPS_VERSION number
============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-24 16:10:49
|
Revision: 1131
http://xoops.svn.sourceforge.net/xoops/?rev=1131&view=rev
Author: dugris
Date: 2007-10-24 09:10:53 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Fixed bug #1415777 : xml feed is not working when debug mode is activated
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/backend.php
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-24 10:16:06 UTC (rev 1130)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-24 16:10:53 UTC (rev 1131)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- Fixed bug #1415777 : xml feed is not working when debug mode is activated (DuGris)
- Fixed : Do not display the comment form if the option module "Allow anonymous post in comments?" is disabled (dugris)
- Fixed bug #1808484 : Check modules permissions before displaying "Recent comments blocks" (herve/dugris)
- Fixed #1782185 : Adding new parameters (width, height, max file size) for uploading ranks (dugris)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/backend.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/backend.php 2007-10-24 10:16:06 UTC (rev 1130)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/backend.php 2007-10-24 16:10:53 UTC (rev 1131)
@@ -67,5 +67,6 @@
}
}
}
+$GLOBALS['xoopsLogger']->activated = false;
$tpl->display('db:system_rss.html');
?>
\ 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: <du...@us...> - 2007-10-24 10:16:06
|
Revision: 1130
http://xoops.svn.sourceforge.net/xoops/?rev=1130&view=rev
Author: dugris
Date: 2007-10-24 03:16:06 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Fixed : Do not display the comment form if the option module "Allow anonymous post in comments?" is disabled
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_edit.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_new.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_reply.php
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-24 09:45:47 UTC (rev 1129)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-24 10:16:06 UTC (rev 1130)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- Fixed : Do not display the comment form if the option module "Allow anonymous post in comments?" is disabled (dugris)
- Fixed bug #1808484 : Check modules permissions before displaying "Recent comments blocks" (herve/dugris)
- Fixed #1782185 : Adding new parameters (width, height, max file size) for uploading ranks (dugris)
- Default theme corrected : xhtml transitional 1.0, css 1/2/3 (kris_fr)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_edit.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_edit.php 2007-10-24 09:45:47 UTC (rev 1129)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_edit.php 2007-10-24 10:16:06 UTC (rev 1130)
@@ -29,12 +29,12 @@
// Project: The XOOPS Project (http://www.xoops.org/) //
// ------------------------------------------------------------------------- //
-if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
- exit();
+if (!defined('XOOPS_ROOT_PATH')) {
+ die("XOOPS root path not defined");
}
include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
-if ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) {
- exit();
+if ( ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) || (!is_object($xoopsUser) && !$xoopsModuleConfig['com_anonpost']) || !is_object($xoopsModule) ) {
+ redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
}
include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_new.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_new.php 2007-10-24 09:45:47 UTC (rev 1129)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_new.php 2007-10-24 10:16:06 UTC (rev 1130)
@@ -29,13 +29,12 @@
// Project: The XOOPS Project (http://www.xoops.org/) //
// ------------------------------------------------------------------------- //
-if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
- exit();
+if (!defined('XOOPS_ROOT_PATH')) {
+ die("XOOPS root path not defined");
}
-
include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
-if ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) {
- exit();
+if ( ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) || (!is_object($xoopsUser) && !$xoopsModuleConfig['com_anonpost']) || !is_object($xoopsModule) ) {
+ redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
}
include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
@@ -63,7 +62,7 @@
$com_mode = $xoopsConfig['com_mode'];
}
}
-
+
if (!isset($_GET['com_order'])) {
if (is_object($xoopsUser)) {
$com_order = $xoopsUser->getVar('uorder');
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_reply.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_reply.php 2007-10-24 09:45:47 UTC (rev 1129)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/include/comment_reply.php 2007-10-24 10:16:06 UTC (rev 1130)
@@ -29,9 +29,14 @@
// Project: The XOOPS Project (http://www.xoops.org/) //
// ------------------------------------------------------------------------- //
-if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
- exit();
+if (!defined('XOOPS_ROOT_PATH')) {
+ die("XOOPS root path not defined");
}
+include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+if ( ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) || (!is_object($xoopsUser) && !$xoopsModuleConfig['com_anonpost']) || !is_object($xoopsModule) ) {
+ redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+}
+
include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
$com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
$com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-24 09:45:45
|
Revision: 1129
http://xoops.svn.sourceforge.net/xoops/?rev=1129&view=rev
Author: dugris
Date: 2007-10-24 02:45:47 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Fixed bug #1808484 : Check modules permissions before displaying "Recent comments blocks"
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/blocks/system_blocks.php
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-24 03:14:15 UTC (rev 1128)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-24 09:45:47 UTC (rev 1129)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- Fixed bug #1808484 : Check modules permissions before displaying "Recent comments blocks" (herve/dugris)
- Fixed #1782185 : Adding new parameters (width, height, max file size) for uploading ranks (dugris)
- Default theme corrected : xhtml transitional 1.0, css 1/2/3 (kris_fr)
- improved : xhtml/css compliance /banners.php (kris_fr)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/blocks/system_blocks.php 2007-10-24 03:14:15 UTC (rev 1128)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/blocks/system_blocks.php 2007-10-24 09:45:47 UTC (rev 1129)
@@ -327,6 +327,24 @@
$criteria->setLimit(intval($options[0]));
$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');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <you...@us...> - 2007-10-24 03:14:11
|
Revision: 1128
http://xoops.svn.sourceforge.net/xoops/?rev=1128&view=rev
Author: young-pee
Date: 2007-10-23 20:14:15 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Improved rev.1122
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php 2007-10-23 17:29:08 UTC (rev 1127)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php 2007-10-24 03:14:15 UTC (rev 1128)
@@ -128,7 +128,8 @@
$edituser->setVar('user_mailok', $_POST['user_mailok']);
if ( isset( $_POST['theme_selected'] ) ){
$edituser->setVar('theme' , $_POST['theme_selected'] );
- $xoopsUser->setVar('theme' , $_POST['theme_selected'] );
+ $_SESSION['xoopsUserTheme'] = $_POST['theme_selected'];
+ $xoopsConfig['theme_set'] = $_SESSION['xoopsUserTheme'];
}else{
$edituser->setVar('theme' , $xoopsConfig['theme_set'] ) ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <you...@us...> - 2007-10-23 17:29:07
|
Revision: 1127
http://xoops.svn.sourceforge.net/xoops/?rev=1127&view=rev
Author: young-pee
Date: 2007-10-23 10:29:08 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Sorry... i had commited my personal mainfile.php
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/htdocs/mainfile.php
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/mainfile.php 2007-10-23 06:35:05 UTC (rev 1126)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/mainfile.php 2007-10-23 17:29:08 UTC (rev 1127)
@@ -1,105 +1,35 @@
-<?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_MAINFILE_INCLUDED") ) {
- define("XOOPS_MAINFILE_INCLUDED",1);
-
- // XOOPS Physical Path
- // Physical path to your main XOOPS directory WITHOUT trailing slash
- // Example: define('XOOPS_ROOT_PATH', '/home/gpilla/workspace/2.0.something/htdocs');
- define('XOOPS_ROOT_PATH', '/home/gpilla/workspace/2.0.something/htdocs');
-
- // XOOPS Virtual Path (URL)
- // Virtual path to your main XOOPS directory WITHOUT trailing slash
- // Example: define('XOOPS_URL', 'http://xs.dev');
- define('XOOPS_URL', 'http://xs.dev');
-
- define('XOOPS_CHECK_PATH', 1);
- // Protect against external scripts execution if safe mode is not enabled
- if ( XOOPS_CHECK_PATH && !@ini_get('safe_mode') ) {
- if ( function_exists('debug_backtrace') ) {
- $xoopsScriptPath = debug_backtrace();
- if ( !count($xoopsScriptPath) ) {
- die("XOOPS path check: this file cannot be requested directly");
- }
- $xoopsScriptPath = $xoopsScriptPath[0]['file'];
- } else {
- $xoopsScriptPath = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] : $_SERVER['SCRIPT_FILENAME'];
- }
- if ( DIRECTORY_SEPARATOR != '/' ) {
- // IIS6 may double the \ chars
- $xoopsScriptPath = str_replace( strpos( $xoopsScriptPath, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsScriptPath);
- }
- if ( strcasecmp( substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace( DIRECTORY_SEPARATOR, '/', XOOPS_ROOT_PATH)) ) {
- exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
- }
- }
-
- // Database
- // Choose the database to be used
- define('XOOPS_DB_TYPE', 'mysql');
-
- // Table Prefix
- // This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
- define('XOOPS_DB_PREFIX', 'xs01');
-
- // Database Hostname
- // Hostname of the database server. If you are unsure, 'localhost' works in most cases.
- define('XOOPS_DB_HOST', 'localhost');
-
- // Database Username
- // Your database user account on the host
- define('XOOPS_DB_USER', 'developer');
-
- // Database Password
- // Password for your database user account
- define('XOOPS_DB_PASS', 'pass');
-
- // Database Name
- // The name of database on the host. The installer will attempt to create the database if not exist
- define('XOOPS_DB_NAME', 'xoops01');
-
- // Use persistent connection? (Yes=1 No=0)
- // Default is 'Yes'. Choose 'Yes' if you are unsure.
- define('XOOPS_DB_PCONNECT', 0);
-
- define('XOOPS_GROUP_ADMIN', '1');
- define('XOOPS_GROUP_USERS', '2');
- define('XOOPS_GROUP_ANONYMOUS', '3');
-
- foreach ( array('GLOBALS', '_SESSION', 'HTTP_SESSION_VARS', '_GET', 'HTTP_GET_VARS', '_POST', 'HTTP_POST_VARS', '_COOKIE', 'HTTP_COOKIE_VARS', '_REQUEST', '_SERVER', 'HTTP_SERVER_VARS', '_ENV', 'HTTP_ENV_VARS', '_FILES', 'HTTP_POST_FILES', 'xoopsDB', 'xoopsUser', 'xoopsUserId', 'xoopsUserGroups', 'xoopsUserIsAdmin', 'xoopsConfig', 'xoopsOption', 'xoopsModule', 'xoopsModuleConfig', 'xoopsRequestUri') as $bad_global ) {
- if ( isset( $_REQUEST[$bad_global] ) ) {
- header( 'Location: '.XOOPS_URL.'/' );
- exit();
- }
- }
-
- if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
- include XOOPS_ROOT_PATH."/include/common.php";
- }
-}
+<?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 //
+// ------------------------------------------------------------------------ //
+/**
+ * Xoops is not installed, redirect to the installer
+ **/
+
+// XOOPS is not installed yet.
+if(! defined('XOOPS_INSTALL')){
+ header('Location: install/index.php');
+}
?>
\ 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: <you...@us...> - 2007-10-23 06:35:04
|
Revision: 1126
http://xoops.svn.sourceforge.net/xoops/?rev=1126&view=rev
Author: young-pee
Date: 2007-10-22 23:35:05 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Meged with 2.0.18 bugfixes at 2007-10-23
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
XoopsCore/branches/tasks/2.0.something/htdocs/banners.php
XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formhiddentoken.php
XoopsCore/branches/tasks/2.0.something/htdocs/favicon.ico
XoopsCore/branches/tasks/2.0.something/htdocs/images/s_poweredby.gif
XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php
XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/avatar.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/block.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/comment.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configcategory.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configitem.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configoption.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/group.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/groupperm.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/image.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/imagecategory.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/imageset.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/imagesetimg.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/module.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/notification.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/privmessage.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/tplfile.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/tplset.php
XoopsCore/branches/tasks/2.0.something/htdocs/kernel/user.php
XoopsCore/branches/tasks/2.0.something/htdocs/mainfile.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/userrank/main.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/userrank/rankform.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/userrank.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css
XoopsCore/branches/tasks/2.0.something/htdocs/xoops.css
Added Paths:
-----------
XoopsCore/branches/tasks/2.0.something/htdocs/images/password.gif
XoopsCore/branches/tasks/2.0.something/htdocs/images/password.png
XoopsCore/branches/tasks/2.0.something/htdocs/language/english/banners.php
Property Changed:
----------------
XoopsCore/branches/tasks/2.0.something/htdocs/templates_c/
Modified: XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
===================================================================
--- XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 06:35:05 UTC (rev 1126)
@@ -10,15 +10,25 @@
- Added : New Theme (Skalpa)
- Removed: All old not supported themes.
- Added: In the User Edit page, the user can chose the theme to be dispalyed when he is logged. (young-pee)
-- Fixed: Harcoded lines in theme.php and common.php. (young-pee)
+- Fixed: More harcoded lines now in common.php. (young-pee)
- Added: New advice function level, the warning. (young-pee)
- Added: In the admin.php added 3 warnings for the corrects rights for /cache /templates_c and for /uploads. (young-pee)
+- Change XOOPS_VERSION number
-
============================
Unreleased: Version 2.0.18
============================
+- Fixed #1782185 : Adding new parameters (width, height, max file size) for uploading ranks (dugris)
+- Default theme corrected : xhtml transitional 1.0, css 1/2/3 (kris_fr)
+- improved : xhtml/css compliance /banners.php (kris_fr)
+- new favicon.ico (http://www.xoops.org/modules/news/article.php?storyid=2749 - http://www.xoops.org/uploads/OfficialLogoKit.zip)
+- improved : xhtml/css compliance (kris_fr)
+- Fixed bug #1779352 : Hardcoded language, Secure and improve code, Removal style/css (young-pee/dugris)
+- Fixed bug #1774929 : cannot herit methods from kernel's class (Garrath/dugris)
+- Fixed : Corrected a line hardcoded (young-pee)
+- Fixed : Making sure params used in queries are properly sanitized with intval() when they are integer (herve/malanciault)
+- Fixed : In XoopsUser::getUnameFromId, if usereal, then making sure the real name is not just an empty space (herve/malanciault)
- Fixed : rev 1043 for direction acces to admin.php (dugris)
- Fixed : rev 1048 XoopsSecurity, personalize the variable of session and the variable of form (dugris)
- Improved: XoopsSecurity, personalize the variable of session and the variable of form (dugris)
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/banners.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/banners.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/banners.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -25,6 +25,8 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
+$xoopsOption['pagetype'] = "banners";
+
include "mainfile.php";
/********************************************/
@@ -35,28 +37,19 @@
{
global $xoopsDB, $xoopsLogger, $xoopsConfig;
include("header.php");
- echo "<style type='text/css'>
- body {background-color : #fcfcfc;color: #000000;font-weight: normal;font-size: 12px;font-family: Trebuchet MS,Verdana, Arial, Helvetica, sans-serif;margin-left: 0px;margin-top: 0px;margin-right: 0px;margin-bottom: 0px;}
- .redirect {width: 70%;margin: 110px;text-align: center;padding: 15px;text-align:center;border: #e0e0e0 1px solid;color: #666666;background-color: #f6f6f6;text-align: center;}
- .redirect a:link {color: #666666;text-decoration: none;font-weight: bold;}
- .redirect a:visited {color: #666666;text-decoration: none;font-weight: bold;}
- .redirect a:hover {color: #999999;text-decoration: underline;font-weight: bold;}
- hr {height: 3px;border: 3px #E18A00 solid;filter : Alpha(Opacity=100,FinishOpacity=10,Style=2);width: 95%;}
- font.bigtext { font-size: 16px; font-weight: bold; }
- </style>
-
- <form action='banners.php' method='post'>
- <table width='100%' class='redirect'>
- <tr><td colspan='2' align='center'>
- <b>Advertising Statistics</b><hr /></td></tr>
- <tr><td align='right'><b>Login: </b></td>
- <td><input class='textbox' type='text' name='login' size='12' maxlength='10' /></td></tr>
- <tr><td align='right'><b>Password: </b></td>
- <td><input class='textbox' type='password' name='pass' size='12' maxlength='10' /></td></tr>
- <tr><td align='center' colspan='2'><input type='hidden' name='op' value='Ok' />".$GLOBALS['xoopsSecurity']->getTokenHTML()."
- <input type='submit' value='Login'></td></tr>
- <tr><td colspan='2' align='center'><hr />Please type your client information</td></tr>
- </table></form>";
+ echo "<div id='login_window'>
+ <h2 class='content_title'>"._BANNERS_LOGIN_TITLE."</h2>
+ <form method='post' action='banners.php' class='login_form'>
+ <div class='credentials'>
+ <label for='login_form-login'>"._BANNERS_LOGIN_LOGIN."</label>
+ <input type='text' name='login' id='login_form-login' value='' /><br />
+ <label for='login_form-password'>"._BANNERS_LOGIN_PASS."</label>
+ <input type='password' name='pass' id='login_form-password' value='' /><br />
+ </div>
+ <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>"._BANNERS_LOGIN_OK."</button></div>
+ <div class='login_info'>"._BANNERS_LOGIN_INFO."</div>".
+ $GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN")."
+ </form></div>";
include "footer.php";
}
@@ -64,30 +57,34 @@
/* Function to display the banners stats for */
/* each client */
/*********************************************/
-function bannerstats($login, $pass)
+function bannerstats()
{
global $xoopsDB, $xoopsConfig, $xoopsLogger;
- if ($login == "" || $pass == "") {
+ if ($_SESSION['banner_login'] == "" || $_SESSION['banner_pass'] == "") {
redirect_header("banners.php",2);
exit();
}
- $result = $xoopsDB->query(sprintf("SELECT cid, name, passwd FROM %s WHERE login=%s", $xoopsDB->prefix("bannerclient"), $xoopsDB->quoteString($login)));
+ $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 ( $pass==$passwd ) {
+ if ( $_SESSION['banner_pass'] == $passwd ) {
include "header.php";
- echo "<style type='text/css'>
- .b_td {color: #ffffff; background-color: #2F5376; padding: 3px; text-align: center;}
- </style>
- <h4 style='text-align:center;'><b>Current Active Banners for $name</b><br /></h4>
- <table width='100%' border='0'><tr>
- <td class='b_td'><b>ID</b></td>
- <td class='b_td'><b>Imp. Made</b></td>
- <td class='b_td'><b>Imp. Total</b></td>
- <td class='b_td'><b>Imp. Left</b></td>
- <td class='b_td'><b>Clicks</b></td>
- <td class='b_td'><b>% Clicks</b></td>
- <td class='b_td'><b>Functions</b></td></tr>";
+
+ echo "<div id='bannerstats'>
+ <h4 class='content_title'>".sprintf( _BANNERS_TITLE , $name )."</h4><hr />
+ <table summary=''>
+ <caption>".sprintf( _BANNERS_TITLE , $name )."</caption>
+ <thead><tr>
+ <td>ID</td>
+ <td>"._BANNERS_IMP_MADE."</td>
+ <td>"._BANNERS_IMP_TOTAL."</td>
+ <td>"._BANNERS_IMP_LEFT."</td>
+ <td>"._BANNERS_CLICKS."</td>
+ <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) ) {
if ( $impmade == 0 ) {
$percent = 0;
@@ -95,76 +92,88 @@
$percent = substr(100 * $clicks / $impmade, 0, 5);
}
if ( $imptotal == 0 ) {
- $left = "Unlimited";
+ $left = _BANNERS_UNLIMITED;
} else {
$left = $imptotal-$impmade;
}
- echo "<tr><td align='center'>$bid</td>
- <td align='center'>$impmade</td>
- <td align='center'>$imptotal</td>
- <td align='center'>$left</td>
- <td align='center'>$clicks</td>
- <td align='center'>$percent%</td>
- <td align='center'><a href='banners.php?op=EmailStats&login=$login&pass=$pass&cid=$cid&bid=$bid&t=".$GLOBALS['xoopsSecurity']->createToken()."'>E-mail Stats</a></td></tr>";
+ $class = ($i % 2 == 0) ? 'even' : 'odd';
+ echo "<tbody><tr class='$class'>
+ <td>$bid</td>
+ <td>$impmade</td>
+ <td>$imptotal</td>
+ <td>$left</td>
+ <td>$clicks</td>
+ <td>$percent%</td>
+ <td><a href='banners.php?op=EmailStats&cid=$cid&bid=$bid' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
+ $i++;
}
- echo "</table><br /><br /><div>Following are your running Banners in " . htmlspecialchars( $xoopsConfig['sitename'] ). " </div><br /><br />";
+ 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);
if ($numrows>1) {
- echo "<hr /><br />";
+ echo "<br />";
}
if (!empty($htmlbanner) && !empty($htmlcode)){
echo $myts->displayTarea($htmlcode);
}else{
if(strtolower(substr($imageurl,strrpos($imageurl,".")))==".swf") {
- echo "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/ swflash.cab#version=6,0,40,0\"; width=\"468\" height=\"60\">";
+ echo "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0\" width=\"468\" height=\"60\">";
echo "<param name=movie value=\"$imageurl\" />";
echo "<param name=quality value='high' />";
- echo "<embed src=\"$imageurl\" quality='high' pluginspage=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\"; type=\"application/x-shockwave-flash\" width=\"468\" height=\"60\">";
+ echo "<embed src=\"$imageurl\" quality='high' pluginspage=\"http://www.macromedia.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" width=\"468\" height=\"60\">";
echo "</embed>";
echo "</object>";
} else {
- echo "<img src='$imageurl' border='1' alt='' />";
+ echo "<img src='$imageurl' alt='' />";
}
}
- echo"Banner ID: $bid<br />
- Send <a href='banners.php?op=EmailStats&login=$login&cid=$cid&bid=$bid&pass=$pass&t=".$GLOBALS['xoopsSecurity']->createToken()."'>E-Mail Stats</a> for this Banner<br />";
+ echo "<br /><strong>" . _BANNERS_ID . $bid . "</strong><br />" .
+ sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&cid='.$cid.'&bid='.$bid) . "<br />";
if (!$htmlbanner){
$clickurl = htmlspecialchars($clickurl, ENT_QUOTES);
- echo "This Banner points to <a href='$clickurl'>this URL</a><br />
- <form action='banners.php' method='post'>
- Change URL: <input class='textbox' type='text' name='url' size='50' maxlength='200' value='$clickurl' />
- <input class='textbox' type='hidden' name='login' value='$login' />
- <input class='textbox' type='hidden' name='bid' value='$bid' />
- <input class='textbox' type='hidden' name='pass' value='$pass' />
- <input class='textbox' type='hidden' name='cid' value='$cid' />
- <input type='submit' name='op' value='Change' /></form>";
+ 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='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")){
- echo "<h4 style='text-align:center;'>Banners Finished for $name</h4><br />
- <table width='100%' border='0'><tr>
- <td class='b_td'><b>ID</b></td>
- <td class='b_td'><b>Impressions</b></td>
- <td class='b_td'><b>Clicks</b></td>
- <td class='b_td'><b>% Clicks</b></td>
- <td class='b_td'><b>Start Date</b></td>
- <td class='b_td'><b>End Date</b></td></tr>";
- while ( list($bid, $impressions, $clicks, $datestart, $dateend) = $xoopsDB->fetchRow($result) ) {
- $percent = substr(100 * $clicks / $impressions, 0, 5);
- echo "<tr><td align='center'>$bid</td>
- <td align='center'>$impressions</td>
- <td align='center'>$clicks</td>
- <td align='center'>$percent%</td>
- <td align='center'>".formatTimestamp($datestart)."</td>
- <td align='center'>".formatTimestamp($dateend)."</td></tr>";
+ if($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from ".$xoopsDB->prefix("bannerfinish")." where cid=$cid")){
+ echo "<h4 class='content_title'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><hr />
+ <table summary=''>
+ <caption>" . sprintf(_BANNERS_FINISHED, $name) . "</caption>
+ <thead><tr>
+ <td>ID</td>
+ <td>"._BANNERS_IMP_MADE."</td>
+ <td>"._BANNERS_CLICKS."</td>
+ <td>"._BANNERS_PER_CLICKS."</td>
+ <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);
+ $class = ($i % 2 == 0) ? 'even' : 'odd';
+ 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>";
}
- echo "</table>";
- }
include "footer.php";
} else {
redirect_header("banners.php",2);
@@ -176,17 +185,17 @@
/* Function to let the client E-mail his */
/* banner Stats */
/*********************************************/
-function EmailStats($login, $cid, $bid, $pass)
+function EmailStats($cid, $bid)
{
global $xoopsDB, $xoopsConfig;
- if ($login != "" && $pass != "") {
+ if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "") {
$cid = intval($cid);
$bid = intval($bid);
- if ($result2 = $xoopsDB->query(sprintf("select name, email, passwd from %s where cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($login)))) {
+ if ($result2 = $xoopsDB->query(sprintf("select name, email, passwd from %s where cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) {
list($name, $email, $passwd) = $xoopsDB->fetchRow($result2);
- if ($pass == $passwd) {
+ if ($_SESSION['banner_pass'] == $passwd) {
if ($email == "") {
- redirect_header("banners.php",3,"There isn't an email associated with client ".$name.".<br />Please contact the Administrator");
+ redirect_header("banners.php", 3, sprintf( _BANNERS_MAIL_ERROR, $name) );
exit();
} else {
if ($result = $xoopsDB->query("select bid, imptotal, impmade, clicks, imageurl, clickurl, date from ".$xoopsDB->prefix("banner")." where bid=$bid and cid=$cid")) {
@@ -197,14 +206,14 @@
$percent = substr(100 * $clicks / $impmade, 0, 5);
}
if ( $imptotal == 0 ) {
- $left = "Unlimited";
- $imptotal = "Unlimited";
+ $left = _BANNERS_UNLIMITED;
+ $imptotal = _BANNERS_UNLIMITED;
} else {
$left = $imptotal-$impmade;
}
$fecha = date("F jS Y, h:iA.");
- $subject = "Your Banner Statistics at ".$xoopsConfig['sitename'];
- $message = "Following are the complete stats for your advertising investment at ". $xoopsConfig['sitename']." :\n\n\nClient Name: $name\nBanner ID: $bid\nBanner Image: $imageurl\nBanner URL: $clickurl\n\nImpressions Purchased: $imptotal\nImpressions Made: $impmade\nImpressions Left: $left\nClicks Received: $clicks\nClicks Percent: $percent%\n\n\nReport Generated on: $fecha";
+ $subject = sprintf(_BANNERS_MAIL_SUBJECT , $xoopsConfig['sitename'] );
+ $message = sprintf(_BANNERS_MAIL_MESSAGE , $xoopsConfig['sitename'], $name, $bid, $imageurl, $clickurl, $imptotal, $impmade, $left, $clicks, $percent, $fecha);
$xoopsMailer =& getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($email);
@@ -213,7 +222,7 @@
$xoopsMailer->setSubject($subject);
$xoopsMailer->setBody($message);
$xoopsMailer->send();
- redirect_header("banners.php?op=Ok&login=$login&pass=$pass&t=".$GLOBALS['xoopsSecurity']->createToken(), 3, "Statistics for your banner has been sent to your email address.");
+ redirect_header("banners.php?op=Ok", 3, _BANNERS_MAIL_OK);
exit();
}
}
@@ -228,19 +237,19 @@
/* Function to let the client to change the */
/* url for his banner */
/*********************************************/
-function change_banner_url_by_client($login, $pass, $cid, $bid, $url)
+function change_banner_url_by_client($cid, $bid, $url)
{
global $xoopsDB;
- if ($login != "" && $pass != "" && $url != "") {
+ if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "" && $url != "") {
$cid = intval($cid);
$bid = intval($bid);
- $sql = sprintf("select passwd from %s where cid=%u and login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($login));
+ $sql = sprintf("select passwd from %s where cid=%u and login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login']));
if ($result = $xoopsDB->query($sql)) {
list($passwd) = $xoopsDB->fetchRow($result);
- if ( $pass == $passwd ) {
+ if ( $_SESSION['banner_pass'] == $passwd ) {
$sql = sprintf("update %s set clickurl=%s where bid=%u AND cid=%u", $xoopsDB->prefix("banner"), $xoopsDB->quoteString($url), $bid, $cid);
if ($xoopsDB->query($sql)) {
- redirect_header("banners.php?op=Ok&login=$login&pass=$pass&t=".$GLOBALS['xoopsSecurity']->createToken(), 3, "URL has been changed.");
+ redirect_header("banners.php?op=Ok", 3, "URL has been changed.");
exit();
}
}
@@ -280,42 +289,24 @@
}
clickbanner($bid);
break;
-case "login":
- clientlogin();
- break;
case "Ok":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
+ if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
+ if ( !$GLOBALS['xoopsSecurity']->check("BANNER_LOGIN") ) {
+ 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']));
}
- $login = $pass = '';
- if (!empty($_GET['login'])) {
- $login = $myts->stripslashesGPC(trim($_GET['login']));
- }
- if (!empty($_GET['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_GET['pass']));
- }
- if (!empty($_POST['login'])) {
- $login = $myts->stripslashesGPC(trim($_POST['login']));
- }
- if (!empty($_POST['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_POST['pass']));
- }
- bannerstats($login, $pass);
+ bannerstats();
break;
-case "Change":
- if (!$GLOBALS['xoopsSecurity']->check()) {
+case _BANNERS_CHANGE:
+ if (!$GLOBALS['xoopsSecurity']->check("BANNER_EDIT")) {
redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
- $login = $pass = $url = '';
$bid = $cid = 0;
- if (!empty($_POST['login'])) {
- $login = $myts->stripslashesGPC(trim($_POST['login']));
- }
- if (!empty($_POST['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_POST['pass']));
- }
if (!empty($_POST['url'])) {
$url = $myts->stripslashesGPC(trim($_POST['url']));
}
@@ -325,29 +316,19 @@
if (!empty($_POST['cid'])) {
$cid = intval($_POST['cid']);
}
- change_banner_url_by_client($login, $pass, $cid, $bid, $url);
+ change_banner_url_by_client($cid, $bid, $url);
break;
case "EmailStats":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
- $login = $pass = '';
$bid = $cid = 0;
- if (!empty($_GET['login'])) {
- $login = $myts->stripslashesGPC(trim($_GET['login']));
- }
- if (!empty($_GET['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_GET['pass']));
- }
if (!empty($_GET['bid'])) {
$bid = intval($_GET['bid']);
}
if (!empty($_GET['cid'])) {
$cid = intval($_GET['cid']);
}
- EmailStats($login, $cid, $bid, $pass);
+ EmailStats($cid, $bid);
break;
+case "login":
default:
clientlogin();
break;
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formhiddentoken.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formhiddentoken.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formhiddentoken.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -49,7 +49,7 @@
* @param string $name "name" attribute
*/
function XoopsFormHiddenToken($name = 'XOOPS_TOKEN', $timeout = 0){
- $this->XoopsFormHidden($name.'_REQUEST', $GLOBALS['xoopsSecurity']->createToken($name,$timeout));
+ $this->XoopsFormHidden($name . '_REQUEST', $GLOBALS['xoopsSecurity']->createToken($name, $timeout));
}
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/favicon.ico
===================================================================
(Binary files differ)
Added: XoopsCore/branches/tasks/2.0.something/htdocs/images/password.gif
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/tasks/2.0.something/htdocs/images/password.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/tasks/2.0.something/htdocs/images/password.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/tasks/2.0.something/htdocs/images/password.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/images/s_poweredby.gif
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -441,12 +441,14 @@
function xoops_getenv($key)
{
$ret = '';
- //$phpv = explode(".", PHP_VERSION);
- //if ($phpv[0] > 3 && $phpv[1] > 0) {
- // $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key];
- //} else {
- $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : $_ENV[$key];
- //}
+ if ( array_key_exists( $key, $_SERVER) && isset($_SERVER[$key]) ) {
+ $ret = $_SERVER[$key];
+ return $ret;
+ }
+ if ( array_key_exists( $key, $_ENV) && isset($_ENV[$key]) ) {
+ $ret = $_ENV[$key];
+ return $ret;
+ }
return $ret;
}
@@ -747,4 +749,4 @@
}
return trim($text);
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -33,18 +33,18 @@
// of missing fields in install file, when add new fields to database)
function make_groups(&$dbm){
- $gruops['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_WEBMASTER)."', '".addslashes(_INSTALL_WEBMASTERD)."', 'Admin')");
- $gruops['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_REGUSERS)."', '".addslashes(_INSTALL_REGUSERSD)."', 'User')");
- $gruops['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_ANONUSERS)."', '".addslashes(_INSTALL_ANONUSERSD)."', 'Anonymous')");
+ $groups['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_WEBMASTER)."', '".addslashes(_INSTALL_WEBMASTERD)."', 'Admin')");
+ $groups['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_REGUSERS)."', '".addslashes(_INSTALL_REGUSERSD)."', 'User')");
+ $groups['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_ANONUSERS)."', '".addslashes(_INSTALL_ANONUSERSD)."', 'Anonymous')");
- if(!$gruops['XOOPS_GROUP_ADMIN'] || !$gruops['XOOPS_GROUP_USERS'] || !$gruops['XOOPS_GROUP_ANONYMOUS']){
+ if(!$groups['XOOPS_GROUP_ADMIN'] || !$groups['XOOPS_GROUP_USERS'] || !$groups['XOOPS_GROUP_ANONYMOUS']){
return false;
}
- return $gruops;
+ return $groups;
}
-function make_data(&$dbm, &$cm, $adminname, $adminpass, $adminmail, $language, $gruops){
+function make_data(&$dbm, &$cm, $adminname, $adminpass, $adminmail, $language, $groups){
$myts =& textSanitizer::getInstance();
//$xoopsDB =& Database::getInstance();
@@ -54,31 +54,31 @@
// data for table 'groups_users_link'
- $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", 1)");
- $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_USERS'].", 1)");
+ $dbm->insert('groups_users_link', " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", 1)");
+ $dbm->insert('groups_users_link', " VALUES (0, ".$groups['XOOPS_GROUP_USERS'].", 1)");
// data for table 'group_permission'
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_USERS'].",1,1,'module_read')");
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_USERS'].",1,1,'module_read')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
// data for table 'banner'
@@ -126,10 +126,10 @@
}
$options = !isset($newblock['options']) ? '' : trim($newblock['options']);
$edit_func = !isset($newblock['edit_func']) ? '' : trim($newblock['edit_func']);
-
+
# Adding dynamic block area/position system - TheRpLima - 2007-10-21
#$newbid = $dbm->insert('newblocks', " VALUES (0, 1, ".$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 0, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.")");
- $newbid = $dbm->insert('newblocks', " VALUES (0, 1, ".$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 1, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.")");
+ $newbid = $dbm->insert('newblocks', " VALUES (0, 1, ".$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 1, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.")");
//$newbid = $xoopsDB->getInsertId();
$newtplid = $dbm->insert('tplfile', " VALUES (0, ".$newbid.", 'system', 'default', '".addslashes($newblock['template'])."', '".addslashes($newblock['description'])."', ".$time.", ".$time.", 'block')");
@@ -137,10 +137,10 @@
$tplsource = fread($fp, filesize('../modules/system/templates/blocks/'.$newblock['template']));
fclose($fp);
$dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (".$newtplid.", '".addslashes($tplsource)."')");
- $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 1, 'block_read')");
- //$dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
- $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_USERS'].", ".$newbid.", 1, 'block_read')");
- $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ANONYMOUS'].", ".$newbid.", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", ".$newbid.", 1, 'block_read')");
+ //$dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
+ $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_USERS'].", ".$newbid.", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ANONYMOUS'].", ".$newbid.", 1, 'block_read')");
}
}
@@ -189,9 +189,9 @@
$dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '5', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)");
$dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '3', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)");
$dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '1', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)");
- $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".$gruops['XOOPS_GROUP_ADMIN'].", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
+ $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".$groups['XOOPS_GROUP_ADMIN'].", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
$dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)");
- $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".$gruops['XOOPS_GROUP_ADMIN'].", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
+ $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".$groups['XOOPS_GROUP_ADMIN'].", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
$dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '0', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)");
$dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '0', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)");
$dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '80', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)");
@@ -264,16 +264,22 @@
$dbm->insert('config', " VALUES (90,0,7,'ldap_surname_attr','_MD_AM_LDAP_SURNAME_ATTR','sn','_MD_AM_LDAP_SURNAME_ATTR_DESC','textbox','text',17)");
$dbm->insert('config', " VALUES (91,0,7,'ldap_field_mapping','_MD_AM_LDAP_FIELD_MAPPING_ATTR','email=mail|name=displayname','_MD_AM_LDAP_FIELD_MAPPING_DESC','textarea','text',18)");
$dbm->insert('config', " VALUES (92,0,7,'ldap_provisionning_upd', '_MD_AM_LDAP_PROVIS_UPD', '1', '_MD_AM_LDAP_PROVIS_UPD_DESC', 'yesno', 'int', 19)");
- $dbm->insert('config', " VALUES (93,0,7,'ldap_use_TLS','_MD_AM_LDAP_USETLS','0','_MD_AM_LDAP_USETLS_DESC','yesno','int', 20)");
+ $dbm->insert('config', " VALUES (93,0,7,'ldap_use_TLS','_MD_AM_LDAP_USETLS','0','_MD_AM_LDAP_USETLS_DESC','yesno','int', 20)");
+ $dbm->insert('config', " VALUES (94, 0, 2, 'rank_width', '_MD_AM_RANKW', '120', '_MD_AM_RANKWDSC', 'textbox', 'int', 21)");
+ $dbm->insert('config', " VALUES (95, 0, 2, 'rank_height', '_MD_AM_RANKH', '120', '_MD_AM_RANKHDSC', 'textbox', 'int', 21)");
+ $dbm->insert('config', " VALUES (96, 0, 2, 'rank_maxsize', '_MD_AM_RANKMAX', '35000', '_MD_AM_RANKMAXDSC', 'textbox', 'int', 21)");
+
+
#####################################################################################
## Adding Password Quality Meter Config - TheRpLima - 2007-10-20
#####################################################################################
$dbm->insert('config', " VALUES (94,0, 2,'pass_level','_MD_AM_PASSLEVEL','20','_MD_AM_PASSLEVEL_DESC','select','int',1)");
-
- return $gruops;
+
+
+ return $groups;
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/kernel/avatar.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/kernel/avatar.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/kernel/avatar.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -104,7 +104,10 @@
function insert(&$avatar)
{
- if (strtolower(get_class($avatar)) != 'xoopsavatar') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($avatar, 'xoopsavatar')) {
return false;
}
if (!$avatar->isDirty()) {
@@ -134,9 +137,14 @@
function delete(&$avatar)
{
- if (strtolower(get_class($avatar)) != 'xoopsavatar') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($avatar, 'xoopsavatar')) {
return false;
}
+
+
$id = $avatar->getVar('avatar_id');
$sql = sprintf("DELETE FROM %s WHERE avatar_id = %u", $this->db->prefix('avatar'), $id);
if (!$result = $this->db->query($sql)) {
@@ -206,9 +214,14 @@
function getUser(&$avatar){
$ret = array();
- if (strtolower(get_class($avatar)) != 'xoopsavatar') {
- return $ret;
+
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($avatar, 'xoopsavatar')) {
+ return false;
}
+
$sql = 'SELECT user_id FROM '.$this->db->prefix('avatar_user_link').' WHERE avatar_id='.$avatar->getVar('avatar_id');
if (!$result = $this->db->query($sql)) {
return $ret;
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/kernel/block.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/kernel/block.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/kernel/block.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -40,10 +40,10 @@
/**
* A block
- *
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000 XOOPS.org
- *
+ *
* @package kernel
**/
class XoopsBlock extends XoopsObject
@@ -51,7 +51,7 @@
/**
* constructor
- *
+ *
* @param mixed $id
**/
function XoopsBlock($id = null)
@@ -94,7 +94,7 @@
/**
* return the content of the block for output
- *
+ *
* @param string $format
* @param string $c_type type of content<br>
* Legal value for the type of content<br>
@@ -137,8 +137,8 @@
/**
* (HTML-) form for setting the options of the block
- *
- * @return string HTML for the form, FALSE if not defined for this block
+ *
+ * @return string HTML for the form, FALSE if not defined for this block
**/
function getOptions()
{
@@ -172,10 +172,10 @@
/**
* XOOPS block handler class. (Singelton)
- *
- * This class is responsible for providing data access mechanisms to the data source
- * of XOOPS block class objects.
*
+ * This class is responsible for providing data access mechanisms to the data source
+ * of XOOPS block class objects.
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000 XOOPS.org
* @package kernel
@@ -186,10 +186,10 @@
/**
* create a new block
- *
+ *
* @see XoopsBlock
* @param bool $isNew is the new block new??
- * @return object XoopsBlock reference to the new block
+ * @return object XoopsBlock reference to the new block
**/
function &create($isNew = true)
{
@@ -202,10 +202,10 @@
/**
* retrieve a specific {@link XoopsBlock}
- *
+ *
* @see XoopsBlock
* @param int $id bid of the block to retrieve
- * @return object XoopsBlock reference to the block
+ * @return object XoopsBlock reference to the block
**/
function &get($id)
{
@@ -226,13 +226,16 @@
/**
* write a new block into the database
- *
+ *
* @param object XoopsBlock $block reference to the block to insert
* @return bool TRUE if succesful
**/
function insert(&$block)
{
- if (strtolower(get_class($block)) != 'xoopsblock') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($block, 'xoopsblock')) {
return false;
}
if (!$block->isDirty()) {
@@ -262,13 +265,16 @@
/**
* delete a block from the database
- *
- * @param object XoopsBlock $block reference to the block to delete
+ *
+ * @param object XoopsBlock $block reference to the block to delete
* @return bool TRUE if succesful
**/
function delete(&$block)
{
- if (strtolower(get_class($block)) != 'xoopsblock') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($block, 'xoopsblock')) {
return false;
}
$id = $block->getVar('bid');
@@ -316,9 +322,9 @@
/**
* get a list of blocks matchich certain conditions
- *
+ *
* @param string $criteria conditions to match
- * @return array array of blocks matching the conditions
+ * @return array array of blocks matching the conditions
**/
function getList($criteria = null)
{
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/kernel/comment.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/kernel/comment.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/kernel/comment.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -34,19 +34,19 @@
}
/**
- *
- *
+ *
+ *
* @package kernel
- *
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
/**
* A Comment
- *
+ *
* @package kernel
- *
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
@@ -83,7 +83,7 @@
/**
* Is this comment on the root level?
- *
+ *
* @return bool
**/
function isRoot()
@@ -93,15 +93,15 @@
}
/**
- * XOOPS comment handler class.
- *
- * This class is responsible for providing data access mechanisms to the data source
+ * XOOPS comment handler class.
+ *
+ * This class is responsible for providing data access mechanisms to the data source
* of XOOPS comment class objects.
*
- *
+ *
* @package kernel
* @subpackage comment
- *
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
@@ -109,10 +109,10 @@
{
/**
- * Create a {@link XoopsComment}
- *
+ * Create a {@link XoopsComment}
+ *
* @param bool $isNew Flag the object as "new"?
- *
+ *
* @return object
*/
function &create($isNew = true)
@@ -125,10 +125,10 @@
}
/**
- * Retrieve a {@link XoopsComment}
- *
+ * Retrieve a {@link XoopsComment}
+ *
* @param int $id ID
- *
+ *
* @return object {@link XoopsComment}, FALSE on fail
**/
function &get($id)
@@ -151,14 +151,17 @@
/**
* Write a comment to database
- *
+ *
* @param object &$comment
- *
+ *
* @return bool
**/
function insert(&$comment)
{
- if (strtolower(get_class($comment)) != 'xoopscomment') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($comment, 'xoopscomment')) {
return false;
}
if (!$comment->isDirty()) {
@@ -188,14 +191,17 @@
/**
* Delete a {@link XoopsComment} from the database
- *
+ *
* @param object &$comment
- *
+ *
* @return bool
**/
function delete(&$comment)
{
- if (strtolower(get_class($comment)) != 'xoopscomment') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($comment, 'xoopscomment')) {
return false;
}
$sql = sprintf("DELETE FROM %s WHERE com_id = %u", $this->db->prefix('xoopscomments'), $comment->getVar('com_id'));
@@ -206,11 +212,11 @@
}
/**
- * Get some {@link XoopsComment}s
- *
+ * Get some {@link XoopsComment}s
+ *
* @param object $criteria
* @param bool $id_as_key Use IDs as keys into the array?
- *
+ *
* @return array Array of {@link XoopsComment} objects
**/
function getObjects($criteria = null, $id_as_key = false)
@@ -244,9 +250,9 @@
/**
* Count Comments
- *
- * @param object $criteria {@link CriteriaElement}
- *
+ *
+ * @param object $criteria {@link CriteriaElement}
+ *
* @return int Count
**/
function getCount($criteria = null)
@@ -264,9 +270,9 @@
/**
* Delete multiple comments
- *
- * @param object $criteria {@link CriteriaElement}
- *
+ *
+ * @param object $criteria {@link CriteriaElement}
+ *
* @return bool
**/
function deleteAll($criteria = null)
@@ -283,9 +289,9 @@
/**
* Get a list of comments
- *
- * @param object $criteria {@link CriteriaElement}
- *
+ *
+ * @param object $criteria {@link CriteriaElement}
+ *
* @return array Array of raw database records
**/
function getList($criteria = null)
@@ -300,14 +306,14 @@
/**
* Retrieves comments for an item
- *
+ *
* @param int $module_id Module ID
* @param int $item_id Item ID
* @param string $order Sort order
* @param int $status Status of the comment
* @param int $limit Max num of comments to retrieve
* @param int $start Start offset
- *
+ *
* @return array Array of {@link XoopsComment} objects
**/
function getByItemId($module_id, $item_id, $order = null, $status = null, $limit = null, $start = 0)
@@ -329,11 +335,11 @@
/**
* Gets total number of comments for an item
- *
+ *
* @param int $module_id Module ID
* @param int $item_id Item ID
* @param int $status Status of the comment
- *
+ *
* @return array Array of {@link XoopsComment} objects
**/
function getCountByItemId($module_id, $item_id, $status = null)
@@ -348,13 +354,13 @@
/**
- * Get the top {@link XoopsComment}s
- *
+ * Get the top {@link XoopsComment}s
+ *
* @param int $module_id
* @param int $item_id
* @param strint $order
* @param int $status
- *
+ *
* @return array Array of {@link XoopsComment} objects
**/
function getTopComments($module_id, $item_id, $order, $status = null)
@@ -371,11 +377,11 @@
/**
* Retrieve a whole thread
- *
+ *
* @param int $comment_rootid
* @param int $comment_id
* @param int $status
- *
+ *
* @return array Array of {@link XoopsComment} objects
**/
function getThread($comment_rootid, $comment_id, $status = null)
@@ -390,11 +396,11 @@
/**
* Update
- *
+ *
* @param object &$comment {@link XoopsComment} object
* @param string $field_name Name of the field
* @param mixed $field_value Value to write
- *
+ *
* @return bool
**/
function updateByField(&$comment, $field_name, $field_value)
@@ -406,7 +412,7 @@
/**
* Delete all comments for one whole module
- *
+ *
* @param int $module_id ID of the module
* @return bool
**/
@@ -417,14 +423,14 @@
/**
* Change a value in multiple comments
- *
+ *
* @param string $fieldname Name of the field
* @param string $fieldvalue Value to write
- * @param object $criteria {@link CriteriaElement}
- *
+ * @param object $criteria {@link CriteriaElement}
+ *
* @return bool
**/
-/*
+/*
function updateAll($fieldname, $fieldvalue, $criteria = null)
{
$set_clause = is_numeric($fieldvalue) ? $filedname.' = '.$fieldvalue : $filedname.' = '.$this->db->quoteString($fieldvalue);
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configcategory.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configcategory.php 2007-10-23 05:16:32 UTC (rev 1125)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configcategory.php 2007-10-23 06:35:05 UTC (rev 1126)
@@ -34,10 +34,10 @@
}
/**
- *
- *
+ *
+ *
* @package kernel
- *
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
@@ -45,17 +45,17 @@
/**
* A category of configs
- *
+ *
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000-2003 XOOPS.org
- *
+ *
* @package kernel
*/
class XoopsConfigCategory extends XoopsObject
{
/**
* Constructor
- *
+ *
*/
function XoopsConfigCategory()
{
@@ -68,14 +68,14 @@
/**
- * XOOPS configuration category handler class.
- *
- * This class is responsible for providing data access mechanisms to the data source
+ * XOOPS configuration category handler class.
+ *
+ * This class is responsible for providing data access mechanisms to the data source
* of XOOPS configuration category class objects.
*
* @author Kazumi Ono <on...@xo...>
* @copyright copyright (c) 2000-2003 XOOPS.org
- *
+ *
* @package kernel
* @subpackage config
*/
@@ -84,10 +84,10 @@
/**
* Create a new category
- *
+ *
* @param bool $isNew Flag the new object as "new"?
- *
- * @return object New {@link XoopsConfigCategory}
+ *
+ * @return object New {@link XoopsConfigCategory}
*/
function &create($isNew = true)
{
@@ -99,10 +99,10 @@
}
/**
- * Retrieve a {@link XoopsConfigCategory}
- *
+ * Retrieve a {@link XoopsConfigCategory}
+ *
* @param int $id ID
- *
+ *
* @return object {@link XoopsConfigCategory}, FALSE on fail
*/
function &get($id) {
@@ -124,14 +124,17 @@
/**
* Store a {@link XoopsConfigCategory}
- *
+ *
* @param object &$confcat {@link XoopsConfigCategory}
- *
+ *
* @return bool TRUE on success
*/
function insert(&$confcat)
{
- if (strtolower(get_class($confcat)) != 'xoopsconfigcategory') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($confcat, 'xoopsconfigcategory')) {
return false;
}
if (!$confcat->isDirty()) {
@@ -161,16 +164,20 @@
/**
* Delelete a {@link XoopsConfigCategory}
- *
+ *
* @param object &$confcat {@link XoopsConfigCategory}
- *
+ *
* @return bool TRUE on success
*/
function delete(&$confcat)
{
- if (strtolower(get_class($confcat)) != 'xoopsconfigcategory') {
+ /**
+ * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
+ */
+ if (!is_a($confcat, 'xoopsconfigcategory')) {
return false;
}
+
$sql = sprintf("DELETE FROM %s WHERE confcat_id = %u", $this->db->prefix('configcategory'), $configcategory->getVar('confcat_id'));
if (!$result = $this->db->query($sql)) {
return false;
@@ -180,10 +187,10 @@
/**
* Get some {@link XoopsConfigCategory}s
- *
- * @param object $criteria {@link CriteriaElement}
+ *
+ * @param object $criteria {@link CriteriaElement}
* @param bool $id_as_key Use the IDs as keys to the array?
- *
+ *
* @return array Array of {@link XoopsConfigCategory}s
*/
function getObjects($criteria = null, $id_as_key = false)
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/kernel/configitem.php
===================================================================
--- XoopsCore/branches/tasks/2....
[truncated message content] |
|
From: <you...@us...> - 2007-10-23 05:16:29
|
Revision: 1125
http://xoops.svn.sourceforge.net/xoops/?rev=1125&view=rev
Author: young-pee
Date: 2007-10-22 22:16:32 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Correct style.css of rev. 1124
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css 2007-10-23 05:10:11 UTC (rev 1124)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css 2007-10-23 05:16:32 UTC (rev 1125)
@@ -30,7 +30,7 @@
/* Redirect messages */
div.errorMsg { background-color: #FF3737; color: White; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
-div.errorWarn { background-color: #FF3737; color: White; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
+div.errorWarn { background-color: #FFCC00; color: Black; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
div.confirmMsg { background-color : #DDFFDF; color: #136C99; text-align:center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight : bold;}
/* General small */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <you...@us...> - 2007-10-23 05:10:08
|
Revision: 1124
http://xoops.svn.sourceforge.net/xoops/?rev=1124&view=rev
Author: young-pee
Date: 2007-10-22 22:10:11 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Added 3 Warning in the admin.php to check if the rights for cache templates_c and uploads are correct.
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
XoopsCore/branches/tasks/2.0.something/htdocs/admin.php
XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php
XoopsCore/branches/tasks/2.0.something/htdocs/language/english/global.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css
Modified: XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
===================================================================
--- XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 05:05:59 UTC (rev 1123)
+++ XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 05:10:11 UTC (rev 1124)
@@ -10,7 +10,9 @@
- Added : New Theme (Skalpa)
- Removed: All old not supported themes.
- Added: In the User Edit page, the user can chose the theme to be dispalyed when he is logged. (young-pee)
-- Fixed: Harcoded lines in theme.php and common.php
+- Fixed: Harcoded lines in theme.php and common.php. (young-pee)
+- Added: New advice function level, the warning. (young-pee)
+- Added: In the admin.php added 3 warnings for the corrects rights for /cache /templates_c and for /uploads. (young-pee)
============================
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/admin.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/admin.php 2007-10-23 05:05:59 UTC (rev 1123)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/admin.php 2007-10-23 05:10:11 UTC (rev 1124)
@@ -62,14 +62,35 @@
case "list":
xoops_cp_header();
// ###### Output warn messages for security ######
- if (is_dir(XOOPS_ROOT_PATH."/install/" )) {
- xoops_error(sprintf(_WARNINSTALL2,XOOPS_ROOT_PATH.'/install/'));
- echo '<br />';
+
+ // Only the "administrators" of the site will see the warnings... not the other groups.
+ // TODO: Make it a seteable configuration ...
+ if( in_array( XOOPS_GROUP_ADMIN , $xoopsUser->getGroups() ) ){
+
+ if (is_dir(XOOPS_ROOT_PATH."/install/" )) {
+ xoops_error(sprintf(_WARNINSTALL2,XOOPS_ROOT_PATH.'/install/'));
+ echo '<br />';
+ }
+ if ( is_writable(XOOPS_ROOT_PATH."/mainfile.php" ) ) {
+ xoops_error(sprintf(_WARNINWRITEABLE,XOOPS_ROOT_PATH.'/mainfile.php'));
+ echo '<br />';
+ }
+
+ // The next warnings are necesary for a correct function of the System
+ if ( !is_writable(XOOPS_CACHE_PATH ) ) {
+ xoops_warning(sprintf(_WARNINNOTWRITEABLE,XOOPS_CACHE_PATH));
+ echo '<br />';
+ }
+ if ( !is_writable(XOOPS_UPLOAD_PATH ) ) {
+ xoops_warning(sprintf(_WARNINNOTWRITEABLE,XOOPS_UPLOAD_PATH));
+ echo '<br />';
+ }
+ if ( !is_writable(XOOPS_COMPILE_PATH ) ) {
+ xoops_warning(sprintf(_WARNINNOTWRITEABLE,XOOPS_COMPILE_PATH));
+ echo '<br />';
+ }
+
}
- if ( is_writable(XOOPS_ROOT_PATH."/mainfile.php" ) ) {
- xoops_error(sprintf(_WARNINWRITEABLE,XOOPS_ROOT_PATH.'/mainfile.php'));
- echo '<br />';
- }
if (!empty($_GET['xoopsorgnews'])) {
$rssurl = 'http://sourceforge.net/export/rss2_projnews.php?group_id=41586&rss_fulltext=1';
$rssfile = XOOPS_CACHE_PATH.'/adminnews.xml';
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php 2007-10-23 05:05:59 UTC (rev 1123)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/include/functions.php 2007-10-23 05:10:11 UTC (rev 1124)
@@ -88,6 +88,23 @@
echo '</div>';
}
+function xoops_warning($msg, $title='')
+{
+ echo '
+ <div class="errorWarn">';
+ if ($title != '') {
+ echo '<h4>'.$title.'</h4>';
+ }
+ if (is_array($msg)) {
+ foreach ($msg as $m) {
+ echo $m.'<br />';
+ }
+ } else {
+ echo $msg;
+ }
+ echo '</div>';
+}
+
function xoops_result($msg, $title='')
{
echo '
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/language/english/global.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/language/english/global.php 2007-10-23 05:05:59 UTC (rev 1123)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/language/english/global.php 2007-10-23 05:10:11 UTC (rev 1124)
@@ -25,6 +25,7 @@
define("_IFNOTRELOAD","If the page does not automatically reload, please click <a href='%s'>here</a>");
define("_WARNINSTALL2","WARNING: Directory %s exists on your server. <br />Please remove this directory for security reasons.");
define("_WARNINWRITEABLE","WARNING: File %s is writeable by the server. <br />Please change the permission of this file for security reasons.<br /> in Unix (444), in Win32 (read-only)");
+define("_WARNINNOTWRITEABLE","WARNING: File %s is not writeable by the server. <br />Please change the permission of this file for functionality reasons.<br /> in Unix (777), in Win32 (writeable)");
// Error messages issued by XoopsObject::cleanVars()
define( "_XOBJ_ERR_REQUIRED", "%s is required" );
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css 2007-10-23 05:05:59 UTC (rev 1123)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/style.css 2007-10-23 05:10:11 UTC (rev 1124)
@@ -29,7 +29,8 @@
div.xoopsQuote a:hover, div.xoopsQuote a:active { color: #1778cb; background-color: transparent;}
/* Redirect messages */
-div.errorMsg { background-color: #FF3737; color: White; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
+div.errorMsg { background-color: #FF3737; color: White; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
+div.errorWarn { background-color: #FF3737; color: White; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
div.confirmMsg { background-color : #DDFFDF; color: #136C99; text-align:center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight : bold;}
/* General small */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <you...@us...> - 2007-10-23 05:05:55
|
Revision: 1123
http://xoops.svn.sourceforge.net/xoops/?rev=1123&view=rev
Author: young-pee
Date: 2007-10-22 22:05:59 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Corrected more hardcoded lines...
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php
Modified: XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
===================================================================
--- XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 04:55:44 UTC (rev 1122)
+++ XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 05:05:59 UTC (rev 1123)
@@ -9,7 +9,8 @@
- Fixed : Making sure params used in queries are properly sanitized with intval() when they are integer (herve/malanciault)
- Added : New Theme (Skalpa)
- Removed: All old not supported themes.
-- Added Feature: In the User Edit page, the user can chose the theme to be dispalyed when he is logged. (young-pee)
+- Added: In the User Edit page, the user can chose the theme to be dispalyed when he is logged. (young-pee)
+- Fixed: Harcoded lines in theme.php and common.php
============================
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php 2007-10-23 04:55:44 UTC (rev 1122)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php 2007-10-23 05:05:59 UTC (rev 1123)
@@ -44,7 +44,7 @@
function xos_kernel_Xoops2() {
$this->paths['www'] = array( XOOPS_ROOT_PATH, XOOPS_URL );
$this->paths['modules'] = array( XOOPS_ROOT_PATH . '/modules', XOOPS_URL . '/modules' );
- $this->paths['themes'] = array( XOOPS_ROOT_PATH . '/themes', XOOPS_URL . '/themes' );
+ $this->paths['themes'] = array( XOOPS_THEME_PATH , XOOPS_THEME_URL );
}
/**
* Convert a XOOPS path to a physical one
@@ -92,9 +92,18 @@
}
-global $xoops;
-$xoops =& new xos_kernel_Xoops2();
+ define("SMARTY_DIR", XOOPS_ROOT_PATH."/class/smarty/");
+ define("XOOPS_CACHE_PATH", XOOPS_ROOT_PATH."/cache");
+ define("XOOPS_UPLOAD_PATH", XOOPS_ROOT_PATH."/uploads");
+ define("XOOPS_THEME_PATH", XOOPS_ROOT_PATH."/themes");
+ define("XOOPS_COMPILE_PATH", XOOPS_ROOT_PATH."/templates_c");
+ define("XOOPS_THEME_URL", XOOPS_URL."/themes");
+ define("XOOPS_UPLOAD_URL", XOOPS_URL."/uploads");
+
+ global $xoops;
+ $xoops =& new xos_kernel_Xoops2();
+
// Instantiate security object
require_once XOOPS_ROOT_PATH."/class/xoopssecurity.php";
global $xoopsSecurity;
@@ -111,6 +120,7 @@
$xoopsLogger->startTime();
$xoopsLogger->startTime( 'XOOPS Boot' );
+
# Adding dynamic block area/position system - TheRpLima - 2007-10-21
/*
define("XOOPS_SIDEBLOCK_LEFT",0);
@@ -135,20 +145,13 @@
define("XOOPS_CENTERBLOCK_BOTTOMRIGHT",8);
define("XOOPS_CENTERBLOCK_BOTTOM",7);
#
-
+
define("XOOPS_BLOCK_INVISIBLE",0);
define("XOOPS_BLOCK_VISIBLE",1);
define("XOOPS_MATCH_START",0);
define("XOOPS_MATCH_END",1);
define("XOOPS_MATCH_EQUAL",2);
define("XOOPS_MATCH_CONTAIN",3);
- define("SMARTY_DIR", XOOPS_ROOT_PATH."/class/smarty/");
- define("XOOPS_CACHE_PATH", XOOPS_ROOT_PATH."/cache");
- define("XOOPS_UPLOAD_PATH", XOOPS_ROOT_PATH."/uploads");
- define("XOOPS_THEME_PATH", XOOPS_ROOT_PATH."/themes");
- define("XOOPS_COMPILE_PATH", XOOPS_ROOT_PATH."/templates_c");
- define("XOOPS_THEME_URL", XOOPS_URL."/themes");
- define("XOOPS_UPLOAD_URL", XOOPS_URL."/uploads");
if (!defined('XOOPS_XMLRPC')) {
define('XOOPS_DB_CHKREF', 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <you...@us...> - 2007-10-23 04:55:41
|
Revision: 1122
http://xoops.svn.sourceforge.net/xoops/?rev=1122&view=rev
Author: young-pee
Date: 2007-10-22 21:55:44 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Added a new select box in edit user page, to make able the user to chose o correct the personal theme
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php
XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php
Modified: XoopsCore/branches/tasks/2.0.something/docs/changelog.txt
===================================================================
--- XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 01:17:53 UTC (rev 1121)
+++ XoopsCore/branches/tasks/2.0.something/docs/changelog.txt 2007-10-23 04:55:44 UTC (rev 1122)
@@ -7,6 +7,11 @@
- Fixed : In XoopsUser::getUnameFromId, if usereal, then making sure the real name is not just an empty space (herve/malanciault)
- Fixed : Making sure params used in queries are properly sanitized with intval() when they are integer (herve/malanciault)
+- Added : New Theme (Skalpa)
+- Removed: All old not supported themes.
+- Added Feature: In the User Edit page, the user can chose the theme to be dispalyed when he is logged. (young-pee)
+
+
============================
Unreleased: Version 2.0.18
============================
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php 2007-10-23 01:17:53 UTC (rev 1121)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php 2007-10-23 04:55:44 UTC (rev 1122)
@@ -126,6 +126,12 @@
$edituser->setVar('user_occ', $_POST['user_occ']);
$edituser->setVar('user_intrest', $_POST['user_intrest']);
$edituser->setVar('user_mailok', $_POST['user_mailok']);
+ if ( isset( $_POST['theme_selected'] ) ){
+ $edituser->setVar('theme' , $_POST['theme_selected'] );
+ $xoopsUser->setVar('theme' , $_POST['theme_selected'] );
+ }else{
+ $edituser->setVar('theme' , $xoopsConfig['theme_set'] ) ;
+ }
if (!empty($_POST['usecookie'])) {
setcookie($xoopsConfig['usercookie'], $xoopsUser->getVar('uname'), time()+ 31536000);
} else {
@@ -187,6 +193,10 @@
$umode_select->addOptionArray(array('nest'=>_NESTED, 'flat'=>_FLAT, 'thread'=>_THREADED));
$uorder_select = new XoopsFormSelect(_US_CSORTORDER, 'uorder', $xoopsUser->getVar('uorder'));
$uorder_select->addOptionArray(array(XOOPS_COMMENT_OLD1ST => _OLDESTFIRST, XOOPS_COMMENT_NEW1ST => _NEWESTFIRST));
+ $selected_theme = new XoopsFormSelect(_US_SELECT_THEME, 'theme_selected' , $xoopsUser->theme() );
+ foreach ( $xoopsConfig['theme_set_allowed'] as $theme ){
+ $selected_theme->addOption( $theme , $theme );
+ }
// RMV-NOTIFY
// TODO: add this to admin user-edit functions...
include_once XOOPS_ROOT_PATH . "/language/" . $xoopsConfig['language'] . '/notification.php';
@@ -216,7 +226,7 @@
$pwd_tray = new XoopsFormElementTray(_US_PASSWORD.'<br />'._US_TYPEPASSTWICE);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
-
+
$mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $xoopsUser->getVar('user_mailok'));
$uid_hidden = new XoopsFormHidden('uid', $xoopsUser->getVar('uid'));
$op_hidden = new XoopsFormHidden('op', 'saveuser');
@@ -231,6 +241,8 @@
$form->addElement($occupation_text);
$form->addElement($interest_text);
$form->addElement($sig_tray);
+ if ( count( $xoopsConfig['theme_set_allowed'] ) > 1 )
+ $form->addElement($selected_theme);
$form->addElement($umode_select);
$form->addElement($uorder_select);
$form->addElement($notify_method_select);
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php 2007-10-23 01:17:53 UTC (rev 1121)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php 2007-10-23 04:55:44 UTC (rev 1122)
@@ -140,4 +140,6 @@
define('_US_REGFORM_NOJAVASCRIPT', 'To log in at the site it\'s necessary that your browser has javascript enabled.');
define('_US_REGFORM_WARNING', 'To register at the site you need to use a secure password. Try to create your password by using a mixture of letters (upper and lowercase), numbers and symbols. Try to create a password the more complex as possible although you can remember it.');
define('_US_CHANGE_PASSWORD', 'Change Password?');
+
+define('_US_SELECT_THEME', 'Chose Personal Theme (Changes would be aplied, on your next login)');
?>
\ 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: <du...@us...> - 2007-10-23 01:17:51
|
Revision: 1121
http://xoops.svn.sourceforge.net/xoops/?rev=1121&view=rev
Author: dugris
Date: 2007-10-22 18:17:53 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Fixed #1782185 : Adding new parameters (width, height, max file size) for uploading ranks
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/install/makedata.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/kernel/configitem.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/main.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/rankform.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/userrank.php
Added Paths:
-----------
XoopsCore/branches/2.0.x/2.0.18/upgrade/upd-2.0.17-to-2.0.18/
XoopsCore/branches/2.0.x/2.0.18/upgrade/upd-2.0.17-to-2.0.18/index.php
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-23 01:17:53 UTC (rev 1121)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- Fixed #1782185 : Adding new parameters (width, height, max file size) for uploading ranks (dugris)
- Default theme corrected : xhtml transitional 1.0, css 1/2/3 (kris_fr)
- improved : xhtml/css compliance /banners.php (kris_fr)
- new favicon.ico (http://www.xoops.org/modules/news/article.php?storyid=2749 - http://www.xoops.org/uploads/OfficialLogoKit.zip)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/install/makedata.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/install/makedata.php 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/install/makedata.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -33,18 +33,18 @@
// of missing fields in install file, when add new fields to database)
function make_groups(&$dbm){
- $gruops['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_WEBMASTER)."', '".addslashes(_INSTALL_WEBMASTERD)."', 'Admin')");
- $gruops['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_REGUSERS)."', '".addslashes(_INSTALL_REGUSERSD)."', 'User')");
- $gruops['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_ANONUSERS)."', '".addslashes(_INSTALL_ANONUSERSD)."', 'Anonymous')");
+ $groups['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_WEBMASTER)."', '".addslashes(_INSTALL_WEBMASTERD)."', 'Admin')");
+ $groups['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_REGUSERS)."', '".addslashes(_INSTALL_REGUSERSD)."', 'User')");
+ $groups['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (0, '".addslashes(_INSTALL_ANONUSERS)."', '".addslashes(_INSTALL_ANONUSERSD)."', 'Anonymous')");
- if(!$gruops['XOOPS_GROUP_ADMIN'] || !$gruops['XOOPS_GROUP_USERS'] || !$gruops['XOOPS_GROUP_ANONYMOUS']){
+ if(!$groups['XOOPS_GROUP_ADMIN'] || !$groups['XOOPS_GROUP_USERS'] || !$groups['XOOPS_GROUP_ANONYMOUS']){
return false;
}
- return $gruops;
+ return $groups;
}
-function make_data(&$dbm, &$cm, $adminname, $adminpass, $adminmail, $language, $gruops){
+function make_data(&$dbm, &$cm, $adminname, $adminpass, $adminmail, $language, $groups){
$myts =& textSanitizer::getInstance();
//$xoopsDB =& Database::getInstance();
@@ -54,31 +54,31 @@
// data for table 'groups_users_link'
- $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", 1)");
- $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_USERS'].", 1)");
+ $dbm->insert('groups_users_link', " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", 1)");
+ $dbm->insert('groups_users_link', " VALUES (0, ".$groups['XOOPS_GROUP_USERS'].", 1)");
// data for table 'group_permission'
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_USERS'].",1,1,'module_read')");
- $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_USERS'].",1,1,'module_read')");
+ $dbm->insert("group_permission", " VALUES (0,".$groups['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0,".$groups['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
// data for table 'banner'
@@ -133,10 +133,10 @@
$tplsource = fread($fp, filesize('../modules/system/templates/blocks/'.$newblock['template']));
fclose($fp);
$dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (".$newtplid.", '".addslashes($tplsource)."')");
- $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 1, 'block_read')");
- //$dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
- $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_USERS'].", ".$newbid.", 1, 'block_read')");
- $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ANONYMOUS'].", ".$newbid.", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", ".$newbid.", 1, 'block_read')");
+ //$dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
+ $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_USERS'].", ".$newbid.", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, ".$groups['XOOPS_GROUP_ANONYMOUS'].", ".$newbid.", 1, 'block_read')");
}
}
@@ -183,9 +183,9 @@
$dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '5', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)");
$dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '3', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)");
$dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '1', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)");
- $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".$gruops['XOOPS_GROUP_ADMIN'].", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
+ $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".$groups['XOOPS_GROUP_ADMIN'].", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
$dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)");
- $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".$gruops['XOOPS_GROUP_ADMIN'].", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
+ $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".$groups['XOOPS_GROUP_ADMIN'].", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
$dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '0', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)");
$dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '0', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)");
$dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '80', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)");
@@ -258,9 +258,13 @@
$dbm->insert('config', " VALUES (90,0,7,'ldap_surname_attr','_MD_AM_LDAP_SURNAME_ATTR','sn','_MD_AM_LDAP_SURNAME_ATTR_DESC','textbox','text',17)");
$dbm->insert('config', " VALUES (91,0,7,'ldap_field_mapping','_MD_AM_LDAP_FIELD_MAPPING_ATTR','email=mail|name=displayname','_MD_AM_LDAP_FIELD_MAPPING_DESC','textarea','text',18)");
$dbm->insert('config', " VALUES (92,0,7,'ldap_provisionning_upd', '_MD_AM_LDAP_PROVIS_UPD', '1', '_MD_AM_LDAP_PROVIS_UPD_DESC', 'yesno', 'int', 19)");
- $dbm->insert('config', " VALUES (93,0,7,'ldap_use_TLS','_MD_AM_LDAP_USETLS','0','_MD_AM_LDAP_USETLS_DESC','yesno','int', 20)");
+ $dbm->insert('config', " VALUES (93,0,7,'ldap_use_TLS','_MD_AM_LDAP_USETLS','0','_MD_AM_LDAP_USETLS_DESC','yesno','int', 20)");
- return $gruops;
+ $dbm->insert('config', " VALUES (94, 0, 2, 'rank_width', '_MD_AM_RANKW', '120', '_MD_AM_RANKWDSC', 'textbox', 'int', 21)");
+ $dbm->insert('config', " VALUES (95, 0, 2, 'rank_height', '_MD_AM_RANKH', '120', '_MD_AM_RANKHDSC', 'textbox', 'int', 21)");
+ $dbm->insert('config', " VALUES (96, 0, 2, 'rank_maxsize', '_MD_AM_RANKMAX', '35000', '_MD_AM_RANKMAXDSC', 'textbox', 'int', 21)");
+
+ return $groups;
}
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/kernel/configitem.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/kernel/configitem.php 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/kernel/configitem.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -293,7 +293,7 @@
$sql = 'SELECT * FROM '.$this->db->prefix('config');
if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
$sql .= ' '.$criteria->renderWhere();
- $sql .= ' ORDER BY conf_order ASC';
+ $sql .= ' ORDER BY conf_order ASC, conf_id ASC';
$limit = $criteria->getLimit();
$start = $criteria->getStart();
}
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/main.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/main.php 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/main.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -46,6 +46,9 @@
$op = $_POST['op'];
}
+$config_handler =& xoops_gethandler('config');
+$xoopsConfigUser =& $config_handler->getConfigsByCat(XOOPS_CONF_USER);
+
switch ($op) {
case "RankForumEdit":
@@ -86,11 +89,13 @@
$rank_title = $myts->stripSlashesGPC($_POST['rank_title']);
$rank_image = '';
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png'), 100000, 120, 120);
+ $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png'), $xoopsConfigUser['rank_maxsize'], $xoopsConfigUser['rank_width'], $xoopsConfigUser['rank_height']);
$uploader->setPrefix('rank');
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
if ($uploader->upload()) {
$rank_image = $uploader->getSavedFileName();
+ } else {
+ xoops_error( $uploader->getErrors() );
}
}
$newid = $db->genId($db->prefix("ranks")."_rank_id_seq");
@@ -104,7 +109,7 @@
xoops_error('Failed storing rank data into the database');
xoops_cp_footer();
} else {
- redirect_header("admin.php?fct=userrank&op=RankForumAdmin",1,_AM_DBUPDATED);
+ redirect_header("admin.php?fct=userrank&op=RankForumAdmin",3,_AM_DBUPDATED);
}
break;
@@ -119,12 +124,14 @@
$rank_title = $myts->stripSlashesGPC($_POST['rank_title']);
$delete_old_image = false;
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png'), 100000, 120, 120);
+ $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png'), $xoopsConfigUser['rank_maxsize'], $xoopsConfigUser['rank_width'], $xoopsConfigUser['rank_height']);
$uploader->setPrefix('rank');
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
if ($uploader->upload()) {
$rank_image = $uploader->getSavedFileName();
$delete_old_image = true;
+ } else {
+ xoops_error( $uploader->getErrors() );
}
}
if ($rank_special > 0) {
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/rankform.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/rankform.php 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/admin/userrank/rankform.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -29,6 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
+global $xoopsConfigUser;
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
$rank_form = new XoopsThemeForm($rank['form_title'], 'rankform', 'admin.php', 'post', true);
$rank_form->setExtra('enctype="multipart/form-data"');
@@ -41,7 +42,11 @@
if (trim($rank['rank_image']) != '' && file_exists(XOOPS_UPLOAD_PATH.'/'.$rank['rank_image'])) {
$rank_label = new XoopsFormLabel('', '<img src="'.XOOPS_UPLOAD_URL.'/'.$rank['rank_image'].'" alt="" />');
$rank_tray->addElement($rank_label);
+ unset($rank_label);
}
+$rank_label = new XoopsFormLabel('', '<br />' . sprintf(_AM_RANKW, $xoopsConfigUser['rank_width']) . '<br />' . sprintf(_AM_RANKH, $xoopsConfigUser['rank_height']) . '<br />' . sprintf(_AM_RANKMAX, $xoopsConfigUser['rank_maxsize']) );
+$rank_tray->addElement($rank_label);
+
$rank_form->addElement($rank_tray);
$tray = new XoopsFormElementTray(_AM_SPECIAL, '<br />');
$tray->addElement(new XoopsFormRadioYN('', 'rank_special', $rank['rank_special']));
@@ -51,4 +56,4 @@
$rank_form->addElement(new XoopsFormHidden('op', $rank['op']));
$rank_form->addElement(new XoopsFormHidden('fct', 'userrank'));
$rank_form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/preferences.php 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/preferences.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -238,10 +238,12 @@
"<br>for example : email=mail" .
"<br>Separate each with a |" .
"<br><br>!! For advanced users !!");
-
+
define("_MD_AM_LDAP_PROVIS_UPD", "Maintain xoops account provisionning");
define("_MD_AM_LDAP_PROVIS_UPD_DESC", "The Xoops User account is always synchronized with the Authentication Server");
-
-
+define("_MD_AM_RANKW","Rank image max width (pixel)");
+define("_MD_AM_RANKH","Rank image max height (pixel)");
+define("_MD_AM_RANKMAX","Rank image max filesize (byte)");
+
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/userrank.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/userrank.php 2007-10-23 00:16:25 UTC (rev 1120)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/language/english/admin/userrank.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -25,4 +25,8 @@
define("_AM_VALIDUNDER","(A valid image file under <b>%s</b> directory)");
define("_AM_SPECIALCAN","(Special ranks can be assigned to users irrespective of the number of user posts)");
define("_AM_ACTION","Action");
+
+define("_AM_RANKW","Max width %s pixels");
+define("_AM_RANKH","Max height %s pixels");
+define("_AM_RANKMAX","Max filesize %s bytes");
?>
\ No newline at end of file
Added: XoopsCore/branches/2.0.x/2.0.18/upgrade/upd-2.0.17-to-2.0.18/index.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/upgrade/upd-2.0.17-to-2.0.18/index.php (rev 0)
+++ XoopsCore/branches/2.0.x/2.0.18/upgrade/upd-2.0.17-to-2.0.18/index.php 2007-10-23 01:17:53 UTC (rev 1121)
@@ -0,0 +1,70 @@
+<?php
+
+class upgrade_2018 {
+
+ var $usedFiles = array( );
+
+ function isApplied() {
+ return ( /*$this->check_file_patch() &&*/ $this->check_rank_config() );
+ }
+
+ function apply() {
+ return $this->apply_rank_config();
+ }
+
+ function check_file_patch() {
+ /* $path = XOOPS_ROOT_PATH . '/class/auth';
+ $lines = file( "$path/auth_provisionning.php");
+ foreach ( $lines as $line ) {
+ if ( strpos( $line, "ldap_provisionning_upd" ) !== false ) {
+ // Patch found: do not apply again
+ return true;
+ }
+ } */
+ return true;
+ }
+
+
+ function check_rank_config() {
+ $db = $GLOBALS['xoopsDB'];
+ $value = getDbValue( $db, 'config', 'conf_id',
+ "`conf_name` = 'rank_width' AND `conf_catid` = " . XOOPS_CONF_USER
+ );
+ return (bool)($value);
+ }
+
+ function query( $sql ) {
+ echo $sql;
+ $db = $GLOBALS['xoopsDB'];
+ if ( ! ( $ret = $db->queryF( $sql ) ) ) {
+ echo $db->error();
+ }
+ }
+
+ function apply_rank_config() {
+ $db = $GLOBALS['xoopsDB'];
+
+ // Insert config values
+ $table = $db->prefix( 'config' );
+ $data = array(
+ 'rank_width' => "'_MD_AM_RANKW', '120', '_MD_AM_RANKWDSC', 'textbox', 'int', 21",
+ 'rank_height' => "'_MD_AM_RANKH', '120', '_MD_AM_RANKHDSC', 'textbox', 'int', 21",
+ 'rank_maxsize' => "'_MD_AM_RANKMAX', '35000', '_MD_AM_RANKMAXDSC', 'textbox', 'int', 21",
+ );
+ reset($data);
+ foreach ( $data as $name => $values ) {
+ if ( !getDbValue( $db, 'config', 'conf_id', "`conf_modid`=0 AND `conf_catid`=2 AND `conf_name`='$name'" ) ) {
+ $this->query(
+ "INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) " .
+ "VALUES ( 0,2,'$name',$values)"
+ );
+ }
+ }
+ return true;
+ }
+}
+
+$upg = new upgrade_2018();
+return $upg;
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-23 00:16:21
|
Revision: 1120
http://xoops.svn.sourceforge.net/xoops/?rev=1120&view=rev
Author: dugris
Date: 2007-10-22 17:16:25 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
improved : xhtml/css compliance /banners.php (kris_fr)
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php 2007-10-23 00:14:43 UTC (rev 1119)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php 2007-10-23 00:16:25 UTC (rev 1120)
@@ -41,13 +41,14 @@
<h2 class='content_title'>"._BANNERS_LOGIN_TITLE."</h2>
<form method='post' action='banners.php' class='login_form'>
<div class='credentials'>
- <label for='login_form-login'>"._BANNERS_LOGIN_LOGIN." :</label>
+ <label for='login_form-login'>"._BANNERS_LOGIN_LOGIN."</label>
<input type='text' name='login' id='login_form-login' value='' /><br />
- <label for='login_form-password'>"._BANNERS_LOGIN_PASS." :</label>
+ <label for='login_form-password'>"._BANNERS_LOGIN_PASS."</label>
<input type='password' name='pass' id='login_form-password' value='' /><br />
</div>
<div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>"._BANNERS_LOGIN_OK."</button></div>
- <div class='login_info'>"._BANNERS_LOGIN_INFO."</div>".$GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN")."
+ <div class='login_info'>"._BANNERS_LOGIN_INFO."</div>".
+ $GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN")."
</form></div>";
include "footer.php";
}
@@ -71,6 +72,7 @@
echo "<div id='bannerstats'>
<h4 class='content_title'>".sprintf( _BANNERS_TITLE , $name )."</h4><hr />
<table summary=''>
+ <caption>".sprintf( _BANNERS_TITLE , $name )."</caption>
<thead><tr>
<td>ID</td>
<td>"._BANNERS_IMP_MADE."</td>
@@ -79,7 +81,7 @@
<td>"._BANNERS_CLICKS."</td>
<td>"._BANNERS_PER_CLICKS."</td>
<td>"._BANNERS_FUNCTIONS."</td></tr></thead>
- <tfoot></tfoot>";
+ <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;
@@ -147,13 +149,16 @@
echo "<br />";
if($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from ".$xoopsDB->prefix("bannerfinish")." where cid=$cid")){
echo "<h4 class='content_title'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><hr />
- <table table=''><thead><tr>
+ <table summary=''>
+ <caption>" . sprintf(_BANNERS_FINISHED, $name) . "</caption>
+ <thead><tr>
<td>ID</td>
<td>"._BANNERS_IMP_MADE."</td>
<td>"._BANNERS_CLICKS."</td>
<td>"._BANNERS_PER_CLICKS."</td>
<td>"._BANNERS_STARTED."</td>
- <td>"._BANNERS_ENDED."</td></tr></thead><tfoot></tfoot>";
+ <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) ) {
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php 2007-10-23 00:14:43 UTC (rev 1119)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php 2007-10-23 00:16:25 UTC (rev 1120)
@@ -2,8 +2,8 @@
// $Id: $
//%%%%%% File Name banners.php %%%%%
define('_BANNERS_LOGIN_TITLE',"Advertising Statistics");
-define('_BANNERS_LOGIN_LOGIN',"Login");
-define('_BANNERS_LOGIN_PASS',"Password");
+define('_BANNERS_LOGIN_LOGIN',"Login :");
+define('_BANNERS_LOGIN_PASS',"Password :");
define('_BANNERS_LOGIN_INFO',"Please type your client information");
define('_BANNERS_LOGIN_OK',"OK");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-23 00:14:42
|
Revision: 1119
http://xoops.svn.sourceforge.net/xoops/?rev=1119&view=rev
Author: dugris
Date: 2007-10-22 17:14:43 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Default theme corrected : xhtml transitional 1.0, css 1/2/3 (kris_fr)
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/images/s_poweredby.gif
XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/style.css
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/logo.gif
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleMAC.css
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleNN.css
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme.html
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_c.html
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_l.html
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_r.html
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockleft.html
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockright.html
XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-23 00:14:43 UTC (rev 1119)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- Default theme corrected : xhtml transitional 1.0, css 1/2/3 (kris_fr)
- improved : xhtml/css compliance /banners.php (kris_fr)
- new favicon.ico (http://www.xoops.org/modules/news/article.php?storyid=2749 - http://www.xoops.org/uploads/OfficialLogoKit.zip)
- improved : xhtml/css compliance (kris_fr)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/images/s_poweredby.gif
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/style.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/style.css 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/modules/system/style.css 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,66 +1,95 @@
+/* IMPORTANT, PLEASE RESPECT THIS SEMANTIC ORDER !!! :
+ - position box,
+ - width,
+ - heigth,
+ - margin,
+ - background-color,
+ - background-image,
+ - padding,
+ - content (color, style font, ...),
+ - border,
+ ... */
+
/* General definitions */
-body { background-color : transparent; font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif; margin: 0px; padding: 0px;}
+html, body {background-color : transparent; font-size: 10pt; font-family: Verdana, Arial, Helvetica, sans-serif;}
-img {border: none;}
+img { border: 0;}
-hr { height: 3px; border: 3px #E18A00 solid; width: 95%;}
+hr { height: 3px; width: 95%; text-align:center; border: 3px #E18A00 solid;}
+/* lists */
ul { margin: 2px; padding: 2px; list-style: decimal inside; text-align: left;}
-li { margin-left: 2px; list-style: square inside; color: #000000;}
+li { margin-left: 2px; color: #000; list-style: square inside;}
-h1 { font-size: 20px;}
-h2 { font-size: 18px;}
-h3 { font-size: 16px;}
-h4 { font-size: 14px;}
+/* titles */
+h1, h2, h3, h4 { padding: 0.5em 0 .5em .5em;}
+h1 { font-size: 1.4em;}
+h2 { font-size: 1.2em;}
+h3 { font-size: 1.1em;}
+h4 { font-size: 1.1em; font-weight: bold;}
-th {background-color: #2F5376; color: #FFFFFF; padding : 2px; vertical-align : middle;}
+/* ===== hypertext links ===== */
+a:link { background-color: transparent; color: #666; font-weight: bold; text-decoration: none;}
+a:visited { background-color: transparent; color: #666; font-weight: bold; text-decoration: none;}
+a:hover { background-color: transparent; color: #ff9966; font-weight: bold; text-decoration: none;}
-a:link {text-decoration: none; color: #666666; font-weight: bold; background-color: transparent;}
-a:visited {text-decoration: none; color: #666666; font-weight: bold; background-color: transparent;}
-a:hover {text-decoration: none; color: #ff9966; font-weight: bold; background-color: transparent;}
+/* ===== Code and Quote Definition ===== */
+.xoopsCode { background-color: #FAFAFA; color: #006600; font-size: .9em; border: #c2cdd6 1px dashed;}
+.xoopsQuote { background-color: #FAFAFA; color: #444; font-size: .9em; line-height: 1.2em; text-align: justify; border: #c2cdd6 1px dashed;}
-/* Code and Quote Definition */
-div.xoopsCode { font-size: 11px; color: #006600; background-color: #FAFAFA; border: #c2cdd6 1px dashed;}
-div.xoopsQuote { font-size: 11px; color: #444444; line-height: 125%; text-align: justify; background-color: #FAFAFA; border: #c2cdd6 1px dashed;}
+/* ===== Links for Quotes ===== */
+.xoopsQuote a:link, div.xoopsQuote a:visited { background-color: transparent; color: #444; font-weight: bold;}
+.xoopsQuote a:hover, div.xoopsQuote a:active { background-color: transparent; color: #1778cb;}
-/* Links for Quotes */
-div.xoopsQuote a:link, div.xoopsQuote a:visited { color: #444444; font-weight: bold; background-color: transparent;}
-div.xoopsQuote a:hover, div.xoopsQuote a:active { color: #1778cb; background-color: transparent;}
+/* ===== Redirect messages ===== */
+.errorMsg,.confirmMsg, .resultMsg { padding: .8em; text-align:center; margin-bottom: 1em; border: 2px solid #ddd;}
+.errorMsg { background-color: #FBE3E4; color: #D12F19; border-color: #FBC2C4; }
+.confirmMsg { background-color: #FFF6BF; color: #817134; border-color: #FFD324; }
+.resultMsg { background-color: #E6EFC2; color: #529214; border-color: #C6D880; }
+.errorMsg a { background-color: transparent; color: #D12F19; }
+.confirmMsg a { background-color: transparent; color: #817134; }
+.successMsg a { background-color: transparent; color: #529214; }
+/*.errorMsg { background-color: #FF3737; padding: 10px; color:#fff; font-size:1em; font-weight: bold; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa;}
+.confirmMsg { background-color : #DDFFDF; color: #136C99; font-size:1em; text-align:center; font-weight : bold; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa;}*/
-/* Redirect messages */
-div.errorMsg { background-color: #FF3737; color: White; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
-div.confirmMsg { background-color : #DDFFDF; color: #136C99; text-align:center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight : bold;}
+/* ===== General small ===== */
+.fontSmall { font-size : .7em;}
+a.fontSmall { background-color: transparent; color: #006699;}
+a.fontSmall:hover { background-color: transparent; color: #C23030; text-decoration: underline;}
-/* General small */
-.fontSmall { font-size : 10px; background-color: transparent;}
-a.fontSmall { color: #006699;}
-a.fontSmall:hover { color: #C23030; text-decoration: underline;}
+/* ===== forms elements ===== */
+input {background-color: #fff; color:inherit; font-size: .8em; font-family: verdana, arial, helvetica, sans-serif; border-left: #000 1px solid;color: #000; border-bottom: #000 1px solid; border-right: #000 1px solid; border-top: #000 1px solid;}
+textarea { width: 430px; font-size: .8em; font-family: verdana, arial, helvetica, sans-serif; border: #000 1px solid;}
+input.formTextBox { background: #fff; color:inherit; font-size: .8em; font-family: verdana, arial, helvetica, sans-serif;border: #000 1px solid; }
+select { font-size: .8em; font-family: verdana, arial, helvetica, sans-serif; border: #000 1px solid;}
-/*forms elements*/
-input { border-right: #000000 1px solid; border-top: #000000 1px solid; font: 11px verdana, arial, helvetica, sans-serif; border-left: #000000 1px solid;color: #000000; border-bottom: #000000 1px solid; background-color: #ffffff;}
-textarea { border: #000000 1px solid; width: 430px; font: 11px verdana, arial, helvetica, sans-serif;}
-input.formTextBox { border: #000000 1px solid; background: #ffffff; font: 11px verdana, arial, helvetica, sans-serif;}
-select { border: #000000 1px solid; font: 11px verdana, arial, helvetica, sans-serif;}
+/* ===== content module ===== */
+.content { text-align: justify; padding: 0 15px 0px 15px;}
-div.content { text-align: left; padding: 0px 15px 0px 15px;}
-
.xoopsCenter { text-align:center;}
-.bg1 { background-color: #E6E6E6;}
-.bg2 { background-color: #2F5376;}
-.bg3 { background-color: #2F5376; color: #ffffff;}
-.bg4 { background-color: #ECECEC;}
-.bg5 { background-color: #ECECEC;}
+.bg1 { background-color: #E6E6E6; color:inherit;}
+.bg2 { background-color: #2F5376; color:inherit;}
+.bg3 { background-color: #2F5376; color: #fff;}
+.bg4 { background-color: #ECECEC; color:inherit;}
+.bg5 { background-color: #ECECEC; color:inherit;}
+/* ===== tables ===== */
+caption {font-style: italic; font-weight: bold;}
+th, thead {background-color: #2F5376; padding : 2px; color: #fff; vertical-align : middle;}
.outer {border: 1px solid #c0c0c0;}
-.head {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-.even {background-color: #dee3e7; padding: 5px;}
-.odd {background-color: #E6E6E6; padding: 5px;}
-.foot {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-tr.head td {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-tr.even td {background-color: #dee3e7; padding: 5px;}
-tr.odd td {background-color: #E6E6E6; padding: 5px;}
-tr.foot td {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
+.head {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
+.even {background-color: #dee3e7; padding: 5px; color:inherit;}
+.odd {background-color: #E6E6E6; padding: 5px; color:inherit;}
+.foot, tfoot {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
+tr.head td {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
+tr.even td {background-color: #dee3e7; padding: 5px; color:inherit;}
+tr.odd td {background-color: #E6E6E6; padding: 5px; color:inherit;}
+tr.foot td {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
-.admin_layer {width: 200px; border: 1px solid #c0c0c0; background-color: #c0c0c0; margin: 5px; padding: 1px;}
\ No newline at end of file
+/* ===== admin menu popup ===== */
+.admin_layer {width: 200px; margin: 5px; background-color: #c0c0c0; padding: 1px; color:#666; border: 1px solid #c0c0c0;}
+
+/* ===== debug messages ===== */
+#xo-logger-output {font-size: .8em;}
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/logo.gif
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,27 +1,38 @@
-body {color: #000; background: #fff; margin: 0; padding: 0;}
+/* IMPORTANT, PLEASE RESPECT THIS SEMANTIC ORDER !!! :
+ - position box,
+ - width,
+ - heigth,
+ - margin,
+ - background-color,
+ - background-image,
+ - padding,
+ - content (color, style font, ...),
+ - border,
+ ... */
-table {width: 100%;}
-table td {padding: 0; border-width: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif;}
+html, body {background-color: #fff; color: #000; font-size:9pt;}
-a {color: #666; text-decoration: none; font-weight: bold; background-color: transparent;}
-a:hover {color: #ff6600;, background-color:transparent;}
+/* ===== hypertext links ===== */
+a {background-color: transparent; color: #666; font-weight: bold; text-decoration: none;}
+a:hover {background-color:transparent; color: #ff6600;}
/* ===== titles ===== */
h1 {font-size: 1.4em; font-weight: bold;}
h2 {font-size: 1.2em; font-weight: bold;}
-h3 { padding-bottom: 3px; font-size: 1em;}
-h4 {font-size: 1em; font-weight: bold;}
+h3 {padding-bottom: 3px; font-size: 1.1em; font-weight: bold;}
+h4 {font-size: 1.1em; font-weight: bold;}
h5 {font-size: .9em;}
h6 {font-size: .8em;}
+/* ===== lists ===== */
ul { margin: 2px; padding: 2px; list-style: decimal inside; text-align: left;}
-li { margin-left: 2px; color: #2F5376;}
+li { margin-left: 2px; background-color:transparent; color: #2F5376;}
/* ===== images ===== */
img {border: 0;}
-/* ===== other attributes of contents ===== */
-hr{ border-width: 1px; border-style: dashed; text-align: center; width: 95%;}
+/* ===== others attributes of contents ===== */
+hr{ display:none;}
p {}
acronym, abbr { border-bottom: #000 1px dashed;}
acronym:hover, abbr:hover { border-bottom-color: #ff9900;}
@@ -34,108 +45,124 @@
address {}
bdo { direction: ltr;}
-/* forms */
-fieldset { padding:1em; margin: 0 0 1em 0; border: none; }
+/* ===== forms ===== */
+fieldset { margin: 0 0 1em 0; padding:1em; border: none;}
legend { font-size: 1.1em; font-weight: bold;}
label { display: block; float: left; font-weight: bold;}
-input {font-size: 1em; border: 1px solid #ccc;}
-input[type="submit"], input[type="button"], input[type=reset], .xo-formbuttons, .formButton, button {background-color: #e6e6e6; color:inherit; border:1px solid #bbb; cursor: pointer;}
-input[type="submit"]:focus,input[type="button"]:focus, input[type=reset]:focus, .xo-formbuttons:focus, .formButton:focus, button:focus,
-input[type="submit"]:hover,input[type="button"]:hover, input[type=reset]:hover, .xo-formbuttons:hover, .formButton:hover, button:hover { background-color: #2F5376; color:#fff;}
+input {margin:3px; font-size: 1em; border: 1px solid #ccc;}
+button, input[type="submit"],input[type="button"], input[type="reset"], .xo-formbuttons, .formButton { background-color: #e6e6e6; color:inherit; border:1px solid #bbb; cursor: pointer;}
+button:focus, input[type="submit"]:focus,input[type="button"]:focus, input[type="reset"]:focus, .xo-formbuttons:focus, .formButton:focus,
+ button:hover, input[type="submit"]:hover,input[type="button"]:hover, input[type="reset"]:hover, .xo-formbuttons:hover, .formButton:hover
+ { background-color: #2F5376; color:#fff;}
input.formButton {}
-select { background-color:#f6f6f6; border:1px solid #ccc; font-size: .9em;}
-select:focus { background-color:#fff; border:1px solid #999;}
-textarea {width: 85%; height: 110px; margin:0.5em 0.5em 0.5em 0; background-color:#eee; padding:5px; border:1px solid #bbb; overflow: auto;}
-textarea:focus { border:1px solid #999; background-color:#fff; }
+select { background-color:#f6f6f6; color:inherit; border:1px solid #ccc; font-size: 1em;}
+select:focus { background-color:#fff; color:inherit; border:1px solid #999;}
+textarea {width: 85%; height: 110px; margin:0.5em 0.5em 0.5em 0; background-color:#eee; padding:5px; color:inherit; border:1px solid #bbb; overflow: auto;}
+textarea:focus { background-color:#fff; color:inherit; border:1px solid #999;}
+/* ===== contents (example for articles and news) ===== */
.item {border: 1px solid #ccc;}
-.itemHead {padding: 3px; background-color: #2F5376; color: #fff;}
-.itemInfo {text-align: right; padding: 3px; background-color: #efefef}
-.itemTitle a {font-size: 1.3em; font-weight: bold; font-variant: small-caps; color: #fff; background-color: transparent;}
+.itemHead { background-color: #2F5376; padding: 3px; color: #fff;}
+.itemInfo { background-color: #efefef; color:#666; padding: 3px; text-align: right;}
+.itemTitle a { background-color: transparent; color: #fff; font-size: 1.2em; font-weight: bold; font-variant: small-caps;}
.itemPoster {font-size: .9em; font-style:italic;}
.itemPostDate {font-size: .9em; font-style:italic;}
.itemStats {font-size: .9em; font-style:italic;}
.itemBody {padding-left: 5px;}
.itemText {margin-top: 5px; margin-bottom: 5px; line-height: 1.5em;}
.itemText:first-letter {font-size: 1.3em; font-weight: bold;}
-.itemFoot {text-align: right; padding: 3px; background-color: #efefef;, color:inherit;}
+.itemFoot { background-color: #efefef; padding: 3px; color:inherit; text-align: right;}
.itemAdminLink {font-size: .9em;}
.itemPermaLink {font-size: .9em;}
-caption {font-style: italic; font-weight: bold;}
-th, thead {background-color: #2F5376; color: #fff; padding : 2px; vertical-align : middle; font-family: Verdana, Arial, Helvetica, sans-serif;}
+/* ===== header ===== */
+#headerbanner {width: 100%; background-color: #2F5376; color:#fff; vertical-align: middle; text-align:center;}
+#headerbar { background-image: url(hbar.gif); border-bottom: 1px solid #ddd;}
-td#headerbanner {width: 100%; background-color: #2F5376; vertical-align: middle; text-align:center;}
-td#headerbar {border-bottom: 1px solid #ddd; background-image: url(hbar.gif);}
+/* ===== left column ===== */
+#leftcolumn {width: 170px; font-size:1em; border-right: 1px solid #ccc;}
+#leftcolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
+#leftcolumn .blockTitle { background-color: #ddd; padding: 3px; color: #639ACE; font-weight: bold; text-align:center;}
+#leftcolumn .blockContent {padding: 3px 3px 10px 3px; line-height: 1.2em;}
-td#leftcolumn {width: 170px; border-right: 1px solid #ccc; font-size:12px;}
-td#leftcolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
-td#leftcolumn div.blockTitle {padding: 3px; background-color: #ddd; color: #639ACE; font-weight: bold;}
-td#leftcolumn div.blockContent {padding: 3px; line-height: 1.2em;}
-
-#centercolumn {font-size: 12px;}
+/* ===== center column ===== */
+#centercolumn {font-size: 1em; text-align: justify;}
#centercolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
#centerCcolumn, #bottomCcolumn {padding: 0 3px 1px 3px;}
-#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #639ACE; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0;}
-#centerCcolumn .blockContent, #bottomCcolumn .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;}
+#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {background-color:transparent; padding: 3px 3px 0 10px; color: #639ACE; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0;}
+#centerCcolumn .blockContent, #bottomCcolumn .blockContent { line-height: 1.2em; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px;}
-#centerLcolumn, #bottomLcolumn, #centerRcolumn, #bottomRcolumn {
- width: 50%; padding: 0 3px 0 0;
-}
+#centerLcolumn, #bottomLcolumn, #centerRcolumn, #bottomRcolumn { width: 50%; padding: 0 3px 0 0;}
#centerLcolumn .blockTitle, #bottomLcolumn .blockTitle, #centerRcolumn .blockTitle, #bottomRcolumn .blockTitle {
- padding: 3px; color: #639ACE; font-weight: bold; margin-top: 0;
-}
+ margin-top: 0; background-color: transparent; padding: 3px 3px 0 10px; color: #639ACE; font-weight: bold;}
#centerLcolumn .blockContent, #centerRcolumn .blockContent, #bottomLcolumn .blockContent, #bottomRcolumn .blockContent {
- border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-left: 2px; margin-right: 3px; margin-bottom: 2px; line-height: 1.2em;
-}
+ line-height: 1.2em; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-left: 2px; margin-right: 3px; margin-bottom: 2px;}
-div#content {text-align: left; padding: 8px;}
+/* ===== content module ===== */
+div#content {padding: 8px; text-align: justify;}
-td#rightcolumn {width: 170px; border-left: 1px solid #ccc; font-size:12px;}
-td#rightcolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
-td#rightcolumn div.blockTitle {padding: 3px; background-color: #ddd; color: #639ACE; font-weight: bold;}
-td#rightcolumn div.blockContent {padding: 3px; line-height: 1.2em;}
+/* ===== right column ===== */
+#rightcolumn {width: 170px; font-size:1em; border-left: 1px solid #ccc;}
+#rightcolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
+#rightcolumn .blockTitle { background-color: #ddd; padding: 3px; color: #639ACE; font-weight: bold; text-align:center;}
+#rightcolumn .blockContent {padding: 3px 3px 10px 3px; line-height: 1.2em;}
-tr#footerbar {text-align:center; background-image: url(hbar.gif);}
+/* ===== footer ===== */
+#footerbar {background-image: url(hbar.gif); text-align:center;}
-td#mainmenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px;}
-td#mainmenu a:hover {background-color: #fff;}
-td#mainmenu a.menuTop {padding-left: 3px; border-top: 1px solid #c0c0c0; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-td#mainmenu a.menuMain {padding-left: 3px; border-right: 1px solid #666666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-td#mainmenu a.menuSub {padding-left: 9px; border-right: 1px solid #666666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+/* ===== main menu block ===== */
+#mainmenu a { display: block; margin: 0; background-color: #e6e6e6; color:#666; padding: 4px;}
+#mainmenu a:hover {background-color: #fff; color:#ff6600;}
+#mainmenu a.menuTop {padding-left: 3px; border-top: 1px solid #c0c0c0; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+#mainmenu a.menuMain {padding-left: 3px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+#mainmenu a.menuSub {padding: 2px 0 2px 9px; font-size:.9em; font-weight:normal; font-style: italic; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-td#usermenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-td#usermenu a:hover {background-color: #fff;}
-td#usermenu a.menuTop {border-top: 1px solid #c0c0c0;}
-td#usermenu a.highlight {background-color: #fcc;}
+/* ===== user menu block ===== */
+#usermenu a { display: block; margin: 0; background-color: #e6e6e6; padding: 4px; color:#666; font-size:.9em; font-style:italic; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+#usermenu a:hover {background-color: #fff; color:#ff6600;}
+#usermenu a.menuTop {border-top: 1px solid #c0c0c0;}
+#usermenu a.highlight {background-color: #fcc; color:inherit;}
+/* ===== tables ===== */
+caption {font-style: italic; font-weight: bold;}
+th, thead {background-color: #2F5376; padding : 2px; vertical-align : middle; color: #fff; font-weight:bold; font-family: Verdana, Arial, Helvetica, sans-serif; text-align:center;}
+table td {padding: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif; border-width: 0;}
.outer {border: 1px solid #c0c0c0;}
-.head {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-.even {background-color: #dee3e7; padding: 5px;}
-.odd {background-color: #E9E9E9; padding: 5px;}
-.foot, tfoot {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
-tr.even td {background-color: #dee3e7; padding: 5px;}
-tr.odd td {background-color: #E9E9E9; padding: 5px;}
+.head {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
+.even {background-color: #dee3e7; padding: 5px; color:inherit;}
+.odd {background-color: #E9E9E9; padding: 5px; color:inherit;}
+.foot, tfoot {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
+tr.even td {background-color: #dee3e7; padding: 5px; color:inherit;}
+tr.odd td {background-color: #E9E9E9; padding: 5px; color:inherit;}
-div.errorMsg { background-color: #FFCCCC; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa; font-weight: bold; padding: 10px;}
-div.confirmMsg { background-color: #DDFFDF; color: #136C99; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa; font-weight: bold; padding: 10px;}
-div.resultMsg { background-color : #ccc; color: #333; text-align: center; border-top: 1px solid #c0c0c0; border-left: 1px solid #c0c0c0; font-weight: bold; border-right: 1px solid #666666; border-bottom: 1px solid #666; padding: 10px;}
+/* ===== core messages ===== */
+.errorMsg { background-color: #FFCCCC; padding: 10px; color:inherit; font-weight: bold; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa;}
+.confirmMsg { background-color: #DDFFDF; padding: 10px; color: #136C99; font-weight: bold; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa;}
+.resultMsg { background-color : #ccc; padding: 10px; color: #333; font-weight: bold; text-align: center; border-top: 1px solid #c0c0c0; border-left: 1px solid #c0c0c0; border-right: 1px solid #666666; border-bottom: 1px solid #666;}
-div.xoopsCode { background: #fff; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0 6px 6px 6px; height: 200px; overflow: auto;}
-div.xoopsQuote { background: #fff; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0 6px 6px 6px;}
+/* ===== code and quote ===== */
+.xoopsCode { overflow: auto; height: 200px; background-color: #fff; padding: 6px; color:inherit; font-family: "Courier New",Courier,monospace; border: 1px inset #000080;}
+.xoopsQuote { background-color: #fff; padding: 6px; color:inherit; font-family: "Courier New",Courier,monospace;border: 1px inset #000080;}
+blockquote { font-style: italic;}
+/* ===== content (example for forum) ===== */
.comTitle {font-weight: bold; margin-bottom: 2px;}
.comText {padding: 2px;}
-.comUserStat {font-size: 10px; color: #2F5376; font-weight:bold; border: 1px solid #c0c0c0; background-color: #fff; margin: 2px; padding: 2px;}
+.comUserStat { margin: 2px; background-color: #fff; padding: 2px; color: #2F5376; font-size: .8em; font-weight:bold; border: 1px solid #c0c0c0;}
.comUserStatCaption {font-weight: normal;}
-.comUserStatus {margin-left: 2px; margin-top: 10px; color: #2F5376; font-weight:bold; font-size: 10px;}
+.comUserStatus {margin-left: 2px; margin-top: 10px; background-color: transparent; color: #2F5376; font-weight:bold; font-size: .8em;}
.comUserRank {margin: 2px;}
-.comUserRankText {font-size: 10px;font-weight:bold;}
+.comUserRankText {font-size: .8em; font-weight:bold;}
.comUserRankImg {border: 0;}
-.comUserName {}
+.comUserName a { background-color: transparent; color:#fff;}
+.comUserName a:hover { background-color:transparent; color: #ff6600;}
.comUserImg {margin: 2px;}
-.comDate {font-weight: normal; font-style: italic; font-size: small;}
-.comDateCaption {font-weight: bold; font-style: normal;}
\ No newline at end of file
+.comDate { font-size: .8em; font-weight: normal; font-style: italic;}
+.comDateCaption {font-weight: bold; font-style: normal;}
+.signature { font-size: .9em; font-style:italic;}
+
+/* ===== debug messages ===== */
+#xo-logger-output table {width:100%; font-size: .8em;}
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleMAC.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleMAC.css 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleMAC.css 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,3 +1,2 @@
@import url(style.css);
-/* Very short Mac-specific additions/changes here (if
-any) */
+/* Very short Mac-specific additions/changes here (if any) */
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleNN.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleNN.css 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/styleNN.css 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,3 +1,2 @@
@import url(style.css);
-/* Very short Gecko-specific additions/changes here (if
-any) */
\ No newline at end of file
+/* Very short Gecko-specific additions/changes here (if any) */
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme.html 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme.html 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,121 +1,138 @@
<!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>
-<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}>" />
-<meta name="keywords" content="<{$xoops_meta_keywords}>" />
-<meta name="description" content="<{$xoops_meta_description}>" />
-<meta name="rating" content="<{$xoops_meta_rating}>" />
-<meta name="author" content="<{$xoops_meta_author}>" />
-<meta name="copyright" content="<{$xoops_meta_copyright}>" />
-<meta name="generator" content="XOOPS" />
-<title><{$xoops_sitename}> - <{$xoops_pagetitle}></title>
-<link href="<{$xoops_url}>/favicon.ico" rel="SHORTCUT ICON" />
-<link rel="stylesheet" type="text/css" media="screen" href="<{$xoops_url}>/xoops.css" />
-<link rel="stylesheet" type="text/css" media="screen" href="<{$xoops_themecss}>" />
-<!-- RMV: added module header -->
-<{$xoops_module_header}>
-<script type="text/javascript">
-<!--
-<{$xoops_js}>
-//-->
-</script>
+<!-- Assign Theme name -->
+ <{assign var=theme_name value=$xoTheme->folderName}>
+<!-- Title and meta -->
+ <title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
+ <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+ <meta name="robots" content="<{$xoops_meta_robots}>" />
+ <meta name="keywords" content="<{$xoops_meta_keywords}>" />
+ <meta name="description" content="<{$xoops_meta_description}>" />
+ <meta name="rating" content="<{$xoops_meta_rating}>" />
+ <meta name="author" content="<{$xoops_meta_author}>" />
+ <meta name="copyright" content="<{$xoops_meta_copyright}>" />
+ <meta name="generator" content="XOOPS" />
+<!-- Rss -->
+<link rel="alternate" type="application/rss+xml" title="<{$smarty.const.THEME_RSS}>" href="<{xoAppUrl backend.php}>" />
+<!-- Favicon -->
+ <link rel="shortcut icon" type="image/ico" href="<{xoAppUrl icons/favicon.ico}>" />
+<!-- scripts xoops.js and instructions header.php files-->
+ <{$xoops_module_header}>
+<!-- Sheet Css -->
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{xoAppUrl xoops.css}>" />
+ <link rel="stylesheet" type="text/css" media="all" title="Style sheet" href="<{xoImgUrl style.css}>" />
</head>
<body>
+<!-- Start Header -->
<table cellspacing="0">
<tr id="header">
- <td id="headerlogo"><a href="<{$xoops_url}>/"><img src="<{$xoops_imageurl}>logo.gif" width="150" height="80" alt="" /></a></td>
+ <td id="headerlogo"><a href="<{xoAppUrl /}>"><img src="<{xoImgUrl logo.gif}>" width="234" height="80" alt="<{$xoops_sitename}>" /></a></td>
<td id="headerbanner"><{$xoops_banner}></td>
</tr>
<tr>
<td id="headerbar" colspan="2"> </td>
</tr>
</table>
+<!-- End header -->
<table cellspacing="0">
<tr>
+ <!-- Start left blocks loop -->
+ <{if $xoops_showlblock}>
<td id="leftcolumn">
- <!-- Start left blocks loop -->
- <{foreach item=block from=$xoops_lblocks}>
- <{include file="default/theme_blockleft.html"}>
- <{/foreach}>
- <!-- End left blocks loop -->
-
+ <{foreach item=block from=$xoBlocks.canvas_left}>
+ <{includeq file="$theme_name/theme_blockleft.html"}>
+ <{/foreach}>
</td>
-
+ <{/if}>
+ <!-- End left blocks loop -->
+
<td id="centercolumn">
<!-- Display center blocks if any -->
- <{if $xoops_showcblock == 1}>
+ <{if $xoBlocks.page_topleft or $xoBlocks.page_topcenter or $xoBlocks.page_topright}>
<table cellspacing="0">
- <tr>
- <td id="centerCcolumn" colspan="2">
- <!-- Start center-center blocks loop -->
- <{foreach item=block from=$xoops_ccblocks}>
- <{include file="default/theme_blockcenter_c.html"}>
- <{/foreach}>
- <!-- End center-center blocks loop -->
- </td>
- </tr>
- <tr>
- <td id="centerLcolumn">
- <!-- Start center-left blocks loop -->
- <{foreach item=block from=$xoops_clblocks}>
- <{include file="default/theme_blockcenter_l.html"}>
- <{/foreach}>
- <!-- End center-left blocks loop -->
- </td>
- <td id="centerRcolumn">
- <!-- Start center-right blocks loop -->
- <{foreach item=block from=$xoops_crblocks}>
- <{include file="default/theme_blockcenter_r.html"}>
- <{/foreach}>
- <!-- End center-right blocks loop -->
- </td>
- </tr>
+ <tr>
+ <td id="centerCcolumn" colspan="2">
+ <!-- Start center-center blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_topcenter}>
+ <{includeq file="$theme_name/theme_blockcenter_c.html"}>
+ <{/foreach}>
+ <!-- End center-center blocks loop -->
+ </td>
+ </tr>
+ <tr>
+ <td id="centerLcolumn">
+ <!-- Start center-left blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_topleft}>
+ <{includeq file="$theme_name/theme_blockcenter_l.html"}>
+ <{/foreach}>
+ <!-- End center-left blocks loop -->
+ </td>
+ <td id="centerRcolumn">
+ <!-- Start center-right blocks loop -->
+ <{foreach item=block from=$xoBlocks.page_topright}>
+ <{includeq file="$theme_name/theme_blockcenter_r.html"}>
+ <{/foreach}>
+ <!-- End center-right blocks loop -->
+ </td>
+ </tr>
</table>
- <{/if}>
- <!-- End display center blocks -->
- <div id="content">
- <{$xoops_contents}>
- </div>
+ <{/if}>
+ <!-- End center top blocks loop -->
+
+ <!-- Start content module page -->
+ <div id="content"><{$xoops_contents}></div>
+ <!-- End content module -->
+
+ <!-- Start center bottom blocks loop -->
<{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomright or $xoBlocks.page_bottomcenter}>
<table cellspacing="0">
<{if $xoBlocks.page_bottomcenter}>
- <tr><td id="bottomCcolumn" colspan="2">
- <{foreach from=$xoBlocks.page_bottomcenter item=block}><{include file="default/theme_blockcenter_c.html"}><{/foreach}>
- </td>
- </tr>
- <{/if}>
- <{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomright}>
- <tr>
- <td id="bottomLcolumn">
- <{foreach from=$xoBlocks.page_bottomleft item=block}><{include file="default/theme_blockcenter_l.html"}><{/foreach}>
- </td>
- <td id="bottomRcolumn">
- <{foreach from=$xoBlocks.page_bottomright item=block}><{include file="default/theme_blockcenter_r.html"}><{/foreach}>
- </td>
- </tr>
+ <tr><td id="bottomCcolumn" colspan="2">
+ <{foreach from=$xoBlocks.page_bottomcenter item=block}>
+ <{include file="$theme_name/theme_blockcenter_c.html"}>
+ <{/foreach}>
+ </td>
+ </tr>
+ <{/if}>
+ <{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomright}>
+ <tr>
+ <td id="bottomLcolumn">
+ <{foreach from=$xoBlocks.page_bottomleft item=block}>
+ <{include file="$theme_name/theme_blockcenter_l.html"}>
+ <{/foreach}>
+ </td>
+ <td id="bottomRcolumn">
+ <{foreach from=$xoBlocks.page_bottomright item=block}>
+ <{include file="$theme_name/theme_blockcenter_r.html"}>
+ <{/foreach}>
+ </td>
+ </tr>
<{/if}>
</table>
<{/if}>
+ <!-- End center bottom blocks loop -->
</td>
- <{if $xoops_showrblock == 1}>
+ <{if $xoops_showrblock}>
<td id="rightcolumn">
<!-- Start right blocks loop -->
- <{foreach item=block from=$xoops_rblocks}>
- <{include file="default/theme_blockright.html"}>
- <{/foreach}>
+ <{foreach item=block from=$xoBlocks.canvas_right}>
+ <{includeq file="$theme_name/theme_blockright.html"}>
+ <{/foreach}>
<!-- End right blocks loop -->
</td>
<{/if}>
</tr>
</table>
-
+<!-- Start footer -->
<table cellspacing="0">
<tr id="footerbar">
- <td><a href="http://xoops.sourceforge.net/" target="_blank"><img src="<{$xoops_imageurl}>poweredby.gif" alt="" /></a></td>
+ <td><a href="http://xoops.sourceforge.net/" rel="external"><img src="<{xoImgUrl poweredby.gif}>" alt="XOOPS Project Sourceforge" /></a></td>
</tr>
</table>
+<!-- End footer -->
+
+<!--{xo-logger-output}-->
</body>
</html>
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_c.html
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_c.html 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_c.html 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,6 +1,6 @@
<div style="padding: 5px;">
- <fieldset>
- <legend class="blockTitle"><{$block.title}></legend>
- <div class="blockContent"><{$block.content}></div>
- </fieldset>
+<{if $block.title}>
+<div class="blockTitle"><h3><{$block.title}></h3></div>
+<{/if}>
+<div class="blockContent"><{$block.content}></div>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_l.html
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_l.html 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_l.html 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,6 +1,6 @@
<div style="padding: 0px 0px 0px 8px;">
- <fieldset>
- <legend class="blockTitle"><{$block.title}></legend>
- <div class="blockContent"><{$block.content}></div>
- </fieldset>
+<{if $block.title}>
+<div class="blockTitle"><h3><{$block.title}></h3></div>
+<{/if}>
+<div class="blockContent"><{$block.content}></div>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_r.html
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_r.html 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockcenter_r.html 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,6 +1,6 @@
<div style="padding: 0px 5px 0px 0px;">
- <fieldset>
- <legend class="blockTitle"><{$block.title}></legend>
- <div class="blockContent"><{$block.content}></div>
- </fieldset>
+<{if $block.title}>
+<div class="blockTitle"><h3><{$block.title}></h3></div>
+<{/if}>
+<div class="blockContent"><{$block.content}></div>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockleft.html
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockleft.html 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockleft.html 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,2 +1,4 @@
-<div class="blockTitle"><{$block.title}></div>
+<{if $block.title}>
+<div class="blockTitle"><h3><{$block.title}></h3></div>
+<{/if}>
<div class="blockContent"><{$block.content}></div>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockright.html
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockright.html 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/theme_blockright.html 2007-10-23 00:14:43 UTC (rev 1119)
@@ -1,2 +1,4 @@
-<div class="blockTitle"><{$block.title}></div>
+<{if $block.title}>
+<div class="blockTitle"><h3><{$block.title}></h3></div>
+<{/if}>
<div class="blockContent"><{$block.content}></div>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css 2007-10-22 00:17:02 UTC (rev 1118)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css 2007-10-23 00:14:43 UTC (rev 1119)
@@ -92,8 +92,9 @@
}
.xoops-form-element-caption-required .caption-marker {
- color: #ff0000;
+ background-color: inherit;
padding-left: 2px;
+ color: #ff0000;
}
.xoops-form-element-help {
@@ -134,8 +135,6 @@
background-color: #f8f8f8;
color: inherit;
border: 1px solid #000;
- -moz-border-radius: 12px;
- border-radius: 12px 12px;
}
#login_window h2 {
margin: .5em;
@@ -148,11 +147,8 @@
padding: 1em;
background-color: #ccc;
color: inherit;
- -moz-border-radius: 8px;
- border-radius: 8px 8px;
}
.login_form .credentials label {
- display: -moz-inline-box;
display: inline-block;
width: 33%;
margin: 1px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-22 00:17:00
|
Revision: 1118
http://xoops.svn.sourceforge.net/xoops/?rev=1118&view=rev
Author: dugris
Date: 2007-10-21 17:17:02 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
improved : xhtml/css compliance /banners.php (kris_fr)
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php
Added Paths:
-----------
XoopsCore/branches/2.0.x/2.0.18/htdocs/images/password.gif
XoopsCore/branches/2.0.x/2.0.18/htdocs/images/password.png
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-22 00:08:35 UTC (rev 1117)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-22 00:17:02 UTC (rev 1118)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- improved : xhtml/css compliance /banners.php (kris_fr)
- new favicon.ico (http://www.xoops.org/modules/news/article.php?storyid=2749 - http://www.xoops.org/uploads/OfficialLogoKit.zip)
- improved : xhtml/css compliance (kris_fr)
- Fixed bug #1779352 : Hardcoded language, Secure and improve code, Removal style/css (young-pee/dugris)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php 2007-10-22 00:08:35 UTC (rev 1117)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php 2007-10-22 00:17:02 UTC (rev 1118)
@@ -37,18 +37,18 @@
{
global $xoopsDB, $xoopsLogger, $xoopsConfig;
include("header.php");
- echo "<form action='banners.php' method='post'>
- <table class='banners'>
- <tr><td colspan='2' class='center'>
- <b>"._BANNERS_LOGIN_TITLE."</b><hr /></td></tr>
- <tr><td align='right'><b>"._BANNERS_LOGIN_LOGIN.": </b></td>
- <td><input class='textbox' type='text' name='login' size='12' maxlength='10' /></td></tr>
- <tr><td align='right'><b>"._BANNERS_LOGIN_PASS.": </b></td>
- <td><input class='textbox' type='password' name='pass' size='12' maxlength='10' /></td></tr>
- <tr><td class='center' colspan='2'><input type='hidden' name='op' value='Ok' />
- <input type='submit' value='Login'></td></tr>
- <tr><td colspan='2' class='center'><hr />"._BANNERS_LOGIN_INFO."</td></tr>
- </table>".$GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN")."</form>";
+ echo "<div id='login_window'>
+ <h2 class='content_title'>"._BANNERS_LOGIN_TITLE."</h2>
+ <form method='post' action='banners.php' class='login_form'>
+ <div class='credentials'>
+ <label for='login_form-login'>"._BANNERS_LOGIN_LOGIN." :</label>
+ <input type='text' name='login' id='login_form-login' value='' /><br />
+ <label for='login_form-password'>"._BANNERS_LOGIN_PASS." :</label>
+ <input type='password' name='pass' id='login_form-password' value='' /><br />
+ </div>
+ <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>"._BANNERS_LOGIN_OK."</button></div>
+ <div class='login_info'>"._BANNERS_LOGIN_INFO."</div>".$GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN")."
+ </form></div>";
include "footer.php";
}
@@ -67,15 +67,20 @@
list($cid, $name, $passwd) = $xoopsDB->fetchRow($result);
if ( $_SESSION['banner_pass'] == $passwd ) {
include "header.php";
- echo "<h4 class='center'><b>".sprintf( _BANNERS_TITLE , $name )."</b><br /></h4>
- <table><tr>
- <th class='center'><b>ID</b></th>
- <th class='center'><b>"._BANNERS_IMP_MADE."</b></th>
- <th class='center'><b>"._BANNERS_IMP_TOTAL."</b></th>
- <th class='center'><b>"._BANNERS_IMP_LEFT."</b></th>
- <th class='center'><b>"._BANNERS_CLICKS."</b></th>
- <th class='center'><b>"._BANNERS_PER_CLICKS."</b></th>
- <th class='center'><b>"._BANNERS_FUNCTIONS."</b></th></tr>";
+
+ echo "<div id='bannerstats'>
+ <h4 class='content_title'>".sprintf( _BANNERS_TITLE , $name )."</h4><hr />
+ <table summary=''>
+ <thead><tr>
+ <td>ID</td>
+ <td>"._BANNERS_IMP_MADE."</td>
+ <td>"._BANNERS_IMP_TOTAL."</td>
+ <td>"._BANNERS_IMP_LEFT."</td>
+ <td>"._BANNERS_CLICKS."</td>
+ <td>"._BANNERS_PER_CLICKS."</td>
+ <td>"._BANNERS_FUNCTIONS."</td></tr></thead>
+ <tfoot></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) ) {
@@ -90,45 +95,49 @@
$left = $imptotal-$impmade;
}
$class = ($i % 2 == 0) ? 'even' : 'odd';
- echo "<tr class='$class'><td class='center'>$bid</td>
- <td class='center'>$impmade</td>
- <td class='center'>$imptotal</td>
- <td class='center'>$left</td>
- <td class='center'>$clicks</td>
- <td class='center'>$percent%</td>
- <td class='center'><a href='banners.php?op=EmailStats&cid=$cid&bid=$bid'>" . _BANNERS_STATS . "</a></td></tr>";
+ echo "<tbody><tr class='$class'>
+ <td>$bid</td>
+ <td>$impmade</td>
+ <td>$imptotal</td>
+ <td>$left</td>
+ <td>$clicks</td>
+ <td>$percent%</td>
+ <td><a href='banners.php?op=EmailStats&cid=$cid&bid=$bid' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
$i++;
}
- echo "</table><br /><br /><div>". _BANNERS_FOW_IN . htmlspecialchars( $xoopsConfig['sitename'] ). " </div><br /><br />";
+ 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);
if ($numrows>1) {
- echo "<hr /><br />";
+ echo "<br />";
}
if (!empty($htmlbanner) && !empty($htmlcode)){
echo $myts->displayTarea($htmlcode);
}else{
if(strtolower(substr($imageurl,strrpos($imageurl,".")))==".swf") {
- echo "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/ swflash.cab#version=6,0,40,0\" width=\"468\" height=\"60\">";
+ echo "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0\" width=\"468\" height=\"60\">";
echo "<param name=movie value=\"$imageurl\" />";
echo "<param name=quality value='high' />";
- echo "<embed src=\"$imageurl\" quality='high' pluginspage=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\" type=\"application/x-shockwave-flash\" width=\"468\" height=\"60\">";
+ echo "<embed src=\"$imageurl\" quality='high' pluginspage=\"http://www.macromedia.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" width=\"468\" height=\"60\">";
echo "</embed>";
echo "</object>";
} else {
- echo "<img src='$imageurl' border='1' alt='' />";
+ echo "<img src='$imageurl' alt='' />";
}
}
- echo "<br />" . _BANNERS_ID . $bid . "<br />" .
+ echo "<br /><strong>" . _BANNERS_ID . $bid . "</strong><br />" .
sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&cid='.$cid.'&bid='.$bid) . "<br />";
if (!$htmlbanner){
$clickurl = htmlspecialchars($clickurl, ENT_QUOTES);
echo sprintf(_BANNERS_POINTS, $clickurl) . "<br />
<form action='banners.php' method='post'>". _BANNERS_URL . "
- <input class='textbox' type='text' name='url' size='50' maxlength='200' value='$clickurl' />
- <input class='textbox' type='hidden' name='bid' value='$bid' />
- <input class='textbox' 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>";
}
@@ -137,27 +146,29 @@
/* Finnished Banners */
echo "<br />";
if($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from ".$xoopsDB->prefix("bannerfinish")." where cid=$cid")){
- echo "<h4 class='center'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><br />
- <table><tr>
- <th class='center'><b>ID</b></td>
- <th class='center'><b>"._BANNERS_IMP_MADE."</b></td>
- <th class='center'><b>"._BANNERS_CLICKS."</b></td>
- <th class='center'><b>"._BANNERS_PER_CLICKS."</b></td>
- <th class='center'><b>"._BANNERS_STARTED."</b></td>
- <th class='center'><b>"._BANNERS_ENDED."</b></td></tr>";
- $i=0;
- while ( list($bid, $impressions, $clicks, $datestart, $dateend) = $xoopsDB->fetchRow($result) ) {
- $percent = substr(100 * $clicks / $impressions, 0, 5);
- $class = ($i % 2 == 0) ? 'even' : 'odd';
- echo "<tr class='$class'><td class='center'>$bid</td>
- <td class='center'>$impressions</td>
- <td class='center'>$clicks</td>
- <td class='center'>$percent%</td>
- <td class='center'>".formatTimestamp($datestart)."</td>
- <td class='center'>".formatTimestamp($dateend)."</td></tr>";
+ echo "<h4 class='content_title'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><hr />
+ <table table=''><thead><tr>
+ <td>ID</td>
+ <td>"._BANNERS_IMP_MADE."</td>
+ <td>"._BANNERS_CLICKS."</td>
+ <td>"._BANNERS_PER_CLICKS."</td>
+ <td>"._BANNERS_STARTED."</td>
+ <td>"._BANNERS_ENDED."</td></tr></thead><tfoot></tfoot>";
+
+ $i=0;
+ 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>
+ <td>".formatTimestamp($datestart)."</td>
+ <td>".formatTimestamp($dateend)."</td></tr></tbody>";
+ }
+ echo "</table></div>";
}
- echo "</table>";
- }
include "footer.php";
} else {
redirect_header("banners.php",2);
Added: XoopsCore/branches/2.0.x/2.0.18/htdocs/images/password.gif
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.0.x/2.0.18/htdocs/images/password.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.0.x/2.0.18/htdocs/images/password.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.0.x/2.0.18/htdocs/images/password.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php 2007-10-22 00:08:35 UTC (rev 1117)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php 2007-10-22 00:17:02 UTC (rev 1118)
@@ -5,6 +5,7 @@
define('_BANNERS_LOGIN_LOGIN',"Login");
define('_BANNERS_LOGIN_PASS',"Password");
define('_BANNERS_LOGIN_INFO',"Please type your client information");
+define('_BANNERS_LOGIN_OK',"OK");
define('_BANNERS_ID',"Banner ID:");
define('_BANNERS_TITLE',"Current Active Banners for %s");
@@ -20,8 +21,8 @@
define('_BANNERS_CHANGE',"Save");
define('_BANNERS_STATS',"E-mail Stats");
-define('_BANNERS_SEND_STATS',"Send <a href='%s' />E-mail Stats</a> for this Banner");
-define('_BANNERS_POINTS',"This Banner points to <a href='%s'>this URL</a>");
+define('_BANNERS_SEND_STATS',"Send <a href='%s' title='E-mail Stats'/>E-mail Stats</a> for this Banner");
+define('_BANNERS_POINTS',"This Banner points to <a href='%s' title=''>this URL</a>");
define('_BANNERS_UNLIMITED',"Unlimited");
define('_BANNERS_FINISHED',"Banners Finished for %s");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-22 00:08:31
|
Revision: 1117
http://xoops.svn.sourceforge.net/xoops/?rev=1117&view=rev
Author: dugris
Date: 2007-10-21 17:08:35 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/favicon.ico
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-21 23:44:39 UTC (rev 1116)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-22 00:08:35 UTC (rev 1117)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- new favicon.ico (http://www.xoops.org/modules/news/article.php?storyid=2749 - http://www.xoops.org/uploads/OfficialLogoKit.zip)
- improved : xhtml/css compliance (kris_fr)
- Fixed bug #1779352 : Hardcoded language, Secure and improve code, Removal style/css (young-pee/dugris)
- Fixed bug #1774929 : cannot herit methods from kernel's class (Garrath/dugris)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/favicon.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-21 23:44:39
|
Revision: 1116
http://xoops.svn.sourceforge.net/xoops/?rev=1116&view=rev
Author: dugris
Date: 2007-10-21 16:44:39 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
improved : xhtml/css compliance (kris_fr)
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css
XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-21 13:58:10 UTC (rev 1115)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-21 23:44:39 UTC (rev 1116)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- improved : xhtml/css compliance (kris_fr)
- Fixed bug #1779352 : Hardcoded language, Secure and improve code, Removal style/css (young-pee/dugris)
- Fixed bug #1774929 : cannot herit methods from kernel's class (Garrath/dugris)
- Fixed : Corrected a line hardcoded (young-pee)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css 2007-10-21 13:58:10 UTC (rev 1115)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/themes/default/style.css 2007-10-21 23:44:39 UTC (rev 1116)
@@ -1,104 +1,135 @@
body {color: #000; background: #fff; margin: 0; padding: 0;}
-table {width: 100%; font-size: small;}
+table {width: 100%;}
table td {padding: 0; border-width: 0; vertical-align: top; font-family: Verdana, Arial, Helvetica, sans-serif;}
-a {color: #666666; text-decoration: none; font-weight: bold; background-color: transparent;}
-a:hover {color: #ff6600;}
+a {color: #666; text-decoration: none; font-weight: bold; background-color: transparent;}
+a:hover {color: #ff6600;, background-color:transparent;}
-h1 {}
-h2 {}
-h3 {}
-h4 {}
-h5 {}
+/* ===== titles ===== */
+h1 {font-size: 1.4em; font-weight: bold;}
+h2 {font-size: 1.2em; font-weight: bold;}
+h3 { padding-bottom: 3px; font-size: 1em;}
+h4 {font-size: 1em; font-weight: bold;}
+h5 {font-size: .9em;}
+h6 {font-size: .8em;}
+
ul { margin: 2px; padding: 2px; list-style: decimal inside; text-align: left;}
li { margin-left: 2px; color: #2F5376;}
+/* ===== images ===== */
+img {border: 0;}
+
+/* ===== other attributes of contents ===== */
+hr{ border-width: 1px; border-style: dashed; text-align: center; width: 95%;}
+p {}
+acronym, abbr { border-bottom: #000 1px dashed;}
+acronym:hover, abbr:hover { border-bottom-color: #ff9900;}
+q {}
+cite {}
+em {}
+dfn {}
+strong {}
+del {}
+address {}
+bdo { direction: ltr;}
+
+/* forms */
+fieldset { padding:1em; margin: 0 0 1em 0; border: none; }
+legend { font-size: 1.1em; font-weight: bold;}
+label { display: block; float: left; font-weight: bold;}
+input {font-size: 1em; border: 1px solid #ccc;}
+input[type="submit"], input[type="button"], input[type=reset], .xo-formbuttons, .formButton, button {background-color: #e6e6e6; color:inherit; border:1px solid #bbb; cursor: pointer;}
+input[type="submit"]:focus,input[type="button"]:focus, input[type=reset]:focus, .xo-formbuttons:focus, .formButton:focus, button:focus,
+input[type="submit"]:hover,input[type="button"]:hover, input[type=reset]:hover, .xo-formbuttons:hover, .formButton:hover, button:hover { background-color: #2F5376; color:#fff;}
input.formButton {}
-.item {border: 1px solid #cccccc;}
-.itemHead {padding: 3px; background-color: #2F5376; color: #FFFFFF;}
+select { background-color:#f6f6f6; border:1px solid #ccc; font-size: .9em;}
+select:focus { background-color:#fff; border:1px solid #999;}
+textarea {width: 85%; height: 110px; margin:0.5em 0.5em 0.5em 0; background-color:#eee; padding:5px; border:1px solid #bbb; overflow: auto;}
+textarea:focus { border:1px solid #999; background-color:#fff; }
+
+
+.item {border: 1px solid #ccc;}
+.itemHead {padding: 3px; background-color: #2F5376; color: #fff;}
.itemInfo {text-align: right; padding: 3px; background-color: #efefef}
-.itemTitle a {font-size: 130%; font-weight: bold; font-variant: small-caps; color: #ffffff; background-color: transparent;}
-.itemPoster {font-size: 90%; font-style:italic;}
-.itemPostDate {font-size: 90%; font-style:italic;}
-.itemStats {font-size: 90%; font-style:italic;}
+.itemTitle a {font-size: 1.3em; font-weight: bold; font-variant: small-caps; color: #fff; background-color: transparent;}
+.itemPoster {font-size: .9em; font-style:italic;}
+.itemPostDate {font-size: .9em; font-style:italic;}
+.itemStats {font-size: .9em; font-style:italic;}
.itemBody {padding-left: 5px;}
.itemText {margin-top: 5px; margin-bottom: 5px; line-height: 1.5em;}
-.itemText:first-letter {font-size: 133%; font-weight: bold;}
-.itemFoot {text-align: right; padding: 3px; background-color: #efefef;}
-.itemAdminLink {font-size: 90%;}
-.itemPermaLink {font-size: 90%;}
+.itemText:first-letter {font-size: 1.3em; font-weight: bold;}
+.itemFoot {text-align: right; padding: 3px; background-color: #efefef;, color:inherit;}
+.itemAdminLink {font-size: .9em;}
+.itemPermaLink {font-size: .9em;}
-th {background-color: #2F5376; color: #FFFFFF; padding : 2px; vertical-align : middle; font-family: Verdana, Arial, Helvetica, sans-serif;}
+caption {font-style: italic; font-weight: bold;}
+th, thead {background-color: #2F5376; color: #fff; padding : 2px; vertical-align : middle; font-family: Verdana, Arial, Helvetica, sans-serif;}
td#headerbanner {width: 100%; background-color: #2F5376; vertical-align: middle; text-align:center;}
-td#headerbar {border-bottom: 1px solid #dddddd; background-image: url(hbar.gif);}
+td#headerbar {border-bottom: 1px solid #ddd; background-image: url(hbar.gif);}
-td#leftcolumn {width: 170px; border-right: 1px solid #cccccc; font-size:12px;}
-td#leftcolumn th {background-color: #2F5376; color: #FFFFFF; vertical-align: middle;}
-td#leftcolumn div.blockTitle {padding: 3px; background-color: #dddddd; color: #639ACE; font-weight: bold;}
-td#leftcolumn div.blockContent {padding: 3px; line-height: 120%; line-height: 120%;}
+td#leftcolumn {width: 170px; border-right: 1px solid #ccc; font-size:12px;}
+td#leftcolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
+td#leftcolumn div.blockTitle {padding: 3px; background-color: #ddd; color: #639ACE; font-weight: bold;}
+td#leftcolumn div.blockContent {padding: 3px; line-height: 1.2em;}
-
#centercolumn {font-size: 12px;}
-#centercolumn th {background-color: #2F5376; color: #FFFFFF; vertical-align: middle;}
+#centercolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
-#centerCcolumn, #bottomCcolumn {padding: 0px 3px 1px 3px;}
-#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #639ACE; font-weight: bold; margin-top: 0px; margin-right: 0px; margin-left: 0px;}
-#centerCcolumn .blockContent, #bottomCcolumn .blockContent {border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom: 1px solid #dddddd; padding: 3px; margin-right: 0px; margin-left: 0px; margin-bottom: 2px; line-height: 120%;}
+#centerCcolumn, #bottomCcolumn {padding: 0 3px 1px 3px;}
+#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #639ACE; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0;}
+#centerCcolumn .blockContent, #bottomCcolumn .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;}
#centerLcolumn, #bottomLcolumn, #centerRcolumn, #bottomRcolumn {
- width: 50%; padding: 0px 3px 0px 0px;
+ width: 50%; padding: 0 3px 0 0;
}
#centerLcolumn .blockTitle, #bottomLcolumn .blockTitle, #centerRcolumn .blockTitle, #bottomRcolumn .blockTitle {
- padding: 3px; color: #639ACE; font-weight: bold; margin-top: 0px;
+ padding: 3px; color: #639ACE; font-weight: bold; margin-top: 0;
}
#centerLcolumn .blockContent, #centerRcolumn .blockContent, #bottomLcolumn .blockContent, #bottomRcolumn .blockContent {
- border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom: 1px solid #dddddd; padding: 3px; margin-left: 2px; margin-right: 3px; margin-bottom: 2px; line-height: 120%;
+ border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-left: 2px; margin-right: 3px; margin-bottom: 2px; line-height: 1.2em;
}
div#content {text-align: left; padding: 8px;}
-td#rightcolumn {width: 170px; border-left: 1px solid #cccccc; font-size:12px;}
-td#rightcolumn th {background-color: #2F5376; color: #FFFFFF; vertical-align: middle;}
-td#rightcolumn div.blockTitle {padding: 3px; background-color: #dddddd; color: #639ACE; font-weight: bold;}
-td#rightcolumn div.blockContent {padding: 3px; line-height: 120%;}
+td#rightcolumn {width: 170px; border-left: 1px solid #ccc; font-size:12px;}
+td#rightcolumn th {background-color: #2F5376; color: #fff; vertical-align: middle;}
+td#rightcolumn div.blockTitle {padding: 3px; background-color: #ddd; color: #639ACE; font-weight: bold;}
+td#rightcolumn div.blockContent {padding: 3px; line-height: 1.2em;}
tr#footerbar {text-align:center; background-image: url(hbar.gif);}
td#mainmenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px;}
-td#mainmenu a:hover {background-color: #ffffff;}
-td#mainmenu a.menuTop {padding-left: 3px; border-top: 1px solid #c0c0c0; border-right: 1px solid #666666; border-bottom: 1px solid #666666; border-left: 1px solid #c0c0c0;}
-td#mainmenu a.menuMain {padding-left: 3px; border-right: 1px solid #666666; border-bottom: 1px solid #666666; border-left: 1px solid #c0c0c0;}
-td#mainmenu a.menuSub {padding-left: 9px; border-right: 1px solid #666666; border-bottom: 1px solid #666666; border-left: 1px solid #c0c0c0;}
+td#mainmenu a:hover {background-color: #fff;}
+td#mainmenu a.menuTop {padding-left: 3px; border-top: 1px solid #c0c0c0; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+td#mainmenu a.menuMain {padding-left: 3px; border-right: 1px solid #666666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+td#mainmenu a.menuSub {padding-left: 9px; border-right: 1px solid #666666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
-td#usermenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px; border-right: 1px solid #666666; border-bottom: 1px solid #666666; border-left: 1px solid #c0c0c0;}
-td#usermenu a:hover {background-color: #ffffff;}
+td#usermenu a {background-color: #e6e6e6; display: block; margin: 0; padding: 4px; border-right: 1px solid #666; border-bottom: 1px solid #666; border-left: 1px solid #c0c0c0;}
+td#usermenu a:hover {background-color: #fff;}
td#usermenu a.menuTop {border-top: 1px solid #c0c0c0;}
td#usermenu a.highlight {background-color: #fcc;}
-
-
.outer {border: 1px solid #c0c0c0;}
.head {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
.even {background-color: #dee3e7; padding: 5px;}
.odd {background-color: #E9E9E9; padding: 5px;}
-.foot {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
+.foot, tfoot {background-color: #c2cdd6; padding: 5px; font-weight: bold;}
tr.even td {background-color: #dee3e7; padding: 5px;}
tr.odd td {background-color: #E9E9E9; padding: 5px;}
-div.errorMsg { background-color: #FFCCCC; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
-div.confirmMsg { background-color: #DDFFDF; color: #136C99; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;}
-div.resultMsg { background-color : #CCCCCC; color: #333333; text-align: center; border-top: 1px solid #c0c0c0; border-left: 1px solid #c0c0c0; font-weight: bold; border-right: 1px solid #666666; border-bottom: 1px solid #666666; padding: 10px;}
+div.errorMsg { background-color: #FFCCCC; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa; font-weight: bold; padding: 10px;}
+div.confirmMsg { background-color: #DDFFDF; color: #136C99; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa; font-weight: bold; padding: 10px;}
+div.resultMsg { background-color : #ccc; color: #333; text-align: center; border-top: 1px solid #c0c0c0; border-left: 1px solid #c0c0c0; font-weight: bold; border-right: 1px solid #666666; border-bottom: 1px solid #666; padding: 10px;}
-div.xoopsCode { background: #FFFFFF; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0px 6px 6px 6px; height: 200px; overflow: auto;}
-div.xoopsQuote { background: #FFFFFF; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0px 6px 6px 6px;}
+div.xoopsCode { background: #fff; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0 6px 6px 6px; height: 200px; overflow: auto;}
+div.xoopsQuote { background: #fff; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0 6px 6px 6px;}
-
.comTitle {font-weight: bold; margin-bottom: 2px;}
.comText {padding: 2px;}
-.comUserStat {font-size: 10px; color: #2F5376; font-weight:bold; border: 1px solid #c0c0c0; background-color: #ffffff; margin: 2px; padding: 2px;}
+.comUserStat {font-size: 10px; color: #2F5376; font-weight:bold; border: 1px solid #c0c0c0; background-color: #fff; margin: 2px; padding: 2px;}
.comUserStatCaption {font-weight: normal;}
.comUserStatus {margin-left: 2px; margin-top: 10px; color: #2F5376; font-weight:bold; font-size: 10px;}
.comUserRank {margin: 2px;}
@@ -106,5 +137,5 @@
.comUserRankImg {border: 0;}
.comUserName {}
.comUserImg {margin: 2px;}
-.comDate {font-weight: normal; font-style: italic; font-size: smaller;}
-.comDateCaption {font-weight: bold; font-style: normal;}
+.comDate {font-weight: normal; font-style: italic; font-size: small;}
+.comDateCaption {font-weight: bold; font-style: normal;}
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css 2007-10-21 13:58:10 UTC (rev 1115)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css 2007-10-21 23:44:39 UTC (rev 1116)
@@ -1,50 +1,183 @@
-img {border: 0;}
+/* reset css selectors */
+* { margin: 0; padding: 0; border: 0; outline: none; text-decoration: none;font-family: sans-serif; font-size: 1em; font-weight: normal; font-style: normal;}
-#xoopsHiddenText {visibility: hidden; color: #000000; font-weight: normal; font-style: normal; text-decoration: none;}
+table { width: 100%; border-collapse: collapse;}
+img { border:0;}
+acronym, abbr, dfn { cursor: help;}
+q, cite, em, dfn, strong { font-style:italic;}
+strong, dfn {font-weight: bold;}
+del { text-decoration: line-through;}
+address { font-style: normal; letter-spacing: .1em;}
-.pagneutral {font-size: 10px; width: 16px; height: 19px;text-align: center; background-image: url(./images/pagneutral.gif);}
-.pagact {font-size: 10px; width: 16px; height: 19px;text-align: center; background-image: url(./images/pagact.gif);}
-.paginact {font-size: 10px; width: 16px; height: 19px;text-align: center; background-image: url(./images/paginact.gif);}
+/*======== styles pour mettre des blocs "flottants" par exemple des images ======== */
+.floatleft {
+ float: left;
+ margin-top: 1em;
+ margin-right : 1em;
+ padding-left: 4px;
+ border: 0;
+}
+.floatright {
+ float: right;
+ margin-bottom: 1em;
+ margin-left: 1em;
+ padding: 2px;
+ border: 0;
+}
+/*======== Alignment class ======== */
+.txtleft { text-align: left; }
+.txtright { text-align: right; }
+.txtcenter { text-align: center; }
+.txtjustify { text-align: justify; }
+.alignmiddle { vertical-align: middle;}
+.aligntop { vertical-align: top;}
+.alignbottom { vertical-align: bottom;}
-#mainmenu a {text-align:left; display: block; margin: 0; padding: 4px;}
-#mainmenu a.menuTop {padding-left: 3px;}
-#mainmenu a.menuMain {padding-left: 3px;}
-#mainmenu a.menuSub {padding-left: 9px;}
+.positop {margin-top:0;padding-top:0;}
+.posibottom {margin-bottom:0;padding-bottom:0;}
-#usermenu a {text-align:left; display: block; margin: 0; padding: 4px;}
-#usermenu a.menuTop {}
-#usermenu a.highlight {color: #0000ff; background-color: #fcc;}
+/*======== Width class ======== */
+.width100 { width: 100%;}
+.width98 {width: 98%;}
+.width95 {width: 95%;}
+.width90 {width: 90%;}
+.width85 {width: 85%;}
+.width80 {width: 80%;}
+.width75 { width: 75%;}
+.width66 { width: 66%;}
+.width50 { width: 50%;}
+.width33 { width: 33%;}
+.width25 { width: 25%;}
+.width20 { width: 20%;}
+.width10 { width: 10%;}
+.width5 {width: 5%;}
+.width1 {width: 1%;}
-.center { text-align: center;}
-.left { text-align: left; }
-.right { text-align: right; }
-.center { text-align: center; }
-.justify { text-align: justify; }
+/* ========= Font class ========== */
+.extrasmall { font-size: .7em;}
+.small { font-size: .9em;}
+.normal { font-size: 1em;}
+.big { font-size: 1.2em;}
+.maxi { font-size: 1.5em;}
+.bold { font-weight: bold;}
+.italic {font-style: italic;}
+
+.red {background-color: inherit; color: #ff0000;}
+.blue {background-color: inherit; color: #0000ff;}
+.black {background-color: inherit; color:#000;}
+.white {background-color: inherit; color:#fff;}
+.yellow {background-color: inherit; color: #ffff00;}
+.orange { background-color: inherit; color: #ffa500;}
+.green { background-color: inherit; color: #32CD32;}
+.silver { background-color: inherit; color: #c0c0c0;}
+
+/*======== Show class ======== */
+.clear{ clear:both; height:0; font-size:0; line-height:0; }
+.clearleft{ clear:left; height:0; font-size:0; line-height:0; }
+.clearright{ clear:right; height:0; font-size:0; line-height:0; }
+.block { display: block; }
+.hide { display: none; }
+.spacer { padding: 0 0 3px 0;}
+.nowrap {display: nowrap;}
+
+
+/* xoops dhtml editor : don't remove */
+#xoopsHiddenText {visibility: hidden; color: #000000; font-weight: normal; font-style: normal; text-decoration: none;}
+
/* For required elements in XOOPS form, can be overwritten in theme styles */
.xoops-form-element-caption .caption-marker {
- display: none;
+ display: none;
}
.xoops-form-element-caption-required .caption-marker {
- color: #ff0000;
- padding-left: 2px;
+ color: #ff0000;
+ padding-left: 2px;
}
.xoops-form-element-help {
- font-size: 90%;
- padding-top: 5px;
- font-weight: normal;
+ font-size: .9em;
+ padding-top: 5px;
+ font-weight: normal;
}
+/* class XoopsPageNav::renderImageNav */
+.pagneutral {
+ font-size: 10px;
+ width: 16px;
+ height: 19px;
+ text-align: center;
+ background-image: url(./images/pagneutral.gif);
+}
+.pagact {
+ font-size: 10px;
+ width: 16px;
+ height: 19px;
+ text-align: center;
+ background-image: url(./images/pagact.gif);
+}
+
+.paginact {
+ font-size: 10px;
+ width: 16px;
+ height: 19px;
+ text-align: center;
+ background-image: url(./images/paginact.gif);
+}
+
/* For banners.php */
-.banners {
- width: 70%;
- margin: 110px;
- padding: 15px;
- border: #e0e0e0 1px solid;
- color: #666666;
- background-color: #f6f6f6;
- text-align: center;
+#bannerstats {}
+#login_window {
+ max-width: 480px;
+ margin: 1em auto;
+ background-color: #f8f8f8;
+ color: inherit;
+ border: 1px solid #000;
+ -moz-border-radius: 12px;
+ border-radius: 12px 12px;
}
+#login_window h2 {
+ margin: .5em;
+ padding: 130px 0 0;
+ background: url( images/password.png) no-repeat center top;
+ text-align: center;
+}
+.login_form .credentials {
+ margin: .5em 1em;
+ padding: 1em;
+ background-color: #ccc;
+ color: inherit;
+ -moz-border-radius: 8px;
+ border-radius: 8px 8px;
+}
+.login_form .credentials label {
+ display: -moz-inline-box;
+ display: inline-block;
+ width: 33%;
+ margin: 1px;
+}
+.login_form .credentials input {
+ width: 50%;
+ margin: 1px;
+ padding: 1px;
+ border: 1px solid #000;
+}
+.login_form .credentials input:focus {
+ border: 1px solid #2266cc;
+}
+.login_form .actions {
+ padding: 1.5em .5em .5em;
+ text-align: center;
+}
+.login_info {
+ margin: .5em 1em;
+ text-align: center;
+}
+.content_title {
+ font-size: 1.2em;
+}
+#bannerstats td {
+ text-align: center;
+
+}
\ 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: <rea...@us...> - 2007-10-21 13:58:08
|
Revision: 1115
http://xoops.svn.sourceforge.net/xoops/?rev=1115&view=rev
Author: real_therplima
Date: 2007-10-21 06:58:10 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Adding dynamic block area/position system and Activating the block clone function
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/htdocs/class/theme_blocks.php
XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsblock.php
XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php
XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php
XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.data.sql
XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.structure.sql
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockform.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blocksadmin.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/groups/groupform.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/groups.php
Added Paths:
-----------
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockspadmin.php
XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/pblockform.php
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/class/theme_blocks.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/class/theme_blocks.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -65,16 +65,22 @@
$groups = @is_object( $xoopsUser ) ? $xoopsUser->getGroups() : array( XOOPS_GROUP_ANONYMOUS );
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ /*
$oldzones = array(
- XOOPS_SIDEBLOCK_LEFT => 'canvas_left',
- XOOPS_SIDEBLOCK_RIGHT => 'canvas_right',
- XOOPS_CENTERBLOCK_LEFT => 'page_topleft',
- XOOPS_CENTERBLOCK_CENTER => 'page_topcenter',
- XOOPS_CENTERBLOCK_RIGHT => 'page_topright',
- XOOPS_CENTERBLOCK_BOTTOMLEFT => 'page_bottomleft',
- XOOPS_CENTERBLOCK_BOTTOM => 'page_bottomcenter',
- XOOPS_CENTERBLOCK_BOTTOMRIGHT => 'page_bottomright',
+ XOOPS_SIDEBLOCK_LEFT => 'canvas_left',
+ XOOPS_SIDEBLOCK_RIGHT => 'canvas_right',
+ XOOPS_CENTERBLOCK_LEFT => 'page_topleft',
+ XOOPS_CENTERBLOCK_CENTER => 'page_topcenter',
+ XOOPS_CENTERBLOCK_RIGHT => 'page_topright',
+ XOOPS_CENTERBLOCK_BOTTOMLEFT => 'page_bottomleft',
+ XOOPS_CENTERBLOCK_BOTTOM => 'page_bottomcenter',
+ XOOPS_CENTERBLOCK_BOTTOMRIGHT => 'page_bottomright',
);
+ */
+ $xblock = new XoopsBlock();
+ $oldzones = $xblock->getBlockPositions();
+ #
foreach ( $oldzones as $zone ) {
$this->blocks[$zone] = array();
}
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsblock.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsblock.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsblock.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -314,6 +314,9 @@
$sql .= " AND l.gperm_groupid=".$groupid."";
}
$sql .= " AND b.isactive=".$isactive;
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ /*
if ( isset($side) ) {
// get both sides in sidebox? (some themes need this)
if ( $side == XOOPS_SIDEBLOCK_BOTH ) {
@@ -325,6 +328,25 @@
}
$sql .= " AND ".$side;
}
+ */
+ if ( isset($side) ) {
+ // get both sides in sidebox? (some themes need this)
+ $tp = ($side == -2)?'L':($side == -6)?'C':'';
+ if ( $tp != '') {
+ $side = "";
+ $s1 = "SELECT id FROM ".$db->prefix("block_positions")." WHERE block_type=\"".$tp."\" ORDER BY id ASC";
+ $res = $db->query($s1);
+ while ( $myrow = $db->fetchArray($res) ) {
+ $side .= "side=".$myrow['id']." OR ";
+ }
+ $side = "(".substr($side,0,strlen($side)-4).")";
+ } else {
+ $side = "side=".$side;
+ }
+ $where_query .= " AND ".$side;
+ }
+ #
+
if ( isset($visible) ) {
$sql .= " AND b.visible=$visible";
}
@@ -350,6 +372,9 @@
$db =& Database::getInstance();
$ret = array();
$where_query = " WHERE isactive=".$isactive;
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ /*
if ( isset($side) ) {
// get both sides in sidebox? (some themes need this)
if ( $side == 2 ) {
@@ -361,6 +386,25 @@
}
$where_query .= " AND ".$side;
}
+ */
+ if ( isset($side) ) {
+ // get both sides in sidebox? (some themes need this)
+ $tp = ($side == -2)?'L':($side == -6)?'C':'';
+ if ( $tp != '') {
+ $side = "";
+ $s1 = "SELECT id FROM ".$db->prefix("block_positions")." WHERE block_type=\"".$tp."\" ORDER BY id ASC";
+ $res = $db->query($s1);
+ while ( $myrow = $db->fetchArray($res) ) {
+ $side .= "side=".$myrow['id']." OR ";
+ }
+ $side = "(".substr($side,0,strlen($side)-4).")";
+ } else {
+ $side = "side=".$side;
+ }
+ $where_query .= " AND ".$side;
+ }
+ #
+
if ( isset($visible) ) {
$where_query .= " AND visible=$visible";
}
@@ -537,5 +581,29 @@
list($count) = $db->fetchRow($result);
return $count;
}
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ function getBlockPositions($full=false){
+ $db =& Database::getInstance();
+
+ $ret = array();
+
+ $sql = 'SELECT * FROM '.$db->prefix('block_positions').' ORDER BY id ASC';
+ $result = $db->query($sql);
+ while ($row = $db->fetchArray($result)) {
+ if (!$full){
+ $ret[$row['id']] = $row['pname'];
+ }else{
+ $ret[$row['id']]['pname'] = $row['pname'];
+ $ret[$row['id']]['title'] = $row['title'];
+ $ret[$row['id']]['description'] = $row['description'];
+ $ret[$row['id']]['block_default'] = $row['block_default'];
+ $ret[$row['id']]['block_type'] = $row['block_type'];
+ }
+ }
+
+ return $ret;
+ }
+ #
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/include/common.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -111,7 +111,8 @@
$xoopsLogger->startTime();
$xoopsLogger->startTime( 'XOOPS Boot' );
-
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ /*
define("XOOPS_SIDEBLOCK_LEFT",0);
define("XOOPS_SIDEBLOCK_RIGHT",1);
define("XOOPS_SIDEBLOCK_BOTH",2);
@@ -122,6 +123,19 @@
define("XOOPS_CENTERBLOCK_BOTTOMLEFT",7);
define("XOOPS_CENTERBLOCK_BOTTOMRIGHT",8);
define("XOOPS_CENTERBLOCK_BOTTOM",9);
+ */
+ define("XOOPS_SIDEBLOCK_LEFT",1);
+ define("XOOPS_SIDEBLOCK_RIGHT",2);
+ define("XOOPS_SIDEBLOCK_BOTH",-2);
+ define("XOOPS_CENTERBLOCK_LEFT",3);
+ define("XOOPS_CENTERBLOCK_RIGHT",5);
+ define("XOOPS_CENTERBLOCK_CENTER",4);
+ define("XOOPS_CENTERBLOCK_ALL",-6);
+ define("XOOPS_CENTERBLOCK_BOTTOMLEFT",6);
+ define("XOOPS_CENTERBLOCK_BOTTOMRIGHT",8);
+ define("XOOPS_CENTERBLOCK_BOTTOM",7);
+ #
+
define("XOOPS_BLOCK_INVISIBLE",0);
define("XOOPS_BLOCK_VISIBLE",1);
define("XOOPS_MATCH_START",0);
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/install/makedata.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -126,7 +126,11 @@
}
$options = !isset($newblock['options']) ? '' : trim($newblock['options']);
$edit_func = !isset($newblock['edit_func']) ? '' : trim($newblock['edit_func']);
- $newbid = $dbm->insert('newblocks', " VALUES (0, 1, ".$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 0, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.")");
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ #$newbid = $dbm->insert('newblocks', " VALUES (0, 1, ".$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 0, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.")");
+ $newbid = $dbm->insert('newblocks', " VALUES (0, 1, ".$func_num.", '".addslashes($options)."', '".addslashes($newblock['name'])."', '".addslashes($newblock['name'])."', '', 1, 0, ".$visible.", 'S', 'H', 1, 'system', '".addslashes($newblock['file'])."', '".addslashes($newblock['show_func'])."', '".addslashes($edit_func)."', '".addslashes($newblock['template'])."', 0, ".$time.")");
+
//$newbid = $xoopsDB->getInsertId();
$newtplid = $dbm->insert('tplfile', " VALUES (0, ".$newbid.", 'system', 'default', '".addslashes($newblock['template'])."', '".addslashes($newblock['description'])."', ".$time.", ".$time.", 'block')");
//$newtplid = $xoopsDB->getInsertId();
@@ -155,7 +159,9 @@
$result = $dbm->query($sql);
while ($myrow = $dbm->fetchArray($result)) {
- if ($myrow['side'] == 0) {
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ #if ($myrow['side'] == 0) {
+ if ($myrow['side'] == 1) {
$dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", 0)");
} else {
$dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", -1)");
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.data.sql
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.data.sql 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.data.sql 2007-10-21 13:58:10 UTC (rev 1115)
@@ -19,6 +19,18 @@
# Dumping data for table `bannerfinish`
#
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
+#
+# Dumping data for table `block_positions`
+#
+INSERT INTO `block_positions` VALUES (1,'canvas_left','_AM_SBLEFT',NULL,1,'L');
+INSERT INTO `block_positions` VALUES (2,'canvas_right','_AM_SBRIGHT',NULL,1,'L');
+INSERT INTO `block_positions` VALUES (3,'page_topleft','_AM_CBLEFT',NULL,1,'C');
+INSERT INTO `block_positions` VALUES (4,'page_topcenter','_AM_CBCENTER',NULL,1,'C');
+INSERT INTO `block_positions` VALUES (5,'page_topright','_AM_CBRIGHT',NULL,1,'C');
+INSERT INTO `block_positions` VALUES (6,'page_bottomleft','_AM_CBBOTTOMLEFT',NULL,1,'C');
+INSERT INTO `block_positions` VALUES (7,'page_bottomcenter','_AM_CBBOTTOM',NULL,1,'C');
+INSERT INTO `block_positions` VALUES (8,'page_bottomright','_AM_CBBOTTOMRIGHT',NULL,1,'C');
#
# Dumping data for table `comments`
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.structure.sql
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.structure.sql 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/install/sql/mysql.structure.sql 2007-10-21 13:58:10 UTC (rev 1115)
@@ -92,7 +92,22 @@
) TYPE=MyISAM;
# --------------------------------------------------------
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
#
+# Table structure for table xoops_block_positions
+#
+
+CREATE TABLE `block_positions` (
+ id int(11) NOT NULL auto_increment,
+ pname varchar(30) default '',
+ title varchar(90) NOT NULL default '',
+ description text,
+ block_default int(1) NOT NULL default '0',
+ block_type varchar(1) NOT NULL default 'L',
+ PRIMARY KEY (`id`)
+) TYPE=MyISAM;
+
+#
# Table structure for table `block_module_link`
#
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockform.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockform.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockform.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -30,8 +30,22 @@
if (isset($block['name'])) {
$form->addElement(new XoopsFormLabel(_AM_NAME, $block['name']));
}
+
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
+/*
$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']);
$side_select->addOptionArray(array(0 => _AM_SBLEFT, 1 => _AM_SBRIGHT, 3 => _AM_CBLEFT, 4 => _AM_CBRIGHT, 5 => _AM_CBCENTER, 7 => _AM_CBBOTTOMLEFT, 8 => _AM_CBBOTTOMRIGHT, 9 => _AM_CBBOTTOM, ));
+*/
+$posarr = XoopsBlock::getBlockPositions(true);
+$arr = array();
+foreach ($posarr as $k=>$v){
+ $tit = (defined($posarr[$k]['title']))?constant($posarr[$k]['title']):$posarr[$k]['title'];
+ $arr[$k] = $tit;
+}
+$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']);
+$side_select->addOptionArray($arr);
+#
+
$form->addElement($side_select);
$form->addElement(new XoopsFormText(_AM_WEIGHT, "bweight", 2, 5, $block['weight']));
$form->addElement(new XoopsFormRadioYN(_AM_VISIBLE, 'bvisible', $block['visible']));
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blocksadmin.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blocksadmin.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blocksadmin.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -35,7 +35,11 @@
// check if the user is authorised
if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
-
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ $oldzones = XoopsBlock::getBlockPositions(true);
+ #
+
function list_blocks()
{
global $xoopsUser, $xoopsConfig;
@@ -44,6 +48,11 @@
$selmod = isset($_GET['selmod']) ? intval($_GET['selmod']) : 0;
$selvis = isset($_GET['selvis']) ? intval($_GET['selvis']) : 2;
$selgrp = isset($_GET['selgrp']) ? intval($_GET['selgrp']) : XOOPS_GROUP_USERS;
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ echo "<h4 style='float:right; text-align:left;'><a href='admin.php?fct=blocksadmin&op=adminpblocks'>"._AM_BPADMIN."</a></h4>";
+ #
+
echo "
<h4 style='text-align:left;'>"._AM_BADMIN."</h4>";
echo '<form action="admin.php" method="get">';
@@ -97,10 +106,20 @@
echo '<option value="2" '.$selvis2.'>'._ALL.'</option>';
echo '</select> <input type="submit" value="'._GO.'" name="selsubmit" />';
echo '</form>';
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ /*
echo "<form action='admin.php' name='blockadmin' method='post'>
<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
<tr valign='middle'><th width='20%'>"._AM_BLKDESC."</th><th>"._AM_TITLE."</th><th>"._AM_MODULE."</th><th align='center' nowrap='nowrap'>"._AM_SIDE."<br />"._LEFT."-"._CENTER."-"._RIGHT."</th><th align='center'>"._AM_WEIGHT."</th><th align='center'>"._AM_VISIBLE."</th><th align='right'>"._AM_ACTION."</th></tr>
- ";
+ ";
+ */
+ echo "<form action='admin.php' name='blockadmin' method='post'>
+ <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
+ <tr valign='middle'><th width='20%'>"._AM_BLKDESC."</th><th>"._AM_TITLE."</th><th>"._AM_MODULE."</th><th align='center' nowrap='nowrap'>"._AM_SIDE."</th><th align='center'>"._AM_WEIGHT."</th><th align='center'>"._AM_VISIBLE."</th><th align='right'>"._AM_ACTION."</th></tr>
+ ";
+ #
+
if ($selvis == 2) $selvis = null;
if ($selgrp == 0) {
// get blocks that are not assigned to any groups
@@ -113,7 +132,15 @@
$module_list2 =& $module_handler->getList();
// for custom blocks
$module_list2[0] = ' ';
+
+ # Activate the block clone function - TheRpLima - 2007-10-21
+ $block_configs = get_block_configs() ;
+ #
+
foreach (array_keys($block_arr) as $i) {
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ /*
$sel0 = $sel1 = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = $ssel5 = $ssel6 = $ssel7 = "";
if ( $block_arr[$i]->getVar("visible") == 1 ) {
$sel1 = " checked='checked'";
@@ -159,12 +186,45 @@
<input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOM."'$ssel7 />
<input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOMRIGHT."'$ssel6 />
</div>
- </td><td class='$class' align='center'><input type='text' name='weight[$i]' value='".$block_arr[$i]->getVar("weight")."' size='5' maxlength='5' /></td><td class='$class' align='center' nowrap><input type='radio' name='visible[$i]' value='1'$sel1>"._YES." <input type='radio' name='visible[$i]' value='0'$sel0>"._NO."</td><td class='$class' align='right'><a href='admin.php?fct=blocksadmin&op=edit&bid=".$block_arr[$i]->getVar("bid")."'>"._EDIT."</a>";
+ </td><td class='$class' align='center'><input type='text' name='weight[$i]' value='".$block_arr[$i]->getVar("weight")."' size='5' maxlength='5' /></td><td class='$class' align='center' nowrap><input type='radio' name='visible[$i]' value='1'$sel1>"._YES." <input type='radio' name='visible[$i]' value='0'$sel0>"._NO."</td><td class='$class' align='right'><a href='admin.php?fct=blocksadmin&op=edit&bid=".$block_arr[$i]->getVar("bid")."'>"._EDIT."</a>";
+ */
+ $sel0 = $sel1 = "";
+ if ( $block_arr[$i]->getVar("visible") == 1 ) {
+ $sel1 = " checked='checked'";
+ } else {
+ $sel0 = " checked='checked'";
+ }
+ if ( $block_arr[$i]->getVar("title") == "" ) {
+ $title = " ";
+ } else {
+ $title = $block_arr[$i]->getVar("title");
+ }
+ global $oldzones;
+ $selb = '<select name="side['.$i.']" size=3>';
+ foreach ($oldzones as $k=>$v){
+ if ($block_arr[$i]->getVar("side") == $k)
+ $sel = ' selected="selected"';
+ else
+ $sel = '' ;
+ $tit = (defined($oldzones[$k]['title']))?constant($oldzones[$k]['title']):$oldzones[$k]['title'];
+ $selb .= '<option value="'.$k.'"'.$sel.'>'.$tit.'</option>';
+ }
+ $selb .= '</select>';
+ $name = $block_arr[$i]->getVar("name");
+ echo "<tr valign='top'><td class='$class'>".$name."</td><td class='$class'>".$title."</td><td class='$class'>".$module_list2[$block_arr[$i]->getVar('mid')]."</td><td class='$class' align='center' nowrap='nowrap'>";
+ echo $selb."</td><td class='$class' align='center'><input type='text' name='weight[$i]' value='".$block_arr[$i]->getVar("weight")."' size='5' maxlength='5' /></td><td class='$class' align='center' nowrap><input type='radio' name='visible[$i]' value='1'$sel1>"._YES." <input type='radio' name='visible[$i]' value='0'$sel0>"._NO."</td><td class='$class' align='right'><a href='admin.php?fct=blocksadmin&op=edit&bid=".$block_arr[$i]->getVar("bid")."'>"._EDIT."</a>";
+ #
-
- if ($block_arr[$i]->getVar('block_type') != 'S') {
+ # Activate the block clone function - TheRpLima - 2007-10-21
+ #if ($block_arr[$i]->getVar('block_type') != 'S') {
+ # echo " <a href='admin.php?fct=blocksadmin&op=delete&bid=".$block_arr[$i]->getVar("bid")."'>"._DELETE."</a>";
+ #}
+ if ($block_arr[$i]->getVar('block_type') != 'S' && $block_arr[$i]->getVar('block_type') != 'M') {
echo " <a href='admin.php?fct=blocksadmin&op=delete&bid=".$block_arr[$i]->getVar("bid")."'>"._DELETE."</a>";
}
+ echo " <a href='admin.php?fct=blocksadmin&op=clone&bid=".$block_arr[$i]->getVar("bid")."'>"._CLONE."</a>" ;
+ #
+
echo "
<input type='hidden' name='oldside[$i]' value='".$block_arr[$i]->getVar('side')."' />
<input type='hidden' name='oldweight[$i]' value='".$block_arr[$i]->getVar('weight')."' />
@@ -387,6 +447,8 @@
$myblock->store();
}
+ # Activate the block clone function - TheRpLima - 2007-10-21
+ /*
function clone_block($bid)
{
global $xoopsConfig;
@@ -407,7 +469,28 @@
xoops_cp_footer();
exit();
}
-
+ */
+ function clone_block($bid)
+ {
+ global $xoopsConfig;
+ xoops_cp_header();
+ $myblock = new XoopsBlock($bid);
+ $db =& Database::getInstance();
+ $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
+ $result = $db->query($sql);
+ $modules = array();
+ while ($row = $db->fetchArray($result)) {
+ $modules[] = intval($row['module_id']);
+ }
+ $is_custom = ($myblock->getVar('block_type') == 'C' || $myblock->getVar('block_type') == 'E') ? true : false;
+ $block = array('form_title' => _AM_CLONEBLOCK, 'name' => $myblock->getVar('name'), 'title' => 'clone_'.$myblock->getVar('title'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'content' => $myblock->getVar('content', 'N'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'clone_ok', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'));
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '._AM_CLONEBLOCK.'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blockform.php';
+ $form->display();
+ xoops_cp_footer();
+ exit();
+ }
+ /*
function clone_block_ok($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options)
{
global $xoopsUser;
@@ -465,6 +548,74 @@
}
redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
}
+ */
+ function clone_block_ok($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bcachetime, $bmodule, $options)
+ {
+ global $xoopsUser;
+ $block = new XoopsBlock($bid);
+ $clone =& $block->xoopsClone();
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ xoops_cp_footer();
+ exit();
+ }
+ $clone->setVar('side', $bside);
+ $clone->setVar('weight', $bweight);
+ $clone->setVar('visible', $bvisible);
+ $clone->setVar('content', $bcontent);
+ $clone->setVar('title', $btitle);
+ $clone->setVar('bcachetime', $bcachetime);
+ if ( isset($options) && (count($options) > 0) ) {
+ $options = implode('|', $options);
+ $clone->setVar('options', $options);
+ }
+ $clone->setVar('bid', 0);
+ if ($block->getVar('block_type') == 'C' || $block->getVar('block_type') == 'E') {
+ $clone->setVar('block_type', 'E');
+ } else {
+ $clone->setVar('block_type', 'D');
+ }
+ $newid = $clone->store();
+ if (!$newid) {
+ xoops_cp_header();
+ $clone->getHtmlErrors();
+ xoops_cp_footer();
+ exit();
+ }
+ /*
+ if ($clone->getVar('template') != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate =& $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $bid);
+ if (count($btemplate) > 0) {
+ $tplclone =& $btemplate[0]->xoopsClone();
+ $tplclone->setVar('tpl_id', 0);
+ $tplclone->setVar('tpl_refid', $newid);
+ $tplman->insert($tplclone);
+ }
+ } */
+ $db =& Database::getInstance();
+ foreach ($bmodule as $bmid) {
+ $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
+ $db->query($sql);
+ }
+ $groups =& $xoopsUser->getGroups();
+ $count = count($groups);
+ for ($i = 0; $i < $count; $i++) {
+ $sql = "INSERT INTO ".$db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (".$groups[$i].", ".$newid.", 1, 'block_read')";
+ $db->query($sql);
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+ }
+ function get_block_configs()
+ {
+ $error_reporting_level = error_reporting( 0 ) ;
+ include '../xoops_version.php' ;
+ error_reporting( $error_reporting_level ) ;
+ if( empty( $modversion['blocks'] ) ) return array() ;
+ else return $modversion['blocks'] ;
+ }
+ #
} else {
echo "Access Denied";
}
Added: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockspadmin.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockspadmin.php (rev 0)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/blockspadmin.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -0,0 +1,154 @@
+<?php
+// $Id: blocksadmin.php 506 2006-05-26 23:10:37Z skalpa $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ exit("Access Denied");
+}
+// check if the user is authorised
+if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ $act = (isset($_GET['act']) && $_GET['act'] != '')?$_GET['act']:((isset($_POST['act']) && $_POST['act'] != '')?$_POST['act']:'list');
+ if ($act == 'list'){
+ xoops_cp_header();
+ listPblocks();
+ xoops_cp_footer();
+ }elseif ($act == 'edit'){
+ $pbid = (isset($_GET['pbid']) && $_GET['pbid'] != '')?$_GET['pbid']:((isset($_POST['pbid']) && $_POST['pbid'] != '')?$_POST['pbid']:0);
+ xoops_cp_header();
+ edit_pblock($pbid);
+ xoops_cp_footer();
+ }elseif ($act == 'delete'){
+ $pbid = (isset($_GET['pbid']) && $_GET['pbid'] != '')?$_GET['pbid']:((isset($_POST['pbid']) && $_POST['pbid'] != '')?$_POST['pbid']:0);
+ xoops_cp_header();
+ xoops_confirm(array( 'pbid' => $pbid, 'act'=>'delete_ok'),'admin.php?fct=blocksadmin&op=adminpblocks', _AM_BPMSG3);
+ xoops_cp_footer();
+ }elseif ($act == 'delete_ok'){
+ $pbid = (isset($_GET['pbid']) && $_GET['pbid'] != '')?$_GET['pbid']:((isset($_POST['pbid']) && $_POST['pbid'] != '')?$_POST['pbid']:0);
+ del_pblock($pbid);
+ }elseif ($act == 'save'){
+ save_pblock($_POST);
+ }elseif ($act == 'edit_ok'){
+ save_pblock($_POST,true);
+ }
+} else {
+ echo "Acess Denied";
+}
+
+function listPblocks(){
+ include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+ $oldzones = XoopsBlock::getBlockPositions(true);
+ echo "
+ <h4 style='float:right; text-align:left;'><a href='admin.php?fct=blocksadmin'>"._AM_BADMIN."</a></h4>";
+ echo "
+ <h4 style='text-align:left;'>"._AM_BPADMIN."</h4>";
+
+ echo '<p>'._AM_BPHELP.'</p><br /><br />';
+
+ echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
+ <tr valign='middle'><th>"._AM_BPCOD."</th><th>"._AM_BPNAME."</th><th>"._AM_TITLE."</th><th width='30%'>"._AM_BPDESC."</th><th align='right' width='12%'>"._AM_ACTION."</th></tr>
+ ";
+ $class = 'odd';
+ foreach ($oldzones as $k=>$v){
+ $class = ($class == 'even')?'odd':'even';
+ echo '<tr class="'.$class.'">';
+ echo '<td align="center">'.$k.'</td>';
+ echo '<td>'.$oldzones[$k]['pname'].'</td>';
+ $tit = (defined($oldzones[$k]['title']))?constant($oldzones[$k]['title']):$oldzones[$k]['title'];
+ echo '<td>'.$tit.'</td>';
+ echo '<td>'.$oldzones[$k]['description'].'</td>';
+ if (!$oldzones[$k]['block_default']){
+ $opcoes = '<a href="admin.php?fct=blocksadmin&op=adminpblocks&act=edit&pbid='.$k.'">'._EDIT.'</a> | ';
+ $opcoes .= '<a href="admin.php?fct=blocksadmin&op=adminpblocks&act=delete&pbid='.$k.'">'._DELETE.'</a>';
+ }else{
+ $opcoes = '';
+ }
+ echo '<td align="right">'.$opcoes.'</td>';
+ echo '</tr>';
+ }
+ echo "<tr><td class='foot' align='center' colspan='7'>
+ </td></tr></table>
+ </form>
+ <br /><br />";
+ $pblock = array(
+ 'form_title' => _AM_ADDPBLOCK,
+ 'pname' => '',
+ 'title' => '',
+ 'description' => '',
+ 'act' => 'save'
+ );
+ include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/pblockform.php';
+ $form->display();
+}
+
+function edit_pblock($pbid){
+ include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+ $oldzones = XoopsBlock::getBlockPositions(true);
+
+ echo '<a href="admin.php?fct=blocksadmin&op=adminpblocks">'. _AM_BPADMIN .'</a> <span style="font-weight:bold;">»»</span> '._AM_EDITPBLOCK.'<br /><br />';
+
+ $pblock = array(
+ 'form_title' => _AM_EDITPBLOCK,
+ 'pbid' => $pbid,
+ 'pname' => $oldzones[$pbid]['pname'],
+ 'title' => $oldzones[$pbid]['title'],
+ 'description' => $oldzones[$pbid]['description'],
+ 'act' => 'edit_ok'
+ );
+
+ include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/pblockform.php';
+ $form->display();
+}
+
+function save_pblock($dados,$edit=false){
+ $db =& Database::getInstance();
+
+ if (!$edit)
+ $sql = 'INSERT INTO '.$db->prefix('block_positions').' (pname,title,description,block_default,block_type) VALUES ("'.$dados['pname'].'","'.$dados['title'].'","'.$dados['description'].'","0","L")';
+ else
+ $sql = 'UPDATE '.$db->prefix('block_positions').' SET pname="'.$dados['pname'].'", title="'.$dados['title'].'", description="'.$dados['description'].'", block_default="0", block_type="L" WHERE id='.$dados['pbid'];
+
+ if ($db->queryF($sql))
+ redirect_header('admin.php?fct=blocksadmin&op=adminpblocks',1,_AM_BPMSG1);
+ else
+ redirect_header('admin.php?fct=blocksadmin&op=adminpblocks',1,_AM_BPMSG2);
+}
+
+function del_pblock($pbid){
+ $db =& Database::getInstance();
+
+ $sql = 'DELETE FROM '.$db->prefix('block_positions').' WHERE id='.$pbid;
+
+ if ($db->queryF($sql))
+ redirect_header('admin.php?fct=blocksadmin&op=adminpblocks',1,_AM_BPMSG1);
+ else
+ redirect_header('admin.php?fct=blocksadmin&op=adminpblocks',1,_AM_BPMSG2);
+}
+
+?>
\ No newline at end of file
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/main.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/main.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -43,7 +43,10 @@
}
if ( isset($_GET['op']) ) {
- if ($_GET['op'] == "edit" || $_GET['op'] == "delete" || $_GET['op'] == "delete_ok" || $_GET['op'] == "clone") {
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ //if ($_GET['op'] == "edit" || $_GET['op'] == "delete" || $_GET['op'] == "delete_ok" || $_GET['op'] == "clone") {
+ if ($_GET['op'] == "edit" || $_GET['op'] == "delete" || $_GET['op'] == "delete_ok" || $_GET['op'] == "clone" || $_GET['op'] == "adminpblocks") {
+ #
$op = $_GET['op'];
$bid = isset($_GET['bid']) ? intval($_GET['bid']) : 0;
}
@@ -110,6 +113,13 @@
exit();
}
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
+if ($op == 'adminpblocks') {
+ include "blockspadmin.php";
+ exit;
+}
+#
+
if ( $op == "list" ) {
xoops_cp_header();
list_blocks();
@@ -174,6 +184,8 @@
xoops_cp_footer();
exit();
}
+
+# Activate the block clone function - TheRpLima - 2007-10-21
/*
if ($op == 'clone') {
clone_block($bid);
@@ -183,4 +195,13 @@
clone_block_ok($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
}
*/
+if ($op == 'clone') {
+ clone_block($bid);
+}
+
+if ($op == 'clone_ok') {
+ //clone_block_ok($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
+ clone_block_ok($bid,$bside,$bweight,$bvisible,$btitle,$bcontent,$bcachetime,$bmodule,$options);
+}
+#
?>
\ No newline at end of file
Added: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/pblockform.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/pblockform.php (rev 0)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/blocksadmin/pblockform.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -0,0 +1,48 @@
+<?php
+// $Id: blockform.php 755 2006-09-24 21:30:21Z phppp $
+// ------------------------------------------------------------------------ //
+// 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 //
+// ------------------------------------------------------------------------ //
+
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+$form = new XoopsThemeForm($pblock['form_title'], 'pblockform', 'admin.php', "post", true);
+
+$pname = new XoopsFormText(_AM_NAME, "pname", 30, 30, $pblock['pname']);
+$pname->setDescription(_AM_PBNAME_DESC);
+$form->addElement($pname);
+$form->addElement(new XoopsFormText(_AM_TITLE, 'title', 30, 90, $pblock['title']), false);
+$textarea = new XoopsFormTextArea(_AM_BPDESC, 'description', $pblock['description'], 5, 50);
+$form->addElement($textarea);
+
+if (isset($pblock['pbid'])) {
+ $form->addElement(new XoopsFormHidden('pbid', $pblock['pbid']));
+}
+$form->addElement(new XoopsFormHidden('act', $pblock['act']));
+$form->addElement(new XoopsFormHidden('fct', 'blocksadmin'));
+$form->addElement(new XoopsFormHidden('op', 'adminpblocks'));
+$button_tray = new XoopsFormElementTray('', ' ');
+
+$button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, "submit"));
+$form->addElement($button_tray);
+?>
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/groups/groupform.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/groups/groupform.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/groups/groupform.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -63,6 +63,8 @@
$criteria->add(new Criteria('isactive', 1));
$r_mod_checkbox->addOptionArray($module_handler->getList($criteria));
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
+/*
$r_lblock_checkbox = new XoopsFormCheckBox('<b>'._LEFT.'</b><br />', "read_bids[]", $r_block_value);
$new_blocks_array = array();
$blocks_array = XoopsBlock::getAllBlocks("list", XOOPS_SIDEBLOCK_LEFT);
@@ -91,6 +93,26 @@
$r_block_tray->addElement($r_lblock_checkbox);
$r_block_tray->addElement($r_cblock_checkbox);
$r_block_tray->addElement($r_rblock_checkbox);
+*/
+$posarr = XoopsBlock::getBlockPositions(true);
+$block_checkbox = array();
+$i = 0;
+foreach ($posarr as $k=>$v){
+ $tit = (defined($posarr[$k]['title']))?constant($posarr[$k]['title']):$posarr[$k]['title'];
+ $block_checkbox[$i] = new XoopsFormCheckBox('<b>'.$tit.'</b><br />', "read_bids[]", $r_block_value);
+ $new_blocks_array = array();
+ $blocks_array = XoopsBlock::getAllBlocks("list", $k);
+ foreach ($blocks_array as $key=>$value) {
+ $new_blocks_array[$key] = "<a href='".XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&op=edit&bid=".$key."'>".$value." (ID: ".$key.")</a>";
+ }
+ $block_checkbox[$i]->addOptionArray($new_blocks_array);
+ $i++;
+}
+$r_block_tray = new XoopsFormElementTray(_AM_BLOCKRIGHTS, "<br /><br />");
+foreach ($block_checkbox as $k=>$v){
+ $r_block_tray->addElement($block_checkbox[$k]);
+}
+#
$op_hidden = new XoopsFormHidden("op", $op_value);
$fct_hidden = new XoopsFormHidden("fct", "groups");
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -286,7 +286,12 @@
$template = trim($block['template']);
}
$block_name = addslashes(trim($block['name']));
- $sql = "INSERT INTO ".$db->prefix("newblocks")." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES ($newbid, $newmid, ".intval($blockkey).", '$options', '".$block_name."','".$block_name."', '', 0, 0, 0, 'M', 'H', 1, '".addslashes($dirname)."', '".addslashes(trim($block['file']))."', '".addslashes(trim($block['show_func']))."', '".addslashes($edit_func)."', '".$template."', 0, ".time().")";
+
+ # Adding dynamic block area/position system - TheRpLima - 2007-10-21
+ //$sql = "INSERT INTO ".$db->prefix("newblocks")." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES ($newbid, $newmid, ".intval($blockkey).", '$options', '".$block_name."','".$block_name."', '', 0, 0, 0, 'M', 'H', 1, '".addslashes($dirname)."', '".addslashes(trim($block['file']))."', '".addslashes(trim($block['show_func']))."', '".addslashes($edit_func)."', '".$template."', 0, ".time().")";
+ $sql = "INSERT INTO ".$db->prefix("newblocks")." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES ($newbid, $newmid, ".intval($blockkey).", '$options', '".$block_name."','".$block_name."', '', 1, 0, 0, 'M', 'H', 1, '".addslashes($dirname)."', '".addslashes(trim($block['file']))."', '".addslashes(trim($block['show_func']))."', '".addslashes($edit_func)."', '".$template."', 0, ".time().")";
+ #
+
if (!$db->query($sql)) {
$msgs[] = ' <span style="color:#ff0000;">ERROR: Could not add block <b>'.$block['name'].'</b> to the database! Database error: <b>'.$db->error().'</b></span>';
} else {
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/blocksadmin.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/blocksadmin.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/blocksadmin.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -5,6 +5,25 @@
//%%%%%% blocks.php %%%%%
define("_AM_BADMIN","Blocks Administration");
+
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
+define('_AM_BPADMIN',"Blocks Positions Administration");
+define('_AM_BPCOD',"ID");
+define('_AM_BPNAME',"Name of Position");
+define('_AM_BPDESC',"Description of Position");
+define('_AM_ADDPBLOCK',"Add new Block Position");
+define('_AM_EDITPBLOCK',"Edit Block Position");
+define('_AM_PBNAME_DESC',"Name of Block Position, it is with this name that will have to be created the Loop in the theme for the exhibition of blocks.<br/>Use a name with small_caption letters, without spaces and special characters.");
+define('_AM_BPMSG1',"Successfully carried through operation!");
+define('_AM_BPMSG2',"Problems had occurred to carry through them the operations.");
+define('_AM_BPMSG3',"It is certain that it desires to exclude this block position?<br /><b>Warning:</b> This operation cannot be insult!");
+define('_AM_BPHELP','To include the new block positions on the theme, put the code bellow in the place where it desires that the blocks appear.
+<div style="border: 1px dashed #AABBCC; padding:10px; width:86%;">
+<{foreach from=$xoBlocks.<b>name_of_position</b> item=block}><br /><{include file="<b>path_to_theme_folder/file_to_show_blocks</b>"}><br /><{/foreach}>
+</div>
+');
+#
+
define("_AM_ADDBLOCK","Add a new block");
define("_AM_LISTBLOCK","List all blocks");
define("_AM_SIDE","Side");
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/groups.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/groups.php 2007-10-21 05:15:48 UTC (rev 1114)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/modules/system/language/english/admin/groups.php 2007-10-21 13:58:10 UTC (rev 1115)
@@ -34,4 +34,15 @@
define('_AM_GROUPSMAIN', 'Groups Main');
define('_AM_ADMINNO', 'There must be at least one user in the webmasters group');
+
+# Adding dynamic block area/position system - TheRpLima - 2007-10-21
+define("_AM_SBLEFT","Side Block - Left");
+define("_AM_SBRIGHT","Side Block - Right");
+define("_AM_CBLEFT","Center Block - Left");
+define("_AM_CBRIGHT","Center Block - Right");
+define("_AM_CBCENTER","Center Block - Center");
+define("_AM_CBBOTTOMLEFT","Center Block - Bottom left");
+define("_AM_CBBOTTOMRIGHT","Center Block - Bottom right");
+define("_AM_CBBOTTOM","Center Block - Bottom");
+#
?>
\ 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: <rea...@us...> - 2007-10-21 05:16:01
|
Revision: 1114
http://xoops.svn.sourceforge.net/xoops/?rev=1114&view=rev
Author: real_therplima
Date: 2007-10-20 22:15:48 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
Creating EXM task branch
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/admin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/backend.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/banners.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/auth/auth.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/auth/auth_ads.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/auth/auth_ldap.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/auth/auth_xoops.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/auth/authfactory.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/class.tar.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/class.zipfile.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/commentrenderer.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/criteria.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/database/database.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/database/databasefactory.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/database/sqlutility.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/downloader.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/errorhandler.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/logger.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/mimetypes.inc.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/module.errorhandler.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/module.textsanitizer.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/pagenav.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/debug.tpl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/internals/core.write_compiled_include.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/internals/core.write_file.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/block.textformat.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/compiler.assign.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.assign_debug_info.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.config_load.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.counter.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.cycle.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.debug.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.eval.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.fetch.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_checkboxes.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_image.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_options.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_radios.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_select_date.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_select_time.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.html_table.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.mailto.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.math.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.popup.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.popup_init.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.capitalize.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.cat.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.count_characters.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.count_paragraphs.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.count_sentences.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.count_words.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.date_format.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.debug_print_var.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.default.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.escape.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.indent.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.lower.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.nl2br.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.regex_replace.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.replace.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.spacify.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.string_format.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.strip.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.strip_tags.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.truncate.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.upper.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/modifier.wordwrap.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/shared.escape_special_chars.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/shared.make_timestamp.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/xoops_plugins/compiler.includeq.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/xoops_plugins/resource.db.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/snoopy.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/tardownloader.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/template.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/theme.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/theme_blocks.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/tree.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/uploader.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/bloggerapi.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/metaweblogapi.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/movabletypeapi.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/xmlrpcapi.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/xmlrpcparser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rpc/xoopsapi.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/rss/xmlrss2parser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/saxparser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/themesetparser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xml/xmltaghandler.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsblock.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopscomments.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/form.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formbutton.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formhidden.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formhiddentoken.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formlabel.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formpassword.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formradioyn.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselectcountry.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselectgroup.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselectlang.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselecttheme.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselecttimezone.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/simpleform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/tableform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsform/themeform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsformloader.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopslists.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsmailer.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsmodule.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsobject.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopssecurity.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsstory.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopstopic.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopstree.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopsuser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/zipdownloader.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/edituser.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/favicon.ico
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/footer.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/header.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/image.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/imagemanager.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/bold.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/icons/delete.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/icons/edit.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/icons/pm.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/icons/profile.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/icons/reply.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/image.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/poweredby.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/s_poweredby.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/images/underline.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/calendarjs.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/checklogin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_constants.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_delete.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_edit.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_form.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_new.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_post.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_reply.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/comment_view.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/commentform.inc.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/common.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/cp_functions.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/cp_header.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/functions.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/layersmenu.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/notification_constants.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/notification_functions.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/notification_select.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/notification_update.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/old_functions.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/old_theme_functions.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/passwordquality.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/registerform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/searchform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/xoops.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/include/xoopscodes.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/index.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/avatar.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/block.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/comment.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/config.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/configcategory.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/configitem.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/configoption.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/group.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/groupperm.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/handlerregistry.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/image.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/imagecategory.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/imageset.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/imagesetimg.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/member.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/module.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/notification.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/object.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/online.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/privmessage.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/session.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/tplfile.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/tplset.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/kernel/user.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/admin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/auth.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/calendar.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/comment.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/global.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/mail.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/misc.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/notification.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/pmsg.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/search.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/timezone.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/user.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/language/english/xoopsmailerlocal.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/lostpass.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/mainfile.dist.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/mainfile.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/misc.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/avatars/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/avatars/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/banners/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/banners/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/blocksadmin/blockform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/blocksadmin/blocksadmin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/blocksadmin/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/comments/admin_header.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/comments/comment_delete.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/comments/comment_edit.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/comments/comment_post.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/comments/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/findusers/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/findusers/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/groups/groupform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/groups/groups.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/groups/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/images/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/mailusers/mailform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/mailusers/mailusers.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/mailusers/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/mailusers/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/modulesadmin/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/preferences/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/smilies/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/smilies/smileform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/smilies/smilies.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/smilies/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/tplsets/themeimgform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/tplsets/tplform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/tplsets/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/userrank/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/userrank/rankform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/userrank/userrank.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/userrank/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/users/userform.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/users/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/version/main.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin/version/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/admin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/constants.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/images/info.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/images/install.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/images/system_slogo.png
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/images/uninstall.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/images/update.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/include/update.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/avatars.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/banners.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/comments.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/findusers.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/groups.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/images.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/mailusers.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/smilies.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/tplsets.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/userrank.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/users.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin/version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/admin.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/blocks.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/language/english/modinfo.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/menu.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/style.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/templates/blocks/system_block_comments.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/templates/blocks/system_block_user.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/templates/system_redirect.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/templates/system_siteclosed.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/templates/system_userinfo.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/modules/system/xoops_version.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/notifications.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/pda.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/pmlite.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/readpmsg.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/register.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/search.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4d4e4c4f2.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4d6422f04.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4d75edb5e.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4d8676346.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4d99c6eaa.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4daabd491.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4dbc14f3f.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4dcd7b9f4.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4ddd6835f.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4df1944ee.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4e02c5440.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4e1748cc9.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4e29bbcc7.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4e398ff7b.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4e4c2e742.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/uploads/smil3dbd4e7853679.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/user.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/userinfo.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/viewpmsg.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/xmlrpc.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/xoops.css
Added Paths:
-----------
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/captcha.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/class.makeImg.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/iam_csvdump.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.assign.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/smarty/plugins/function.xoops_link.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/_documentation.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/_whatsnew.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckcontextmenu.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckeditingarea.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckevents.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckicon.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckiecleanup.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckmenublock.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckmenublockpanel.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckmenuitem.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckpanel.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckplugin.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckspecialcombo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckstyledef.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckstyledef_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckstyledef_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckstylesloader.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbar.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarbreak_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarbutton.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarbuttonui.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarfontscombo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarpanelbutton.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarspecialcombo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fcktoolbarstylecombo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckxml_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/classes/fckxml_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fck_othercommands.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fckfitwindow.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fcknamedcommand.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fckpastewordcommand.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fckstylecommand.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fcktablecommand.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/commandclasses/fcktextcolorcommand.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/fckconstants.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/fckeditorapi.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/fckjscoreextensions.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_1.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_1_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_1_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_2.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_2_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_2_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fck_contextmenu.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckbrowserinfo.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckcodeformatter.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckcommands.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckconfig.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckdebug.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckdialog.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckdialog_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckdialog_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckdocumentprocessor.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcklanguagemanager.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckplugins.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckregexlib.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckselection.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckselection_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckselection_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktablehandler.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktablehandler_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktablehandler_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktoolbaritems.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktoolbarset.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktools.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktools_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fcktools_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckundo_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckundo_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckurlparams.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckxhtml.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckxhtml_gecko.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckxhtml_ie.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/_source/internals/fckxhtmlentities.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/behaviors/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/behaviors/disablehandles.htc
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/behaviors/hiddenfield.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/behaviors/hiddenfield.htc
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/behaviors/showtableborders.htc
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/fck_editorarea.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/fck_internal.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/fck_showtableborders_gecko.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/images/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/images/fck_anchor.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/images/fck_flashlogo.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/css/images/fck_pagebreak.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/fck_dialog_common.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/fck_dialog_common.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/fcknumericfield.htc
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/images/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/images/locked.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/images/reset.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/images/unlocked.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/common/moz-bindings.xml
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_about/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_about/lgpl.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_about/logo_fckeditor.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_about/logo_fredck.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_about.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_anchor.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_button.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_checkbox.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_colorselector.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_docprops/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_docprops/fck_document_preview.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_docprops.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_find.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_flash/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_flash/fck_flash.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_flash/fck_flash_preview.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_flash.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_form.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_hiddenfield.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_image/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_image/fck_image.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_image/fck_image_preview.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_image.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_link/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_link/fck_link.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_link.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_listprop.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_paste.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_radiobutton.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_replace.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_select/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_select/fck_select.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_select.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_smiley.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_source.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_specialchar.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_spellerpages.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_table.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_tablecell.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_template/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_template/images/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_template/images/template1.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_template/images/template2.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_template/images/template3.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_template.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_textarea.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_textfield.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/00.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/data.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/diacritic.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/dialogue.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/fck_universalkey.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/keyboard_layout.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey/multihexa.js
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/dialog/fck_universalkey.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/fckblank.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/fckdebug.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/fckdialog.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/fckeditor.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/fckeditor.original.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/browser.css
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/browser.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/basexml.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/class_upload.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/commands.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/config.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/connector.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/io.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/asp/util.asp
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/aspx/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/aspx/connector.aspx
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/cfm/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/cfm/config.cfm
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/cfm/connector.cfm
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/lasso/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/lasso/config.lasso
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/lasso/connector.lasso
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/basexml.pl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/commands.pl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/connector.cgi
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/io.pl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/temp/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/upload_fck.pl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/perl/util.pl
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/basexml.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/commands.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/config.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/connector.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/io.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/php/util.php
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/py/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/py/connector.py
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/connectors/test.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/frmactualfolder.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/frmcreatefolder.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/frmfolders.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/frmresourceslist.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/frmresourcetype.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/frmupload.html
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/ButtonArrow.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/Folder.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/Folder32.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/FolderOpened.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/FolderOpened32.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/FolderUp.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/ai.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/avi.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/cs.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/dll.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/doc.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/exe.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/fla.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/gif.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/htm.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/html.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/js.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/swf.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/swt.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/txt.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/xls.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/xml.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/32/zip.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/ai.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/avi.gif
XoopsCore/branches/tasks/2.0.18 XTXM/htdocs/class/xoopseditor/FCKeditor/editor/filemanager/browser/default/images/icons/bmp.gif
XoopsCore/branches/tasks/2.0.1...
[truncated message content] |
|
From: <rea...@us...> - 2007-10-21 03:36:15
|
Revision: 1113
http://xoops.svn.sourceforge.net/xoops/?rev=1113&view=rev
Author: real_therplima
Date: 2007-10-20 20:36:11 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
made a copy
Added Paths:
-----------
XoopsCore/branches/tasks/2.0.18 XTXM/
Copied: XoopsCore/branches/tasks/2.0.18 XTXM (from rev 1112, XoopsCore/branches/tasks/2.0.something)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-10-20 17:25:55
|
Revision: 1112
http://xoops.svn.sourceforge.net/xoops/?rev=1112&view=rev
Author: dugris
Date: 2007-10-20 10:25:58 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
Fixed bug #1779352 : Hardcoded language, Secure and improve code, Removal style/css
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php
XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css
Added Paths:
-----------
XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php
Modified: XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-20 17:07:28 UTC (rev 1111)
+++ XoopsCore/branches/2.0.x/2.0.18/docs/changelog.txt 2007-10-20 17:25:58 UTC (rev 1112)
@@ -5,6 +5,7 @@
2007/09/09: Version 2.0.18
============================
+- Fixed bug #1779352 : Hardcoded language, Secure and improve code, Removal style/css (young-pee/dugris)
- Fixed bug #1774929 : cannot herit methods from kernel's class (Garrath/dugris)
- Fixed : Corrected a line hardcoded (young-pee)
- Fixed : Making sure params used in queries are properly sanitized with intval() when they are integer (herve/malanciault)
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php 2007-10-20 17:07:28 UTC (rev 1111)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/banners.php 2007-10-20 17:25:58 UTC (rev 1112)
@@ -25,6 +25,8 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------ //
+$xoopsOption['pagetype'] = "banners";
+
include "mainfile.php";
/********************************************/
@@ -35,28 +37,18 @@
{
global $xoopsDB, $xoopsLogger, $xoopsConfig;
include("header.php");
- echo "<style type='text/css'>
- body {background-color : #fcfcfc;color: #000000;font-weight: normal;font-size: 12px;font-family: Trebuchet MS,Verdana, Arial, Helvetica, sans-serif;margin-left: 0px;margin-top: 0px;margin-right: 0px;margin-bottom: 0px;}
- .redirect {width: 70%;margin: 110px;text-align: center;padding: 15px;text-align:center;border: #e0e0e0 1px solid;color: #666666;background-color: #f6f6f6;text-align: center;}
- .redirect a:link {color: #666666;text-decoration: none;font-weight: bold;}
- .redirect a:visited {color: #666666;text-decoration: none;font-weight: bold;}
- .redirect a:hover {color: #999999;text-decoration: underline;font-weight: bold;}
- hr {height: 3px;border: 3px #E18A00 solid;filter : Alpha(Opacity=100,FinishOpacity=10,Style=2);width: 95%;}
- font.bigtext { font-size: 16px; font-weight: bold; }
- </style>
-
- <form action='banners.php' method='post'>
- <table width='100%' class='redirect'>
- <tr><td colspan='2' align='center'>
- <b>Advertising Statistics</b><hr /></td></tr>
- <tr><td align='right'><b>Login: </b></td>
+ echo "<form action='banners.php' method='post'>
+ <table class='banners'>
+ <tr><td colspan='2' class='center'>
+ <b>"._BANNERS_LOGIN_TITLE."</b><hr /></td></tr>
+ <tr><td align='right'><b>"._BANNERS_LOGIN_LOGIN.": </b></td>
<td><input class='textbox' type='text' name='login' size='12' maxlength='10' /></td></tr>
- <tr><td align='right'><b>Password: </b></td>
+ <tr><td align='right'><b>"._BANNERS_LOGIN_PASS.": </b></td>
<td><input class='textbox' type='password' name='pass' size='12' maxlength='10' /></td></tr>
- <tr><td align='center' colspan='2'><input type='hidden' name='op' value='Ok' />".$GLOBALS['xoopsSecurity']->getTokenHTML()."
+ <tr><td class='center' colspan='2'><input type='hidden' name='op' value='Ok' />
<input type='submit' value='Login'></td></tr>
- <tr><td colspan='2' align='center'><hr />Please type your client information</td></tr>
- </table></form>";
+ <tr><td colspan='2' class='center'><hr />"._BANNERS_LOGIN_INFO."</td></tr>
+ </table>".$GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN")."</form>";
include "footer.php";
}
@@ -64,30 +56,28 @@
/* Function to display the banners stats for */
/* each client */
/*********************************************/
-function bannerstats($login, $pass)
+function bannerstats()
{
global $xoopsDB, $xoopsConfig, $xoopsLogger;
- if ($login == "" || $pass == "") {
+ if ($_SESSION['banner_login'] == "" || $_SESSION['banner_pass'] == "") {
redirect_header("banners.php",2);
exit();
}
- $result = $xoopsDB->query(sprintf("SELECT cid, name, passwd FROM %s WHERE login=%s", $xoopsDB->prefix("bannerclient"), $xoopsDB->quoteString($login)));
+ $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 ( $pass==$passwd ) {
+ if ( $_SESSION['banner_pass'] == $passwd ) {
include "header.php";
- echo "<style type='text/css'>
- .b_td {color: #ffffff; background-color: #2F5376; padding: 3px; text-align: center;}
- </style>
- <h4 style='text-align:center;'><b>Current Active Banners for $name</b><br /></h4>
- <table width='100%' border='0'><tr>
- <td class='b_td'><b>ID</b></td>
- <td class='b_td'><b>Imp. Made</b></td>
- <td class='b_td'><b>Imp. Total</b></td>
- <td class='b_td'><b>Imp. Left</b></td>
- <td class='b_td'><b>Clicks</b></td>
- <td class='b_td'><b>% Clicks</b></td>
- <td class='b_td'><b>Functions</b></td></tr>";
+ echo "<h4 class='center'><b>".sprintf( _BANNERS_TITLE , $name )."</b><br /></h4>
+ <table><tr>
+ <th class='center'><b>ID</b></th>
+ <th class='center'><b>"._BANNERS_IMP_MADE."</b></th>
+ <th class='center'><b>"._BANNERS_IMP_TOTAL."</b></th>
+ <th class='center'><b>"._BANNERS_IMP_LEFT."</b></th>
+ <th class='center'><b>"._BANNERS_CLICKS."</b></th>
+ <th class='center'><b>"._BANNERS_PER_CLICKS."</b></th>
+ <th class='center'><b>"._BANNERS_FUNCTIONS."</b></th></tr>";
$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) ) {
if ( $impmade == 0 ) {
$percent = 0;
@@ -95,19 +85,21 @@
$percent = substr(100 * $clicks / $impmade, 0, 5);
}
if ( $imptotal == 0 ) {
- $left = "Unlimited";
+ $left = _BANNERS_UNLIMITED;
} else {
$left = $imptotal-$impmade;
}
- echo "<tr><td align='center'>$bid</td>
- <td align='center'>$impmade</td>
- <td align='center'>$imptotal</td>
- <td align='center'>$left</td>
- <td align='center'>$clicks</td>
- <td align='center'>$percent%</td>
- <td align='center'><a href='banners.php?op=EmailStats&login=$login&pass=$pass&cid=$cid&bid=$bid&t=".$GLOBALS['xoopsSecurity']->createToken()."'>E-mail Stats</a></td></tr>";
+ $class = ($i % 2 == 0) ? 'even' : 'odd';
+ echo "<tr class='$class'><td class='center'>$bid</td>
+ <td class='center'>$impmade</td>
+ <td class='center'>$imptotal</td>
+ <td class='center'>$left</td>
+ <td class='center'>$clicks</td>
+ <td class='center'>$percent%</td>
+ <td class='center'><a href='banners.php?op=EmailStats&cid=$cid&bid=$bid'>" . _BANNERS_STATS . "</a></td></tr>";
+ $i++;
}
- echo "</table><br /><br /><div>Following are your running Banners in " . htmlspecialchars( $xoopsConfig['sitename'] ). " </div><br /><br />";
+ echo "</table><br /><br /><div>". _BANNERS_FOW_IN . htmlspecialchars( $xoopsConfig['sitename'] ). " </div><br /><br />";
$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);
@@ -118,50 +110,51 @@
echo $myts->displayTarea($htmlcode);
}else{
if(strtolower(substr($imageurl,strrpos($imageurl,".")))==".swf") {
- echo "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/ swflash.cab#version=6,0,40,0\"; width=\"468\" height=\"60\">";
+ echo "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/ swflash.cab#version=6,0,40,0\" width=\"468\" height=\"60\">";
echo "<param name=movie value=\"$imageurl\" />";
echo "<param name=quality value='high' />";
- echo "<embed src=\"$imageurl\" quality='high' pluginspage=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\"; type=\"application/x-shockwave-flash\" width=\"468\" height=\"60\">";
+ echo "<embed src=\"$imageurl\" quality='high' pluginspage=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\" type=\"application/x-shockwave-flash\" width=\"468\" height=\"60\">";
echo "</embed>";
echo "</object>";
} else {
echo "<img src='$imageurl' border='1' alt='' />";
}
}
- echo"Banner ID: $bid<br />
- Send <a href='banners.php?op=EmailStats&login=$login&cid=$cid&bid=$bid&pass=$pass&t=".$GLOBALS['xoopsSecurity']->createToken()."'>E-Mail Stats</a> for this Banner<br />";
+ echo "<br />" . _BANNERS_ID . $bid . "<br />" .
+ sprintf(_BANNERS_SEND_STATS, 'banners.php?op=EmailStats&cid='.$cid.'&bid='.$bid) . "<br />";
if (!$htmlbanner){
$clickurl = htmlspecialchars($clickurl, ENT_QUOTES);
- echo "This Banner points to <a href='$clickurl'>this URL</a><br />
- <form action='banners.php' method='post'>
- Change URL: <input class='textbox' type='text' name='url' size='50' maxlength='200' value='$clickurl' />
- <input class='textbox' type='hidden' name='login' value='$login' />
+ echo sprintf(_BANNERS_POINTS, $clickurl) . "<br />
+ <form action='banners.php' method='post'>". _BANNERS_URL . "
+ <input class='textbox' type='text' name='url' size='50' maxlength='200' value='$clickurl' />
<input class='textbox' type='hidden' name='bid' value='$bid' />
- <input class='textbox' type='hidden' name='pass' value='$pass' />
<input class='textbox' type='hidden' name='cid' value='$cid' />
- <input type='submit' name='op' value='Change' /></form>";
+ <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")){
- echo "<h4 style='text-align:center;'>Banners Finished for $name</h4><br />
- <table width='100%' border='0'><tr>
- <td class='b_td'><b>ID</b></td>
- <td class='b_td'><b>Impressions</b></td>
- <td class='b_td'><b>Clicks</b></td>
- <td class='b_td'><b>% Clicks</b></td>
- <td class='b_td'><b>Start Date</b></td>
- <td class='b_td'><b>End Date</b></td></tr>";
+ if($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from ".$xoopsDB->prefix("bannerfinish")." where cid=$cid")){
+ echo "<h4 class='center'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><br />
+ <table><tr>
+ <th class='center'><b>ID</b></td>
+ <th class='center'><b>"._BANNERS_IMP_MADE."</b></td>
+ <th class='center'><b>"._BANNERS_CLICKS."</b></td>
+ <th class='center'><b>"._BANNERS_PER_CLICKS."</b></td>
+ <th class='center'><b>"._BANNERS_STARTED."</b></td>
+ <th class='center'><b>"._BANNERS_ENDED."</b></td></tr>";
+ $i=0;
while ( list($bid, $impressions, $clicks, $datestart, $dateend) = $xoopsDB->fetchRow($result) ) {
$percent = substr(100 * $clicks / $impressions, 0, 5);
- echo "<tr><td align='center'>$bid</td>
- <td align='center'>$impressions</td>
- <td align='center'>$clicks</td>
- <td align='center'>$percent%</td>
- <td align='center'>".formatTimestamp($datestart)."</td>
- <td align='center'>".formatTimestamp($dateend)."</td></tr>";
+ $class = ($i % 2 == 0) ? 'even' : 'odd';
+ echo "<tr class='$class'><td class='center'>$bid</td>
+ <td class='center'>$impressions</td>
+ <td class='center'>$clicks</td>
+ <td class='center'>$percent%</td>
+ <td class='center'>".formatTimestamp($datestart)."</td>
+ <td class='center'>".formatTimestamp($dateend)."</td></tr>";
}
echo "</table>";
}
@@ -176,17 +169,17 @@
/* Function to let the client E-mail his */
/* banner Stats */
/*********************************************/
-function EmailStats($login, $cid, $bid, $pass)
+function EmailStats($cid, $bid)
{
global $xoopsDB, $xoopsConfig;
- if ($login != "" && $pass != "") {
+ if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "") {
$cid = intval($cid);
$bid = intval($bid);
- if ($result2 = $xoopsDB->query(sprintf("select name, email, passwd from %s where cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($login)))) {
+ if ($result2 = $xoopsDB->query(sprintf("select name, email, passwd from %s where cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) {
list($name, $email, $passwd) = $xoopsDB->fetchRow($result2);
- if ($pass == $passwd) {
+ if ($_SESSION['banner_pass'] == $passwd) {
if ($email == "") {
- redirect_header("banners.php",3,"There isn't an email associated with client ".$name.".<br />Please contact the Administrator");
+ redirect_header("banners.php", 3, sprintf( _BANNERS_MAIL_ERROR, $name) );
exit();
} else {
if ($result = $xoopsDB->query("select bid, imptotal, impmade, clicks, imageurl, clickurl, date from ".$xoopsDB->prefix("banner")." where bid=$bid and cid=$cid")) {
@@ -197,14 +190,14 @@
$percent = substr(100 * $clicks / $impmade, 0, 5);
}
if ( $imptotal == 0 ) {
- $left = "Unlimited";
- $imptotal = "Unlimited";
+ $left = _BANNERS_UNLIMITED;
+ $imptotal = _BANNERS_UNLIMITED;
} else {
$left = $imptotal-$impmade;
}
$fecha = date("F jS Y, h:iA.");
- $subject = "Your Banner Statistics at ".$xoopsConfig['sitename'];
- $message = "Following are the complete stats for your advertising investment at ". $xoopsConfig['sitename']." :\n\n\nClient Name: $name\nBanner ID: $bid\nBanner Image: $imageurl\nBanner URL: $clickurl\n\nImpressions Purchased: $imptotal\nImpressions Made: $impmade\nImpressions Left: $left\nClicks Received: $clicks\nClicks Percent: $percent%\n\n\nReport Generated on: $fecha";
+ $subject = sprintf(_BANNERS_MAIL_SUBJECT , $xoopsConfig['sitename'] );
+ $message = sprintf(_BANNERS_MAIL_MESSAGE , $xoopsConfig['sitename'], $name, $bid, $imageurl, $clickurl, $imptotal, $impmade, $left, $clicks, $percent, $fecha);
$xoopsMailer =& getMailer();
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($email);
@@ -213,7 +206,7 @@
$xoopsMailer->setSubject($subject);
$xoopsMailer->setBody($message);
$xoopsMailer->send();
- redirect_header("banners.php?op=Ok&login=$login&pass=$pass&t=".$GLOBALS['xoopsSecurity']->createToken(), 3, "Statistics for your banner has been sent to your email address.");
+ redirect_header("banners.php?op=Ok", 3, _BANNERS_MAIL_OK);
exit();
}
}
@@ -228,19 +221,19 @@
/* Function to let the client to change the */
/* url for his banner */
/*********************************************/
-function change_banner_url_by_client($login, $pass, $cid, $bid, $url)
+function change_banner_url_by_client($cid, $bid, $url)
{
global $xoopsDB;
- if ($login != "" && $pass != "" && $url != "") {
+ if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "" && $url != "") {
$cid = intval($cid);
$bid = intval($bid);
- $sql = sprintf("select passwd from %s where cid=%u and login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($login));
+ $sql = sprintf("select passwd from %s where cid=%u and login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login']));
if ($result = $xoopsDB->query($sql)) {
list($passwd) = $xoopsDB->fetchRow($result);
- if ( $pass == $passwd ) {
+ if ( $_SESSION['banner_pass'] == $passwd ) {
$sql = sprintf("update %s set clickurl=%s where bid=%u AND cid=%u", $xoopsDB->prefix("banner"), $xoopsDB->quoteString($url), $bid, $cid);
if ($xoopsDB->query($sql)) {
- redirect_header("banners.php?op=Ok&login=$login&pass=$pass&t=".$GLOBALS['xoopsSecurity']->createToken(), 3, "URL has been changed.");
+ redirect_header("banners.php?op=Ok", 3, "URL has been changed.");
exit();
}
}
@@ -280,42 +273,24 @@
}
clickbanner($bid);
break;
-case "login":
- clientlogin();
- break;
case "Ok":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
+ if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
+ if ( !$GLOBALS['xoopsSecurity']->check("BANNER_LOGIN") ) {
+ 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']));
}
- $login = $pass = '';
- if (!empty($_GET['login'])) {
- $login = $myts->stripslashesGPC(trim($_GET['login']));
- }
- if (!empty($_GET['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_GET['pass']));
- }
- if (!empty($_POST['login'])) {
- $login = $myts->stripslashesGPC(trim($_POST['login']));
- }
- if (!empty($_POST['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_POST['pass']));
- }
- bannerstats($login, $pass);
+ bannerstats();
break;
-case "Change":
- if (!$GLOBALS['xoopsSecurity']->check()) {
+case _BANNERS_CHANGE:
+ if (!$GLOBALS['xoopsSecurity']->check("BANNER_EDIT")) {
redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
- $login = $pass = $url = '';
$bid = $cid = 0;
- if (!empty($_POST['login'])) {
- $login = $myts->stripslashesGPC(trim($_POST['login']));
- }
- if (!empty($_POST['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_POST['pass']));
- }
if (!empty($_POST['url'])) {
$url = $myts->stripslashesGPC(trim($_POST['url']));
}
@@ -325,29 +300,19 @@
if (!empty($_POST['cid'])) {
$cid = intval($_POST['cid']);
}
- change_banner_url_by_client($login, $pass, $cid, $bid, $url);
+ change_banner_url_by_client($cid, $bid, $url);
break;
case "EmailStats":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
- $login = $pass = '';
$bid = $cid = 0;
- if (!empty($_GET['login'])) {
- $login = $myts->stripslashesGPC(trim($_GET['login']));
- }
- if (!empty($_GET['pass'])) {
- $pass = $myts->stripslashesGPC(trim($_GET['pass']));
- }
if (!empty($_GET['bid'])) {
$bid = intval($_GET['bid']);
}
if (!empty($_GET['cid'])) {
$cid = intval($_GET['cid']);
}
- EmailStats($login, $cid, $bid, $pass);
+ EmailStats($cid, $bid);
break;
+case "login":
default:
clientlogin();
break;
Added: XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php (rev 0)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/language/english/banners.php 2007-10-20 17:25:58 UTC (rev 1112)
@@ -0,0 +1,35 @@
+<?php
+// $Id: $
+//%%%%%% File Name banners.php %%%%%
+define('_BANNERS_LOGIN_TITLE',"Advertising Statistics");
+define('_BANNERS_LOGIN_LOGIN',"Login");
+define('_BANNERS_LOGIN_PASS',"Password");
+define('_BANNERS_LOGIN_INFO',"Please type your client information");
+
+define('_BANNERS_ID',"Banner ID:");
+define('_BANNERS_TITLE',"Current Active Banners for %s");
+define('_BANNERS_URL',"Change URL:");
+
+define('_BANNERS_FOW_IN',"Following are your running Banners in ");
+define('_BANNERS_IMP_MADE',"Imp. Made");
+define('_BANNERS_IMP_TOTAL',"Imp. Total");
+define('_BANNERS_IMP_LEFT',"Imp. Left");
+define('_BANNERS_CLICKS',"Clicks");
+define('_BANNERS_PER_CLICKS',"% Clicks");
+define('_BANNERS_FUNCTIONS',"Functions");
+
+define('_BANNERS_CHANGE',"Save");
+define('_BANNERS_STATS',"E-mail Stats");
+define('_BANNERS_SEND_STATS',"Send <a href='%s' />E-mail Stats</a> for this Banner");
+define('_BANNERS_POINTS',"This Banner points to <a href='%s'>this URL</a>");
+define('_BANNERS_UNLIMITED',"Unlimited");
+
+define('_BANNERS_FINISHED',"Banners Finished for %s");
+define('_BANNERS_STARTED',"Start Date");
+define('_BANNERS_ENDED',"End Date");
+
+define('_BANNERS_MAIL_SUBJECT',"Your Banner Statistics at %s");
+define('_BANNERS_MAIL_MESSAGE',"Following are the complete stats for your advertising investment at %s :\n\n\nClient Name: %s\nBanner ID: %s\nBanner Image: %s\nBanner URL: %s\n\nImpressions Purchased: %s\nImpressions Made: %s\nImpressions Left: %s\nClicks Received: %s\nClicks Percent: %f \n\n\nReport Generated on: %s");
+define('_BANNERS_MAIL_OK',"Statistics for your banner has been sent to your email address.");
+define('_BANNERS_MAIL_ERROR',"There isn't an email associated with client %s.<br />Please contact the Administrator");
+?>
\ No newline at end of file
Modified: XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css 2007-10-20 17:07:28 UTC (rev 1111)
+++ XoopsCore/branches/2.0.x/2.0.18/htdocs/xoops.css 2007-10-20 17:25:58 UTC (rev 1112)
@@ -16,6 +16,12 @@
#usermenu a.menuTop {}
#usermenu a.highlight {color: #0000ff; background-color: #fcc;}
+.center { text-align: center;}
+.left { text-align: left; }
+.right { text-align: right; }
+.center { text-align: center; }
+.justify { text-align: justify; }
+
/* For required elements in XOOPS form, can be overwritten in theme styles */
.xoops-form-element-caption .caption-marker {
display: none;
@@ -31,3 +37,14 @@
padding-top: 5px;
font-weight: normal;
}
+
+/* For banners.php */
+.banners {
+ width: 70%;
+ margin: 110px;
+ padding: 15px;
+ border: #e0e0e0 1px solid;
+ color: #666666;
+ background-color: #f6f6f6;
+ text-align: center;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rea...@us...> - 2007-10-20 17:07:24
|
Revision: 1111
http://xoops.svn.sourceforge.net/xoops/?rev=1111&view=rev
Author: real_therplima
Date: 2007-10-20 10:07:28 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
Adding Password Security Quality Meeter by Xoops EXM
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php
XoopsCore/branches/tasks/2.0.something/htdocs/include/passwordquality.js
XoopsCore/branches/tasks/2.0.something/htdocs/include/registerform.php
XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php 2007-10-20 16:01:57 UTC (rev 1110)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/edituser.php 2007-10-20 17:07:28 UTC (rev 1111)
@@ -198,11 +198,25 @@
$bio_tarea = new XoopsFormTextArea(_US_EXTRAINFO, 'bio', $xoopsUser->getVar('bio', 'E'));
$cookie_radio_value = empty($_COOKIE[$xoopsConfig['usercookie']]) ? 0 : 1;
$cookie_radio = new XoopsFormRadioYN(_US_USECOOKIE, 'usecookie', $cookie_radio_value, _YES, _NO);
- $pwd_text = new XoopsFormPassword('', 'password', 10, 32);
- $pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
- $pwd_tray = new XoopsFormElementTray(_US_PASSWORD.'<br />'._US_TYPEPASSTWICE);
- $pwd_tray->addElement($pwd_text);
- $pwd_tray->addElement($pwd_text2);
+
+ #####################################################################################
+ ## Adding Password Quality Meter Config - TheRpLima - 2007-10-20
+ #####################################################################################
+ #$pwd_text = new XoopsFormPassword('', 'password', 10, 32);
+ $pwd_change_radio = new XoopsFormRadioYN(_US_CHANGE_PASSWORD, 'change_pass', 0, _YES, _NO);
+ $pwd_change_radio->setExtra('');
+ $config_handler =& xoops_gethandler('config');
+ $passConfig =& $config_handler->getConfigsByCat(2);
+ if ($passConfig['pass_level'] <= 20){
+ $pwd_text = new XoopsFormPassword('', 'password', 10, 32);
+ }else{
+ include_once XOOPS_ROOT_PATH."/include/passwordquality.php";
+ }
+ $pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
+ $pwd_tray = new XoopsFormElementTray(_US_PASSWORD.'<br />'._US_TYPEPASSTWICE);
+ $pwd_tray->addElement($pwd_text);
+ $pwd_tray->addElement($pwd_text2);
+
$mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $xoopsUser->getVar('user_mailok'));
$uid_hidden = new XoopsFormHidden('uid', $xoopsUser->getVar('uid'));
$op_hidden = new XoopsFormHidden('op', 'saveuser');
@@ -222,6 +236,7 @@
$form->addElement($notify_method_select);
$form->addElement($notify_mode_select);
$form->addElement($bio_tarea);
+ $form->addElement($pwd_change_radio);
$form->addElement($pwd_tray);
$form->addElement($cookie_radio);
$form->addElement($mailok_radio);
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/include/passwordquality.js
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/include/passwordquality.js 2007-10-20 16:01:57 UTC (rev 1110)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/include/passwordquality.js 2007-10-20 17:07:28 UTC (rev 1111)
@@ -35,12 +35,32 @@
}
//init
-function initQualityMeter(){
- var _pwd = document.getElementById(passField);
- updateQualityMeter();
- if (_pwd){
- document.forms["userinfo"][passField].
- }
+function initQualityMeter(change){
+ var _pwd = document.getElementById(passField);
+ if (!change && tipo != 1){
+ var change = 0;
+ }else if (!change && tipo == 1){
+ var change = 1;
+ }else if (change && tipo == 0){
+ var change = change;
+ }else if (change && tipo == 1){
+ var change = change;
+ }
+ if (change == 1){
+ _pwd.disabled = false;
+ document.getElementById('vpass').disabled = false;
+ updateQualityMeter();
+ if (_pwd){
+ document.forms["userinfo"][passField].
+ }
+ }else if (change == 0){
+ var sbtn = document.forms["userinfo"]["submit"];
+ sbtn.disabled = false;
+ _pwd.value = '';
+ _pwd.disabled = true;
+ document.getElementById('vpass').value = '';
+ document.getElementById('vpass').disabled = true;
+ }
}
@@ -81,7 +101,7 @@
if (pwlength > minpass){
pwlength = minpass;
}
-
+
//checa se o nome de usu\xE1rio est\xE1 contido na string
//ele pega o nome do usu\xE1rio case insensite, e tanto faz se o
//esta no inicio, meio ou fim da palavra, o que ele pega \xE9 o nome em si.
@@ -248,7 +268,7 @@
if (pwstrength < pass_level){
sbtn.disabled = true;
}else
- //Se seguran\xE7a e o comprimento da senha maior que os n\xEDveis configuados libera o bot\xE3o
+ //Se seguran\xE7a e o comprimento da senha maior que os n\xEDveis configurados libera o bot\xE3o
//do formul\xE1rio permitindo a realiza\xE7\xE3o do cadastro
if (pwstrength > pass_level && pwlength >= minpass){
sbtn.disabled = false;
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/include/registerform.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/include/registerform.php 2007-10-20 16:01:57 UTC (rev 1110)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/include/registerform.php 2007-10-20 17:07:28 UTC (rev 1111)
@@ -70,18 +70,19 @@
$uname_size = $xoopsConfigUser['maxuname'] < 25 ? $xoopsConfigUser['maxuname'] : 25;
$reg_form->addElement(new XoopsFormText(_US_NICKNAME, "uname", $uname_size, $uname_size, $myts->htmlSpecialChars($uname)), true);
$reg_form->addElement($email_tray);
+#####################################################################################
+## Adding Password Quality Meter Config - TheRpLima - 2007-10-20
+#####################################################################################
//$reg_form->addElement(new XoopsFormPassword(_US_PASSWORD, "pass", 10, 32, $myts->htmlSpecialChars($pass)), true);
$config_handler =& xoops_gethandler('config');
$passConfig =& $config_handler->getConfigsByCat(2);
-echo '<pre>';
-print_r($passConfig);
-echo '</pre>';
if ($passConfig['pass_level'] <= 20){
$reg_form->addElement(new XoopsFormPassword(_US_PASSWORD, "pass", 10, 32, $myts->htmlSpecialChars($pass)), true);
}else{
include_once XOOPS_ROOT_PATH."/include/passwordquality.php";
}
$reg_form->addElement(new XoopsFormPassword(_US_VERIFYPASS, "vpass", 10, 32, $myts->htmlSpecialChars($vpass)), true);
+
$reg_form->addElement(new XoopsFormText(_US_WEBSITE, "url", 25, 255, $myts->htmlSpecialChars($url)));
$tzselected = ($timezone_offset != "") ? $timezone_offset : $xoopsConfig['default_TZ'];
$reg_form->addElement(new XoopsFormSelectTimezone(_US_TIMEZONE, "timezone_offset", $tzselected));
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php 2007-10-20 16:01:57 UTC (rev 1110)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/language/english/user.php 2007-10-20 17:07:28 UTC (rev 1111)
@@ -139,4 +139,5 @@
#Password Quality Meter Config - TheRpLima - 2007-10-20
define('_US_REGFORM_NOJAVASCRIPT', 'To log in at the site it\'s necessary that your browser has javascript enabled.');
define('_US_REGFORM_WARNING', 'To register at the site you need to use a secure password. Try to create your password by using a mixture of letters (upper and lowercase), numbers and symbols. Try to create a password the more complex as possible although you can remember it.');
+define('_US_CHANGE_PASSWORD', 'Change Password?');
?>
\ 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: <rea...@us...> - 2007-10-20 16:01:54
|
Revision: 1110
http://xoops.svn.sourceforge.net/xoops/?rev=1110&view=rev
Author: real_therplima
Date: 2007-10-20 09:01:57 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
Add id option to radio button object
Modified Paths:
--------------
XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formradio.php
Modified: XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formradio.php
===================================================================
--- XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formradio.php 2007-10-20 14:48:01 UTC (rev 1109)
+++ XoopsCore/branches/tasks/2.0.something/htdocs/class/xoopsform/formradio.php 2007-10-20 16:01:57 UTC (rev 1110)
@@ -143,7 +143,7 @@
function render(){
$ret = "";
foreach ( $this->getOptions() as $value => $name ) {
- $ret .= "<input type='radio' name='".$this->getName()."' value='".$value."'";
+ $ret .= "<input type='radio' name='".$this->getName()."' id='".$this->getName()."' value='".$value."'";
$selected = $this->getValue();
if ( isset($selected) && ($value == $selected) ) {
$ret .= " checked='checked'";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.